Skip to content

[automated] Merge branch 'vs17.11' => 'vs17.12' #10805

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 14 commits into from
Oct 15, 2024
Merged

[automated] Merge branch 'vs17.11' => 'vs17.12' #10805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
559bfd3
Localized file check-in by OneLocBuild Task: Build definition ID 9434…
dotnet-bot Aug 23, 2024
bcaf466
[17.11] Fix component governance alerts (#10520)
MichalPavlik Sep 6, 2024
829da3b
Assembly redirect fix (#10624)
MichalPavlik Sep 9, 2024
9021c54
[vs17.11] Update dependencies from dotnet/arcade (#10654)
dotnet-maestro[bot] Sep 11, 2024
a69bbaa
Upgrade system.text.json to 8.0.4 (#10650)
maridematte Sep 12, 2024
3618188
disable loc (#10693)
maridematte Sep 25, 2024
aca7250
zzz
YuliiaKovalova Sep 27, 2024
445df62
merge
YuliiaKovalova Oct 3, 2024
b97fc8e
[vs17.11] Update dependencies from dotnet/arcade (#10691)
dotnet-maestro[bot] Oct 3, 2024
5f06904
[vs17.11] Update dependencies from dotnet/arcade (#10793)
dotnet-maestro[bot] Oct 14, 2024
7e19752
merge
YuliiaKovalova Oct 14, 2024
7e874c0
merge
YuliiaKovalova Oct 14, 2024
b5ec16e
Merge branch 'vs17.12' into merge/vs17.11-to-vs17.12
YuliiaKovalova Oct 14, 2024
e836b71
Update Versions.props
YuliiaKovalova Oct 14, 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
1 change: 1 addition & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
<UsagePattern IdentityGlob="System.Text.Json/*8.0.4*" />
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
</IgnorePatterns>
<Usages>
</Usages>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.12.3</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>17.12.4</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/sdl/NuGet.config
View file
Open in desktop

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

4 changes: 1 addition & 3 deletions eng/common/sdl/execute-all-sdl-tools.ps1
View file
Open in desktop

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

8 changes: 0 additions & 8 deletions eng/common/sdl/init-sdl.ps1
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion eng/common/sdl/sdl.ps1
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop

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