diff --git a/eng/Versions.props b/eng/Versions.props index 2ba3ebd16..bacb04d34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,6 +27,7 @@ 17 22 11 + 0 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -151,10 +152,14 @@ true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(VersionFeature70), 1)) + $([MSBuild]::Subtract($(VersionFeature80), 1)) $(VersionFeature60) $(VersionFeature70) + $(VersionFeature80) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature80), 1)) + $(VersionFeature80) @@ -164,15 +169,15 @@ 5.0.403 6.0.302 7.0.100 - 8.0.100-rc.2.23480.5 + 8.0.100 5.0.17-servicing.22215.4 6.0.7-servicing.22322.3 7.0.0-rtm.22518.7 - 8.0.0-rc.2.23463.2 + 8.0.0-rtm.23531.5 5.0.17-servicing.22218.2 6.0.7-servicing.22322.2 7.0.0-rtm.22518.2 - 8.0.0-rc.2.23463.3 + 8.0.0-rtm.23531.4 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -190,7 +195,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) - 8.0.0-rc.2.23463.9 + 8.0.$(AspNetCoreTemplateFeature80) $(MicrosoftDotNetCommonItemTemplates80PackageVersion) $(MicrosoftWinFormsProjectTemplates80PackageVersion) $(MicrosoftWPFProjectTemplates80PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 06871eb53..7fd7b2c14 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -96,13 +96,13 @@ <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET80RuntimePackVersion>8.0.0-rc.2.23479.6 - <_NET80TargetingPackVersion>8.0.0-rc.2.23479.6 - <_NET80WebAssemblyPackVersion>8.0.0-rc.2.23479.6 - <_WindowsDesktop80RuntimePackVersion>8.0.0-rc.2.23479.10 - <_WindowsDesktop80TargetingPackVersion>8.0.0-rc.2.23479.10 - <_AspNet80RuntimePackVersion>8.0.0-rc.2.23480.2 - <_AspNet80TargetingPackVersion>8.0.0-rc.2.23480.2 + <_NET80RuntimePackVersion>8.0.$(VersionFeature80) + <_NET80TargetingPackVersion>8.0.$(VersionFeature80) + <_NET80WebAssemblyPackVersion>8.0.$(VersionFeature80) + <_WindowsDesktop80RuntimePackVersion>8.0.$(VersionFeature80) + <_WindowsDesktop80TargetingPackVersion>8.0.$(VersionFeature80) + <_AspNet80RuntimePackVersion>8.0.$(VersionFeature80) + <_AspNet80TargetingPackVersion>8.0.$(VersionFeature80) <_NET70RuntimePackVersion>7.0.$(VersionFeature70) <_NET70TargetingPackVersion>7.0.$(VersionFeature70) @@ -588,7 +588,7 @@ Copyright (c) .NET Foundation. All rights reserved. - +