Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'main' #42807

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 13 commits into from
Aug 27, 2024
Merged

[automated] Merge branch 'release/9.0.1xx' => 'main' #42807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
21de44d
RC2 Branding
marcpopMSFT Aug 14, 2024
4932981
Enable CI builds for the public RC2 branch
marcpopMSFT Aug 15, 2024
e4a7434
RC2 Branding (#42744)
marcpopMSFT Aug 15, 2024
fa4b852
Enable CI builds for the public RC2 branch (#42747)
marcpopMSFT Aug 15, 2024
98a3b5a
[release/9.0.1xx] .NET Source-Build 9.0.100-preview.7.24407.1 August …
github-actions[bot] Aug 16, 2024
cd32a9c
Update stage 0 to fix cppcli tests (#42806)
marcpopMSFT Aug 18, 2024
cd3c520
Try resetting the toolset framework env variable
marcpopMSFT Aug 18, 2024
3119515
removing extra parenth
marcpopMSFT Aug 19, 2024
9bdfba1
Fix the cppcli tests by upgrading to preview 7 in stage 0 (#42822)
marcpopMSFT Aug 19, 2024
7c6ebaa
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
Aug 19, 2024
e415d49
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
Aug 21, 2024
c33ac83
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
Aug 26, 2024
6d13cb1
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
Aug 27, 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 .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ trigger:
branches:
include:
- main
- release/9.0.1xx-preview*
- release/9.0.1xx
- internal/release/*
- exp/*

Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rc</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">1</PreReleaseVersionIteration>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">2</PreReleaseVersionIteration>
<!-- In source-build the version of the compiler must be same or newer than the version of the
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
in that build mode analyzer assemblies always target the live compiler API. -->
Expand All @@ -33,9 +33,9 @@
<VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50>
<VersionFeature60>32</VersionFeature60>
<VersionFeature60>33</VersionFeature60>
<VersionFeature70>20</VersionFeature70>
<VersionFeature80>7</VersionFeature80>
<VersionFeature80>8</VersionFeature80>
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
Expand Down