Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/angular-47489a9557
Browse files Browse the repository at this point in the history
  • Loading branch information
bingenito authored Mar 6, 2024
2 parents 6a04add + 02f55ee commit 68f569a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,13 @@ jobs:
- name: Codecov
uses: codecov/[email protected]
uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}

# By uploading it's shared with the other workflows that are reusing this
- name: Upload Shell Binaries
uses: actions/upload-artifact@v3
with:
name: shell-binaries
path: ${{ github.workspace }}/src/shell/dotnet/Shell/bin/Release/net6.0-windows/
path: ${{ github.workspace }}/src/shell/dotnet/Shell/bin/Release/net6.0-windows/
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
<PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/fdc3/js/composeui-fdc3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"rimraf": "5.0.5",
"rollup": "^3.14.0",
"ts-jest": "29.1.0",
"ts-node": "10.9.1",
"ts-node": "10.9.2",
"tslib": "^2.4.0",
"typescript": "^5.3.3"
}
Expand Down
2 changes: 1 addition & 1 deletion src/shell/js/composeui-node-launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"jest": "29.5.0",
"rimraf": "^5.0.5",
"ts-jest": "29.1.0",
"ts-node": "10.9.1",
"ts-node": "10.9.2",
"tslib": "^2.4.0",
"typescript": "^5.3.3"
}
Expand Down

0 comments on commit 68f569a

Please sign in to comment.