Skip to content

[automated] Merge branch 'vs17.14' => 'vs18.0' #12667

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
rainersigwald merged 33 commits into from
Oct 20, 2025
Merged

[automated] Merge branch 'vs17.14' => 'vs18.0' #12667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
fda44ee
[vs17.8] Update dependencies from dotnet/arcade (#12497)
dotnet-maestro[bot] Sep 8, 2025
a5c19d0
[vs17.11] Update dependencies from dotnet/arcade (#12499)
dotnet-maestro[bot] Sep 8, 2025
e71ee2d
[vs17.10] Update dependencies from dotnet/arcade (#12501)
dotnet-maestro[bot] Sep 8, 2025
aa888d3
Merged PR 668397: [vs17.10] Recreate temp on linux using CreateTempSu…
JanProvaznik Sep 15, 2025
f0cbb13
Merged PR 668395: [vs17.8] Recreate temp on linux using CreateTempSub…
JanProvaznik Sep 15, 2025
02bf662
Merged PR 668398: [vs17.11] Recreate temp on linux using CreateTempSu…
JanProvaznik Sep 15, 2025
728984d
Merged PR 668951: [vs17.12] Recreate temp on linux using CreateTempSu…
JanProvaznik Sep 15, 2025
09c1be8
Merged PR 668400: [vs17.14] Recreate temp on linux using CreateTempSu…
JanProvaznik Sep 15, 2025
cbe8df0
Merge v17.10.46 into vs17.10
JanProvaznik Oct 15, 2025
9a504bc
Merge v17.11.48 into vs17.11
JanProvaznik Oct 15, 2025
3afee21
Merge v17.12.50 into vs17.12
JanProvaznik Oct 15, 2025
f89a133
Merge v17.14.28 into vs17.14
JanProvaznik Oct 15, 2025
6be7d75
[vs17.8] Merge v17.8.43 into vs17.8 (#12646)
rainersigwald Oct 17, 2025
49570e4
[vs17.10] Merge v17.10.46 into vs17.10 (#12647)
rainersigwald Oct 17, 2025
465c458
[vs17.12] Merge v17.12.50 into vs17.12 (#12649)
rainersigwald Oct 17, 2025
b5618cb
[vs17.14] Merge v17.14.28 into vs17.14 (#12650)
rainersigwald Oct 17, 2025
cdfe9a7
[vs17.11] Merge v17.11.48 into vs17.11 (#12648)
JanProvaznik Oct 20, 2025
8e9a4ba
[vs17.8] Update dependencies from dotnet/arcade (#12523)
dotnet-maestro[bot] Oct 20, 2025
fa28cac
[vs17.10] Update dependencies from dotnet/arcade (#12525)
dotnet-maestro[bot] Oct 20, 2025
c3bf5aa
[vs17.11] Update dependencies from dotnet/arcade (#12524)
dotnet-maestro[bot] Oct 20, 2025
f7ee510
Merge branch 'vs17.10' into merge/vs17.8-to-vs17.10
JanProvaznik Oct 20, 2025
7457a57
[vs17.14] Update dependencies from dotnet/arcade (#12517)
dotnet-maestro[bot] Oct 20, 2025
675b209
[vs17.12] Update dependencies from dotnet/arcade (#12518)
dotnet-maestro[bot] Oct 20, 2025
7ed9cf3
[automated] Merge branch 'vs17.8' => 'vs17.10' (#12664)
JanProvaznik Oct 20, 2025
1656215
Merge branch 'vs17.11' into merge/vs17.10-to-vs17.11
JanProvaznik Oct 20, 2025
155d42e
[automated] Merge branch 'vs17.10' => 'vs17.11' (#12665)
JanProvaznik Oct 20, 2025
3c92f20
Disable localization for vs17.14 (#12619)
AR-May Oct 20, 2025
61706fe
Merge branch 'vs17.12' into merge/vs17.11-to-vs17.12
JanProvaznik Oct 20, 2025
2681ee4
[automated] Merge branch 'vs17.11' => 'vs17.12' (#12675)
JanProvaznik Oct 20, 2025
f527f0e
Merge branch 'vs17.14' into merge/vs17.12-to-vs17.14
JanProvaznik Oct 20, 2025
90160d4
[automated] Merge branch 'vs17.12' => 'vs17.14' (#12666)
JanProvaznik Oct 20, 2025
73796e6
Merge branch 'vs18.0' into merge/vs17.14-to-vs18.0
JanProvaznik Oct 20, 2025
3a597e5
fix merge of loc config
JanProvaznik Oct 20, 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
2 changes: 1 addition & 1 deletion .vsts-dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ variables:
- name: SkipApplyOptimizationData
value: true
- name: EnableReleaseOneLocBuild
value: true # Enable loc for vs17.14
value: true # Enable loc for vs18.0
- name: Codeql.Enabled
value: true
- group: DotNet-MSBuild-SDLValidation-Params
Expand Down
1 change: 0 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>

<!-- differentiate experimental insertions to avoid package id conflicts,
it has to be alphabetically after "preview" to avoid downgrade errors in VS -->
<PreReleaseVersionLabel Condition="'$(IsExperimental)' == 'true'">test</PreReleaseVersionLabel>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/nuget-verification.ps1
View file
Open in desktop

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

Loading