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.

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.13' => 'main' #11281

Merged
merged 40 commits into from
Jan 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
40 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
1a4d14a
[vs17.12] Update dependencies from dotnet/arcade (#11034)
dotnet-maestro[bot] Dec 10, 2024
b30c99e
Final Branding (#11130)
JanKrivanek Dec 12, 2024
2ac96a1
Bump version (#11135)
JanKrivanek Dec 13, 2024
afd5396
[vs17.12] Disable 17.12 localization (#11132)
JanKrivanek Dec 17, 2024
f7f4b08
[vs17.12] Bump VS and xcopy-msbuild version to 17.12.0 (#11155)
github-actions[bot] Dec 18, 2024
eb37b2e
[automated] Merge branch 'vs17.10' => 'vs17.11' (#11137)
github-actions[bot] Dec 19, 2024
e667d16
[vs17.13] Update dependencies from dotnet/source-build-reference-pack…
dotnet-maestro[bot] Dec 24, 2024
324a836
Merge branch 'vs17.12' into merge/vs17.11-to-vs17.12
GangWang01 Jan 3, 2025
e3fb21f
Eliminate the unnecessary change from vs17.11
GangWang01 Jan 3, 2025
7814a9e
Bump up version prefix to 17.12.22
GangWang01 Jan 3, 2025
876b889
Update SolutionPersistence version (#11188)
JanKrivanek Jan 3, 2025
10ad3ab
Remove conditional reference to System.Text.Json
GangWang01 Jan 6, 2025
1c985b1
[automated] Merge branch 'vs17.11' => 'vs17.12' (#11204)
GangWang01 Jan 6, 2025
868983a
Merge branch 'vs17.13' into merge/vs17.12-to-vs17.13
GangWang01 Jan 6, 2025
ce83d1e
Bump up version prefix to 17.13.3
GangWang01 Jan 6, 2025
583e46a
[vs17.13] Update dependencies from dotnet/arcade (#11221)
dotnet-maestro[bot] Jan 7, 2025
3d6c224
Merge branch 'vs17.13' into merge/vs17.12-to-vs17.13
GangWang01 Jan 8, 2025
048235c
Bump up version prefix to 17.13.4
GangWang01 Jan 8, 2025
000e099
[automated] Merge branch 'vs17.12' => 'vs17.13' (#11203)
GangWang01 Jan 9, 2025
524caa3
Localized file check-in by OneLocBuild Task: Build definition ID 9434…
dotnet-bot Jan 13, 2025
bfea91c
Remove IO.Redist from GetPathToBuildToolsFile (#11270)
SimaTian Jan 14, 2025
5519e18
Merge branch 'main' into merge/vs17.13-to-main
GangWang01 Jan 16, 2025
91025b9
Keep the translation in the main branch
GangWang01 Jan 16, 2025
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
Prev Previous commit
Next Next commit
Localized file check-in by OneLocBuild Task: Build definition ID 9434…
…: Build ID 10751309 (#11194)

Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10751309
dotnet-bot authored Jan 13, 2025
commit 524caa39a4354536038bc85c746c9a7a06bd3f16
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
@@ -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.13.4</VersionPrefix>
<VersionPrefix>17.13.5</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.12.6</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
10 changes: 5 additions & 5 deletions src/Build/Resources/xlf/Strings.cs.xlf

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

18 changes: 9 additions & 9 deletions src/Build/Resources/xlf/Strings.de.xlf

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

14 changes: 7 additions & 7 deletions src/Build/Resources/xlf/Strings.es.xlf

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

Loading