Skip to content

Commit d4e5b07

Browse files
authored
Merge branch 'main' into dependabot/nuget/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype/Grpc.Net.Client-2.65.0
2 parents 13b0150 + ac6aba7 commit d4e5b07

File tree

10 files changed

+819
-276
lines changed

10 files changed

+819
-276
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,14 @@ updates:
1111
# Dependabot doesn't support glob syntax. Every solution needs an entry
1212

1313
- package-ecosystem: 'nuget'
14-
directory: '/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent'
15-
schedule:
16-
interval: 'monthly'
17-
18-
- package-ecosystem: 'nuget'
19-
directory: '/src/messaging/dotnet/src/Client'
20-
schedule:
21-
interval: 'monthly'
22-
23-
- package-ecosystem: 'nuget'
24-
directory: '/src/messaging/dotnet/src/Core'
25-
schedule:
26-
interval: 'monthly'
27-
28-
- package-ecosystem: 'nuget'
29-
directory: '/src/messaging/dotnet/src/Host'
30-
schedule:
31-
interval: 'monthly'
32-
33-
- package-ecosystem: 'nuget'
34-
directory: '/src/messaging/dotnet/src/Server'
35-
schedule:
36-
interval: 'monthly'
37-
38-
- package-ecosystem: 'nuget'
39-
directory: '/src/shell/dotnet/Shell'
40-
schedule:
41-
interval: 'monthly'
42-
43-
- package-ecosystem: 'nuget'
44-
directory: '/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype'
45-
schedule:
46-
interval: 'monthly'
47-
48-
- package-ecosystem: 'nuget'
49-
directory: '/'
14+
directories:
15+
- '/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent'
16+
- '/src/messaging/dotnet/src/Client'
17+
- '/src/messaging/dotnet/src/Core'
18+
- '/src/messaging/dotnet/src/Host'
19+
- '/src/messaging/dotnet/src/Server'
20+
- '/src/shell/dotnet/Shell'
21+
- '/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype'
5022
schedule:
5123
interval: 'monthly'
5224
groups:

Directory.Packages.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.0.0" />
1010
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
1111
<PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
12-
<PackageVersion Include="Google.Protobuf" Version="3.27.2" />
13-
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.62.0" />
12+
<PackageVersion Include="Google.Protobuf" Version="3.27.3" />
13+
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.65.0" />
1414
<PackageVersion Include="Grpc.AspNetCore" Version="2.62.0" />
1515
<PackageVersion Include="Grpc.AspNetCore.Web" Version="2.62.0" />
1616
<PackageVersion Include="Grpc.Core.Testing" Version="2.46.6" />
1717
<PackageVersion Include="Grpc.Net.Client" Version="2.65.0" />
18-
<PackageVersion Include="Grpc.Tools" Version="2.64.0" />
18+
<PackageVersion Include="Grpc.Tools" Version="2.65.0" />
1919
<PackageVersion Include="Grpc" Version="2.46.6" />
20-
<PackageVersion Include="Infragistics.WPF.DockManager.Trial" Version="23.2.157" />
21-
<PackageVersion Include="Infragistics.WPF.Ribbon.Trial" Version="23.2.157" />
22-
<PackageVersion Include="Infragistics.WPF.Trial" Version="23.2.157" />
20+
<PackageVersion Include="Infragistics.WPF.DockManager.Trial" Version="23.2.233" />
21+
<PackageVersion Include="Infragistics.WPF.Ribbon.Trial" Version="23.2.233" />
22+
<PackageVersion Include="Infragistics.WPF.Trial" Version="23.2.233" />
2323
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
2424
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
2525
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
@@ -46,16 +46,16 @@
4646
<PackageVersion Include="Serilog" Version="2.11.0" />
4747
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
4848
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
49-
<PackageVersion Include="System.Drawing.Common" Version="8.0.6" />
49+
<PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
5050
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
5151
<PackageVersion Include="System.Management" Version="8.0.0" />
5252
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
5353
<PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
5454
<PackageVersion Include="System.Reactive" Version="6.0.1" />
5555
<PackageVersion Include="System.ServiceModel.Primitives" Version="6.2.0" />
56-
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
57-
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.0.22" />
58-
<PackageVersion Include="TestableIO.System.IO.Abstractions" Version="21.0.22" />
56+
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
57+
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.0.29" />
58+
<PackageVersion Include="TestableIO.System.IO.Abstractions" Version="21.0.29" />
5959
<PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
6060
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
6161
<PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />

