From b5e20af6f571a6fe003184996f70541f9a1027cb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Jun 2022 20:28:03 +0000 Subject: [PATCH 01/17] Merged PR 23310: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220614.1 - **Date Produced**: June 15, 2022 1:39:26 AM UTC - **Commit**: bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22268.1 to 6.0.0-servicing.22314.1][3] [3]: https://github.com/dotnet/source-build-reference-packages/compare/8ea40b4...bc3b0a4 [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- NuGet.config | 22 ++++++++++++++++++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index f50bca67f..604028977 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -15,11 +19,18 @@ + + + + + + + @@ -38,13 +49,24 @@ + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0500c8180..d99555dd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 + bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b From 3eff7cb90ae005b10a154b224fc689e959af3593 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Jun 2022 22:39:55 +0000 Subject: [PATCH 02/17] Merged PR 23544: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20220614.7 - **Date Produced**: June 14, 2022 8:03:55 PM UTC - **Commit**: fdd3a242bc813f371023adff4e4c05c0be705d2a - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1] [1]: https://github.com/dotnet/arcade/compare/e3cbecc...fdd3a24 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.106 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d99555dd3..98b29c6b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e121f07ce..81b56d1ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22261.7 + 6.0.0-beta.22314.7 diff --git a/global.json b/global.json index de4424c2a..80e9668ff 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.105", + "dotnet": "6.0.106", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22314.7" } } From ed49dd9da16af3e3a5b71f5e3bef901e0c45e2a6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 17:38:16 +0000 Subject: [PATCH 03/17] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.0.2-rc.3 to 6.0.2-rc.5 (parent: Microsoft.NET.Sdk) --- NuGet.config | 8 -------- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e3e7efe1..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99bd9d4dd..0ada89108 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5080045df61ed4394fb46368acaa7ba7c7d2f664 + 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5080045df61ed4394fb46368acaa7ba7c7d2f664 + 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac @@ -151,9 +151,9 @@ c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a5782faf46b91a7b43935a28d1e185e79a50588a + + https://github.com/nuget/nuget.client + 75551652b352f860ea0b29095b64fa63715dd672 diff --git a/eng/Versions.props b/eng/Versions.props index c0c0820cc..92eb5d22a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.106-servicing.22268.20 - 6.0.106-servicing.22268.20 + 6.0.107-servicing.22321.28 + 6.0.107-servicing.22321.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From beddbdec0a0aaea3ff106a2bc4713ec5d87bf63f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 21:39:15 +0000 Subject: [PATCH 04/17] Merged PR 23696: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22268.6 to 6.0.107-servicing.22315.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22314.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22268.4 to 6.0.7-servicing.22321.2 (parent:... --- NuGet.config | 8 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ee0fa704..c8fde6e36 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ada89108..0806d52ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 98e84064eac187f44cb1981bef60d5968678d3f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 + d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 + d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 + d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac + 8fb31b0f731d911fd9460780fab6134bf910befe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1950cf1f86d705a5df9be278e39d40ae7bd5ac + 8fb31b0f731d911fd9460780fab6134bf910befe - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 + 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - dabcf2041548f7594b21e9bf865463abdfd14307 + 6bdf005a9fdcade55cc00e6359e69b247740e097 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 92eb5d22a..0aa6b816d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.6-servicing.22267.5 + 6.0.7-servicing.22314.5 - 6.0.6-servicing.22268.4 + 6.0.7-servicing.22321.2 - 6.0.106 + 6.0.107 @@ -44,44 +44,44 @@ - 6.0.6 - 6.0.6 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 + 6.0.7 + 6.0.7 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 0.2.0 - 6.0.107-servicing.22321.28 - 6.0.107-servicing.22321.28 + 6.0.107-servicing.22322.8 + 6.0.107-servicing.22322.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.4 + 6.0.5 - 6.0.6-servicing.22267.7 - 6.0.6-servicing.22267.7 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22322.2 + 6.0.7-servicing.22322.2 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 2.1.0 - 6.0.6-servicing.22268.6 - 6.0.6-servicing.22268.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22321.2 + 6.0.7-servicing.22321.2 + 6.0.7 + 6.0.7 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.106 + 6.0.107 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From e0cc63f11d71fe285544b127908b700da399f6aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 23:43:34 +0000 Subject: [PATCH 05/17] Merged PR 23697: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300 to 6.0.302 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.300-rtm.22215.5 to 6.0.302-servicing.22321.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300 to 6.0.302 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (pa... --- NuGet.config | 36 ++++---------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 82 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index 604028977..ec5638937 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,20 @@ - - - - - + - - - - + + - - - - - + @@ -49,25 +39,15 @@ - - - - - + - - - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98b29c6b8..14557e9a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7d10adc397690db6f5c73da866aa443232ff1c88 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff + 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://github.com/dotnet/templating - 60a2f73de55434984bbe3d5ad9281b3863355b31 + 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://github.com/dotnet/templating - 60a2f73de55434984bbe3d5ad9281b3863355b31 + 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://github.com/dotnet/templating - 60a2f73de55434984bbe3d5ad9281b3863355b31 + 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8daa5f75dfc7592e30e28e71d448621d12442893 + 5da87044239563a982a84a352f283621208d66f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8daa5f75dfc7592e30e28e71d448621d12442893 + 5da87044239563a982a84a352f283621208d66f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - dabcf2041548f7594b21e9bf865463abdfd14307 + 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a8942f45835ba527cedacc02f7a75468f7a7b4bd + + https://github.com/nuget/nuget.client + 4be14ee6b6587a02f05337505bd840fbcbe898f6 diff --git a/eng/Versions.props b/eng/Versions.props index 81b56d1ba..58f372aff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.6-servicing.22267.5 + 6.0.7-servicing.22322.3 - 6.0.6-servicing.22268.4 + 6.0.7-servicing.22322.2 - 6.0.300 + 6.0.302 @@ -44,44 +44,44 @@ - 6.0.6 - 6.0.6 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 - 6.0.6-servicing.22268.5 + 6.0.7 + 6.0.7 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 + 6.0.7-servicing.22314.16 0.2.0 - 6.0.301-rtm.22274.11 - 6.0.301-rtm.22274.11 + 6.0.302-servicing.22322.21 + 6.0.302-servicing.22322.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.4 + 6.0.5 - 6.0.6-servicing.22267.7 - 6.0.6-servicing.22267.7 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22322.2 + 6.0.7-servicing.22322.2 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 2.1.0 - 6.0.6-servicing.22268.6 - 6.0.6-servicing.22268.6 - 6.0.6 - 6.0.6 + 6.0.7-servicing.22322.3 + 6.0.7-servicing.22322.3 + 6.0.7 + 6.0.7 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300 + 6.0.302 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 6a808a4c486bf5f6bcf69424b029d215937e11bb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jun 2022 14:52:37 +0000 Subject: [PATCH 06/17] Merged PR 23715: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.7-servicing.22314.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220622.34 - **Date Produced**: June 23, 2022 5:04:19 AM UTC - **Commit**: 336044192d20c6c49968ffc53bbc8ca363bd94e8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5] - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.7 to 6.0.7][6] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22321.2 to 6.0.7-servicing.2... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8fde6e36..f569adcbc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0806d52ee..fa80176e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8fb31b0f731d911fd9460780fab6134bf910befe + 336044192d20c6c49968ffc53bbc8ca363bd94e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8fb31b0f731d911fd9460780fab6134bf910befe + 336044192d20c6c49968ffc53bbc8ca363bd94e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6bdf005a9fdcade55cc00e6359e69b247740e097 + 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0aa6b816d..b7e5aecbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.7-servicing.22314.5 + 6.0.7-servicing.22322.3 - 6.0.7-servicing.22321.2 + 6.0.7-servicing.22322.2 @@ -46,18 +46,18 @@ 6.0.7 6.0.7 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 0.2.0 - 6.0.107-servicing.22322.8 - 6.0.107-servicing.22322.8 + 6.0.107-servicing.22322.34 + 6.0.107-servicing.22322.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.7-servicing.22321.2 - 6.0.7-servicing.22321.2 + 6.0.7-servicing.22322.3 + 6.0.7-servicing.22322.3 6.0.7 6.0.7 From 421de59ba85e84b1e3d6cf4260e283531f1185e3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 16:19:37 +0000 Subject: [PATCH 07/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22322.21 -> To Version 6.0.302-servicing.22323.5 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.7 -> To Version 6.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec5638937..88f3011d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,6 @@ - @@ -39,12 +38,11 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14557e9a4..fd65edc0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 55a6352b57cb1d777e812cc149906533e8d393a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5da87044239563a982a84a352f283621208d66f6 + 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5da87044239563a982a84a352f283621208d66f6 + 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea diff --git a/eng/Versions.props b/eng/Versions.props index 58f372aff..a8c1e49a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.7 6.0.7 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 0.2.0 - 6.0.302-servicing.22322.21 - 6.0.302-servicing.22322.21 + 6.0.302-servicing.22323.5 + 6.0.302-servicing.22323.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ddc14fb7c42d6ac7a4c0238111c0774e647c4b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 19:39:12 +0000 Subject: [PATCH 08/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.107-servicing.22322.34 -> To Version 6.0.107-servicing.22323.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.107 -> To Version 6.0.107 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f569adcbc..08ee9c28b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa80176e9..e311e0115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d168d16503879e3a8106394a5564fe97550e603f + d7124c65e9d6a8d3239a7003747a55fe4d00c61a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d168d16503879e3a8106394a5564fe97550e603f + d7124c65e9d6a8d3239a7003747a55fe4d00c61a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d168d16503879e3a8106394a5564fe97550e603f + d7124c65e9d6a8d3239a7003747a55fe4d00c61a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 336044192d20c6c49968ffc53bbc8ca363bd94e8 + ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 336044192d20c6c49968ffc53bbc8ca363bd94e8 + ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda diff --git a/eng/Versions.props b/eng/Versions.props index b7e5aecbe..79487d28b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.107-servicing.22322.34 - 6.0.107-servicing.22322.34 + 6.0.107-servicing.22323.13 + 6.0.107-servicing.22323.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18f002dda7d3751dc06c9091a7129a6e4ae80aa7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Jun 2022 19:44:03 +0000 Subject: [PATCH 09/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220623.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22322.21 -> To Version 6.0.302-servicing.22323.12 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.7 -> To Version 6.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 88f3011d3..4f5d25388 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + @@ -43,6 +44,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd65edc0a..229d3fa85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ - https://github.com/dotnet/templating - 55a6352b57cb1d777e812cc149906533e8d393a3 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 416d9a7ab914340b357cff31bf49ba7e708f5a41 - - https://github.com/dotnet/templating - 55a6352b57cb1d777e812cc149906533e8d393a3 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 416d9a7ab914340b357cff31bf49ba7e708f5a41 - https://github.com/dotnet/templating - 55a6352b57cb1d777e812cc149906533e8d393a3 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea + dc262f0c444d57181e580d4d5b9a517ea558c64a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61ac8e4ddeacd507ad2827fc6f41efccc8da53ea + dc262f0c444d57181e580d4d5b9a517ea558c64a diff --git a/eng/Versions.props b/eng/Versions.props index a8c1e49a6..54076f4dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.302-servicing.22323.5 - 6.0.302-servicing.22323.5 + 6.0.302-servicing.22323.12 + 6.0.302-servicing.22323.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4df698566f05168995a04cd07cc8cc63fa921607 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 27 Jun 2022 15:23:17 -0700 Subject: [PATCH 10/17] Add more detailed source-build instructions to README (#14038) * Add more detailed source-build instructions to README * Add support information --- README.md | 66 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2b1e76a0f..4be3949f9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ You can consult the [Documents Index for the SDK repo](https://github.com/dotnet This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct). -# Building +# Build .NET installer The repository contains native code project required for the Windows installer. If you intend to build it locally on Windows, you will need to ensure that you have the following items installed. - Install CMAKE 3.21.0 is required if you're building VS 17.0. Make sure to add CMAKE to your PATH (the installer will prompt you). @@ -36,25 +36,69 @@ The repository contains native code project required for the Windows installer. - To build in VS, run a command line build first, then run `artifacts\core-sdk-build-env.bat` from a VS command prompt and then `devenv Microsoft.DotNet.Cli.sln` - To test different languages of the installer, run `artifacts\packages\Debug\Shipping>dotnet-sdk-3.1.412-win-x64.exe /lang 1046` using the LCID of the language you want to test -# Building (source-build) +# Build .NET from source (source-build) -This repo also contains code to help you build the entire .NET product end-to-end from sources (often referred to as source-build), even in disconnected/offline mode. This is currently only tested on Linux. +This repo also contains code to help you build the entire .NET product end-to-end from source (often referred to as source-build), even in disconnected/offline mode. +Please see the [dotnet/source-build](https://github.com/dotnet/source-build) repo for more information. -1. `./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=/path/to/place/complete/dotnet/sources` +## Support - This fetches the complete set of source code used to build the .NET SDK. It creates a tarball of the complete .NET source code at `artifacts/packages//Shipping/`. It also places the extracted sources at `/path/to/place/complete/dotnet/sources`. Due to a few known issues, that source directory should be outside (and not somewhere under) this repository. +.NET Source-Build is supported on the oldest available .NET SDK feature update, and on Linux only. +For example, if both .NET 6.0.1XX and 6.0.2XX feature updates are available from [dotnet.microsoft.com](https://dotnet.microsoft.com/en-us/download/dotnet/6.0), Source-Build will only support 6.0.1XX. +For the latest information about Source-Build support for new .NET versions, please check our [GitHub Discussions page](https://github.com/dotnet/source-build/discussions) for announcements. -2. `cd /path/to/complete/dotnet/sources` +## Prerequisites -3. `./prep.sh --bootstrap` +The dependencies for building .NET from source can be found [here](https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/linux-requirements.md). - This downloads a .NET SDK and a number of .NET packages and other prebuilts needed to build .NET from source. +## Building - Eventually, we want to make it possible to bootstrap .NET 6 in which case this step can be skipped. +1. Create a .NET source tarball. -4. `./build.sh` + ```bash + ./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=/path/to/place/complete/dotnet/sources + ``` - This builds the entire .NET SDK. The resulting SDK is placed at `artifacts/$ARCH/Release/dotnet-sdk-$VERSION-$ARCH.tar.gz`. + This fetches the complete .NET source code and creates a tarball at `artifacts/packages//Shipping/`. + The extracted source code is also placed at `/path/to/place/complete/dotnet/sources`. + The source directory should be outside (and not somewhere under) the installer directory. + +2. Prep the source to build on your distro. This downloads a .NET SDK and a number of .NET packages needed to build .NET from source. + + ```bash + cd /path/to/complete/dotnet/sources + ./prep.sh + ``` + + On arm64, please use `./prep.sh --bootstrap` instead. This issue is being tracked [here](https://github.com/dotnet/source-build/issues/2758). + +3. Build the .NET SDK + + ```bash + ./build.sh --clean-while-building + ``` + + This builds the entire .NET SDK from source. + The resulting SDK is placed at `artifacts/x64/Release/dotnet-sdk-6.0.100-fedora.33-x64.tar.gz`. + + Optionally add the `--online` flag to add online NuGet restore sources to the build. + This is useful for testing unsupported releases that don't yet build without downloading pre-built binaries from the internet. + + Run `./build.sh --help` to see more information about supported build options. + +4. (Optional) Unpack and install the .NET SDK + + ```bash + mkdir -p $HOME/dotnet + tar zxf artifacts/x64/Release/dotnet-sdk-6.0.100-fedora.33-x64.tar.gz -C $HOME/dotnet + ln -s $HOME/dotnet/dotnet /usr/bin/dotnet + ``` + + To test your source-built SDK, run the following: + + ```bash + dotnet --info + ``` # Build status From 0e6c0b83d52b24b585768fd5104c5686ca2d49d0 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 5 Jul 2022 12:30:15 -0700 Subject: [PATCH 11/17] Update branding to 6.0.108 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c0c0820cc..b7f3797c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From da15ec139622e48b483bc36ce9104762b787b146 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 5 Jul 2022 12:30:19 -0700 Subject: [PATCH 12/17] Update branding to 6.0.303 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e121f07ce..a6c7e9fff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 853275fdcb09c04e79ba224faa4a40fcd4025768 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Jul 2022 12:13:55 -0700 Subject: [PATCH 13/17] Update Asp.Net template (#14111) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8c1961e35..3499501e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.26 + 3.1.27 3.2.1 4.8.0-rc2.19462.10 From b5fa5e2caf07ca0cf0ec11751bc1f58bd17fd555 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 12 Jul 2022 12:14:03 -0700 Subject: [PATCH 14/17] Update asp.net template version (#14110) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index edd8216ba..d93ebd515 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.26 + 3.1.27 3.2.1 4.8.0-rc2.19462.10 From 3c4e56a00af1ba06fb7881f6e85a034973c2b07a Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 13 Jul 2022 09:23:43 -0700 Subject: [PATCH 15/17] update global.json and Versions.props for .NET SDK 6.0.107 (#14121) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d93ebd515..9cf5a4a4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.106 + 6.0.107 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index a1c3686ce..bb32ae2ff 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.106" + "dotnet": "6.0.107" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 3b240faef4fd553d4644df858835789778ae2809 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Jul 2022 22:28:52 +0000 Subject: [PATCH 16/17] Update dependencies from https://github.com/dotnet/sdk build 20220713.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22362.24 -> To Version 6.0.400-preview.22363.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22330.3 -> To Version 12.0.4-beta.22363.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f5d25388..a983e09b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,18 @@ + + - - - @@ -39,15 +38,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01199e28c..396463345 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - d65d07375c17cee2aa374eb9b4f2d9afe5fd202c + dda665ed55faf633e9c8d147ece4a69bf5009c49 - + https://github.com/dotnet/sdk - d65d07375c17cee2aa374eb9b4f2d9afe5fd202c + dda665ed55faf633e9c8d147ece4a69bf5009c49 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 - + https://github.com/dotnet/fsharp - 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 - + https://github.com/dotnet/fsharp - 3b674eb3a3aad38bbd0decfe75ea5aeeed12b499 + 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 diff --git a/eng/Versions.props b/eng/Versions.props index 1d7d271d4..f8b7ab77a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22362.24 - 6.0.400-preview.22362.24 + 6.0.400-preview.22363.31 + 6.0.400-preview.22363.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 559f1a1e4d2e38798be556e19c1198db60a3abc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 01:08:57 +0000 Subject: [PATCH 17/17] Update dependencies from https://github.com/dotnet/sdk build 20220713.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22363.31 -> To Version 6.0.400-preview.22363.39 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 396463345..0c70c5efa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating d8d193bf161de2a50a251035e4f9df2e2e85d7e7 - + https://github.com/dotnet/sdk - dda665ed55faf633e9c8d147ece4a69bf5009c49 + 3cf60fea0352616c274a89ec580b2a521a37566b - + https://github.com/dotnet/sdk - dda665ed55faf633e9c8d147ece4a69bf5009c49 + 3cf60fea0352616c274a89ec580b2a521a37566b diff --git a/eng/Versions.props b/eng/Versions.props index c097ef35a..22a87bc44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22363.31 - 6.0.400-preview.22363.31 + 6.0.400-preview.22363.39 + 6.0.400-preview.22363.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)