Skip to content

Commit fc58e12

Browse files
authored
Distribute 9.0 stable packs in 10.0 SDK (#44918)
1 parent eb4e0ed commit fc58e12

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<VersionFeature60>35</VersionFeature60>
3838
<VersionFeature70>20</VersionFeature70>
3939
<VersionFeature80>10</VersionFeature80>
40+
<VersionFeature90>0</VersionFeature90>
4041
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4142
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4243
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

eng/restore-toolset.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function InitializeCustomSDKToolset {
1818
InstallDotNetSharedFramework "6.0.0"
1919
InstallDotNetSharedFramework "7.0.0"
2020
InstallDotNetSharedFramework "8.0.0"
21-
InstallDotNetSharedFramework "9.0.0-rc.2.24473.5"
21+
InstallDotNetSharedFramework "9.0.0"
2222

2323
CreateBuildEnvScripts
2424
CreateVSShortcut

eng/restore-toolset.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function InitializeCustomSDKToolset {
2424
InstallDotNetSharedFramework "6.0.0"
2525
InstallDotNetSharedFramework "7.0.0"
2626
InstallDotNetSharedFramework "8.0.0"
27-
InstallDotNetSharedFramework "9.0.0-rc.2.24473.5"
27+
InstallDotNetSharedFramework "9.0.0"
2828

2929
CreateBuildEnvScript
3030
}

src/Installer/redist-installer/targets/GenerateBundledVersions.targets

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,12 @@
8585
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
8686
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
8787

88-
<!-- TODO: Once .NET 9.0.X has released, update these version numbers to 9.0.$(VersionFeature90) -->
89-
<_NET90RuntimePackVersion>9.0.0-rc.2.24473.5</_NET90RuntimePackVersion>
90-
<_NET90TargetingPackVersion>9.0.0-rc.2.24473.5</_NET90TargetingPackVersion>
91-
<_WindowsDesktop90RuntimePackVersion>9.0.0-rc.2.24474.4</_WindowsDesktop90RuntimePackVersion>
92-
<_WindowsDesktop90TargetingPackVersion>9.0.0-rc.2.24474.4</_WindowsDesktop90TargetingPackVersion>
93-
<_AspNet90RuntimePackVersion>9.0.0-rc.2.24474.3</_AspNet90RuntimePackVersion>
94-
<_AspNet90TargetingPackVersion>9.0.0-rc.2.24474.3</_AspNet90TargetingPackVersion>
88+
<_NET90RuntimePackVersion>9.0.$(VersionFeature90)</_NET90RuntimePackVersion>
89+
<_NET90TargetingPackVersion>9.0.$(VersionFeature90)</_NET90TargetingPackVersion>
90+
<_WindowsDesktop90RuntimePackVersion>9.0.$(VersionFeature90)</_WindowsDesktop90RuntimePackVersion>
91+
<_WindowsDesktop90TargetingPackVersion>9.0.$(VersionFeature90)</_WindowsDesktop90TargetingPackVersion>
92+
<_AspNet90RuntimePackVersion>9.0.$(VersionFeature90)</_AspNet90RuntimePackVersion>
93+
<_AspNet90TargetingPackVersion>9.0.$(VersionFeature90)</_AspNet90TargetingPackVersion>
9594

9695
<_NET80RuntimePackVersion>8.0.$(VersionFeature80)</_NET80RuntimePackVersion>
9796
<_NET80TargetingPackVersion>8.0.$(VersionFeature80)</_NET80TargetingPackVersion>

0 commit comments

Comments
 (0)