From 3db030fa398e5fb8e9395f91f608cdaae7c537af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:05 +0000 Subject: [PATCH 1/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.37 -> To Version 6.0.127-servicing.24060.21 --- 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 1292acafd..016d79342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 diff --git a/eng/Versions.props b/eng/Versions.props index 337516a40..f562370a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.37 - 6.0.126-servicing.23605.37 + 6.0.127-servicing.24060.21 + 6.0.127-servicing.24060.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3914d2dfc52bb44c1418c9f2399d0e274facd096 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 23:06:47 +0000 Subject: [PATCH 2/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24060.21 -> To Version 6.0.127-servicing.24059.21 --- 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 016d79342..4192607dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 33376dfb3af6145a05c6f33567a7064b928a135f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 33376dfb3af6145a05c6f33567a7064b928a135f diff --git a/eng/Versions.props b/eng/Versions.props index f562370a2..166049dcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.127-servicing.24060.21 - 6.0.127-servicing.24060.21 + 6.0.127-servicing.24059.21 + 6.0.127-servicing.24059.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4bcafac91c45ed6d41e00ad1bb4994b238e8f03 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 23:07:04 +0000 Subject: [PATCH 3/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24059.21 -> To Version 6.0.127-servicing.24060.21 --- 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 4192607dd..016d79342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33376dfb3af6145a05c6f33567a7064b928a135f + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33376dfb3af6145a05c6f33567a7064b928a135f + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 diff --git a/eng/Versions.props b/eng/Versions.props index 166049dcd..f562370a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.127-servicing.24059.21 - 6.0.127-servicing.24059.21 + 6.0.127-servicing.24060.21 + 6.0.127-servicing.24060.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cad5caf868a0918de122693b3d390d0c6fc5c5c0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:09:26 +0000 Subject: [PATCH 4/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24060.21 -> To Version 6.0.127-servicing.24061.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.27 (parent: Microsoft.NET.Sdk --- NuGet.config | 19 +++++------- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1aadfd0ee..cecbee116 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,11 @@ + + @@ -21,14 +23,10 @@ - - - + - - - + @@ -49,6 +47,7 @@ + @@ -57,14 +56,10 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 016d79342..24b46084e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28656189e49c05368afda92b482da8c0049d5638 + f88db578fa807fdab408d8267dc1b1f736fd8dca - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28656189e49c05368afda92b482da8c0049d5638 + f88db578fa807fdab408d8267dc1b1f736fd8dca - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28656189e49c05368afda92b482da8c0049d5638 + f88db578fa807fdab408d8267dc1b1f736fd8dca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 48588050013d6553358d9a50a8bd934ebdac1aab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 48588050013d6553358d9a50a8bd934ebdac1aab https://dev.azure.com/dnceng/internal/_git/dotnet-winforms c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 + 2f8a4024340668c8e8a5e55a9c601f7a62be7c05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f562370a2..09cbe922d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,11 +27,11 @@ - 6.0.26-servicing.23605.3 + 6.0.27-servicing.24060.11 - 6.0.126 + 6.0.127 @@ -44,20 +44,20 @@ - 6.0.26 - 6.0.26 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 + 6.0.27 + 6.0.27 + 6.0.27-servicing.24060.17 + 6.0.27-servicing.24060.17 + 6.0.27-servicing.24060.17 + 6.0.27-servicing.24060.17 0.2.0 - 6.0.127-servicing.24060.21 - 6.0.127-servicing.24060.21 + 6.0.127-servicing.24061.15 + 6.0.127-servicing.24061.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.26-servicing.23605.4 - 6.0.26-servicing.23605.4 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24060.12 + 6.0.27-servicing.24060.12 + 6.0.27 + 6.0.27 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.126 + 6.0.127 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From bf3fa709ed1fe2ddce71e1cc04e844d6a042b86a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:17:09 +0000 Subject: [PATCH 5/8] Merged PR 36615: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24060.12 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24060.12 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.127-servicing.24060.8 to 6.0.127-servicing.24067.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24060.11 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)... --- NuGet.config | 24 ++++-------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 3 files changed, 66 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index cecbee116..a7df86bdf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,20 @@ - + - - - - - - - + - + - + @@ -47,19 +41,17 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24b46084e..6ffa8aa04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f88db578fa807fdab408d8267dc1b1f736fd8dca + 6edfc94a8d69756c30a4741684d245ecae42e8a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f88db578fa807fdab408d8267dc1b1f736fd8dca + 6edfc94a8d69756c30a4741684d245ecae42e8a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f88db578fa807fdab408d8267dc1b1f736fd8dca + 6edfc94a8d69756c30a4741684d245ecae42e8a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48588050013d6553358d9a50a8bd934ebdac1aab + 8c2cdb52b59151206e411a78ec7b279302ceee30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48588050013d6553358d9a50a8bd934ebdac1aab + 8c2cdb52b59151206e411a78ec7b279302ceee30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b + c92bca031b633bb527ac58a44e8f0127ab8984ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f8a4024340668c8e8a5e55a9c601f7a62be7c05 + c259e4173d70ad05737b7d838235c015fa25258b https://github.com/dotnet/fsharp @@ -151,7 +151,7 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 7fe6b814c901490292f02d8ea12749505fbb959a @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5ccc36f5985e2089f47c97a19c250e65ddefd0ba + 5460e2cb3721954528c452d9d32474e4c32b7141 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 09cbe922d..2e2875f31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23605.5 + 6.0.27-servicing.24067.5 - 6.0.27-servicing.24060.11 + 6.0.27-servicing.24067.2 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24060.17 - 6.0.27-servicing.24060.17 - 6.0.27-servicing.24060.17 - 6.0.27-servicing.24060.17 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 0.2.0 - 6.0.127-servicing.24061.15 - 6.0.127-servicing.24061.15 + 6.0.127-servicing.24068.21 + 6.0.127-servicing.24068.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.26-servicing.23605.8 - 6.0.26-servicing.23605.8 - 6.0.26 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24066.28 + 6.0.27-servicing.24066.28 + 6.0.27 + 6.0.27 + 6.0.27 + 6.0.27 2.1.0 - 6.0.27-servicing.24060.12 - 6.0.27-servicing.24060.12 + 6.0.27-servicing.24067.4 + 6.0.27-servicing.24067.4 6.0.27 6.0.27 From 2be7dd302ff34bed93f143d48960b8f564790228 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:34 +0000 Subject: [PATCH 6/8] Merged PR 36618: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240118.21 - **Date Produced**: January 18, 2024 5:52:22 PM UTC - **Commit**: 8c2cdb52b59151206e411a78ec7b279302ceee30 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.127-servicing.24067.36 to 6.0.127-servicing.24068.21][5] - **Microsoft.NET.Sdk**: [from 6.0.127-servicing.24067.36 to 6.0.127-servicing.24068.21][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0666b67593f4c6c3da4d9280251c0cc99751e19c&targetVersion=GC8c2cdb52b59151206e411a78ec7b279302ceee30&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) From d943d115f3773b479e60d2cb2b557c558398158a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 07:49:14 +0000 Subject: [PATCH 7/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.73 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24068.21 -> To Version 6.0.127-servicing.24068.73 --- 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 6ffa8aa04..10de62ba3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6edfc94a8d69756c30a4741684d245ecae42e8a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c2cdb52b59151206e411a78ec7b279302ceee30 + c2a5ce10218b257757dd338b666fb71d2aed0dbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c2cdb52b59151206e411a78ec7b279302ceee30 + c2a5ce10218b257757dd338b666fb71d2aed0dbb diff --git a/eng/Versions.props b/eng/Versions.props index 2e2875f31..f8fa641cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.127-servicing.24068.21 - 6.0.127-servicing.24068.21 + 6.0.127-servicing.24068.73 + 6.0.127-servicing.24068.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d761c25068115f91ba88cdeb5d72271757d0d0f0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Jan 2024 17:44:58 +0000 Subject: [PATCH 8/8] Merged PR 36690: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.127-servicing.24067.3 to 6.0.127-servicing.24070.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - ... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index a7df86bdf..65b1fe47e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10de62ba3..816b9b949 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6edfc94a8d69756c30a4741684d245ecae42e8a1 + 01f9cb6e48d29a58c248ec2faeaafe0372b69b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6edfc94a8d69756c30a4741684d245ecae42e8a1 + 01f9cb6e48d29a58c248ec2faeaafe0372b69b77 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6edfc94a8d69756c30a4741684d245ecae42e8a1 + 01f9cb6e48d29a58c248ec2faeaafe0372b69b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a5ce10218b257757dd338b666fb71d2aed0dbb + 77fc6a3fac5d8d43a71b9379320c0b12012966a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a5ce10218b257757dd338b666fb71d2aed0dbb + 77fc6a3fac5d8d43a71b9379320c0b12012966a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c92bca031b633bb527ac58a44e8f0127ab8984ac + 98b10b3aea4e37eed5ad4875cd251cc94c854c1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c259e4173d70ad05737b7d838235c015fa25258b + 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + a9f209f82fadb1f694ae6932f92c32918e407ded https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f8fa641cc..d9617fae6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24067.5 + 6.0.27-servicing.24070.1 - 6.0.27-servicing.24067.2 + 6.0.27-servicing.24070.3 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 0.2.0 - 6.0.127-servicing.24068.73 - 6.0.127-servicing.24068.73 + 6.0.127-servicing.24070.10 + 6.0.127-servicing.24070.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.27-servicing.24066.28 - 6.0.27-servicing.24066.28 + 6.0.27-servicing.24069.12 + 6.0.27-servicing.24069.12 6.0.27 6.0.27 6.0.27 @@ -78,8 +78,8 @@ - 6.0.27-servicing.24067.4 - 6.0.27-servicing.24067.4 + 6.0.27-servicing.24070.4 + 6.0.27-servicing.24070.4 6.0.27 6.0.27 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.26 + 6.0.27 $(MicrosoftNETWorkloadEmscriptenManifest60100Version)