From 67e4bf2cf09f349693e606fcc1293bdbfde576f3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 13 Mar 2023 14:07:05 -0700 Subject: [PATCH 1/6] Automate asp.net template updates into dotnet/installer --- eng/Versions.props | 28 +++++++++++++++++-- .../targets/GenerateBundledVersions.targets | 7 ----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 75f54c574..3f7f42255 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,6 +19,12 @@ false release + + 30 + 32 + 17 + 14 + @@ -103,12 +109,28 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) + + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + 5.0.403 6.0.302 - 5.0.13 - 6.0.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -135,7 +157,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 3bdff216f..60d7ecde1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -59,13 +59,6 @@ - - 30 - 32 - 17 - 14 - - Microsoft.NETCoreSdk.BundledVersions.props From bb2f4dc0df549cda1b90a915e44098b7b8403ead Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 08:28:02 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/sdk build 20230314.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.13 -> To Version 7.0.300-preview.23164.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a8c28f92..4e823806a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a diff --git a/eng/Versions.props b/eng/Versions.props index 44a7548fa..a6d042519 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.13 - 7.0.300-preview.23163.13 - 7.0.300-preview.23163.13 + 7.0.300-preview.23164.2 + 7.0.300-preview.23164.2 + 7.0.300-preview.23164.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d453fa00438d0e0fc241f70adeccf60fe6252ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:50:54 +0000 Subject: [PATCH 3/6] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15786) [release/7.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e823806a..16093b1d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e diff --git a/eng/Versions.props b/eng/Versions.props index a6d042519..9bf3f89ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23164.2 - 7.0.300-preview.23164.2 - 7.0.300-preview.23164.2 + 7.0.300-preview.23164.4 + 7.0.300-preview.23164.4 + 7.0.300-preview.23164.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b0f9f6f3c7bd5b8d1e078526b64de12b411132b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:40:21 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16093b1d2..044e8923c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..895f275b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23122.4 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 9890ccd94..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } } From c43b7f00f50a475d4371f3bf03c8ba018247fc82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:51:03 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/sdk build 20230314.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.4 -> To Version 7.0.300-preview.23164.22 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16093b1d2..75c8c7f23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..22ec40b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.4 - 7.0.300-preview.23164.4 - 7.0.300-preview.23164.4 + 7.0.300-preview.23164.22 + 7.0.300-preview.23164.22 + 7.0.300-preview.23164.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 52aeec5f31b06dbef91bdf8639f74c5b4c4f985f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 03:04:47 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/sdk build 20230314.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.22 -> To Version 7.0.300-preview.23164.30 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23152.6 -> To Version 4.6.0-2.23164.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d47ab3714..7953d5765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 1314d090671dc1a1500c5303c4b5ae9150f40d98 + 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 7cfa25d08..8c8cd1d06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.22 - 7.0.300-preview.23164.22 - 7.0.300-preview.23164.22 + 7.0.300-preview.23164.30 + 7.0.300-preview.23164.30 + 7.0.300-preview.23164.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)