Merge branch 'main' into dependabot/nuget/prototypes/multi-module-pro…

…totype/examples/multi-module-example/ModulesPrototype/Grpc.Tools-2.64.0
morganstanley · Jul 9, 2024 · 12587a2 · 12587a2
2 parents 1aa1d28 + 60fdfdd
commit 12587a2
Show file tree

Hide file tree

Showing 11 changed files with 373 additions and 182 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -74,13 +74,13 @@ jobs:
            powershell ./build/dotnet-pack.ps1
 
     - name: Upload Nuget Packages
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
       with:
         name: packages
         path: ${{ github.workspace }}/packages
 
     - name: Upload Shell Binaries
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
       with:
         name: shell-binaries
         path: ${{ github.workspace }}/src/shell/dotnet/Shell/bin/Release/net6.0-windows/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       # Using shared artifact from build workflow
       - name: Download Artifact
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: shell-binaries
           path: ${{ github.workspace }}/shell-binaries
@@ -72,7 +72,7 @@ jobs:
     env:
       nuget_source: https://api.nuget.org/v3/index.json
     steps:
-      - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+      - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: packages
           path: ./packages

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: SARIF file
           path: results.sarif

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -9,7 +9,7 @@
     <PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.0.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
-    <PackageVersion Include="Google.Protobuf" Version="3.26.1" />
+    <PackageVersion Include="Google.Protobuf" Version="3.27.2" />
     <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.62.0" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.62.0" />
     <PackageVersion Include="Grpc.AspNetCore.Web" Version="2.62.0" />

diff --git a/examples/fdc3-chart-and-grid/js-chart/package.json b/examples/fdc3-chart-and-grid/js-chart/package.json
@@ -16,13 +16,13 @@
     "bootstrap": "5.3.3",
     "highcharts": "11.4.3",
     "jquery": "3.7.1",
-    "tslib": "2.6.2"
+    "tslib": "2.6.3"
   },
   "devDependencies": {
     "http-server": "14.1.1",
     "rimraf": "5.0.7",
-    "rollup": "4.18.0",
-    "@rollup/plugin-commonjs": "25.0.8",
+    "rollup": "4.18.1",
+    "@rollup/plugin-commonjs": "26.0.1",
     "@rollup/plugin-node-resolve": "15.2.3"
   }
 }
diff --git a/examples/fdc3-chart-and-grid/js-datagrid/package.json b/examples/fdc3-chart-and-grid/js-datagrid/package.json
@@ -10,27 +10,27 @@
     "test": "ng test --watch=false"
   },
   "dependencies": {
-    "@angular/animations": "17.3.10",
+    "@angular/animations": "17.3.11",
     "@angular/cdk": "17.3.10",
-    "@angular/common": "17.3.10",
-    "@angular/compiler": "17.3.10",
-    "@angular/core": "17.3.10",
+    "@angular/common": "17.3.11",
+    "@angular/compiler": "17.3.11",
+    "@angular/core": "17.3.11",
     "@angular/flex-layout": "^15.0.0-beta.42",
-    "@angular/forms": "17.3.10",
+    "@angular/forms": "17.3.11",
     "@angular/material": "17.3.10",
-    "@angular/platform-browser": "17.3.10",
-    "@angular/platform-browser-dynamic": "17.3.10",
-    "@angular/router": "17.3.10",
+    "@angular/platform-browser": "17.3.11",
+    "@angular/platform-browser-dynamic": "17.3.11",
+    "@angular/router": "17.3.11",
     "@finos/fdc3": "2.1.0",
     "material-icons": "1.13.12",
     "rxjs": "7.8.1",
-    "tslib": "2.6.2",
+    "tslib": "2.6.3",
     "zone.js": "0.14.5"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "17.3.8",
     "@angular/cli": "17.3.8",
-    "@angular/compiler-cli": "17.3.10",
+    "@angular/compiler-cli": "17.3.11",
     "@types/jasmine": "5.1.4",
     "jasmine-core": "5.1.2",
     "karma": "6.4.3",

diff --git a/examples/js-chart-and-grid-messagerouter/js-chart/package.json b/examples/js-chart-and-grid-messagerouter/js-chart/package.json
@@ -16,13 +16,13 @@
     "bootstrap": "5.3.3",
     "highcharts": "11.4.3",
     "jquery": "3.7.1",
-    "tslib": "2.6.2"
+    "tslib": "2.6.3"
   },
   "devDependencies": {
     "http-server": "14.1.1",
     "rimraf": "^5.0.5",
-    "rollup": "^3.14.0",
-    "@rollup/plugin-commonjs": "25.0.8",
+    "rollup": "^4.18.1",
+    "@rollup/plugin-commonjs": "26.0.1",
     "@rollup/plugin-node-resolve": "15.2.3"
   }
 }
diff --git a/examples/js-chart-and-grid-messagerouter/js-datagrid/package.json b/examples/js-chart-and-grid-messagerouter/js-datagrid/package.json
@@ -10,27 +10,27 @@
     "test": "ng test --watch=false"
   },
   "dependencies": {
-    "@angular/animations": "17.3.10",
+    "@angular/animations": "17.3.11",
     "@angular/cdk": "17.3.10",
-    "@angular/common": "17.3.10",
-    "@angular/compiler": "17.3.10",
-    "@angular/core": "17.3.10",
+    "@angular/common": "17.3.11",
+    "@angular/compiler": "17.3.11",
+    "@angular/core": "17.3.11",
     "@angular/flex-layout": "^15.0.0-beta.42",
-    "@angular/forms": "17.3.10",
+    "@angular/forms": "17.3.11",
     "@angular/material": "17.3.10",
-    "@angular/platform-browser": "17.3.10",
-    "@angular/platform-browser-dynamic": "17.3.10",
-    "@angular/router": "17.3.10",
+    "@angular/platform-browser": "17.3.11",
+    "@angular/platform-browser-dynamic": "17.3.11",
+    "@angular/router": "17.3.11",
     "material-icons": "1.13.12",
     "@morgan-stanley/composeui-messaging-client": "*",
     "rxjs": "7.8.1",
-    "tslib": "2.6.2",
+    "tslib": "2.6.3",
     "zone.js": "0.14.5"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "17.3.8",
     "@angular/cli": "17.3.8",
-    "@angular/compiler-cli": "17.3.10",
+    "@angular/compiler-cli": "17.3.11",
     "@types/jasmine": "5.1.4",
     "jasmine-core": "5.1.2",
     "karma": "6.4.3",