From 6c9ad6f16d3aedd10b5f110a01bfac9c35513e21 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 15 Jul 2024 14:39:34 -0700 Subject: [PATCH 1/6] Add support for targeting Windows version 26100 and update Windows SDK projection versions --- eng/ManualVersions.props | 13 +++++++------ src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57a4b6415199..8ea5be208a97 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.31 - 10.0.18362.31 - 10.0.19041.31 - 10.0.20348.31 - 10.0.22000.31 - 10.0.22621.31 + 10.0.17763.34 + 10.0.18362.34 + 10.0.19041.34 + 10.0.20348.34 + 10.0.22000.34 + 10.0.22621.34 + 10.0.26100.34 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 580dd9423742..81d3f3ef5e23 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -672,6 +672,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index 59f28eee89af..96595fe2704c 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -19,6 +19,7 @@ public class GivenWindowsApp : TestBase [InlineData("10.0.20348.0")] [InlineData("10.0.22000.0")] [InlineData("10.0.22621.0")] + [InlineData("10.0.26100.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From 6d549e883a023394876c9252edddca47b410b835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:08:01 +0000 Subject: [PATCH 2/6] [release/6.0.4xx] Update dependencies from dotnet/arcade (#20027) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16cdfee24e81..ddf7ced64f16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + 3ea644036738781aff3b55f57a16bc99a6b82c4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cf3f9d329a46..7f4ce95b98f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24360.7 + 6.0.0-beta.24367.5 diff --git a/global.json b/global.json index 18b0acd2a4c5..49287840d85f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24360.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24360.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24367.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24367.5" } } From 6b32636df12a64f2813900baf37362ea509f3a85 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 2 Aug 2024 13:43:40 -0700 Subject: [PATCH 3/6] Hoist the version of two components in the core-sdk task assembly for CG --- eng/Versions.props | 2 ++ src/core-sdk-tasks/core-sdk-tasks.csproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index bfd85dad1677..06414638f789 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,6 +102,8 @@ 8.0.7 8.0.7 2.1.0 + 8.0.1 + 6.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 13f48542583e..5109b410684d 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -18,6 +18,8 @@ + + From ec33b3ccf268d4a8dea44d171d3e7094ce77019a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Aug 2024 11:23:32 -0700 Subject: [PATCH 4/6] Update branding to 6.0.426 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f4ce95b98f2..4b3fa78e8952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 25 + 26 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 12a9782e73abdd4ca914dafd25e513774d7faf46 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 7 Aug 2024 12:51:44 -0700 Subject: [PATCH 5/6] Disable Microsoft.IO.Redist when building from source --- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5109b410684d..3417a6354dec 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -19,7 +19,7 @@ - + From 5c2ed8423a3e3ce753cb76ce00e6a604460b9a30 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Sun, 11 Aug 2024 21:49:09 -0700 Subject: [PATCH 6/6] Update Windows SDK projection versions --- eng/ManualVersions.props | 21 ++++++++++++------ .../targets/GenerateBundledVersions.targets | 22 +++++++++++++------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8ea5be208a97..fa5627fe6d3b 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,19 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.34 - 10.0.18362.34 - 10.0.19041.34 - 10.0.20348.34 - 10.0.22000.34 - 10.0.22621.34 - 10.0.26100.34 + 10.0.17763.41 + 10.0.18362.41 + 10.0.19041.41 + 10.0.20348.41 + 10.0.22000.41 + 10.0.22621.41 + 10.0.26100.41 + 10.0.17763.38 + 10.0.18362.38 + 10.0.19041.38 + 10.0.20348.38 + 10.0.22000.38 + 10.0.22621.38 + 10.0.26100.38 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 9305d7dd882f..0df6bf8f7b3c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1143,13 +1143,21 @@ Copyright (c) .NET Foundation. All rights reserved. /> - - - - - - - + + + + + + + + + + + + + + +