From 9f113aaa5560ab7c87b5c0e6f4eae265eb94d481 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Nov 2023 13:44:07 -0800 Subject: [PATCH 1/5] Downgrade implicit version Currently, we are not tracking changes to be released for 6 or 7 in December. Preparing the downgrade of the implicit version in case that ends up being the case. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index aa53d192b..316862a0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 25)) - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 24)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 5ec5ab4feeb32f14a5fa283af75d1aeefc3e777b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Nov 2023 16:47:05 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/arcade build 20231114.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23556.5 -> To Version 8.0.0-beta.23564.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1a2d386f..b9e8efe31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -209,18 +209,18 @@ - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5d949a221..5570a6c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 diff --git a/global.json b/global.json index 639cb4f44..88256e459 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23556.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" } } From a944bbe5821721091fe9f1ec0eef16a768038294 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:38:49 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231115.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23556.3 -> To Version 8.0.0-alpha.1.23565.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9e8efe31..944dd7ff4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - fa4c0e8f53ef2541a23e519af4dfb86cb88e1bae + 95f83e27806330fec09edd96e06bba3acabe3f35 From 5e315c84d591089970bb93595fa8903fa974f771 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 16 Nov 2023 07:48:08 -0600 Subject: [PATCH 4/5] Update .NET 8 GA MAUI baseline manifests (#17794) These are the releases on NuGet.org that shipped on 11/14. --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5570a6c20..7462e095a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -241,13 +241,13 @@ 8.0.100-rc.1 8.0.0-alpha.23471.13 - 8.0.100-rc.2 - 8.0.0-rc.2.9373 - 34.0.0-rc.2.468 - 16.4.8968-net8-rc2 - 16.4.8968-net8-rc2 - 13.3.8968-net8-rc2 - 16.4.8968-net8-rc2 + 8.0.100 + 8.0.3 + 34.0.43 + 17.0.8478 + 17.0.8478 + 14.0.8478 + 17.0.8478 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) From 4e9256ffb434a2c19b917479a8faf782b24c1bb3 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 16 Nov 2023 11:41:04 -0800 Subject: [PATCH 5/5] Use unique non-stable SDK version for comparison test (#17819) --- .../SourceBuiltArtifactsTests.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index d80eb8e54..7d6278b80 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -56,10 +56,9 @@ public class SourceBuiltArtifactsTests : SdkTests DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk")); string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName; string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath)); - string expectedSdkVersion = sdkVersionLines[1]; + string expectedSdkVersion = sdkVersionLines[3]; // Get the unique, non-stable, SDK version - // Disable due to https://github.com/dotnet/source-build/issues/3693 - // Assert.Equal(expectedSdkVersion, sdkVersion); + Assert.Equal(expectedSdkVersion, sdkVersion); } finally {