Skip to content

[automated] Merge branch 'release/9.0.2xx' => 'main' #8451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Oct 16, 2024
Merged

[automated] Merge branch 'release/9.0.2xx' => 'main' #8451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c77bb0f
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 24, 2024
627ff68
Merge pull request #8396 from dotnet/darc-release/9.0.1xx-b609550c-54…
v-wuzhai Sep 25, 2024
fc6df7d
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/templatin…
v-wuzhai Sep 25, 2024
168dd69
Merge pull request #8397 from dotnet/merge/release/9.0.1xx-to-release…
v-wuzhai Sep 25, 2024
1962eb4
Having folders in the binskim config causes it to fail. This was the …
marcpopMSFT Oct 1, 2024
d9f3872
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Oct 1, 2024
ddafab1
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 2, 2024
6c8d7a2
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 2, 2024
f63a464
Merge pull request #8413 from dotnet/marcpopMSFT-unblockbinskim
marcpopMSFT Oct 3, 2024
ae0f69d
Merge pull request #8422 from dotnet/merge/release/9.0.1xx-to-release…
marcpopMSFT Oct 3, 2024
6990236
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 5, 2024
c94a313
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 5, 2024
6eb2b6c
Merge pull request #8427 from dotnet/darc-release/9.0.1xx-aced5894-24…
v-wuzhai Oct 8, 2024
d19f89e
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/templatin…
v-wuzhai Oct 8, 2024
817f6a9
Merge pull request #8426 from dotnet/darc-release/9.0.2xx-1c2a58f3-98…
v-wuzhai Oct 8, 2024
bd8dec3
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/templatin…
v-wuzhai Oct 8, 2024
a18c3b5
Merge pull request #8428 from dotnet/merge/release/9.0.1xx-to-release…
v-wuzhai Oct 8, 2024
8365815
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
bdc3e1f
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
8f04ecc
Merge pull request #8443 from dotnet/darc-release/9.0.2xx-a116a64c-6c…
v-wuzhai Oct 11, 2024
cc299c9
Merge branch 'main' of https://github.com/dotnet/templating into merg…
v-wuzhai Oct 11, 2024
d3ef0c3
Create Directory.Solution.props
ViktorHofer Oct 15, 2024
33a8ecb
Update Directory.Solution.props
ViktorHofer Oct 15, 2024
052bc0b
Delete Directory.Solution.props
ViktorHofer Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ extends:
tsa:
enabled: true
binskim:
analyzeTargetGlob: $(Build.SourcesDirectory)/artifacts/bin/**.dll;$(Build.SourcesDirectory)/artifacts/bin/**.exe;
analyzeTargetGlob: +:f|**\*.dll;+:f|**\*.exe;
stages:
- stage: build
displayName: Build
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100-rc.1.24452.12"
"dotnet": "9.0.100-rc.2.24474.11"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4"
Expand Down