Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/prototypes/multi-module-pro…
Browse files Browse the repository at this point in the history
…totype/examples/multi-module-example/ModulesPrototype/Google.Protobuf-3.27.2
  • Loading branch information
bingenito authored Jul 9, 2024
2 parents 979b64c + b6f1f73 commit 6a821b9
Show file tree
Hide file tree
Showing 10 changed files with 372 additions and 181 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/fdc3-chart-and-grid/js-chart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
20 changes: 10 additions & 10 deletions examples/fdc3-chart-and-grid/js-datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
20 changes: 10 additions & 10 deletions examples/js-chart-and-grid-messagerouter/js-datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 6a821b9

Please sign in to comment.