From 0fa6d987c6761a714562df70ee80f58187ab59e7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 11 Oct 2022 01:07:10 +0000 Subject: [PATCH 01/18] 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/18] 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/18] 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/18] 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 f214b1e1f388c7fbe920ce8361e2bd4785c61c79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 22:03:02 +0000 Subject: [PATCH 05/18] 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 a057a1e1663989eb79465479e2753a4ca589d6d9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 00:16:57 +0000 Subject: [PATCH 06/18] 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 07/18] 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 08/18] 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 ae3693e5f07ded0e6d616d1d88493a489c0af30a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:36:56 +0000 Subject: [PATCH 09/18] 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 10/18] 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 3423d26870451bed6065f1051fd5320302cbdc56 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:13:41 +0000 Subject: [PATCH 11/18] 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 12/18] 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 f7fd978127261e78e33ed7f0f08cf9b96aefa075 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:58:28 +0000 Subject: [PATCH 13/18] 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 bed2083fee0a371ce936bfe16b997ec96c42eeff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:08 +0000 Subject: [PATCH 14/18] 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 fb958f0c784ead4d72dc645dbe4dedeb7a01385a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 03:58:27 +0000 Subject: [PATCH 15/18] 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 583adf944c459c46da460315ec30710c20c466de Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 15:32:49 +0000 Subject: [PATCH 16/18] [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 17/18] 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 18/18] 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