Skip to content
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

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

Merged
merged 22 commits into from
Dec 10, 2024
Merged

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

Changes from all commits
Commits
Show all changes
22 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
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
00ee828
CG alert cleaning on VS17.11 (#10723)
GangWang01 Oct 15, 2024
4dc10ed
[vs17.11] Update dependencies from dotnet/arcade (#10832)
dotnet-maestro[bot] Oct 22, 2024
271998a
[vs17.11] Update dependencies from dotnet/arcade (#10895)
dotnet-maestro[bot] Oct 29, 2024
fde12b7
[vs17.11] Update dependencies from dotnet/arcade (#10990)
dotnet-maestro[bot] Nov 20, 2024
34ca971
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 25, 2024
881971c
Update VersionPrefix to 17.11.17
GangWang01 Nov 26, 2024
e4428c2
[vs17.11] Update dependencies from dotnet/arcade (#11033)
surayya-MS Nov 28, 2024
9da57dd
[vs17.11] Run tests even if version is not bumped (#11060)
github-actions[bot] Dec 3, 2024
e4f5b93
[vs17.11] Backport VS insertion pipeline YMLs (#11064)
github-actions[bot] Dec 3, 2024
b7493e5
Merge branch 'vs17.12' into merge/vs17.11-to-vs17.12
GangWang01 Dec 6, 2024
454edd8
Eliminate the unnecessary change from vs17.11
GangWang01 Dec 6, 2024
e6ed28b
Remove duplicate version setting for System.Formats.Asn1
GangWang01 Dec 9, 2024
0ee1cb4
Merge branch 'vs17.12' into merge/vs17.11-to-vs17.12
GangWang01 Dec 9, 2024
31ad273
Bump up version prefix to 17.12.18
GangWang01 Dec 9, 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 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.17</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>17.12.18</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand Down