From 11c4b95c74f9cf0485929d204f9c4af6848ca322 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:17 +0000 Subject: [PATCH 01/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23523.37 -> To Version 6.0.126-servicing.23574.1 Dependency coherency updates 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.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..03f09e6af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039431cba..a891e9673 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a..c2386ebf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.125 + 6.0.126 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.125-servicing.23523.37 - 6.0.125-servicing.23523.37 + 6.0.126-servicing.23574.1 + 6.0.126-servicing.23574.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.125 + 6.0.126 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From fd7471c9072304c51021a2216c218af95959ca2e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:25 +0000 Subject: [PATCH 02/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23574.1 -> To Version 6.0.126-servicing.23578.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 03f09e6af..fe7817f00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a891e9673..7e5d919ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a diff --git a/eng/Versions.props b/eng/Versions.props index c2386ebf9..c68cdb0ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.126-servicing.23574.1 - 6.0.126-servicing.23574.1 + 6.0.126-servicing.23578.6 + 6.0.126-servicing.23578.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef743128cbc7065ce729367f2a6d454b0ed6f43 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:30:26 +0000 Subject: [PATCH 03/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23578.6 -> To Version 6.0.126-servicing.23579.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe7817f00..4fab6601b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,14 +40,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5d919ef..a4bf66b6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 diff --git a/eng/Versions.props b/eng/Versions.props index c68cdb0ad..7731bf09c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.126-servicing.23578.6 - 6.0.126-servicing.23578.6 + 6.0.126-servicing.23579.2 + 6.0.126-servicing.23579.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74bce27a5926a4a430b802efe4aeccf187ef1c9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:24 +0000 Subject: [PATCH 04/11] Merged PR 35744: [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.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (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**: 20231201.7 - **Date Produced**: December 1, 2023 7:13:07 PM UTC - **Commit**: 280895b0c4e22fe6995fa31637d14a8da840d8d0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf47a20af7&targetVersion=GC280895b0c4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- 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 4fab6601b..f22372130 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4bf66b6a..8c74919a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 diff --git a/eng/Versions.props b/eng/Versions.props index 7731bf09c..be784a3b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.126-servicing.23579.2 - 6.0.126-servicing.23579.2 + 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de57e296c6d868343c7bb814ab2292fdd143da00 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:22:51 +0000 Subject: [PATCH 05/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.7 -> To Version 6.0.126-servicing.23601.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 f22372130..9a61de726 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c74919a0..c54327a2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 diff --git a/eng/Versions.props b/eng/Versions.props index be784a3b6..4a187c317 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.126-servicing.23601.7 - 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.15 + 6.0.126-servicing.23601.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f121863d4457763492b55e8fc8fa78ce0cbb589 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:35 +0000 Subject: [PATCH 06/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.15 -> To Version 6.0.126-servicing.23604.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a61de726..51d242180 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,16 +44,20 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c54327a2d..72d2cedbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4a187c317..061193e71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23601.15 - 6.0.126-servicing.23601.15 + 6.0.126-servicing.23604.12 + 6.0.126-servicing.23604.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 5f19470397cdaf2c7dfc47f384e201fc90944ad2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:25:34 +0000 Subject: [PATCH 07/11] Merged PR 35828: [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.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.25 to 6.0.26 (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**: 20231205.14 - **Date Produced**: December 5, 2023 10:05:04 PM UTC - **Commit**: 9b8cdd0062a889793bda0f84365492c6e21ff981 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC493e67d127&targetVersion=GC9b8cdd0062&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51d242180..36c575133 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -50,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d2cedbe..671fad883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 061193e71..e07ebd6dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23604.12 - 6.0.126-servicing.23604.12 + 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 1e2c0c0af5208112c081e6788a841f94be4c0bd5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:28:28 +0000 Subject: [PATCH 08/11] Merged PR 35838: [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.DotNet.Common.ItemTemplates**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.126 to 6.0.126 (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**: 20231205.20 - **Date Produced**: December 5, 2023 11:06:57 PM UTC - **Commit**: 45302fdcb923ce0d0c28b9f34f7684443b980a62 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.126 to 6.0.126][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.126 to 6.0.126][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9b8cdd0062&targetVersion=GC45302fdcb9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe58a1e0535&targetVersion=GC28656189e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c575133..e7470c4b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -52,8 +51,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 671fad883..89d861c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 diff --git a/eng/Versions.props b/eng/Versions.props index e07ebd6dd..9d7973343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.14 - 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9445f2ea5b7c1eaadd126545bf313f45a676696 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:07:04 +0000 Subject: [PATCH 09/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.20 -> To Version 6.0.126-servicing.23605.30 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7470c4b2..fbf9c4902 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89d861c82..6114908f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f diff --git a/eng/Versions.props b/eng/Versions.props index 9d7973343..b326a0658 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.126-servicing.23605.20 - 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a706d50916a1dd757a838896dddbb6798fa2e748 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:15:19 +0000 Subject: [PATCH 10/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.37 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.30 -> To Version 6.0.126-servicing.23605.37 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- 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 fbf9c4902..e97435cf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6114908f0..b750cf329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b326a0658..1f643f677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.30 - 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.37 + 6.0.126-servicing.23605.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From e063df560162542bb2a1b6258b89dbd650822f1a Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:23:36 +0100 Subject: [PATCH 11/11] .NET Source-Build 6.0.126 January 2024 Updates (#18155) --- 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 eaeeefcc7..cc3f8afd0 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.125 + 6.0.126 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 06cde48c2..d503a61b9 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.125" + "dotnet": "6.0.126" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",