From 0fa6d987c6761a714562df70ee80f58187ab59e7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 11 Oct 2022 01:07:10 +0000 Subject: [PATCH 01/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.305-servicing.22510.22 --- NuGet.config | 27 ++++++++++++++++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15afcd11a..2343017ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,26 +8,38 @@ + + - + + + + + + + + + + + @@ -47,21 +59,34 @@ + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75778c857..266697f98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c33071e5eddb592a4b2122ec86afb2163873b6e + 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c33071e5eddb592a4b2122ec86afb2163873b6e + 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 diff --git a/eng/Versions.props b/eng/Versions.props index ff2cfe60e..a24454769 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22476.47 - 6.0.305-servicing.22476.47 + 6.0.305-servicing.22510.22 + 6.0.305-servicing.22510.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 534d512b432e831a296a6dffe6d194f75d524b16 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 11 Oct 2022 06:15:30 +0000 Subject: [PATCH 02/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22510.34 --- 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 266697f98..947534d64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 + 22dc8bd691438d82fab7709a12c98f9419e800e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d089dbefb403a9d04a7c9a8e8bf3ccb49f0db49 + 22dc8bd691438d82fab7709a12c98f9419e800e3 diff --git a/eng/Versions.props b/eng/Versions.props index a24454769..448c9b09a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22510.22 - 6.0.305-servicing.22510.22 + 6.0.306-servicing.22510.34 + 6.0.306-servicing.22510.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15885a4d76b1f140bab43f48f091e5e542f4a708 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Oct 2022 21:42:49 +0000 Subject: [PATCH 03/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221014.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22514.20 --- NuGet.config | 23 +---------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2343017ec..9079d2230 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,11 @@ - - - + @@ -28,18 +26,10 @@ - - - - - - - - @@ -72,22 +62,11 @@ - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 947534d64..804b79052 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22dc8bd691438d82fab7709a12c98f9419e800e3 + ee4981160809501f0efb0ec7721b2a2938492c79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22dc8bd691438d82fab7709a12c98f9419e800e3 + ee4981160809501f0efb0ec7721b2a2938492c79 diff --git a/eng/Versions.props b/eng/Versions.props index 448c9b09a..c22f12ea5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22510.34 - 6.0.306-servicing.22510.34 + 6.0.306-servicing.22514.20 + 6.0.306-servicing.22514.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a264cedf479b993ff919b41eeb7eb34a79a9242 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 16 Oct 2022 07:45:44 +0000 Subject: [PATCH 04/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221015.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22515.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 33 ++++------------ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 73 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9079d2230..52d4cb699 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,20 @@ + - - - - - - - - - - - - - + + + @@ -48,25 +39,17 @@ - - - - - - - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 804b79052..2518795ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee4981160809501f0efb0ec7721b2a2938492c79 + 985b54a445c3c09e95d3f1397f26fccd32be3745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee4981160809501f0efb0ec7721b2a2938492c79 + 985b54a445c3c09e95d3f1397f26fccd32be3745 diff --git a/eng/Versions.props b/eng/Versions.props index c22f12ea5..f51fac37b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.305 + 6.0.306 @@ -44,44 +44,44 @@ - 6.0.10 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 + 6.0.11 + 6.0.11 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 0.2.0 - 6.0.306-servicing.22514.20 - 6.0.306-servicing.22514.20 + 6.0.306-servicing.22515.1 + 6.0.306-servicing.22515.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.6 + 6.0.7 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22514.6 + 6.0.11-servicing.22514.6 + 6.0.11 + 6.0.11 + 6.0.11 + 6.0.11 2.1.0 - 6.0.10-servicing.22476.6 - 6.0.10-servicing.22476.6 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22513.9 + 6.0.11-servicing.22513.9 + 6.0.11 + 6.0.11 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.305 + 6.0.306 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From e55af734c22e1c2e2c35a162be5676e687fe2d39 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 17:41:04 +0000 Subject: [PATCH 05/36] Merged PR 26791: [internal/release/6.0.4xx] 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.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22476.21 to 6.0.403-rtm.22512.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22219.3 to 6.0.200-1.22478.1 (parent: Microsoft.NET.S... --- NuGet.config | 26 ++++------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++--------- 3 files changed, 77 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index e29afeaab..963ee559c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ + - - - - - - - + - + - + @@ -44,22 +39,17 @@ - - - - - - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778c68932..2cea7ba1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 + 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 + 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 + 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 + 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 + 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a @@ -135,15 +135,15 @@ 83d2f8162d29a66a8ff323c4bba93c8250013511 - + https://github.com/dotnet/linker - 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6 + 50c2ec00b794ebd130402d51b960c69cfc9ee622 linker - + https://github.com/dotnet/roslyn - 7d8de40e2bfe5bd2546ca49177166741af4c8e07 + 954930214e5a116e3aa1f81cab887b294ae95739 diff --git a/eng/Versions.props b/eng/Versions.props index 266fd059c..f86693cfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.402 + 6.0.403 @@ -44,44 +44,44 @@ - 6.0.10 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 + 6.0.11 + 6.0.11 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 0.2.0 - 6.0.402-servicing.22476.48 - 6.0.402-servicing.22476.48 + 6.0.403-servicing.22515.2 + 6.0.403-servicing.22515.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.6 + 6.0.7 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22514.6 + 6.0.11-servicing.22514.6 + 6.0.11 + 6.0.11 + 6.0.11 + 6.0.11 2.1.0 - 6.0.10-servicing.22476.6 - 6.0.10-servicing.22476.6 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22513.9 + 6.0.11-servicing.22513.9 + 6.0.11 + 6.0.11 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.402 + 6.0.403 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From f214b1e1f388c7fbe920ce8361e2bd4785c61c79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 22:03:02 +0000 Subject: [PATCH 06/36] Merged PR 26801: [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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221017.5 - **Date Produced**: October 17, 2022 4:49:20 PM UTC - **Commit**: 1ebf05b4301e6b29d0288178c184931b2976a58d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22515.1 to 6.0.306-servicing.22517.5][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22515.1 to 6.0.306-servicing.22517.5][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC985b54a&targetVersion=GC1ebf05b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC721ed1f&targetVersion=GC9303db7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 52d4cb699..8493d54d9 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 2518795ed..7165c6a4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 985b54a445c3c09e95d3f1397f26fccd32be3745 + 1ebf05b4301e6b29d0288178c184931b2976a58d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 985b54a445c3c09e95d3f1397f26fccd32be3745 + 1ebf05b4301e6b29d0288178c184931b2976a58d diff --git a/eng/Versions.props b/eng/Versions.props index fc0c7bafc..7d8340c3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22515.1 - 6.0.306-servicing.22515.1 + 6.0.306-servicing.22517.5 + 6.0.306-servicing.22517.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c88a3391a15486f54d831720eb2d3ef1543bd88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:16:44 +0000 Subject: [PATCH 07/36] Merged PR 26822: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221017.21 - **Date Produced**: October 17, 2022 9:51:49 PM UTC - **Commit**: d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3a5d216&targetVersion=GCd149a56&_a=files [2]: https://dev.a... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 963ee559c..677097d4f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cea7ba1f..6391c2658 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a + d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a5d216317af13a7b2a8e3fdbc4c072f2a90c31a + d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 8d60cc76ff0cd2bc37b145dcb5bff097f990844f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f86693cfa..20ac6b792 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22513.6 - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22517.1 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22515.2 - 6.0.403-servicing.22515.2 + 6.0.403-servicing.22517.21 + 6.0.403-servicing.22517.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22513.9 - 6.0.11-servicing.22513.9 + 6.0.11-servicing.22517.3 + 6.0.11-servicing.22517.3 6.0.11 6.0.11 From a057a1e1663989eb79465479e2753a4ca589d6d9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:16:57 +0000 Subject: [PATCH 08/36] Merged PR 26446: [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**: 20221013.1 - **Date Produced**: October 13, 2022 2:49:18 PM UTC - **Commit**: 2477d388d8663fe6a3f1c82376600dbb19bd217d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22464.1 to 6.0.0-servicing.22513.1][4] [4]: https://github.com/dotnet/source-build-reference-packages/compare/59e601c...2477d38 [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- 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 7165c6a4d..c376560ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 59e601c150793f6a32cd39e598ba6fe94edfe21d + 2477d388d8663fe6a3f1c82376600dbb19bd217d From c66f84e95d725b649959d015b087f807f3f77909 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 04:13:25 +0000 Subject: [PATCH 09/36] Merged PR 26823: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221017.22 - **Date Produced**: October 17, 2022 9:54:53 PM UTC - **Commit**: 7a9f7daae15db5611a881fad3f94502a61f976c5 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.5 to 6.0.306-servicing.22517.22][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.5 to 6.0.306-servicing.22517.22][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ebf05b&targetVersion=GC7a9f7da&_a=files [2]: https://dev.a... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8493d54d9..ab8a35844 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c376560ea..c00a176d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ebf05b4301e6b29d0288178c184931b2976a58d + 7a9f7daae15db5611a881fad3f94502a61f976c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ebf05b4301e6b29d0288178c184931b2976a58d + 7a9f7daae15db5611a881fad3f94502a61f976c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 8d60cc76ff0cd2bc37b145dcb5bff097f990844f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7d8340c3c..00e579853 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22513.6 - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22517.1 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22517.5 - 6.0.306-servicing.22517.5 + 6.0.306-servicing.22517.22 + 6.0.306-servicing.22517.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22513.9 - 6.0.11-servicing.22513.9 + 6.0.11-servicing.22517.3 + 6.0.11-servicing.22517.3 6.0.11 6.0.11 From 08d2f8d22353d07b199095b5eb8e8939cd4cd567 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 15:08:47 +0000 Subject: [PATCH 10/36] Merged PR 26829: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221017.35 - **Date Produced**: October 18, 2022 6:46:26 AM UTC - **Commit**: a1b8eada07c2e6b43e853b842f42198c7412b4bc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.22 to 6.0.306-servicing.22517.35][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.22 to 6.0.306-servicing.22517.35][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22507.1 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7a9f7da&targetVersion=GCa1b8ead&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC5d56e0e&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ab8a35844..dd67fb095 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c00a176d7..f18060e62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a9f7daae15db5611a881fad3f94502a61f976c5 + a1b8eada07c2e6b43e853b842f42198c7412b4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a9f7daae15db5611a881fad3f94502a61f976c5 + a1b8eada07c2e6b43e853b842f42198c7412b4bc diff --git a/eng/Versions.props b/eng/Versions.props index 00e579853..afb07ba00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 0.2.0 - 6.0.306-servicing.22517.22 - 6.0.306-servicing.22517.22 + 6.0.306-servicing.22517.35 + 6.0.306-servicing.22517.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From adc37b6826370744eabb3e0d1d4f1846dded7f11 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 17:35:03 +0000 Subject: [PATCH 11/36] Merged PR 26841: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.2 - **Date Produced**: October 18, 2022 3:41:02 PM UTC - **Commit**: fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd149a56&targetVersion=GCfc6df71&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 677097d4f..aef14c2de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6391c2658..3bb22313c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 + fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 + fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 diff --git a/eng/Versions.props b/eng/Versions.props index 20ac6b792..253d751f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 0.2.0 - 6.0.403-servicing.22517.21 - 6.0.403-servicing.22517.21 + 6.0.403-servicing.22518.2 + 6.0.403-servicing.22518.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bdad7e39a83216eb8edff7db32c7d01a06f9233a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:33:38 +0000 Subject: [PATCH 12/36] Merged PR 26855: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.24 - **Date Produced**: October 19, 2022 4:48:37 AM UTC - **Commit**: 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][6] - **VS.Redist.Common.WindowsDesktop.S... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index aef14c2de..db9a96bce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,13 +14,13 @@ - + - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bb22313c..d547a62ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 + 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 + 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8d60cc76ff0cd2bc37b145dcb5bff097f990844f + 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 253d751f2..4bc0d2e7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22513.6 + 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.1 + 6.0.11-servicing.22517.6 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22518.2 - 6.0.403-servicing.22518.2 + 6.0.403-servicing.22518.24 + 6.0.403-servicing.22518.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22514.6 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 + 6.0.11-servicing.22518.9 6.0.11 6.0.11 6.0.11 @@ -78,8 +78,8 @@ - 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22518.2 + 6.0.11-servicing.22518.2 6.0.11 6.0.11 From ae3693e5f07ded0e6d616d1d88493a489c0af30a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:36:56 +0000 Subject: [PATCH 13/36] Merged PR 26856: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221018.15 - **Date Produced**: October 19, 2022 12:15:19 AM UTC - **Commit**: 6ee9b3cebbe71480945ec824535bd15ae2bb5158 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.35 to 6.0.306-servicing.22518.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.35 to 6.0.306-servicing.22518.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa1b8ead&targetVersion=GC6ee9b3c&_a=files [2]: https://de... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd67fb095..a9a0cf79c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f18060e62..67853cbe7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a1b8eada07c2e6b43e853b842f42198c7412b4bc + 6ee9b3cebbe71480945ec824535bd15ae2bb5158 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a1b8eada07c2e6b43e853b842f42198c7412b4bc + 6ee9b3cebbe71480945ec824535bd15ae2bb5158 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8d60cc76ff0cd2bc37b145dcb5bff097f990844f + 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index afb07ba00..c14c01812 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22513.6 + 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.1 + 6.0.11-servicing.22517.6 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22517.35 - 6.0.306-servicing.22517.35 + 6.0.306-servicing.22518.15 + 6.0.306-servicing.22518.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22518.2 + 6.0.11-servicing.22518.2 6.0.11 6.0.11 From 0302ac718dee1bfaad166323e2f449c6ea936de3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:33:17 +0000 Subject: [PATCH 14/36] Merged PR 26891: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221019.7 - **Date Produced**: October 19, 2022 3:08:13 PM UTC - **Commit**: c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22518.15 to 6.0.306-servicing.22519.7][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22518.15 to 6.0.306-servicing.22519.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Ru... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9a0cf79c..5696d9290 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -41,10 +41,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67853cbe7..803bfa558 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9303db79522b69698068b6926d45b4c84fa6368f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee9b3cebbe71480945ec824535bd15ae2bb5158 + c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee9b3cebbe71480945ec824535bd15ae2bb5158 + c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 diff --git a/eng/Versions.props b/eng/Versions.props index c14c01812..af3da8a93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 0.2.0 - 6.0.306-servicing.22518.15 - 6.0.306-servicing.22518.15 + 6.0.306-servicing.22519.7 + 6.0.306-servicing.22519.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22514.6 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 + 6.0.11-servicing.22518.9 6.0.11 6.0.11 6.0.11 From d9bc49495ab92eae6adca0a9ebff9fe01eacd44c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:34:26 +0000 Subject: [PATCH 15/36] Merged PR 26889: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.6 - **Date Produced**: October 19, 2022 3:07:02 PM UTC - **Commit**: c3805b2afca00eebe5ec3d73753070dc527329ea - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9a858ac&targetVersion=GCc3805b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcb12e45&targetVersion=GC1f92829&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index db9a96bce..1e19ac368 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d547a62ab..2348fde15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 + c3805b2afca00eebe5ec3d73753070dc527329ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 + c3805b2afca00eebe5ec3d73753070dc527329ea diff --git a/eng/Versions.props b/eng/Versions.props index 4bc0d2e7a..3390c5c05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 0.2.0 - 6.0.403-servicing.22518.24 - 6.0.403-servicing.22518.24 + 6.0.403-servicing.22519.6 + 6.0.403-servicing.22519.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3423d26870451bed6065f1051fd5320302cbdc56 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:13:41 +0000 Subject: [PATCH 16/36] Merged PR 26896: [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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22517.2 to 6.0.306-servicing.22519.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221019.12 - **Date Produced**: October 19, 2022 5:07:52 PM UTC - **Commit**: de4ec83625cedeb7a6eba5d54e74c72382c29bbb - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.7 to 6.0.306-servicing.22519.12][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.7 to 6.0.306-servicing.22519.12][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22517.2 to 6.0.306-servicing.22519.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc2fc3bf&targetVersion=GCde4ec83&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC9303db7&targetVersion=GC051afa2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 5696d9290..8c693238c 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 803bfa558..16224ded5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 + de4ec83625cedeb7a6eba5d54e74c72382c29bbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 + de4ec83625cedeb7a6eba5d54e74c72382c29bbb diff --git a/eng/Versions.props b/eng/Versions.props index af3da8a93..41cb3ed86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.7 - 6.0.306-servicing.22519.7 + 6.0.306-servicing.22519.12 + 6.0.306-servicing.22519.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2b577f229e181b637ab047bc55507414fe22f3a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:52:55 +0000 Subject: [PATCH 17/36] Merged PR 26909: [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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.6 to 6.0.306-servicing.22519.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221019.15 - **Date Produced**: October 19, 2022 6:12:44 PM UTC - **Commit**: e154f5f69db41b0868744c5b852507310b07483d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.12 to 6.0.306-servicing.22519.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.12 to 6.0.306-servicing.22519.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.6 to 6.0.306-servicing.22519.11][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCde4ec83&targetVersion=GCe154f5f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC051afa2&targetVersion=GC2198eb3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 8c693238c..82a95e340 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 16224ded5..fd161cbce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de4ec83625cedeb7a6eba5d54e74c72382c29bbb + e154f5f69db41b0868744c5b852507310b07483d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de4ec83625cedeb7a6eba5d54e74c72382c29bbb + e154f5f69db41b0868744c5b852507310b07483d diff --git a/eng/Versions.props b/eng/Versions.props index 41cb3ed86..b06397992 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.12 - 6.0.306-servicing.22519.12 + 6.0.306-servicing.22519.15 + 6.0.306-servicing.22519.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3b0ce9494e408bdf871733afebf9411c54bca68 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:45:17 +0000 Subject: [PATCH 18/36] Merged PR 26910: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.21 - **Date Produced**: October 19, 2022 6:59:31 PM UTC - **Commit**: 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc3805b2&targetVersion=GC8a2916d&_a=files [2]: https://dev.a... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1e19ac368..3cc60df47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2348fde15..c29ba5350 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a0cfeb13a6dae400c82d14625115941636f423a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3805b2afca00eebe5ec3d73753070dc527329ea + 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3805b2afca00eebe5ec3d73753070dc527329ea + 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 + 37deaa02f76fc3b8df620e305b450b06fe2b685d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3390c5c05..ce14f9be9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22519.5 - 6.0.11-servicing.22517.6 + 6.0.11-servicing.22519.2 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.6 - 6.0.403-servicing.22519.6 + 6.0.403-servicing.22519.21 + 6.0.403-servicing.22519.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22518.2 - 6.0.11-servicing.22518.2 + 6.0.11-servicing.22519.3 + 6.0.11-servicing.22519.3 6.0.11 6.0.11 From f7fd978127261e78e33ed7f0f08cf9b96aefa075 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:58:28 +0000 Subject: [PATCH 19/36] Merged PR 26912: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221019.23 - **Date Produced**: October 19, 2022 7:20:41 PM UTC - **Commit**: b003a1877b8b73a74c6d400e2373921d20767eb8 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.15 to 6.0.306-servicing.22519.23][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.15 to 6.0.306-servicing.22519.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe154f5f&targetVersion=GCb003a18&_a=files [2]: https://dev... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82a95e340..7263ad46d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd161cbce..fcb045015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e154f5f69db41b0868744c5b852507310b07483d + b003a1877b8b73a74c6d400e2373921d20767eb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e154f5f69db41b0868744c5b852507310b07483d + b003a1877b8b73a74c6d400e2373921d20767eb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 + 37deaa02f76fc3b8df620e305b450b06fe2b685d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b06397992..f52cf3797 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22519.5 - 6.0.11-servicing.22517.6 + 6.0.11-servicing.22519.2 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.15 - 6.0.306-servicing.22519.15 + 6.0.306-servicing.22519.23 + 6.0.306-servicing.22519.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22518.2 - 6.0.11-servicing.22518.2 + 6.0.11-servicing.22519.3 + 6.0.11-servicing.22519.3 6.0.11 6.0.11 From 45b0a08d8b45001124884ac63f2ffbf973a6915d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 20:36:25 +0000 Subject: [PATCH 20/36] Merged PR 26920: [internal/release/6.0.4xx] 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.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.26 - **Date Produced**: October 19, 2022 7:55:37 PM UTC - **Commit**: ed71b196867c16a91420bcd0609de82131d11ebc - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.403 to 6.0.403][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8a2916d&targetVersion=GCed71b19&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0a0cfeb&targetVersion=GC783938a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 3cc60df47..d0429bdc0 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 c29ba5350..9ac2ae45c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0cfeb13a6dae400c82d14625115941636f423a + 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0cfeb13a6dae400c82d14625115941636f423a + 783938a34362e15d913b908f98e093294f2de250 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0cfeb13a6dae400c82d14625115941636f423a + 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d + ed71b196867c16a91420bcd0609de82131d11ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d + ed71b196867c16a91420bcd0609de82131d11ebc diff --git a/eng/Versions.props b/eng/Versions.props index ce14f9be9..60bb245bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.21 - 6.0.403-servicing.22519.21 + 6.0.403-servicing.22519.26 + 6.0.403-servicing.22519.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98b85f8dd515315a00a3655c679e83050f29eeb8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 20 Oct 2022 02:12:51 +0000 Subject: [PATCH 21/36] Merged PR 26935: [internal/release/6.0.4xx] 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.FSharp.Compiler**: from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.36 - **Date Produced**: October 19, 2022 10:39:51 PM UTC - **Commit**: 7c0deced9ce8988403320693522a661cdd1c7f70 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.FSharp.Compiler**: [from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCed71b19&targetVersion=GC7c0dece&_a=files [2]: https://github.com/dotnet/fsharp/compare/4438112...5d69143 [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ac2ae45c..03385f3bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed71b196867c16a91420bcd0609de82131d11ebc + 7c0deced9ce8988403320693522a661cdd1c7f70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed71b196867c16a91420bcd0609de82131d11ebc + 7c0deced9ce8988403320693522a661cdd1c7f70 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 37deaa02f76fc3b8df620e305b450b06fe2b685d - + https://github.com/dotnet/fsharp - 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 + 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - + https://github.com/dotnet/fsharp - 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 + 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc diff --git a/eng/Versions.props b/eng/Versions.props index 60bb245bf..b940f22e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.26 - 6.0.403-servicing.22519.26 + 6.0.403-servicing.22519.36 + 6.0.403-servicing.22519.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bed2083fee0a371ce936bfe16b997ec96c42eeff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:08 +0000 Subject: [PATCH 22/36] Merged PR 26996: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221023.5 - **Date Produced**: October 23, 2022 10:44:50 PM UTC - **Commit**: bcf774aca16d2d8493f05a521ce03819bd195448 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22519.23 to 6.0.306-servicing.22523.5][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22519.23 to 6.0.306-servicing.22523.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb003a18&targetVersion=GCbcf774a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7263ad46d..e5703141e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,23 @@ + + - + + + @@ -41,14 +45,18 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcb045015..a364ec461 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b003a1877b8b73a74c6d400e2373921d20767eb8 + bcf774aca16d2d8493f05a521ce03819bd195448 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b003a1877b8b73a74c6d400e2373921d20767eb8 + bcf774aca16d2d8493f05a521ce03819bd195448 diff --git a/eng/Versions.props b/eng/Versions.props index f52cf3797..c95db2a49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.306-servicing.22519.23 - 6.0.306-servicing.22519.23 + 6.0.306-servicing.22523.5 + 6.0.306-servicing.22523.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22518.9 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 6.0.11 6.0.11 6.0.11 From 41266955bd5410669548e624df32239b52169b88 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:16 +0000 Subject: [PATCH 23/36] Merged PR 26997: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.6 - **Date Produced**: October 23, 2022 10:48:18 PM UTC - **Commit**: 8d1b1fadc14383341698ba47dd871000e3b8f8b6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7c0dece&targetVersion=GC8d1b1fa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0429bdc0..a3a5adc0f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,14 +46,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03385f3bf..a71549079 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 783938a34362e15d913b908f98e093294f2de250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c0deced9ce8988403320693522a661cdd1c7f70 + 8d1b1fadc14383341698ba47dd871000e3b8f8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c0deced9ce8988403320693522a661cdd1c7f70 + 8d1b1fadc14383341698ba47dd871000e3b8f8b6 diff --git a/eng/Versions.props b/eng/Versions.props index b940f22e2..888dd89c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.403-servicing.22519.36 - 6.0.403-servicing.22519.36 + 6.0.403-servicing.22523.6 + 6.0.403-servicing.22523.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22518.9 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 6.0.11 6.0.11 6.0.11 From 847d4331a9ea9e5c3f35ff740a68e3db29bdbbea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 03:58:24 +0000 Subject: [PATCH 24/36] Merged PR 27004: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.16 - **Date Produced**: October 24, 2022 3:29:06 AM UTC - **Commit**: ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6][3] - **Microsoft.DotNet.Commo... --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index a3a5adc0f..8e3e1a08b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,9 +17,7 @@ - - - + @@ -46,16 +42,12 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a71549079..b9a7df5a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 783938a34362e15d913b908f98e093294f2de250 + 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 783938a34362e15d913b908f98e093294f2de250 + 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 783938a34362e15d913b908f98e093294f2de250 + 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8d1b1fadc14383341698ba47dd871000e3b8f8b6 + ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8d1b1fadc14383341698ba47dd871000e3b8f8b6 + ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda diff --git a/eng/Versions.props b/eng/Versions.props index 888dd89c7..d02f494a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 0.2.0 - 6.0.403-servicing.22523.6 - 6.0.403-servicing.22523.6 + 6.0.403-servicing.22523.16 + 6.0.403-servicing.22523.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fb958f0c784ead4d72dc645dbe4dedeb7a01385a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 03:58:27 +0000 Subject: [PATCH 25/36] Merged PR 27002: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221023.15 - **Date Produced**: October 24, 2022 3:27:24 AM UTC - **Commit**: eeb998091f4302f58f636f1c75ee5150d5b940c1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1] - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5][3] - ... --- NuGet.config | 14 ++++---------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index e5703141e..a302dd99f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,8 +17,7 @@ - - + @@ -45,15 +42,12 @@ - - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a364ec461..31dd91950 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcf774aca16d2d8493f05a521ce03819bd195448 + eeb998091f4302f58f636f1c75ee5150d5b940c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcf774aca16d2d8493f05a521ce03819bd195448 + eeb998091f4302f58f636f1c75ee5150d5b940c1 diff --git a/eng/Versions.props b/eng/Versions.props index c95db2a49..5c887fb39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 0.2.0 - 6.0.306-servicing.22523.5 - 6.0.306-servicing.22523.5 + 6.0.306-servicing.22523.15 + 6.0.306-servicing.22523.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bc18bf2920f0d6292aae0c786652e4b840de6a4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 15:32:23 +0000 Subject: [PATCH 26/36] Merged PR 27009: [internal/release/6.0.4xx] 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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.23 - **Date Produced**: October 24, 2022 4:34:27 AM UTC - **Commit**: 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca02a95&targetVersion=GC6b1e4bc&_a=files [2]: https://dev... --- 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 8e3e1a08b..063b396f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9a7df5a2..999ef2404 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda + 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda + 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 37deaa02f76fc3b8df620e305b450b06fe2b685d + 96c5254e5ca5040021caf779216b1b3641875b1e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d02f494a8..ec9e23dce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22519.5 + 6.0.11-servicing.22523.4 - 6.0.11-servicing.22519.2 + 6.0.11-servicing.22523.2 @@ -56,8 +56,8 @@ - 6.0.403-servicing.22523.16 - 6.0.403-servicing.22523.16 + 6.0.403-servicing.22523.23 + 6.0.403-servicing.22523.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22519.3 - 6.0.11-servicing.22519.3 + 6.0.11-servicing.22523.3 + 6.0.11-servicing.22523.3 6.0.11 6.0.11 From 583adf944c459c46da460315ec30710c20c466de Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 15:32:49 +0000 Subject: [PATCH 27/36] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 a302dd99f..8b5c5c827 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31dd91950..35f36b8ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb998091f4302f58f636f1c75ee5150d5b940c1 + 46b48e7a82d138728be2d24594b5ce98d6af92dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb998091f4302f58f636f1c75ee5150d5b940c1 + 46b48e7a82d138728be2d24594b5ce98d6af92dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 37deaa02f76fc3b8df620e305b450b06fe2b685d + 96c5254e5ca5040021caf779216b1b3641875b1e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5c887fb39..a74cc6ce7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22519.5 + 6.0.11-servicing.22523.4 - 6.0.11-servicing.22519.2 + 6.0.11-servicing.22523.2 @@ -56,8 +56,8 @@ - 6.0.306-servicing.22523.15 - 6.0.306-servicing.22523.15 + 6.0.306-servicing.22523.22 + 6.0.306-servicing.22523.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22519.3 - 6.0.11-servicing.22519.3 + 6.0.11-servicing.22523.3 + 6.0.11-servicing.22523.3 6.0.11 6.0.11 From 081ee69e53a16258fa848bda3608f5430a92056d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 4 Nov 2022 12:04:36 -0500 Subject: [PATCH 28/36] Refactor source-build CI triggers and pools (#14835) (#14878) --- eng/source-build-tarball-build-official.yml | 9 ++++++++- .../job/source-build-create-tarball.yml | 17 +++++++++++++---- .../job/source-build-run-tarball-build.yml | 8 +++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index a230a4d7c..38753d24d 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -4,7 +4,14 @@ resources: pipelines: - pipeline: installer-build-resource source: dotnet-installer-official-ci - trigger: true + trigger: + branches: + include: + - main + - release/* + - internal/release/* + stages: + - build stages: - stage: build diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index cffdf6bdb..ac6d73016 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -6,11 +6,20 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + variables: - name: _BuildConfig value: Release diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index e9891a82c..dd9e211dd 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,6 +17,9 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: @@ -76,7 +79,10 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ parameters.poolPublicAmd64 }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ parameters.poolInternalAmd64 }} + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml From e58b4b582e9152942bf92047a4e1bd627429f035 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 7 Nov 2022 17:16:37 -0600 Subject: [PATCH 29/36] Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) --- eng/source-build-tarball-build-official.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index a230a4d7c..5d396baab 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -4,7 +4,19 @@ resources: pipelines: - pipeline: installer-build-resource source: dotnet-installer-official-ci - trigger: true + trigger: + branches: + include: + - main + - release/* + - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx + stages: + - build stages: - stage: build From 753a4009a52b422cdc0d6598c7c40b2f432bee4c Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 8 Nov 2022 06:35:11 -0800 Subject: [PATCH 30/36] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911) * Refactor source-build CI triggers and pools (#14835) (#14878) * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai --- eng/source-build-tarball-build-official.yml | 14 +++++++++++++- .../job/source-build-create-tarball.yml | 17 +++++++++++++---- .../job/source-build-run-tarball-build.yml | 8 +++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index a230a4d7c..5d396baab 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -4,7 +4,19 @@ resources: pipelines: - pipeline: installer-build-resource source: dotnet-installer-official-ci - trigger: true + trigger: + branches: + include: + - main + - release/* + - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx + stages: + - build stages: - stage: build diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index cffdf6bdb..ac6d73016 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -6,11 +6,20 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + variables: - name: _BuildConfig value: Release diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index d927b3a86..45dfbf787 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,6 +17,9 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: @@ -76,7 +79,10 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ parameters.poolPublicAmd64 }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ parameters.poolInternalAmd64 }} + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml From e853b767df842bbcec833db536e01568ab8c8fa5 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 9 Nov 2022 07:50:45 -0800 Subject: [PATCH 31/36] Merging internal commits for release/6.0.1xx (#14926) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk * Update source-build CI to not arm64 leg on internal PRs * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk * Merged PR 26839: Ignore EOL warning for net5.0 in F#. Ignore EOL warning for net5.0 in F#. * Merged PR 26844: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [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**: 20221018.3 - **Date Produced**: October 18, 2022 5:40:56 PM UTC - **Commit**: 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd4e90ae&targetVersion=GC1b66d2b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) * Merged PR 26849: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.14 - **Date Produced**: October 19, 2022 12:13:28 AM UTC - **Commit**: f364505f98c1a6266cc3209616396c35f079e122 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1b66d2b&targetVersion=GCf364505&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7b9c4cb&targetVersion=GCd43b60f&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7a706b&targetVersion=GC1821cb5&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC8d60cc7&targetVersion=GC4e1581e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.Projec... * Merged PR 26877: [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.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) [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**: 20221018.25 - **Date Produced**: October 19, 2022 4:49:17 AM UTC - **Commit**: d2aa8e2e7c433a280775f3ab9845f5e602fb5537 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf364505&targetVersion=GCd2aa8e2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc672e90&targetVersion=GCaf5b37c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) * Merged PR 26888: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) [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**: 20221019.5 - **Date Produced**: October 19, 2022 3:05:49 PM UTC - **Commit**: eea343b1bcf8392e2ddead88bafe9e9f18105cc2 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6][3] ... * Merged PR 26911: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.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**: 20221019.20 - **Date Produced**: October 19, 2022 6:59:59 PM UTC - **Commit**: c287c60f01cd4abc3efecfd992d2b8a227783900 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCeea343b&targetVersion=GCc287c60&_a=files [2]: https://dev.a... * Merged PR 26947: Also set CheckEolTargetFramework=false in F# bootstrap build. F# bootstrap build also needs this argument. * Merged PR 26995: [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.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.10 to 6.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [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**: 20221023.4 - **Date Produced**: October 23, 2022 10:44:47 PM UTC - **Commit**: 4c81383014030abdada230e871efd72be72ea5cb - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.10 to 6.0.11][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc287c60&targetVersion=GC4c81383&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targ... * Merged PR 27003: [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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) [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**: 20221023.14 - **Date Produced**: October 24, 2022 3:26:12 AM UTC - **Commit**: ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4][3] - **... * Merged PR 27008: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.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**: 20221023.21 - **Date Produced**: October 24, 2022 4:33:41 AM UTC - **Commit**: 8f6e48c18dda13f4ddb7b447d4602629099d3639 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCffccd7e&targetVersion=GC8f6e48c&_a=files [2]: https://dev... Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet-Bot Co-authored-by: MichaelSimons Co-authored-by: Chris Rummel --- NuGet.config | 34 ++---- eng/Version.Details.xml | 104 +++++++++--------- eng/Versions.props | 48 ++++---- .../job/source-build-run-tarball-build.yml | 17 ++- .../tarball/content/repos/fsharp.proj | 1 + ...and-unsafe-paths-to-be-able-to-appl.patch} | 0 6 files changed, 93 insertions(+), 111 deletions(-) rename src/SourceBuild/tarball/patches/fsharp/{0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch => 0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch} (100%) diff --git a/NuGet.config b/NuGet.config index 3e6d96c15..42cd0ea91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,21 @@ - + - - - + - - - - - - - + - + - + @@ -50,23 +42,15 @@ - - - - - - - - - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12d34ade0..4d68b58b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 + 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 + 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 + 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a886cd6214c92f6a5d955c056014820c35591e7b + 8f6e48c18dda13f4ddb7b447d4602629099d3639 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a886cd6214c92f6a5d955c056014820c35591e7b + 8f6e48c18dda13f4ddb7b447d4602629099d3639 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 96c5254e5ca5040021caf779216b1b3641875b1e https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - c3fc739ca5a38641fe021f94c3986465296c71e0 + 374833d8416df22155bc0509559352af65bd8266 https://github.com/dotnet/source-build @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/source-build-reference-packages - fdbbfadcaa5804038ad0a3f67c33f489cbeda65c + 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 diff --git a/eng/Versions.props b/eng/Versions.props index b5a9289dd..64c76b641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22523.4 - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22523.2 - 6.0.110 + 6.0.111 @@ -44,44 +44,44 @@ - 6.0.10 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 + 6.0.11 + 6.0.11 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 0.2.0 - 6.0.110-servicing.22476.46 - 6.0.110-servicing.22476.46 + 6.0.111-servicing.22523.21 + 6.0.111-servicing.22523.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.6 + 6.0.7 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11 + 6.0.11 + 6.0.11 + 6.0.11 2.1.0 - 6.0.10-servicing.22476.6 - 6.0.10-servicing.22476.6 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22523.3 + 6.0.11-servicing.22523.3 + 6.0.11 + 6.0.11 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.110 + 6.0.111 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.10 + 6.0.11 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index dd9e211dd..c3c5a5fca 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -84,22 +84,19 @@ jobs: ${{ else }}: ${{ parameters.poolInternalAmd64 }} -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 dependsOn: ${{ parameters.dependsOn }} - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Debian9-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.debian9Arm64Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false + Debian9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian9Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index a03a69fc5..4d00be9ad 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,6 +27,7 @@ + diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch similarity index 100% rename from src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch rename to src/SourceBuild/tarball/patches/fsharp/0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch From b874e10f7c5436e6ce22cafc7f289d082cc7577b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:22:49 -0800 Subject: [PATCH 32/36] [release/6.0.4xx] Update dependencies from dotnet/arcade (#14935) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- NuGet.config | 18 ------ eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/sdl/sdl.ps1 | 38 ++++++++++++ eng/common/templates/steps/execute-sdl.yml | 60 ++++++++++++------- global.json | 6 +- .../Arcade/src/SourceBuild.Tasks.csproj | 2 +- src/SourceBuild/Arcade/tools/BuildTasks.props | 2 +- 8 files changed, 90 insertions(+), 50 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 diff --git a/NuGet.config b/NuGet.config index e29afeaab..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,21 +11,12 @@ - - - - - - - - - @@ -44,22 +35,13 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778c68932..4660a8502 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d227a0641..16d21c80e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22512.3 + 6.0.0-beta.22558.2 diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000..648c5068d --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a2..9dd5709f6 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/global.json b/global.json index 20ae9a5af..b779ff3ff 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.110", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22512.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.2" } } diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index 735289e70..bd43b568b 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 false false disable diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props index 4014b87ad..57c4a4b0a 100644 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ b/src/SourceBuild/Arcade/tools/BuildTasks.props @@ -2,6 +2,6 @@ - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net5.0\SourceBuild.Tasks.dll + $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net6.0\SourceBuild.Tasks.dll \ No newline at end of file From 7bdf6a5ad4d8c9eb774c1d315be1b9388ef99118 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:43:09 -0800 Subject: [PATCH 33/36] update global.json and Versions.props for .NET SDK 6.0.111 (#14932) --- 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 64c76b641..f71657357 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,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.110 + 6.0.111 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 89a95cd0f..d211a6fa7 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.110" + "dotnet": "6.0.111" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 5e29b02b249d0dd98c7e08eca43f64d2c2f43a3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:50:55 -0800 Subject: [PATCH 34/36] [release/6.0.1xx] Update dependencies from dotnet/arcade (#14934) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons --- NuGet.config | 11 +--- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/sdl/sdl.ps1 | 38 ++++++++++++ eng/common/templates/steps/execute-sdl.yml | 60 ++++++++++++------- global.json | 6 +- .../Arcade/src/SourceBuild.Tasks.csproj | 2 +- src/SourceBuild/Arcade/tools/BuildTasks.props | 2 +- 8 files changed, 92 insertions(+), 41 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 diff --git a/NuGet.config b/NuGet.config index 42cd0ea91..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,15 +37,13 @@ - + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d68b58b6..dbe35e32c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 841e1fe0d2498a7ac6445e458ae521511ec226ca https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f71657357..7f4551eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22512.3 + 6.0.0-beta.22558.2 diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000..648c5068d --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a2..9dd5709f6 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/global.json b/global.json index 20ae9a5af..b779ff3ff 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.110", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22512.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.2" } } diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index 735289e70..bd43b568b 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 false false disable diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props index 4014b87ad..57c4a4b0a 100644 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ b/src/SourceBuild/Arcade/tools/BuildTasks.props @@ -2,6 +2,6 @@ - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net5.0\SourceBuild.Tasks.dll + $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net6.0\SourceBuild.Tasks.dll \ No newline at end of file From b48e4150de52897ad8ebdab6cb0551c17f5e474b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Nov 2022 00:05:41 +0000 Subject: [PATCH 35/36] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7 --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/dotnet-install.sh | 4 ++-- global.json | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5f4b3c3c..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -38,7 +37,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6927b79..30ec9ee0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ef6da98d2..4bdd19be0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.2 + 6.0.0-beta.22558.7 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e..b09ea669f 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index b779ff3ff..8facf9ad2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" } } From cf00abac6931f5f92aa95177cb171bd0e33bab3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Nov 2022 00:06:00 +0000 Subject: [PATCH 36/36] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22464.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5f4b3c3c..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -38,7 +37,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6927b79..b7dec2be6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 841e1fe0d2498a7ac6445e458ae521511ec226ca - + https://github.com/dotnet/source-build-reference-packages - 59e601c150793f6a32cd39e598ba6fe94edfe21d + 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37