From c3fd1936b515705344c6a92066de304d89956058 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 02:14:40 +0000 Subject: [PATCH 1/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.202 -> To Version 7.0.203 --- NuGet.config | 19 ++++++++++++++++--- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7723bf088..7256e3c4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,30 @@ + + + + - + + - + + + @@ -48,15 +55,21 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c5879ac0..3d8a952e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 288f1065b0d882689bdbee4a91ceb34617fc9f96 + 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 diff --git a/eng/Versions.props b/eng/Versions.props index fa5b979e3..72b2ee835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.202 - 7.0.202-servicing.23128.1 - 7.0.202-servicing.23128.1 + 7.0.203 + 7.0.203-servicing.23157.25 + 7.0.203-servicing.23157.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2a60f19fddfdecada8cb0e4127ee72e6e4dc30b5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 03:55:30 +0000 Subject: [PATCH 2/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.202 -> To Version 7.0.203 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.5.0-6.23127.3 -> To Version 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7256e3c4a..260e18713 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d8a952e9..465b75ea5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20c1751ef9bb6ad89b4f8ce7c0963dfe3976e839 + 3760d8678b4a386b91b4018163f9e3e9e522f325 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - e2bc27d266040403e0c6de24f29a6bdce5cc7231 + 019bee653d1f2c0d7500be262536e505f67117cf diff --git a/eng/Versions.props b/eng/Versions.props index 72b2ee835..4121e0e36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.203 - 7.0.203-servicing.23157.25 - 7.0.203-servicing.23157.25 + 7.0.203-servicing.23157.34 + 7.0.203-servicing.23157.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e059a7607c0ed1125749561b5464009e3a3f166f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 22:21:56 +0000 Subject: [PATCH 3/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230309.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.203 -> To Version 7.0.203 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 260e18713..e60ae552a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,14 @@ + + @@ -22,14 +24,16 @@ + - + + @@ -57,19 +61,22 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 465b75ea5..fae543cd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3760d8678b4a386b91b4018163f9e3e9e522f325 + 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 diff --git a/eng/Versions.props b/eng/Versions.props index 4121e0e36..021c2270a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.203 - 7.0.203-servicing.23157.34 - 7.0.203-servicing.23157.34 + 7.0.203-servicing.23159.19 + 7.0.203-servicing.23159.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c770989d7616fb76d85799e76652ba2b6648e90 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:09:35 +0000 Subject: [PATCH 4/8] Merged PR 29969: [internal/release/7.0.2xx] 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 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.5.2-3.23152.4 to 4.5.2-3.23171.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.4 to 7.0.4 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.4 to 7.0.4 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230311.3 - **Date Produced**: March 12, 2023 ... --- NuGet.config | 42 ++++----------------- eng/Version.Details.xml | 82 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index e60ae552a..980e9235a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,36 +7,20 @@ - - - - - + - - - - - + - - - - + - + - - - - - @@ -58,26 +42,14 @@ - - - - - + - - - - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5e03ad65..c9c95a0f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4 + eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 019bee653d1f2c0d7500be262536e505f67117cf + d17f741546fad2786cbd6394d08619544e53a36d - + https://github.com/dotnet/msbuild - 6f08c67f3ed838dccfbcdab91e6bebc54a26fd94 + f6fdcf537aded4f49ebedfcb800e2a3c1483fddc https://github.com/dotnet/msbuild @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 3b940a31d..7274649ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.4 - 7.0.4 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 - 7.0.4-servicing.23119.3 + 7.0.5 + 7.0.5 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 + 7.0.5-servicing.23166.6 0.2.0 @@ -70,24 +70,24 @@ 7.0.203 - 7.0.203-servicing.23159.19 - 7.0.203-servicing.23159.19 + 7.0.203-servicing.23171.27 + 7.0.203-servicing.23171.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.1 + 7.0.2 - 7.0.4-servicing.23115.8 - 7.0.4-servicing.23115.8 - 7.0.4 - 7.0.4 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 + 7.0.5 + 7.0.5 + 7.0.5 + 7.0.5 2.1.0 From 3d94398f1b762660c46c6f15839d1ca94119d022 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 23:37:10 +0000 Subject: [PATCH 5/8] Merged PR 30177: [internal/release/7.0.2xx] 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 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscr... --- NuGet.config | 14 ++++---- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 61 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 980e9235a..79f48e78c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,12 +15,13 @@ - + - + + @@ -42,14 +43,15 @@ - + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9c95a0f1..5bb0ace90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eefe3cf1842b6e26d8e421e8da4cb11f72b67df4 + fbc1f3cbf77cbec89545242fc1561884491d95ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b + 83187e9a232f5f54e4783a693ead665d4aa6caa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + b529424dd2a05711abf1f8a18215a5a9b8f79861 https://github.com/dotnet/fsharp @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa + 2a1a284cb9e62959ed261bba6cfc678612fc4559 https://github.com/dotnet/emsdk - 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa + 2a1a284cb9e62959ed261bba6cfc678612fc4559 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7274649ef..c9ee49f03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23172.5 - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23172.5 @@ -58,11 +58,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 0.2.0 @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23171.27 - 7.0.203-servicing.23171.27 + 7.0.203-servicing.23172.24 + 7.0.203-servicing.23172.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 + 7.0.5-servicing.23171.12 + 7.0.5-servicing.23171.12 7.0.5 7.0.5 7.0.5 @@ -92,8 +92,8 @@ - 7.0.4-servicing.23118.3 - 7.0.4-servicing.23118.3 + 7.0.4-servicing.23172.8 + 7.0.4-servicing.23172.8 7.0.4 7.0.4 From f06de864644c7359fac2cbbd7bc6048bd493cccd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:21:03 +0000 Subject: [PATCH 6/8] Merged PR 30247: [internal/release/7.0.2xx] 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 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.4 to 7.0.5 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.4 to 7.0.5 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230325.5 - **Date Produced**: March 25, 2023 4:49:25 PM UTC - **Commit**: ff216197144f80f4ac2449945f0b22a8a06c32ce - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.... --- NuGet.config | 15 +++++----- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 79f48e78c..83fd2e15f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + + - + - + - @@ -43,15 +43,14 @@ - + - + - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bb0ace90..5c553b3e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fb541ff96d21b83022ff1f5213904fd16d180e10 + 8042d61b17540e49e53569e3728d2faa1c596583 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 + d47e49e9c1e173ac90821f7e89cc38e710274241 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fbc1f3cbf77cbec89545242fc1561884491d95ae + ff216197144f80f4ac2449945f0b22a8a06c32ce @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2a1a284cb9e62959ed261bba6cfc678612fc4559 + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d - + https://github.com/dotnet/emsdk - 2a1a284cb9e62959ed261bba6cfc678612fc4559 + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index c9ee49f03..b785b5641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 - 7.0.5-servicing.23171.9 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 + 7.0.5-servicing.23174.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23172.24 - 7.0.203-servicing.23172.24 + 7.0.203-servicing.23175.5 + 7.0.203-servicing.23175.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.5-servicing.23171.12 - 7.0.5-servicing.23171.12 + 7.0.5-servicing.23174.5 + 7.0.5-servicing.23174.5 7.0.5 7.0.5 7.0.5 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.4 - 7.0.4 + 7.0.5 + 7.0.5 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a17b97bf80b3e150dd697a85975da41a0937af54 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 26 Mar 2023 21:46:14 +0000 Subject: [PATCH 7/8] Merged PR 30263: [internal/release/7.0.2xx] 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 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23175.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23176.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230326.4 - **Date Produced**: March 26, 2023 8:03:27 PM UTC - **Commit**: 6791a59d6bb0085576413fde227dcb163572b762 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1] - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23175.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23176.1][... --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83fd2e15f..3f69cec3d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,10 @@ - + + @@ -48,9 +49,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c553b3e2..c69325488 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d + 21bafd49406659961eaf4853853d1b4a4e669654 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ff216197144f80f4ac2449945f0b22a8a06c32ce + 6791a59d6bb0085576413fde227dcb163572b762 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 83187e9a232f5f54e4783a693ead665d4aa6caa6 + f75d9496cbb2fe61cfdb1299520c5c34a062a898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b529424dd2a05711abf1f8a18215a5a9b8f79861 + 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b785b5641..e67fa0aa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.5-servicing.23172.5 + 7.0.5-servicing.23175.1 - 7.0.5-servicing.23172.5 + 7.0.5-servicing.23176.1 @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23175.5 - 7.0.203-servicing.23175.5 + 7.0.203-servicing.23176.4 + 7.0.203-servicing.23176.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.4-servicing.23172.8 - 7.0.4-servicing.23172.8 + 7.0.4-servicing.23176.2 + 7.0.4-servicing.23176.2 7.0.4 7.0.4 From 5b005c19f54dd103ae2cd4d9be6acbea187c5bcd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Mar 2023 00:00:31 +0000 Subject: [PATCH 8/8] Merged PR 30280: [internal/release/7.0.2xx] 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 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230327.18 - **Date Produced**: March 27, 2023 9:16:58 PM UTC - **Commit**: e8a9e334c151df38ce00d696d54f52d4f0c65989 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1] - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.5][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6791a59d6b&targetVersion=GCe8a9e334c1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC21bafd4940&targetVersion=GC265ddce1c1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 14 ++++++++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f69cec3d..a8b2060e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,13 @@ - + + + - + + @@ -49,10 +52,13 @@ - + + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c69325488..86b5fad8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 21bafd49406659961eaf4853853d1b4a4e669654 + 265ddce1c1939672e1223e750544bb0443a8f74b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6791a59d6bb0085576413fde227dcb163572b762 + e8a9e334c151df38ce00d696d54f52d4f0c65989 diff --git a/eng/Versions.props b/eng/Versions.props index e67fa0aa1..48376ba44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.203 - 7.0.203-servicing.23176.4 - 7.0.203-servicing.23176.4 + 7.0.203-servicing.23177.18 + 7.0.203-servicing.23177.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.4-servicing.23176.2 - 7.0.4-servicing.23176.2 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23177.5 + 7.0.5-servicing.23177.5 + 7.0.5 + 7.0.5