diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e545e184..0f1df1e09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,9 +213,9 @@ https://github.com/dotnet/arcade-services 5f08d3d04702feaa49acd692aa3a169512446ee9 - + https://github.com/dotnet/runtime - 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 + af841c8b33cecc92d74222298f1e45bf7bf3d90a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7a4d0ba74..e1d4626f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,16 +111,16 @@ 5.0.403 6.0.302 - 7.0.100-rc.1.22429.2 + 7.0.100 5.0.13 6.0.1 - 7.0.0-rc.1.22427.2 + 7.0.0 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 - 7.0.0-rc.1.22426.4 - 7.0.0-rc.1.22427.1 + 7.0.0-rtm.22518.7 + 7.0.0-rtm.22518.2 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -138,12 +138,12 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - 7.0.0-rc.1.22426.4 - 7.0.0-rc.1.22427.1 + $(MicrosoftWinFormsProjectTemplates70PackageVersion) + $(MicrosoftWPFProjectTemplates70PackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) - 7.0.100-rc.1.22429.2 - 7.0.100-rc.1.22429.2 - 7.0.0-rc.1.22427.2 + $(MicrosoftDotNetCommonItemTemplates70PackageVersion) + $(MicrosoftDotNetCommonItemTemplates70PackageVersion) + 7.0.0 $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 17.5.0-preview-20221107-06 - 7.0.0-rc.1.22426.10 + 8.0.0-alpha.1.22557.12 @@ -209,17 +209,17 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100-rc.2 + 7.0.100 - 7.0.100-rc.1 - 7.0.0-rc.1.6430 - 33.0.0-rc.1.136 - 15.4.1006-rc.1 - 15.4.1006-rc.1 - 12.3.1006-rc.1 - 15.4.1006-rc.1 + 7.0.100 + 7.0.49 + 33.0.4 + 16.0.1478 + 15.4.2372 + 12.3.2372 + 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) 8.0.0-alpha.1.22558.2 8.0.0-alpha.1.22558.2 diff --git a/global.json b/global.json index fda4cecfe..c6e518bc0 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.100-alpha.1.22423.9", "runtimes": { "dotnet": [ - "7.0.0-rc.1.22426.10" + "7.0.0" ] } }, diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 595671170..3d270520d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -64,6 +64,7 @@ 30 17 10 + 0 @@ -77,12 +78,12 @@ <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET70RuntimePackVersion>7.0.0-rc.1.22426.10 - <_NET70TargetingPackVersion>7.0.0-rc.1.22426.10 - <_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22427.1 - <_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22427.1 - <_AspNet70RuntimePackVersion>7.0.0-rc.1.22427.2 - <_AspNet70TargetingPackVersion>7.0.0-rc.1.22427.2 + <_NET70RuntimePackVersion>7.0.$(VersionFeature70) + <_NET70TargetingPackVersion>7.0.$(VersionFeature70) + <_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70) + <_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70) + <_AspNet70RuntimePackVersion>7.0.$(VersionFeature70) + <_AspNet70TargetingPackVersion>7.0.$(VersionFeature70) <_NET60RuntimePackVersion>6.0.$(VersionFeature60) <_NET60TargetingPackVersion>6.0.$(VersionFeature60) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 40cb6f5e4..769da7f5f 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,7 +63,7 @@ - +