From c75a1ba583966bbb2b4e9c005a80496648babfab Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 21 Sep 2023 18:04:19 -0500 Subject: [PATCH 01/36] Tweak the workload version regex --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9761a4caf..4d595e2d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,11 +248,11 @@ 8.0.0-rc.2.23463.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 12a817b846b252b9e13dad125afa9da3c72b57a9 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 22 Sep 2023 20:22:55 -0500 Subject: [PATCH 02/36] Run dotnet watch in non-interactive mode during tests (#17259) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 3fbc04899..a65f6d7e0 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -20,7 +20,7 @@ public class DotNetWatchTests : SmokeTests bool outputChanged = false; DotNetHelper.ExecuteCmd( - "watch run", + "watch run --non-interactive", workingDirectory: projectDirectory, processConfigCallback: processConfigCallback, expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly From e5f2583273b33351becf30f4e0bcef6215aef36c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Sep 2023 03:20:40 +0000 Subject: [PATCH 03/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17395) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23470.10 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23469.12 to 8.0.0-rtm.23471.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23471.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23469.6 to 8.0.0-rtm.23471.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23470.1 to 12.8.0-beta.23471.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23470.1 to 8.0.100-beta.23471.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23470.2 to 4.8.0-3.23471.9 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.8.0-preview-23469-05 to 17.8.0-preview-23471-08 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rc.2.23469.9 to 8.0.0-rtm.23472.12 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rc.2.23463.1 to 8.0.0-rtm.23470.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-8680f4c7-0b46-47b1-9403-80f08224dc10 - Tweak the workload version regex - Temporarily bump emsdk ahead of flow to get a package that exists --- eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++-------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 210660d72..f9e593923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 4b097ad837f15e71d90f928f4689b627948a73bc + 7d1d325d01d081912a056124217e08e1a6046580 - + https://github.com/dotnet/windowsdesktop - 4b097ad837f15e71d90f928f4689b627948a73bc + 7d1d325d01d081912a056124217e08e1a6046580 - + https://github.com/dotnet/windowsdesktop - 4b097ad837f15e71d90f928f4689b627948a73bc + 7d1d325d01d081912a056124217e08e1a6046580 - + https://github.com/dotnet/windowsdesktop - 4b097ad837f15e71d90f928f4689b627948a73bc + 7d1d325d01d081912a056124217e08e1a6046580 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/aspnetcore - 470af1426002d0314cc81f6cc6dc967904acc1c8 + cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/sdk - 65f11437c0ea592862f214027151f09f690759f9 + a38d6d8917a013b80486354a90a9a4b372cb3c44 - + https://github.com/dotnet/sdk - 65f11437c0ea592862f214027151f09f690759f9 + a38d6d8917a013b80486354a90a9a4b372cb3c44 - + https://github.com/dotnet/sdk - 65f11437c0ea592862f214027151f09f690759f9 + a38d6d8917a013b80486354a90a9a4b372cb3c44 - + https://github.com/dotnet/sdk - 65f11437c0ea592862f214027151f09f690759f9 + a38d6d8917a013b80486354a90a9a4b372cb3c44 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - f85493157b69123ae49476be949a8245327c947c + ea0c0e48172eeb7a9814b201aa561d3789c8ff42 - + https://github.com/dotnet/wpf - 0a809bfefed0cce77f17bbac9fbdf69b0fe52897 + 8f8527d020b488bfb8da6ccb9c88b8ceaaf15cdc - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 62aba1c2b0cbfa18f94cff0f471c395ac78ff6c8 - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 62aba1c2b0cbfa18f94cff0f471c395ac78ff6c8 @@ -146,18 +146,18 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/roslyn - 6ce30cbde20fcba1a487c161c25ddae500cdba60 + bd11e7accd665cf8e04572efd9a466690bd50985 - + https://github.com/dotnet/msbuild - 60ae06f6d20616f524a751373aea071df8c2ae48 + 3847162365a20626dbef16f2b1153dada9c26965 @@ -169,9 +169,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc + 446eeb331fcbf2f48c14a377601a8ab950ec942e @@ -231,9 +231,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 3dd2c0ef203db8fe0e849557960b4cd009afbaac + 7b55da982fc6e71c1776c4de89111aee0eecb45a diff --git a/eng/Versions.props b/eng/Versions.props index 4d595e2d7..61fa2d172 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23469.12 + 8.0.0-rtm.23471.6 - 8.0.0-rtm.23469.6 + 8.0.0-rtm.23471.2 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23470.10 - 8.0.0-rtm.23470.10 - 8.0.0-rtm.23470.10 - 8.0.0-rtm.23470.10 - 8.0.0-rtm.23470.10 - 8.0.0-rtm.23470.10 - 8.0.0-rtm.23470.10 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 0.2.0 - 8.0.100-rc.2.23470.37 - 8.0.100-rc.2.23470.37 - 8.0.100-rc.2.23470.37 + 8.0.100-rtm.23472.22 + 8.0.100-rtm.23472.22 + 8.0.100-rtm.23472.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23470.2 + 4.8.0-3.23471.9 - 8.0.0-rc.2.23469.9 + 8.0.0-rtm.23472.12 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 + 8.0.0-rtm.23472.12 + 8.0.0-rtm.23472.12 + 8.0.0-rtm.23472.12 + 8.0.0-rtm.23472.12 + 8.0.0-rtm.23472.12 + 8.0.0-rtm.23472.12 2.1.0 - 8.0.0-rtm.23470.1 - 8.0.0-rtm.23470.1 - 8.0.0-rtm.23470.1 - 8.0.0-rtm.23470.1 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 + 8.0.0-rtm.23471.8 @@ -245,7 +245,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rc.2.23463.1 + 8.0.0-rtm.23470.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From caa0e2215605ee23ca25a5070554ad88cdc91777 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 22:56:31 +0000 Subject: [PATCH 04/36] Update dependencies from https://github.com/dotnet/sdk build 20230923.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23472.22 -> To Version 8.0.100-rtm.23473.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.0-rc.112 -> To Version 6.8.0-rc.117 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9e593923..5c088dcc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/sdk - a38d6d8917a013b80486354a90a9a4b372cb3c44 + ada69cccf81314ecee5fecb725b2183aa54db4a9 - + https://github.com/dotnet/sdk - a38d6d8917a013b80486354a90a9a4b372cb3c44 + ada69cccf81314ecee5fecb725b2183aa54db4a9 - + https://github.com/dotnet/sdk - a38d6d8917a013b80486354a90a9a4b372cb3c44 + ada69cccf81314ecee5fecb725b2183aa54db4a9 - + https://github.com/dotnet/sdk - a38d6d8917a013b80486354a90a9a4b372cb3c44 + ada69cccf81314ecee5fecb725b2183aa54db4a9 https://github.com/dotnet/test-templates @@ -160,9 +160,9 @@ 3847162365a20626dbef16f2b1153dada9c26965 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 7fb5ed887352d2892797a365cfdd7bb8df029941 diff --git a/eng/Versions.props b/eng/Versions.props index 61fa2d172..19c69ef14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23472.22 - 8.0.100-rtm.23472.22 - 8.0.100-rtm.23472.22 + 8.0.100-rtm.23473.1 + 8.0.100-rtm.23473.1 + 8.0.100-rtm.23473.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.8.0-rc.112 + 6.8.0-rc.117 From 90355f7081d51761daa7d484b0ce354aaf44b806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 13:21:07 +0000 Subject: [PATCH 05/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17412) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23474.1 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23471.1 to 12.8.0-beta.23472.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23471.1 to 8.0.100-beta.23472.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c088dcc8..71adabe99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://github.com/dotnet/runtime e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/sdk - ada69cccf81314ecee5fecb725b2183aa54db4a9 + 0de198981a49790d23cec12e266e40c62e9c2349 - + https://github.com/dotnet/sdk - ada69cccf81314ecee5fecb725b2183aa54db4a9 + 0de198981a49790d23cec12e266e40c62e9c2349 - + https://github.com/dotnet/sdk - ada69cccf81314ecee5fecb725b2183aa54db4a9 + 0de198981a49790d23cec12e266e40c62e9c2349 - + https://github.com/dotnet/sdk - ada69cccf81314ecee5fecb725b2183aa54db4a9 + 0de198981a49790d23cec12e266e40c62e9c2349 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://github.com/dotnet/wpf 8f8527d020b488bfb8da6ccb9c88b8ceaaf15cdc - + https://github.com/dotnet/fsharp - 62aba1c2b0cbfa18f94cff0f471c395ac78ff6c8 + 803f0e7b7af405084429d981cfe1f799a5f6d40c - + https://github.com/dotnet/fsharp - 62aba1c2b0cbfa18f94cff0f471c395ac78ff6c8 + 803f0e7b7af405084429d981cfe1f799a5f6d40c diff --git a/eng/Versions.props b/eng/Versions.props index 19c69ef14..656d0d7d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,22 +72,22 @@ - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 + 8.0.0-rtm.23474.1 + 8.0.0-rtm.23474.1 + 8.0.0-rtm.23474.1 + 8.0.0-rtm.23474.1 + 8.0.0-rtm.23474.1 + 8.0.0-rtm.23474.1 + 8.0.0-rtm.23474.1 0.2.0 - 8.0.100-rtm.23473.1 - 8.0.100-rtm.23473.1 - 8.0.100-rtm.23473.1 + 8.0.100-rtm.23475.7 + 8.0.100-rtm.23475.7 + 8.0.100-rtm.23475.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5d8a7dc7ecfc96d3c60e232610e56dcc56030533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 13:21:27 +0000 Subject: [PATCH 06/36] Update dependencies from https://github.com/dotnet/source-build-externals build 20230925.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23471.2 -> To Version 8.0.0-alpha.1.23475.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 71adabe99..732c0c4be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -185,9 +185,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 6dbf3aaa0fc9664df86462f5c70b99800934fccd + e04156dbe14f882a80d4499dbebd45ab156b6c3c From 64563e0fefff4f8ccaf0d54e9a4c28482bd5265b Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 25 Sep 2023 08:46:50 -0500 Subject: [PATCH 07/36] Update SB SDK diff baseline (#17402) --- .../assets/SdkFileDiffExclusions.txt | 5 +++++ .../assets/baselines/MsftToSbSdkFiles.diff | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 7e2cd688a..50b4ca674 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -58,6 +58,11 @@ sb,./packs/Microsoft.NETCore.App.Runtime.*/* # netfx tooling - dumpminitool - https://github.com/dotnet/source-build/issues/3289 msft,./sdk/x.y.z/Extensions/dump/* +# https://github.com/dotnet/msbuild/issues/9213 +msft,./sdk/x.y.z/**/System.Windows.Extensions.dll +msft,./sdk/x.y.z/**/System.Security.Permissions.dll +msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Diagnostics.EventLog.dll + # netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/3285 msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Win32.SystemEvents.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 1f7310c14..434883537 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -147,15 +147,12 @@ index ------------ -./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll -./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll -./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -./sdk/x.y.z/Containers/containerize/System.CommandLine.dll -./sdk/x.y.z/Containers/containerize/System.Configuration.ConfigurationManager.dll -./sdk/x.y.z/Containers/containerize/System.Diagnostics.EventLog.dll -./sdk/x.y.z/Containers/containerize/System.Reflection.MetadataLoadContext.dll -./sdk/x.y.z/Containers/containerize/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/Containers/containerize/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/Containers/containerize/System.Security.Permissions.dll --./sdk/x.y.z/Containers/containerize/System.Windows.Extensions.dll -./sdk/x.y.z/Containers/containerize/tr/ -./sdk/x.y.z/Containers/containerize/tr/Microsoft.DotNet.Cli.Utils.resources.dll -./sdk/x.y.z/Containers/containerize/tr/Microsoft.NET.Build.Containers.resources.dll @@ -251,7 +248,6 @@ index ------------ -./sdk/x.y.z/Containers/tasks/net472/System.Reflection.MetadataLoadContext.dll -./sdk/x.y.z/Containers/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll -./sdk/x.y.z/Containers/tasks/net472/System.Security.AccessControl.dll --./sdk/x.y.z/Containers/tasks/net472/System.Security.Permissions.dll -./sdk/x.y.z/Containers/tasks/net472/System.Security.Principal.Windows.dll -./sdk/x.y.z/Containers/tasks/net472/System.Text.Encodings.Web.dll -./sdk/x.y.z/Containers/tasks/net472/System.Text.Json.dll From 649732965a12e23e24590ca92a2c615d5e4742a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 18:40:47 +0000 Subject: [PATCH 08/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17415) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.0-beta.23472.4 to 12.8.0-beta.23475.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23472.4 to 8.0.100-beta.23475.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71adabe99..b89a22b75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/sdk - 0de198981a49790d23cec12e266e40c62e9c2349 + 7f5d346f46121aaa8f7b1d8dae796a732e3c812b - + https://github.com/dotnet/sdk - 0de198981a49790d23cec12e266e40c62e9c2349 + 7f5d346f46121aaa8f7b1d8dae796a732e3c812b - + https://github.com/dotnet/sdk - 0de198981a49790d23cec12e266e40c62e9c2349 + 7f5d346f46121aaa8f7b1d8dae796a732e3c812b - + https://github.com/dotnet/sdk - 0de198981a49790d23cec12e266e40c62e9c2349 + 7f5d346f46121aaa8f7b1d8dae796a732e3c812b https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://github.com/dotnet/wpf 8f8527d020b488bfb8da6ccb9c88b8ceaaf15cdc - + https://github.com/dotnet/fsharp - 803f0e7b7af405084429d981cfe1f799a5f6d40c + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 - + https://github.com/dotnet/fsharp - 803f0e7b7af405084429d981cfe1f799a5f6d40c + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 diff --git a/eng/Versions.props b/eng/Versions.props index 656d0d7d8..e802cddb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23475.7 - 8.0.100-rtm.23475.7 - 8.0.100-rtm.23475.7 + 8.0.100-rtm.23475.13 + 8.0.100-rtm.23475.13 + 8.0.100-rtm.23475.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ff90f1abc52c3fc02812bad157e2985040a77a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 22:15:58 +0000 Subject: [PATCH 09/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17416) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23472.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23472.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23472.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23472.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23471.6 to 8.0.0-rtm.23472.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23471.8 to 8.0.0-rtm.23472.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23471.2 to 8.0.0-rtm.23472.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-c5abee80-b9d5-429c-80b0-6a4312032fc3 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44da417da..ab1206e36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + 3288084023e895de089381281da54a8541976f13 - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + 3288084023e895de089381281da54a8541976f13 - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + 3288084023e895de089381281da54a8541976f13 - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + 3288084023e895de089381281da54a8541976f13 https://github.com/dotnet/runtime @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 - + https://github.com/dotnet/sdk - 7f5d346f46121aaa8f7b1d8dae796a732e3c812b + dc1b016009b722b871813ab7b8cb1287620017b8 - + https://github.com/dotnet/sdk - 7f5d346f46121aaa8f7b1d8dae796a732e3c812b + dc1b016009b722b871813ab7b8cb1287620017b8 - + https://github.com/dotnet/sdk - 7f5d346f46121aaa8f7b1d8dae796a732e3c812b + dc1b016009b722b871813ab7b8cb1287620017b8 - + https://github.com/dotnet/sdk - 7f5d346f46121aaa8f7b1d8dae796a732e3c812b + dc1b016009b722b871813ab7b8cb1287620017b8 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - ea0c0e48172eeb7a9814b201aa561d3789c8ff42 + 6612d80c7af667b0e4c0690a07b7c4f9860201d4 - + https://github.com/dotnet/wpf - 8f8527d020b488bfb8da6ccb9c88b8ceaaf15cdc + b1726ad39dacd4ab7e723f5a49e610e5bbce1430 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e802cddb8..b3e5d3f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23471.6 + 8.0.0-rtm.23472.4 - 8.0.0-rtm.23471.2 + 8.0.0-rtm.23472.1 @@ -85,9 +85,9 @@ - 8.0.100-rtm.23475.13 - 8.0.100-rtm.23475.13 - 8.0.100-rtm.23475.13 + 8.0.100-rtm.23475.15 + 8.0.100-rtm.23475.15 + 8.0.100-rtm.23475.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 + 8.0.0-rtm.23472.1 + 8.0.0-rtm.23472.1 + 8.0.0-rtm.23472.1 + 8.0.0-rtm.23472.1 From 3ccc7022898b45c00db57d7238bf21af0b5a011e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 14:31:27 +0000 Subject: [PATCH 10/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17417) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23472.1 to 8.0.0-rtm.23475.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23472.1 to 8.0.0-rtm.23475.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23472.1 to 8.0.0-rtm.23475.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23474.1 to 8.0.0-rtm.23475.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23472.1 to 8.0.0-rtm.23475.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23472.4 to 8.0.0-rtm.23472.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23472.1 to 8.0.0-rtm.23475.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23472.1 to 8.0.0-rtm.23472.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23471.9 to 4.8.0-3.23475.10 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.8.0-preview-23471-08 to 17.8.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23472.12 to 8.0.0-rtm.23475.7 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23473.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Remove SourceBuild element from Microsoft.Build dependency Because of the switch to stable versioning --- NuGet.config | 1 + eng/Version.Details.xml | 113 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++--------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcb5685f..4bd747264 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab1206e36..d1c49470b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 3288084023e895de089381281da54a8541976f13 + 2c55fe48e894e853bfc5c1edb61603aeb29c3259 - + https://github.com/dotnet/windowsdesktop - 3288084023e895de089381281da54a8541976f13 + 2c55fe48e894e853bfc5c1edb61603aeb29c3259 - + https://github.com/dotnet/windowsdesktop - 3288084023e895de089381281da54a8541976f13 + 2c55fe48e894e853bfc5c1edb61603aeb29c3259 - + https://github.com/dotnet/windowsdesktop - 3288084023e895de089381281da54a8541976f13 + 2c55fe48e894e853bfc5c1edb61603aeb29c3259 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/aspnetcore - d8a3aa870862d01a8b3a3235f8dd7fc951dd8ff4 + 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - dc1b016009b722b871813ab7b8cb1287620017b8 + 81f9b8374d0cd7f9072a64a711a59544daad3e47 - + https://github.com/dotnet/sdk - dc1b016009b722b871813ab7b8cb1287620017b8 + 81f9b8374d0cd7f9072a64a711a59544daad3e47 - + https://github.com/dotnet/sdk - dc1b016009b722b871813ab7b8cb1287620017b8 + 81f9b8374d0cd7f9072a64a711a59544daad3e47 - + https://github.com/dotnet/sdk - dc1b016009b722b871813ab7b8cb1287620017b8 + 81f9b8374d0cd7f9072a64a711a59544daad3e47 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 6612d80c7af667b0e4c0690a07b7c4f9860201d4 + ef7f2e577d43de5d19d69f9f114894e1150025fd - + https://github.com/dotnet/wpf - b1726ad39dacd4ab7e723f5a49e610e5bbce1430 + ee97472a11bfcc2c3e45fcc8e56ab71bcad09237 https://github.com/dotnet/fsharp @@ -146,19 +146,18 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - e95228dbcf7a69f87b00da969b0cabf2e62ab207 + a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 23bb1060f4e735c35a9bab935eddf28e50fe77ca - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 - + 6cdef424154c976f04802b101e6be6292f8a8897 https://github.com/nuget/nuget.client @@ -169,9 +168,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 446eeb331fcbf2f48c14a377601a8ab950ec942e + 41db2322780b16e4ddadcebca41dc86c7806ed9a diff --git a/eng/Versions.props b/eng/Versions.props index b3e5d3f6a..8922b501b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23472.4 + 8.0.0-rtm.23472.9 - 8.0.0-rtm.23472.1 + 8.0.0-rtm.23472.2 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23474.1 - 8.0.0-rtm.23474.1 - 8.0.0-rtm.23474.1 - 8.0.0-rtm.23474.1 - 8.0.0-rtm.23474.1 - 8.0.0-rtm.23474.1 - 8.0.0-rtm.23474.1 + 8.0.0-rtm.23475.5 + 8.0.0-rtm.23475.5 + 8.0.0-rtm.23475.5 + 8.0.0-rtm.23475.5 + 8.0.0-rtm.23475.5 + 8.0.0-rtm.23475.5 + 8.0.0-rtm.23475.5 0.2.0 - 8.0.100-rtm.23475.15 - 8.0.100-rtm.23475.15 - 8.0.100-rtm.23475.15 + 8.0.100-rtm.23476.5 + 8.0.100-rtm.23476.5 + 8.0.100-rtm.23476.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23471.9 + 4.8.0-3.23475.10 - 8.0.0-rtm.23472.12 + 8.0.0-rtm.23475.7 - 8.0.0-rtm.23472.12 - 8.0.0-rtm.23472.12 - 8.0.0-rtm.23472.12 - 8.0.0-rtm.23472.12 - 8.0.0-rtm.23472.12 - 8.0.0-rtm.23472.12 + 8.0.0-rtm.23475.7 + 8.0.0-rtm.23475.7 + 8.0.0-rtm.23475.7 + 8.0.0-rtm.23475.7 + 8.0.0-rtm.23475.7 + 8.0.0-rtm.23475.7 2.1.0 - 8.0.0-rtm.23472.1 - 8.0.0-rtm.23472.1 - 8.0.0-rtm.23472.1 - 8.0.0-rtm.23472.1 + 8.0.0-rtm.23475.3 + 8.0.0-rtm.23475.3 + 8.0.0-rtm.23475.3 + 8.0.0-rtm.23475.3 @@ -245,7 +245,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23470.1 + 8.0.0-rtm.23473.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 4e1ed0d4e7979f278132b29ab848bfb4c1306a32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 19:44:57 +0000 Subject: [PATCH 11/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.5 -> To Version 8.0.100-rtm.23476.19 --- 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 d1c49470b..2691af70f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - 81f9b8374d0cd7f9072a64a711a59544daad3e47 + 012e8f38f5f1bde4d67a0d91f725cbf564510cdd - + https://github.com/dotnet/sdk - 81f9b8374d0cd7f9072a64a711a59544daad3e47 + 012e8f38f5f1bde4d67a0d91f725cbf564510cdd - + https://github.com/dotnet/sdk - 81f9b8374d0cd7f9072a64a711a59544daad3e47 + 012e8f38f5f1bde4d67a0d91f725cbf564510cdd - + https://github.com/dotnet/sdk - 81f9b8374d0cd7f9072a64a711a59544daad3e47 + 012e8f38f5f1bde4d67a0d91f725cbf564510cdd https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8922b501b..3291b0aae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23476.5 - 8.0.100-rtm.23476.5 - 8.0.100-rtm.23476.5 + 8.0.100-rtm.23476.19 + 8.0.100-rtm.23476.19 + 8.0.100-rtm.23476.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6682e621ce33736453994ce885771fecb171cd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 20:57:15 +0000 Subject: [PATCH 12/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.5 -> To Version 8.0.100-rtm.23476.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset From Version 8.0.0-rtm.23475.3 -> To Version 8.0.0-rtm.23476.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2691af70f..f4769c541 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 2c55fe48e894e853bfc5c1edb61603aeb29c3259 + 3363e20118f7d5a0c5bd0facda546f62053586e4 - + https://github.com/dotnet/windowsdesktop - 2c55fe48e894e853bfc5c1edb61603aeb29c3259 + 3363e20118f7d5a0c5bd0facda546f62053586e4 - + https://github.com/dotnet/windowsdesktop - 2c55fe48e894e853bfc5c1edb61603aeb29c3259 + 3363e20118f7d5a0c5bd0facda546f62053586e4 - + https://github.com/dotnet/windowsdesktop - 2c55fe48e894e853bfc5c1edb61603aeb29c3259 + 3363e20118f7d5a0c5bd0facda546f62053586e4 https://github.com/dotnet/runtime @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - 012e8f38f5f1bde4d67a0d91f725cbf564510cdd + a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 - + https://github.com/dotnet/sdk - 012e8f38f5f1bde4d67a0d91f725cbf564510cdd + a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 - + https://github.com/dotnet/sdk - 012e8f38f5f1bde4d67a0d91f725cbf564510cdd + a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 - + https://github.com/dotnet/sdk - 012e8f38f5f1bde4d67a0d91f725cbf564510cdd + a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - ef7f2e577d43de5d19d69f9f114894e1150025fd + 6093320203df0e82e2e228df152acd23bb9b6692 - + https://github.com/dotnet/wpf - ee97472a11bfcc2c3e45fcc8e56ab71bcad09237 + 8732e3b06c3f1bd587ad0019881506f3e87ff7d7 https://github.com/dotnet/fsharp @@ -150,9 +150,9 @@ https://github.com/dotnet/runtime a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/roslyn - 23bb1060f4e735c35a9bab935eddf28e50fe77ca + a8700449c87c2a7a8e822429e50cd493fb854d0b diff --git a/eng/Versions.props b/eng/Versions.props index 3291b0aae..e40250a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23472.9 + 8.0.0-rtm.23475.6 - 8.0.0-rtm.23472.2 + 8.0.0-rtm.23475.3 @@ -85,16 +85,16 @@ - 8.0.100-rtm.23476.19 - 8.0.100-rtm.23476.19 - 8.0.100-rtm.23476.19 + 8.0.100-rtm.23476.21 + 8.0.100-rtm.23476.21 + 8.0.100-rtm.23476.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23475.10 + 4.8.0-3.23476.3 @@ -112,10 +112,10 @@ - 8.0.0-rtm.23475.3 - 8.0.0-rtm.23475.3 - 8.0.0-rtm.23475.3 - 8.0.0-rtm.23475.3 + 8.0.0-rtm.23476.4 + 8.0.0-rtm.23476.4 + 8.0.0-rtm.23476.4 + 8.0.0-rtm.23476.4 From 9c67d71acdac602e59ccfa7b99a23407949bc3f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 22:02:11 +0000 Subject: [PATCH 13/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.5 -> To Version 8.0.100-rtm.23476.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-rtm.23475.3 -> To Version 8.0.0-rtm.23476.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4769c541..b3b29268e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 + 0ed41921bd63c91377dbc7f6a5367906103788f0 - + https://github.com/dotnet/sdk - a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 + 0ed41921bd63c91377dbc7f6a5367906103788f0 - + https://github.com/dotnet/sdk - a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 + 0ed41921bd63c91377dbc7f6a5367906103788f0 - + https://github.com/dotnet/sdk - a7f8e8bdd323073bfdc99150f9af6fd8fabe2127 + 0ed41921bd63c91377dbc7f6a5367906103788f0 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/nuget/nuget.client - 7fb5ed887352d2892797a365cfdd7bb8df029941 + fed7892af6c079015431389d7cf7a7f630e22bbd diff --git a/eng/Versions.props b/eng/Versions.props index e40250a2e..ed4ba6d51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23476.21 - 8.0.100-rtm.23476.21 - 8.0.100-rtm.23476.21 + 8.0.100-rtm.23476.27 + 8.0.100-rtm.23476.27 + 8.0.100-rtm.23476.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.8.0-rc.117 + 6.8.0-rc.120 From 037f807af7825ad48cb6502e554e0350caf5a0c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 23:36:04 +0000 Subject: [PATCH 14/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.5 -> To Version 8.0.100-rtm.23476.30 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-rtm.23475.3 -> To Version 8.0.0-rtm.23476.4 (parent: Microsoft.NET.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 b3b29268e..801b14dae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - 0ed41921bd63c91377dbc7f6a5367906103788f0 + cc53925cb2d170612d86b8f9a19985139a501f64 - + https://github.com/dotnet/sdk - 0ed41921bd63c91377dbc7f6a5367906103788f0 + cc53925cb2d170612d86b8f9a19985139a501f64 - + https://github.com/dotnet/sdk - 0ed41921bd63c91377dbc7f6a5367906103788f0 + cc53925cb2d170612d86b8f9a19985139a501f64 - + https://github.com/dotnet/sdk - 0ed41921bd63c91377dbc7f6a5367906103788f0 + cc53925cb2d170612d86b8f9a19985139a501f64 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ed4ba6d51..5115585e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23476.27 - 8.0.100-rtm.23476.27 - 8.0.100-rtm.23476.27 + 8.0.100-rtm.23476.30 + 8.0.100-rtm.23476.30 + 8.0.100-rtm.23476.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33e55cab461badfc506d4eb0dd88de12689e56b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 03:29:52 +0000 Subject: [PATCH 15/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.30 -> To Version 8.0.100-rtm.23476.35 Dependency coherency updates Microsoft.Build From Version 17.8.0 -> To Version 17.8.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4bd747264..e29400586 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 801b14dae..79eea6a43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - cc53925cb2d170612d86b8f9a19985139a501f64 + 1483207c888e2bbfb9da9ebe444118fad253ab5c - + https://github.com/dotnet/sdk - cc53925cb2d170612d86b8f9a19985139a501f64 + 1483207c888e2bbfb9da9ebe444118fad253ab5c - + https://github.com/dotnet/sdk - cc53925cb2d170612d86b8f9a19985139a501f64 + 1483207c888e2bbfb9da9ebe444118fad253ab5c - + https://github.com/dotnet/sdk - cc53925cb2d170612d86b8f9a19985139a501f64 + 1483207c888e2bbfb9da9ebe444118fad253ab5c https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ a8700449c87c2a7a8e822429e50cd493fb854d0b - + https://github.com/dotnet/msbuild - 6cdef424154c976f04802b101e6be6292f8a8897 + 585e09762f07aa6ec291cb75cf7e98bdded8e373 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 5115585e7..f0a187f97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23476.30 - 8.0.100-rtm.23476.30 - 8.0.100-rtm.23476.30 + 8.0.100-rtm.23476.35 + 8.0.100-rtm.23476.35 + 8.0.100-rtm.23476.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 17d62b9353407b27d258d4517c31d3653166cde3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 04:30:56 +0000 Subject: [PATCH 16/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.30 -> To Version 8.0.100-rtm.23476.40 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.8.0 -> To Version 17.8.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79eea6a43..15f4a359d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 325a7569823645e43020a8c38771353c6f6eaddf - + https://github.com/dotnet/sdk - 1483207c888e2bbfb9da9ebe444118fad253ab5c + 15cd05130e153fe63edefb4abb10745d6c970428 - + https://github.com/dotnet/sdk - 1483207c888e2bbfb9da9ebe444118fad253ab5c + 15cd05130e153fe63edefb4abb10745d6c970428 - + https://github.com/dotnet/sdk - 1483207c888e2bbfb9da9ebe444118fad253ab5c + 15cd05130e153fe63edefb4abb10745d6c970428 - + https://github.com/dotnet/sdk - 1483207c888e2bbfb9da9ebe444118fad253ab5c + 15cd05130e153fe63edefb4abb10745d6c970428 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 585e09762f07aa6ec291cb75cf7e98bdded8e373 - + https://github.com/nuget/nuget.client - fed7892af6c079015431389d7cf7a7f630e22bbd + eb04000f97ade4add28a9e7447baaadee22ee863 diff --git a/eng/Versions.props b/eng/Versions.props index f0a187f97..cf985e679 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23476.35 - 8.0.100-rtm.23476.35 - 8.0.100-rtm.23476.35 + 8.0.100-rtm.23476.40 + 8.0.100-rtm.23476.40 + 8.0.100-rtm.23476.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.8.0-rc.120 + 6.8.0-rc.121 From cda573804712e498ec467a5e8598f9e1d5cedf84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Sep 2023 06:40:21 +0000 Subject: [PATCH 17/36] Update dependencies from https://github.com/dotnet/sdk build 20230926.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23476.40 -> To Version 8.0.100-rtm.23476.43 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-rtm.23475.5 -> To Version 8.0.0-rtm.23476.22 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15f4a359d..0b672b8b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://github.com/dotnet/runtime a3d5300baee03169bf737cfc4e9b1f7dbece4d05 - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/aspnetcore - 325a7569823645e43020a8c38771353c6f6eaddf + 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/sdk - 15cd05130e153fe63edefb4abb10745d6c970428 + a029761dd110a68360c9797225dad873c67002b6 - + https://github.com/dotnet/sdk - 15cd05130e153fe63edefb4abb10745d6c970428 + a029761dd110a68360c9797225dad873c67002b6 - + https://github.com/dotnet/sdk - 15cd05130e153fe63edefb4abb10745d6c970428 + a029761dd110a68360c9797225dad873c67002b6 - + https://github.com/dotnet/sdk - 15cd05130e153fe63edefb4abb10745d6c970428 + a029761dd110a68360c9797225dad873c67002b6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index cf985e679..26d4bf6d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,22 +72,22 @@ - 8.0.0-rtm.23475.5 - 8.0.0-rtm.23475.5 - 8.0.0-rtm.23475.5 - 8.0.0-rtm.23475.5 - 8.0.0-rtm.23475.5 - 8.0.0-rtm.23475.5 - 8.0.0-rtm.23475.5 + 8.0.0-rtm.23476.22 + 8.0.0-rtm.23476.22 + 8.0.0-rtm.23476.22 + 8.0.0-rtm.23476.22 + 8.0.0-rtm.23476.22 + 8.0.0-rtm.23476.22 + 8.0.0-rtm.23476.22 0.2.0 - 8.0.100-rtm.23476.40 - 8.0.100-rtm.23476.40 - 8.0.100-rtm.23476.40 + 8.0.100-rtm.23476.43 + 8.0.100-rtm.23476.43 + 8.0.100-rtm.23476.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9cfe1c1fb5eb2fde09bc8ebd4e3e8c0b773fc19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 27 Sep 2023 15:28:10 +0200 Subject: [PATCH 18/36] [release/8.0.1xx] Add instructions on synchronizing the VMR (#17424) --- src/VirtualMonoRepo/README.template.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/VirtualMonoRepo/README.template.md b/src/VirtualMonoRepo/README.template.md index 7e85a0467..f23b92645 100644 --- a/src/VirtualMonoRepo/README.template.md +++ b/src/VirtualMonoRepo/README.template.md @@ -144,6 +144,12 @@ Usually, this means the [dotnet/dotnet repository](https://github.com/dotnet/dot In practice, this means that when calling the main build script, you need to provide additional arguments when building outside of a context of a git repository. Alternatively, you can also provide a manifest file where this information can be read from. This file (`release.json`) can be found attached with the [dotnet/dotnet release](https://github.com/dotnet/dotnet/releases). +### Synchronizing code into the VMR + +Sometimes you want to make a change in a repository and test that change in the VMR. You could of course make the change in the VMR directly (locally, as the VMR is read-only for now) but in case it's already available in your repository, you can synchronize it into the VMR (again locally). + +To do this, you can start a [dotnet/dotnet](https://github.com/dotnet/dotnet) Codespace. You will see instructions right when the Codespace starts. Alternatively, you can clone the repository locally and use the `[eng/vmr-sync.sh](../../eng/vmr-sync.sh)` script to do that. Please refer to the documentation in the script for more details. + ## List of components To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: From 375505a85ccd82b33f35e014fa7f96b09a7918b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:31:33 +0000 Subject: [PATCH 19/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17425) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23476.3 to 4.8.0-3.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23475.7 to 8.0.0-rtm.23476.15 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23473.1 to 8.0.0-rtm.23475.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++++--------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b672b8b5..3e9274d8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://github.com/dotnet/windowsdesktop 3363e20118f7d5a0c5bd0facda546f62053586e4 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 https://github.com/dotnet/aspnetcore @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/sdk - a029761dd110a68360c9797225dad873c67002b6 + 6104778d5c6664dd35649bec5e5116c217a8f80a - + https://github.com/dotnet/sdk - a029761dd110a68360c9797225dad873c67002b6 + 6104778d5c6664dd35649bec5e5116c217a8f80a - + https://github.com/dotnet/sdk - a029761dd110a68360c9797225dad873c67002b6 + 6104778d5c6664dd35649bec5e5116c217a8f80a - + https://github.com/dotnet/sdk - a029761dd110a68360c9797225dad873c67002b6 + 6104778d5c6664dd35649bec5e5116c217a8f80a https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - a3d5300baee03169bf737cfc4e9b1f7dbece4d05 + 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/roslyn - a8700449c87c2a7a8e822429e50cd493fb854d0b + 668de5b297f946c11c9a637ab80fae47ba46fdb9 @@ -168,9 +168,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 41db2322780b16e4ddadcebca41dc86c7806ed9a + 0a2aae889f5ce2803fa227e13963b3fbf3ccb6b0 diff --git a/eng/Versions.props b/eng/Versions.props index 26d4bf6d8..b00f1a3a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,29 +85,29 @@ - 8.0.100-rtm.23476.43 - 8.0.100-rtm.23476.43 - 8.0.100-rtm.23476.43 + 8.0.100-rtm.23477.5 + 8.0.100-rtm.23477.5 + 8.0.100-rtm.23477.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23476.3 + 4.8.0-3.23476.15 - 8.0.0-rtm.23475.7 + 8.0.0-rtm.23476.15 - 8.0.0-rtm.23475.7 - 8.0.0-rtm.23475.7 - 8.0.0-rtm.23475.7 - 8.0.0-rtm.23475.7 - 8.0.0-rtm.23475.7 - 8.0.0-rtm.23475.7 + 8.0.0-rtm.23476.15 + 8.0.0-rtm.23476.15 + 8.0.0-rtm.23476.15 + 8.0.0-rtm.23476.15 + 8.0.0-rtm.23476.15 + 8.0.0-rtm.23476.15 2.1.0 @@ -245,7 +245,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23473.1 + 8.0.0-rtm.23475.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 744d4d634443834750b5c10cc3029123a6fd975e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 22:23:30 +0000 Subject: [PATCH 20/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17430) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23476.15 to 4.8.0-3.23477.1 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.8.0-rc.121 to 6.8.0-rc.122 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e9274d8f..935c6870e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/sdk - 6104778d5c6664dd35649bec5e5116c217a8f80a + 29cdfd4ae95dfef2c601db9813dae887e3641c6b - + https://github.com/dotnet/sdk - 6104778d5c6664dd35649bec5e5116c217a8f80a + 29cdfd4ae95dfef2c601db9813dae887e3641c6b - + https://github.com/dotnet/sdk - 6104778d5c6664dd35649bec5e5116c217a8f80a + 29cdfd4ae95dfef2c601db9813dae887e3641c6b - + https://github.com/dotnet/sdk - 6104778d5c6664dd35649bec5e5116c217a8f80a + 29cdfd4ae95dfef2c601db9813dae887e3641c6b https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://github.com/dotnet/runtime 0933e300f0c0647a15a0433f1a3b07bcab9882f4 - + https://github.com/dotnet/roslyn - 668de5b297f946c11c9a637ab80fae47ba46fdb9 + a0f635227f57c805c30ebb06a5afecacc77035f5 https://github.com/dotnet/msbuild 585e09762f07aa6ec291cb75cf7e98bdded8e373 - + https://github.com/nuget/nuget.client - eb04000f97ade4add28a9e7447baaadee22ee863 + 0dd5a1ea536201af94725353e4bc711d7560b246 diff --git a/eng/Versions.props b/eng/Versions.props index b00f1a3a1..55b6d89cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.100-rtm.23477.5 - 8.0.100-rtm.23477.5 - 8.0.100-rtm.23477.5 + 8.0.100-rtm.23477.22 + 8.0.100-rtm.23477.22 + 8.0.100-rtm.23477.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23476.15 + 4.8.0-3.23477.1 @@ -127,7 +127,7 @@ - 6.8.0-rc.121 + 6.8.0-rc.122 From 3c59f6819846ac350124ee1696cc28a4bbf7d1b8 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 22 Sep 2023 09:49:43 -0700 Subject: [PATCH 21/36] Add Workload --- eng/Versions.props | 2 ++ .../assets/SdkFileDiffExclusions.txt | 1 + src/redist/targets/BundledManifests.targets | 1 + 3 files changed, 4 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 55b6d89cb..f8bea2cd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,6 +237,8 @@ + 8.0.100-rc.1 + 8.0.0-alpha.23471.13 8.0.100-rc.1 8.0.0-rc.1.9171 34.0.0-rc.1.432 diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 50b4ca674..23553c25d 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,6 +45,7 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 008dc22c6..d6db716b9 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -4,6 +4,7 @@ + From 0f9d64013c40db256673e89e3d72e5f5f7973612 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 23:51:41 +0000 Subject: [PATCH 22/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17436) [release/8.0.1xx] 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 935c6870e..55c9a1730 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/sdk - 29cdfd4ae95dfef2c601db9813dae887e3641c6b + 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 - + https://github.com/dotnet/sdk - 29cdfd4ae95dfef2c601db9813dae887e3641c6b + 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 - + https://github.com/dotnet/sdk - 29cdfd4ae95dfef2c601db9813dae887e3641c6b + 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 - + https://github.com/dotnet/sdk - 29cdfd4ae95dfef2c601db9813dae887e3641c6b + 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f8bea2cd5..095c02093 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23477.22 - 8.0.100-rtm.23477.22 - 8.0.100-rtm.23477.22 + 8.0.100-rtm.23477.25 + 8.0.100-rtm.23477.25 + 8.0.100-rtm.23477.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9b7cb098b852d9218dd2a7d722934ef5bfa9d37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 00:18:43 +0000 Subject: [PATCH 23/36] Update dependencies from https://github.com/dotnet/sdk build 20230927.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23477.25 -> To Version 8.0.100-rtm.23477.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0-rtm.23476.4 -> To Version 8.0.0-rtm.23477.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55c9a1730..7ff9ca866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 3363e20118f7d5a0c5bd0facda546f62053586e4 + f8b403bd16517af8d0e39f02175165e27abd96f2 - + https://github.com/dotnet/windowsdesktop - 3363e20118f7d5a0c5bd0facda546f62053586e4 + f8b403bd16517af8d0e39f02175165e27abd96f2 - + https://github.com/dotnet/windowsdesktop - 3363e20118f7d5a0c5bd0facda546f62053586e4 + f8b403bd16517af8d0e39f02175165e27abd96f2 - + https://github.com/dotnet/windowsdesktop - 3363e20118f7d5a0c5bd0facda546f62053586e4 + f8b403bd16517af8d0e39f02175165e27abd96f2 https://github.com/dotnet/runtime @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 4292763bd5143205daabb682311ee34f23897d9b - + https://github.com/dotnet/sdk - 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 + e6801f715c0e605eeb81b299d248e63857872923 - + https://github.com/dotnet/sdk - 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 + e6801f715c0e605eeb81b299d248e63857872923 - + https://github.com/dotnet/sdk - 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 + e6801f715c0e605eeb81b299d248e63857872923 - + https://github.com/dotnet/sdk - 67e372dffa8e8ced74f21700e8d7fcc1f1d13562 + e6801f715c0e605eeb81b299d248e63857872923 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 6093320203df0e82e2e228df152acd23bb9b6692 + 1b9c660d20132cd343a6ad747b8a6e633793876f - + https://github.com/dotnet/wpf - 8732e3b06c3f1bd587ad0019881506f3e87ff7d7 + 0f7713f5865b997b73e29c4420204b456ac5bfc2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 095c02093..bdf084298 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23475.6 + 8.0.0-rtm.23477.6 - 8.0.0-rtm.23475.3 + 8.0.0-rtm.23477.1 @@ -85,9 +85,9 @@ - 8.0.100-rtm.23477.25 - 8.0.100-rtm.23477.25 - 8.0.100-rtm.23477.25 + 8.0.100-rtm.23477.32 + 8.0.100-rtm.23477.32 + 8.0.100-rtm.23477.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.0-rtm.23476.4 - 8.0.0-rtm.23476.4 - 8.0.0-rtm.23476.4 - 8.0.0-rtm.23476.4 + 8.0.0-rtm.23477.4 + 8.0.0-rtm.23477.4 + 8.0.0-rtm.23477.4 + 8.0.0-rtm.23477.4 From f5a18a3c144f933dd7c77730c05a3967297239e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Sep 2023 03:50:45 +0000 Subject: [PATCH 24/36] Update dependencies from https://github.com/dotnet/sdk build 20230927.60 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23477.32 -> To Version 8.0.100-rtm.23477.60 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rtm.23476.15 -> To Version 8.0.0-rtm.23477.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ff9ca866..86a2c0766 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://github.com/dotnet/windowsdesktop f8b403bd16517af8d0e39f02175165e27abd96f2 - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/aspnetcore - 4292763bd5143205daabb682311ee34f23897d9b + 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/sdk - e6801f715c0e605eeb81b299d248e63857872923 + 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 - + https://github.com/dotnet/sdk - e6801f715c0e605eeb81b299d248e63857872923 + 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 - + https://github.com/dotnet/sdk - e6801f715c0e605eeb81b299d248e63857872923 + 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 - + https://github.com/dotnet/sdk - e6801f715c0e605eeb81b299d248e63857872923 + 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 0933e300f0c0647a15a0433f1a3b07bcab9882f4 + 885100b00bc944cbb698bc4cc2ec3ec18007534f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bdf084298..0142f65c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,22 +72,22 @@ - 8.0.0-rtm.23476.22 - 8.0.0-rtm.23476.22 - 8.0.0-rtm.23476.22 - 8.0.0-rtm.23476.22 - 8.0.0-rtm.23476.22 - 8.0.0-rtm.23476.22 - 8.0.0-rtm.23476.22 + 8.0.0-rtm.23477.14 + 8.0.0-rtm.23477.14 + 8.0.0-rtm.23477.14 + 8.0.0-rtm.23477.14 + 8.0.0-rtm.23477.14 + 8.0.0-rtm.23477.14 + 8.0.0-rtm.23477.14 0.2.0 - 8.0.100-rtm.23477.32 - 8.0.100-rtm.23477.32 - 8.0.100-rtm.23477.32 + 8.0.100-rtm.23477.60 + 8.0.100-rtm.23477.60 + 8.0.100-rtm.23477.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.0-rtm.23476.15 + 8.0.0-rtm.23477.9 - 8.0.0-rtm.23476.15 - 8.0.0-rtm.23476.15 - 8.0.0-rtm.23476.15 - 8.0.0-rtm.23476.15 - 8.0.0-rtm.23476.15 - 8.0.0-rtm.23476.15 + 8.0.0-rtm.23477.9 + 8.0.0-rtm.23477.9 + 8.0.0-rtm.23477.9 + 8.0.0-rtm.23477.9 + 8.0.0-rtm.23477.9 + 8.0.0-rtm.23477.9 2.1.0 From 46a7370763921ded24dcb70c585ee97883c615d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:03:29 +0000 Subject: [PATCH 25/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17441) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23477.4 to 8.0.0-rtm.23477.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23477.4 to 8.0.0-rtm.23477.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23477.4 to 8.0.0-rtm.23477.8 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23477.4 to 8.0.0-rtm.23477.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23477.6 to 8.0.0-rtm.23477.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23477.4 to 8.0.0-rtm.23477.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23477.1 to 8.0.0-rtm.23477.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23477.1 to 4.8.0-3.23477.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a2c0766..c3bd584ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - f8b403bd16517af8d0e39f02175165e27abd96f2 + 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 - + https://github.com/dotnet/windowsdesktop - f8b403bd16517af8d0e39f02175165e27abd96f2 + 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 - + https://github.com/dotnet/windowsdesktop - f8b403bd16517af8d0e39f02175165e27abd96f2 + 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 - + https://github.com/dotnet/windowsdesktop - f8b403bd16517af8d0e39f02175165e27abd96f2 + 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 https://github.com/dotnet/runtime @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 96da75d67ff058d95e14de12d9fc2ff215074e3c - + https://github.com/dotnet/sdk - 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 + 123342caab35c77058df89b674992a3ad37a1019 - + https://github.com/dotnet/sdk - 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 + 123342caab35c77058df89b674992a3ad37a1019 - + https://github.com/dotnet/sdk - 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 + 123342caab35c77058df89b674992a3ad37a1019 - + https://github.com/dotnet/sdk - 271dfdb2039103eb4ab866c4f1f3401dd8911fd2 + 123342caab35c77058df89b674992a3ad37a1019 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 1b9c660d20132cd343a6ad747b8a6e633793876f + 3653a59a7be8540e914656b4ef2fb26a0384f902 - + https://github.com/dotnet/wpf - 0f7713f5865b997b73e29c4420204b456ac5bfc2 + aacebe9dc98fec26170f2717530ba026d4c4cf26 https://github.com/dotnet/fsharp @@ -150,9 +150,9 @@ https://github.com/dotnet/runtime 885100b00bc944cbb698bc4cc2ec3ec18007534f - + https://github.com/dotnet/roslyn - a0f635227f57c805c30ebb06a5afecacc77035f5 + 154581113ae6cf75c874a0e760d6bb5adc44d44f diff --git a/eng/Versions.props b/eng/Versions.props index 0142f65c6..05fc05fd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23477.6 + 8.0.0-rtm.23477.15 - 8.0.0-rtm.23477.1 + 8.0.0-rtm.23477.4 @@ -85,16 +85,16 @@ - 8.0.100-rtm.23477.60 - 8.0.100-rtm.23477.60 - 8.0.100-rtm.23477.60 + 8.0.100-rtm.23477.62 + 8.0.100-rtm.23477.62 + 8.0.100-rtm.23477.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23477.1 + 4.8.0-3.23477.4 @@ -112,10 +112,10 @@ - 8.0.0-rtm.23477.4 - 8.0.0-rtm.23477.4 - 8.0.0-rtm.23477.4 - 8.0.0-rtm.23477.4 + 8.0.0-rtm.23477.8 + 8.0.0-rtm.23477.8 + 8.0.0-rtm.23477.8 + 8.0.0-rtm.23477.8 From 4e39632d3a6d1dc172033550bd4f40b3a7fe583b Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa <91743470+dkurepa@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:02:35 +0200 Subject: [PATCH 26/36] Move SourceBuild property to a non stable package (#17396) Co-authored-by: Matt Mitchell --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3bd584ce..cadb51595 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,11 +63,11 @@ https://github.com/dotnet/aspnetcore 96da75d67ff058d95e14de12d9fc2ff215074e3c + https://github.com/dotnet/aspnetcore 96da75d67ff058d95e14de12d9fc2ff215074e3c - https://github.com/dotnet/aspnetcore From 6dae8493a54d682ff64973e67bba2bd1333047a3 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 29 Sep 2023 07:36:13 -0500 Subject: [PATCH 27/36] Update sdk diff exclusions (#17444) --- .../assets/SdkFileDiffExclusions.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 23553c25d..3000c80e8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -84,11 +84,6 @@ msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.Protecte msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll -# https://github.com/dotnet/source-build/issues/3632 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/*/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/*/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.resources.dll -sb,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll - # netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290 msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll msft,./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll From 126debcb946a29ae89ff1dac4712cce984df35d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 21:39:42 +0000 Subject: [PATCH 28/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17449) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23477.8 to 8.0.0-rtm.23479.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23477.8 to 8.0.0-rtm.23479.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23477.8 to 8.0.0-rtm.23479.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23477.8 to 8.0.0-rtm.23479.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23477.15 to 8.0.0-rtm.23479.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23477.8 to 8.0.0-rtm.23479.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23477.4 to 8.0.0-rtm.23479.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23475.2 to 12.8.0-beta.23478.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23475.2 to 8.0.100-beta.23478.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23477.4 to 4.8.0-3.23478.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23475.3 to 8.0.0-rtm.23477.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++--------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cadb51595..8a57a2be4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 + e1b9e73c8dbfff5af569b97dae94ccf27563c958 - + https://github.com/dotnet/windowsdesktop - 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 + e1b9e73c8dbfff5af569b97dae94ccf27563c958 - + https://github.com/dotnet/windowsdesktop - 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 + e1b9e73c8dbfff5af569b97dae94ccf27563c958 - + https://github.com/dotnet/windowsdesktop - 9f4e1e4041ba1bc25dcf96ea4ceac6c1bafadec1 + e1b9e73c8dbfff5af569b97dae94ccf27563c958 - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/aspnetcore - 96da75d67ff058d95e14de12d9fc2ff215074e3c + 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/sdk - 123342caab35c77058df89b674992a3ad37a1019 + 9741faaf6e80f067acc17a3e233d63b328e03713 - + https://github.com/dotnet/sdk - 123342caab35c77058df89b674992a3ad37a1019 + 9741faaf6e80f067acc17a3e233d63b328e03713 - + https://github.com/dotnet/sdk - 123342caab35c77058df89b674992a3ad37a1019 + 9741faaf6e80f067acc17a3e233d63b328e03713 - + https://github.com/dotnet/sdk - 123342caab35c77058df89b674992a3ad37a1019 + 9741faaf6e80f067acc17a3e233d63b328e03713 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 3653a59a7be8540e914656b4ef2fb26a0384f902 + 637e44595048bfabc1078e0713a04f72bfbcb633 - + https://github.com/dotnet/wpf - aacebe9dc98fec26170f2717530ba026d4c4cf26 + 6ef4d6a906eee362d8bb447148c6d8d853eac2e6 - + https://github.com/dotnet/fsharp - 10f956e631a1efc0f7f5e49c626c494cd32b1f50 + 38b2bac6361e9b75dc2b51c0f2b78b008872767d - + https://github.com/dotnet/fsharp - 10f956e631a1efc0f7f5e49c626c494cd32b1f50 + 38b2bac6361e9b75dc2b51c0f2b78b008872767d @@ -146,13 +146,13 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 885100b00bc944cbb698bc4cc2ec3ec18007534f + b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/roslyn - 154581113ae6cf75c874a0e760d6bb5adc44d44f + 904f29459d682d4afce3db29f4e4e67cd2edd641 @@ -168,9 +168,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 0a2aae889f5ce2803fa227e13963b3fbf3ccb6b0 + ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337 diff --git a/eng/Versions.props b/eng/Versions.props index 05fc05fd8..0cff07c26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23477.15 + 8.0.0-rtm.23479.1 - 8.0.0-rtm.23477.4 + 8.0.0-rtm.23479.1 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23477.14 - 8.0.0-rtm.23477.14 - 8.0.0-rtm.23477.14 - 8.0.0-rtm.23477.14 - 8.0.0-rtm.23477.14 - 8.0.0-rtm.23477.14 - 8.0.0-rtm.23477.14 + 8.0.0-rtm.23479.3 + 8.0.0-rtm.23479.3 + 8.0.0-rtm.23479.3 + 8.0.0-rtm.23479.3 + 8.0.0-rtm.23479.3 + 8.0.0-rtm.23479.3 + 8.0.0-rtm.23479.3 0.2.0 - 8.0.100-rtm.23477.62 - 8.0.100-rtm.23477.62 - 8.0.100-rtm.23477.62 + 8.0.100-rtm.23479.18 + 8.0.100-rtm.23479.18 + 8.0.100-rtm.23479.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23477.4 + 4.8.0-3.23478.4 - 8.0.0-rtm.23477.9 + 8.0.0-rtm.23478.17 - 8.0.0-rtm.23477.9 - 8.0.0-rtm.23477.9 - 8.0.0-rtm.23477.9 - 8.0.0-rtm.23477.9 - 8.0.0-rtm.23477.9 - 8.0.0-rtm.23477.9 + 8.0.0-rtm.23478.17 + 8.0.0-rtm.23478.17 + 8.0.0-rtm.23478.17 + 8.0.0-rtm.23478.17 + 8.0.0-rtm.23478.17 + 8.0.0-rtm.23478.17 2.1.0 - 8.0.0-rtm.23477.8 - 8.0.0-rtm.23477.8 - 8.0.0-rtm.23477.8 - 8.0.0-rtm.23477.8 + 8.0.0-rtm.23479.1 + 8.0.0-rtm.23479.1 + 8.0.0-rtm.23479.1 + 8.0.0-rtm.23479.1 @@ -247,7 +247,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23475.3 + 8.0.0-rtm.23477.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 0dbaa63b1273f577b236aab5d5eaf19b1610e0d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:53:45 -0700 Subject: [PATCH 29/36] [release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#17448) Co-authored-by: dotnet-maestro[bot] --- 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 8a57a2be4..e3696c2ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -184,9 +184,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - e04156dbe14f882a80d4499dbebd45ab156b6c3c + ed17956dbc31097b7ba6a66be086f4a70a97d84f From 471a817bd5699e61f734ee155372016a1d0dc08b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 00:04:59 +0000 Subject: [PATCH 30/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17450) Co-authored-by: dotnet-maestro[bot] --- 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 e3696c2ad..05470c1e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 064ae8e7674c3c11f8aef78a9a132979c8778cc9 - + https://github.com/dotnet/sdk - 9741faaf6e80f067acc17a3e233d63b328e03713 + bffd6b124aa067d5d5226d7ed83dde333a8d6a89 - + https://github.com/dotnet/sdk - 9741faaf6e80f067acc17a3e233d63b328e03713 + bffd6b124aa067d5d5226d7ed83dde333a8d6a89 - + https://github.com/dotnet/sdk - 9741faaf6e80f067acc17a3e233d63b328e03713 + bffd6b124aa067d5d5226d7ed83dde333a8d6a89 - + https://github.com/dotnet/sdk - 9741faaf6e80f067acc17a3e233d63b328e03713 + bffd6b124aa067d5d5226d7ed83dde333a8d6a89 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0cff07c26..267b0ac90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23479.18 - 8.0.100-rtm.23479.18 - 8.0.100-rtm.23479.18 + 8.0.100-rtm.23502.3 + 8.0.100-rtm.23502.3 + 8.0.100-rtm.23502.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 25a497b0196962bedc4327ad448120de60f5b35c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:57:09 +0000 Subject: [PATCH 31/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17451) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23478.4 to 4.8.0-3.23501.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05470c1e0..7f4125952 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://github.com/dotnet/runtime b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/aspnetcore - 064ae8e7674c3c11f8aef78a9a132979c8778cc9 + 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/sdk - bffd6b124aa067d5d5226d7ed83dde333a8d6a89 + f120df4a70c717c160e93bfc93e011e0607d6541 - + https://github.com/dotnet/sdk - bffd6b124aa067d5d5226d7ed83dde333a8d6a89 + f120df4a70c717c160e93bfc93e011e0607d6541 - + https://github.com/dotnet/sdk - bffd6b124aa067d5d5226d7ed83dde333a8d6a89 + f120df4a70c717c160e93bfc93e011e0607d6541 - + https://github.com/dotnet/sdk - bffd6b124aa067d5d5226d7ed83dde333a8d6a89 + f120df4a70c717c160e93bfc93e011e0607d6541 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://github.com/dotnet/runtime b20f704cc00f390e5560a137deb8f0e64e863e1d - + https://github.com/dotnet/roslyn - 904f29459d682d4afce3db29f4e4e67cd2edd641 + 0d735148bbb4cb511be547fbc1db63a2c81a821d diff --git a/eng/Versions.props b/eng/Versions.props index 267b0ac90..ab5dc82ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,29 +72,29 @@ - 8.0.0-rtm.23479.3 - 8.0.0-rtm.23479.3 - 8.0.0-rtm.23479.3 - 8.0.0-rtm.23479.3 - 8.0.0-rtm.23479.3 - 8.0.0-rtm.23479.3 - 8.0.0-rtm.23479.3 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 0.2.0 - 8.0.100-rtm.23502.3 - 8.0.100-rtm.23502.3 - 8.0.100-rtm.23502.3 + 8.0.100-rtm.23503.1 + 8.0.100-rtm.23503.1 + 8.0.100-rtm.23503.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23478.4 + 4.8.0-3.23501.1 From d13fbb79ddafed4f411a2b53c0778b1c21f5fd0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 20:30:43 +0000 Subject: [PATCH 32/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17455) [release/8.0.1xx] 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 7f4125952..1b45607cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 6b9887091f010b26fe1b3639fb80b71065a0bff7 - + https://github.com/dotnet/sdk - f120df4a70c717c160e93bfc93e011e0607d6541 + 22969374eed5b2467de56e127f65abfb3627e275 - + https://github.com/dotnet/sdk - f120df4a70c717c160e93bfc93e011e0607d6541 + 22969374eed5b2467de56e127f65abfb3627e275 - + https://github.com/dotnet/sdk - f120df4a70c717c160e93bfc93e011e0607d6541 + 22969374eed5b2467de56e127f65abfb3627e275 - + https://github.com/dotnet/sdk - f120df4a70c717c160e93bfc93e011e0607d6541 + 22969374eed5b2467de56e127f65abfb3627e275 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ab5dc82ff..c67c8a4c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.100-rtm.23503.1 - 8.0.100-rtm.23503.1 - 8.0.100-rtm.23503.1 + 8.0.100-rtm.23503.4 + 8.0.100-rtm.23503.4 + 8.0.100-rtm.23503.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f0970dcf4fe2475ecc8c9fd8b979d48cec765490 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 23:03:31 +0000 Subject: [PATCH 33/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17456) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23502.22 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b45607cb..619b372f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://github.com/dotnet/windowsdesktop e1b9e73c8dbfff5af569b97dae94ccf27563c958 - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/aspnetcore - 6b9887091f010b26fe1b3639fb80b71065a0bff7 + f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/sdk - 22969374eed5b2467de56e127f65abfb3627e275 + bfcdc76b77c6fcf05f426210c569f2b56796dd9b - + https://github.com/dotnet/sdk - 22969374eed5b2467de56e127f65abfb3627e275 + bfcdc76b77c6fcf05f426210c569f2b56796dd9b - + https://github.com/dotnet/sdk - 22969374eed5b2467de56e127f65abfb3627e275 + bfcdc76b77c6fcf05f426210c569f2b56796dd9b - + https://github.com/dotnet/sdk - 22969374eed5b2467de56e127f65abfb3627e275 + bfcdc76b77c6fcf05f426210c569f2b56796dd9b https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - b20f704cc00f390e5560a137deb8f0e64e863e1d + ef6283ac0a14c78d9e9fef4841545099bd7ad12b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c67c8a4c2..8628eb9b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,22 +72,22 @@ - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.22 + 8.0.0-rtm.23502.22 + 8.0.0-rtm.23502.22 + 8.0.0-rtm.23502.22 + 8.0.0-rtm.23502.22 + 8.0.0-rtm.23502.22 + 8.0.0-rtm.23502.22 0.2.0 - 8.0.100-rtm.23503.4 - 8.0.100-rtm.23503.4 - 8.0.100-rtm.23503.4 + 8.0.100-rtm.23503.8 + 8.0.100-rtm.23503.8 + 8.0.100-rtm.23503.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.0-rtm.23478.17 + 8.0.0-rtm.23502.11 - 8.0.0-rtm.23478.17 - 8.0.0-rtm.23478.17 - 8.0.0-rtm.23478.17 - 8.0.0-rtm.23478.17 - 8.0.0-rtm.23478.17 - 8.0.0-rtm.23478.17 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 + 8.0.0-rtm.23502.11 2.1.0 From 44e6cb59e07abca55927395e806a7a528342c2c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:59:16 -0700 Subject: [PATCH 34/36] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17469) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 619b372f7..b0960c562 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - e1b9e73c8dbfff5af569b97dae94ccf27563c958 + 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 - + https://github.com/dotnet/windowsdesktop - e1b9e73c8dbfff5af569b97dae94ccf27563c958 + 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 - + https://github.com/dotnet/windowsdesktop - e1b9e73c8dbfff5af569b97dae94ccf27563c958 + 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 - + https://github.com/dotnet/windowsdesktop - e1b9e73c8dbfff5af569b97dae94ccf27563c958 + 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 https://github.com/dotnet/aspnetcore @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/sdk - bfcdc76b77c6fcf05f426210c569f2b56796dd9b + d7cbd4f0f1e502155f9f4efa8ea66347b6241161 - + https://github.com/dotnet/sdk - bfcdc76b77c6fcf05f426210c569f2b56796dd9b + d7cbd4f0f1e502155f9f4efa8ea66347b6241161 - + https://github.com/dotnet/sdk - bfcdc76b77c6fcf05f426210c569f2b56796dd9b + d7cbd4f0f1e502155f9f4efa8ea66347b6241161 - + https://github.com/dotnet/sdk - bfcdc76b77c6fcf05f426210c569f2b56796dd9b + d7cbd4f0f1e502155f9f4efa8ea66347b6241161 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 637e44595048bfabc1078e0713a04f72bfbcb633 + 8a59d1905af0cdfb97facf168ea45ff66a1aac59 - + https://github.com/dotnet/wpf - 6ef4d6a906eee362d8bb447148c6d8d853eac2e6 + bb02ebf62ac63db011265fee937bdde982af8bf6 https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - ef6283ac0a14c78d9e9fef4841545099bd7ad12b + a84f8ffbf5d597b8a91e893a1f413466de017a68 - + https://github.com/dotnet/roslyn - 0d735148bbb4cb511be547fbc1db63a2c81a821d + 61728203004a6c9f57df5cd0b0bf4e35e865f10b diff --git a/eng/Versions.props b/eng/Versions.props index 8628eb9b8..9b5297c6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23479.1 + 8.0.0-rtm.23503.13 - 8.0.0-rtm.23479.1 + 8.0.0-rtm.23504.1 @@ -85,37 +85,37 @@ - 8.0.100-rtm.23503.8 - 8.0.100-rtm.23503.8 - 8.0.100-rtm.23503.8 + 8.0.100-rtm.23504.11 + 8.0.100-rtm.23504.11 + 8.0.100-rtm.23504.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23501.1 + 4.8.0-3.23503.7 - 8.0.0-rtm.23502.11 + 8.0.0-rtm.23503.15 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 - 8.0.0-rtm.23502.11 + 8.0.0-rtm.23503.15 + 8.0.0-rtm.23503.15 + 8.0.0-rtm.23503.15 + 8.0.0-rtm.23503.15 + 8.0.0-rtm.23503.15 + 8.0.0-rtm.23503.15 2.1.0 - 8.0.0-rtm.23479.1 - 8.0.0-rtm.23479.1 - 8.0.0-rtm.23479.1 - 8.0.0-rtm.23479.1 + 8.0.0-rtm.23504.1 + 8.0.0-rtm.23504.1 + 8.0.0-rtm.23504.1 + 8.0.0-rtm.23504.1 From 77a7628585b8f52970455233344ef3a9ce7c9bcb Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 5 Oct 2023 23:43:12 -0700 Subject: [PATCH 35/36] Source-build symbols repackaging (#17454) Co-authored-by: Michael Simons --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- src/SourceBuild/content/build.proj | 82 +++++++++- .../CreateSdkSymbolsLayout.cs | 154 ++++++++++++++++++ 3 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/CreateSdkSymbolsLayout.cs diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 041a47580..f11af8c4b 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -127,7 +127,7 @@ jobs: artifact: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts patterns: | **/Private.SourceBuilt.Artifacts.*.tar.gz - **/dotnet-sdk-*.tar.gz + **/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])*.tar.gz displayName: Download Previous Build - task: CopyFiles@2 diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 55e5a66c0..6b67024d0 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -4,6 +4,7 @@ + @@ -57,6 +58,84 @@ + + + + + + + + + + $([System.IO.Path]::GetFileName('%(SymbolsTarball.Identity)')) + $(Filename.Split('.')[1]) + $(ArtifactsTmpDir)Symbols + $(UnifiedSymbolsLayout)/$(RepositoryName) + + + + + + + + + + + + $(OutputPath)dotnet-symbols-$(MicrosoftSourceBuildIntermediateInstallerVersion)-$(TargetRid).tar.gz + + + + + + + + + + + + + + + $(ArtifactsTmpDir)SdkSymbols + $(OutputPath)dotnet-sdk-symbols-$(MicrosoftSourceBuildIntermediateInstallerVersion)-$(TargetRid).tar.gz + $(ArtifactsTmpDir)Sdk + %(SdkTarballItem.Identity) + + + + + + + + + + + + + + + + - + https://github.com/dotnet/windowsdesktop - 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/windowsdesktop - 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/windowsdesktop - 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/windowsdesktop - 0229aaad6fe7a31fa9fbb56484ede7e187d20d74 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a https://github.com/dotnet/aspnetcore @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore f37eb785c92218e668cf98e8c50139c1395492ad - + https://github.com/dotnet/sdk - d7cbd4f0f1e502155f9f4efa8ea66347b6241161 + 857f22d8f051c090fa367d230aebe9b26450f634 - + https://github.com/dotnet/sdk - d7cbd4f0f1e502155f9f4efa8ea66347b6241161 + 857f22d8f051c090fa367d230aebe9b26450f634 - + https://github.com/dotnet/sdk - d7cbd4f0f1e502155f9f4efa8ea66347b6241161 + 857f22d8f051c090fa367d230aebe9b26450f634 - + https://github.com/dotnet/sdk - d7cbd4f0f1e502155f9f4efa8ea66347b6241161 + 857f22d8f051c090fa367d230aebe9b26450f634 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 8a59d1905af0cdfb97facf168ea45ff66a1aac59 + 8226c3cbaf595ae2c6fb8ed7ccd69ae77d647bd4 - + https://github.com/dotnet/wpf - bb02ebf62ac63db011265fee937bdde982af8bf6 + b892ae845b9832e0873ef2f7c958c46dc6b3d637 https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - a84f8ffbf5d597b8a91e893a1f413466de017a68 + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/roslyn - 61728203004a6c9f57df5cd0b0bf4e35e865f10b + 81d9274600db701a8b08ed8af3fd6b00a775cc33 diff --git a/eng/Versions.props b/eng/Versions.props index 9b5297c6a..4d9ec9875 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23503.13 + 8.0.0-rtm.23504.13 - 8.0.0-rtm.23504.1 + 8.0.0-rtm.23504.3 @@ -85,37 +85,37 @@ - 8.0.100-rtm.23504.11 - 8.0.100-rtm.23504.11 - 8.0.100-rtm.23504.11 + 8.0.100-rtm.23506.7 + 8.0.100-rtm.23506.7 + 8.0.100-rtm.23506.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23503.7 + 4.8.0-3.23504.4 - 8.0.0-rtm.23503.15 + 8.0.0-rtm.23504.8 - 8.0.0-rtm.23503.15 - 8.0.0-rtm.23503.15 - 8.0.0-rtm.23503.15 - 8.0.0-rtm.23503.15 - 8.0.0-rtm.23503.15 - 8.0.0-rtm.23503.15 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 2.1.0 - 8.0.0-rtm.23504.1 - 8.0.0-rtm.23504.1 - 8.0.0-rtm.23504.1 - 8.0.0-rtm.23504.1 + 8.0.0-rtm.23504.7 + 8.0.0-rtm.23504.7 + 8.0.0-rtm.23504.7 + 8.0.0-rtm.23504.7