From e371e5b548729e2066b7ea8c2a376475382dedda Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Sep 2022 12:38:25 -0700 Subject: [PATCH 1/3] Update to the just shiped RC1 version for all 7.0 templates and implicit versions. --- eng/Versions.props | 18 +++++++++--------- global.json | 2 +- .../targets/GenerateBundledVersions.targets | 12 ++++++------ test/SdkTests/SdkTests.csproj | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 391229853..706e11a12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,16 +110,16 @@ 5.0.403 6.0.302 - 7.0.100-rc.1.22416.16 + 7.0.100-rc.1.22429.2 5.0.13 6.0.1 - 7.0.0-rc.1.22423.7 + 7.0.0-rc.1.22427.2 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.22362.6 - 7.0.0-preview.7.22377.1 + 7.0.0-rc.1.22426.4 + 7.0.0-rc.1.22427.1 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -137,12 +137,12 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - 7.0.0-preview.7.22376.2 - 7.0.0-preview.7.22377.1 + 7.0.0-rc.1.22426.4 + 7.0.0-rc.1.22427.1 $(NUnit3DotNetNewTemplatePackageVersion) - 7.0.100-rc.1.22431.7 - 7.0.100-rc.1.22431.7 - 7.0.0-rc.1.22423.7 + 7.0.100-rc.1.22429.2 + 7.0.100-rc.1.22429.2 + 7.0.0-rc.1.22427.2 $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) diff --git a/global.json b/global.json index b8d50d0d1..b867c4d21 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.100-alpha.1.22423.9", "runtimes": { "dotnet": [ - "7.0.0-preview.7.22375.6" + "7.0.100-rc.1.22431.12" ] } }, diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 6eea3744a..0b8082f63 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -77,12 +77,12 @@ <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET70RuntimePackVersion>7.0.0-rc.1.22423.16 - <_NET70TargetingPackVersion>7.0.0-rc.1.22423.16 - <_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22423.6 - <_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22423.6 - <_AspNet70RuntimePackVersion>7.0.0-rc.1.22423.7 - <_AspNet70TargetingPackVersion>7.0.0-rc.1.22423.7 + <_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 <_NET60RuntimePackVersion>6.0.$(VersionFeature60) <_NET60TargetingPackVersion>6.0.$(VersionFeature60) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index dcc98dcfa..40cb6f5e4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,7 +63,7 @@ - + From ea19fb898e18315c1f3f81c9037fe9cd529421d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Sep 2022 12:42:13 -0700 Subject: [PATCH 2/3] Updated the console logging extension as well. --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b4ba4089..f999f9551 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,9 +216,9 @@ https://github.com/dotnet/arcade-services 1031000fad67fa8e3f8dc67ef73611b556eb33a5 - + https://github.com/dotnet/runtime - eecb02807867cad56cd05badddef65e432248b75 + 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 706e11a12..0ed304b22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 17.4.0-preview-20220912-02 - 7.0.0-preview.7.22375.6 + 7.0.0-rc.1.22426.10. From efda899df1f09827b8beb62748003b95d4f8c373 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Sep 2022 13:57:38 -0700 Subject: [PATCH 3/3] Updating the runtime version. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index b867c4d21..8b104ce43 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.100-alpha.1.22423.9", "runtimes": { "dotnet": [ - "7.0.100-rc.1.22431.12" + "7.0.0-rc.1.22426.10" ] } },