examples/fdc3-chart-and-grid/js-chart/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
},
2121
"devDependencies": {
2222
"http-server": "14.1.1",
23-
"rimraf": "5.0.7",
24-
"rollup": "4.18.1",
23+
"rimraf": "6.0.1",
24+
"rollup": "4.19.2",
2525
"@rollup/plugin-commonjs": "26.0.1",
2626
"@rollup/plugin-node-resolve": "15.2.3"
2727
}

examples/fdc3-chart-and-grid/js-datagrid/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
"test": "ng test --watch=false"
1111
},
1212
"dependencies": {
13-
"@angular/animations": "17.3.11",
13+
"@angular/animations": "17.3.12",
1414
"@angular/cdk": "17.3.10",
15-
"@angular/common": "17.3.11",
16-
"@angular/compiler": "17.3.11",
17-
"@angular/core": "17.3.11",
15+
"@angular/common": "17.3.12",
16+
"@angular/compiler": "17.3.12",
17+
"@angular/core": "17.3.12",
1818
"@angular/flex-layout": "^15.0.0-beta.42",
19-
"@angular/forms": "17.3.11",
19+
"@angular/forms": "17.3.12",
2020
"@angular/material": "17.3.10",
21-
"@angular/platform-browser": "17.3.11",
22-
"@angular/platform-browser-dynamic": "17.3.11",
23-
"@angular/router": "17.3.11",
24-
"@finos/fdc3": "2.1.0",
21+
"@angular/platform-browser": "17.3.12",
22+
"@angular/platform-browser-dynamic": "17.3.12",
23+
"@angular/router": "17.3.12",
24+
"@finos/fdc3": "2.1.1",
2525
"material-icons": "1.13.12",
2626
"rxjs": "7.8.1",
2727
"tslib": "2.6.3",
@@ -30,10 +30,10 @@
3030
"devDependencies": {
3131
"@angular-devkit/build-angular": "17.3.8",
3232
"@angular/cli": "17.3.8",
33-
"@angular/compiler-cli": "17.3.11",
33+
"@angular/compiler-cli": "17.3.12",
3434
"@types/jasmine": "5.1.4",
35-
"jasmine-core": "5.1.2",
36-
"karma": "6.4.3",
35+
"jasmine-core": "5.2.0",
36+
"karma": "6.4.4",
3737
"karma-chrome-launcher": "~3.2.0",
3838
"karma-coverage": "2.2.1",
3939
"karma-jasmine": "~5.1.0",

examples/js-chart-and-grid-messagerouter/js-chart/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"devDependencies": {
2222
"http-server": "14.1.1",
23-
"rimraf": "^5.0.5",
23+
"rimraf": "^6.0.1",
2424
"rollup": "^4.18.1",
2525
"@rollup/plugin-commonjs": "26.0.1",
2626
"@rollup/plugin-node-resolve": "15.2.3"

examples/js-chart-and-grid-messagerouter/js-datagrid/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
"test": "ng test --watch=false"
1111
},
1212
"dependencies": {
13-
"@angular/animations": "17.3.11",
13+
"@angular/animations": "17.3.12",
1414
"@angular/cdk": "17.3.10",
15-
"@angular/common": "17.3.11",
16-
"@angular/compiler": "17.3.11",
17-
"@angular/core": "17.3.11",
15+
"@angular/common": "17.3.12",
16+
"@angular/compiler": "17.3.12",
17+
"@angular/core": "17.3.12",
1818
"@angular/flex-layout": "^15.0.0-beta.42",
19-
"@angular/forms": "17.3.11",
19+
"@angular/forms": "17.3.12",
2020
"@angular/material": "17.3.10",
21-
"@angular/platform-browser": "17.3.11",
22-
"@angular/platform-browser-dynamic": "17.3.11",
23-
"@angular/router": "17.3.11",
21+
"@angular/platform-browser": "17.3.12",
22+
"@angular/platform-browser-dynamic": "17.3.12",
23+
"@angular/router": "17.3.12",
2424
"material-icons": "1.13.12",
2525
"@morgan-stanley/composeui-messaging-client": "*",
2626
"rxjs": "7.8.1",
@@ -30,10 +30,10 @@
3030
"devDependencies": {
3131
"@angular-devkit/build-angular": "17.3.8",
3232
"@angular/cli": "17.3.8",
33-
"@angular/compiler-cli": "17.3.11",
33+
"@angular/compiler-cli": "17.3.12",
3434
"@types/jasmine": "5.1.4",
35-
"jasmine-core": "5.1.2",
36-
"karma": "6.4.3",
35+
"jasmine-core": "5.2.0",
36+
"karma": "6.4.4",
3737
"karma-chrome-launcher": "~3.2.0",
3838
"karma-coverage": "2.2.1",
3939
"karma-jasmine": "~5.1.0",

0 commit comments

Comments
 (0)