From c3fd1936b515705344c6a92066de304d89956058 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 02:14:40 +0000 Subject: [PATCH 01/47] 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 02/47] 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 03/47] 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 04/47] 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 05/47] 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 06/47] 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 07/47] 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 08/47] 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 From cbcd287b054edfa1c72c99b90f9fd65707c73e6b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:50 -0700 Subject: [PATCH 09/47] Update branding to 7.0.106 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 54b14ea3a..ff347c7ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From aff54705ad0bf45bee1c3f02340b222907e7ecac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 Apr 2023 15:52:32 -0700 Subject: [PATCH 10/47] Stabilize branding and implicit version --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93f323b4c..697fcafda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,20 +10,20 @@ 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release 30 32 17 - 15 + $([MSBuild]::Add($(VersionFeature), 17)) From 5cac85d60dda1711866787642c8b9027e8625f79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 10:26:38 +0000 Subject: [PATCH 11/47] Update dependencies from https://github.com/dotnet/sdk build 20230407.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23204.25 -> To Version 7.0.300-preview.23207.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-3.23181.8 -> To Version 4.6.0-3.23206.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 768037280..b97db0a6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + a4890ef1558b80487deb5534bc811e45c05ecaff @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 78abd4a4a0e5f9fcf55c6ee920d6265f74ff5b5a + 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 diff --git a/eng/Versions.props b/eng/Versions.props index 15f39434d..95c1aa2c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 + 7.0.300-preview.23207.1 + 7.0.300-preview.23207.1 + 7.0.300-preview.23207.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14ca231477d9421b8a7036d7a276be7944e2cf4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 19:14:34 +0000 Subject: [PATCH 12/47] Update dependencies from https://github.com/dotnet/sdk build 20230407.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23207.1 -> To Version 7.0.300-preview.23207.5 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b97db0a6e..71389c073 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 - + https://github.com/dotnet/sdk - a4890ef1558b80487deb5534bc811e45c05ecaff + c1593c8729e8c0abfcf5b4fae0b6248dba81a063 @@ -138,9 +138,9 @@ 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 - + https://github.com/dotnet/linker - d3fc41eadc9ff73ae8e20eb6f874cf5321714c0b + 08a09f27f664fb84368aa4b9eb862b13bf808579 linker diff --git a/eng/Versions.props b/eng/Versions.props index 95c1aa2c5..586cd92d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23207.1 - 7.0.300-preview.23207.1 - 7.0.300-preview.23207.1 + 7.0.300-preview.23207.5 + 7.0.300-preview.23207.5 + 7.0.300-preview.23207.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9360912f3f5b32579134e91e43b45a1f199f075 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 23:32:47 +0000 Subject: [PATCH 13/47] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16030) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23203.7 to 12.5.0-beta.23209.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23203.7 to 7.0.400-beta.23209.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23165.1 to 7.0.100-1.23207.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-3.23181.8 to 4.6.0-3.23206.9 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0 to 17.7.0-preview-23207-02 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.msbuild: from 17.6.0-preview-23180-04 to 17.7.0-preview-23206-03 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.3.61 to 6.7.0-preview.1.10 (parent: Microsoft.NET.Sdk) --- NuGet.config | 1 - eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 6 +++--- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 62cb9d6ad..5ee25bfce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2a4a7132..4997c5875 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + 7b81b0e381da87154e2fd9a81ee370c35b665fa1 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + 7b81b0e381da87154e2fd9a81ee370c35b665fa1 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + 7b81b0e381da87154e2fd9a81ee370c35b665fa1 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + 7b81b0e381da87154e2fd9a81ee370c35b665fa1 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 5b37dd5fea143baefbef2bd83836188af0815a30 + 9ca38d4070014a8a68666e3b479854f08d2dcd0e - + https://github.com/dotnet/fsharp - 5b37dd5fea143baefbef2bd83836188af0815a30 + 9ca38d4070014a8a68666e3b479854f08d2dcd0e @@ -138,29 +138,29 @@ 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 - + https://github.com/dotnet/linker - d3fc41eadc9ff73ae8e20eb6f874cf5321714c0b + 08a09f27f664fb84368aa4b9eb862b13bf808579 linker - + https://github.com/dotnet/roslyn - 78abd4a4a0e5f9fcf55c6ee920d6265f74ff5b5a + 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 - + https://github.com/dotnet/msbuild - 61dd6568446aff7602d37e6a15595371fa057012 + e2fa2d70f5b1d9f1b8a595391ee3d7c457b0fe26 - + https://github.com/dotnet/msbuild - 61dd6568446aff7602d37e6a15595371fa057012 + cfc1d400eafec60a34d6e0ac4b0979054c03227a - + https://github.com/nuget/nuget.client - 0fa557836fa35aee7d60776ef0c88176dbcd22ac + c3544ac6b1eeedc3967cd66275531d9e3636d5dd diff --git a/eng/Versions.props b/eng/Versions.props index 324ebcd81..d977fb4a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 + 7.0.400-preview.23210.7 + 7.0.400-preview.23210.7 + 7.0.400-preview.23210.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f990fab11a533c38fc6cefa6b282d7d101e7b94c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 09:17:12 -0700 Subject: [PATCH 14/47] [release/7.0.3xx] Update dependencies from dotnet/sdk (#16034) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71389c073..a94168ac1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 - + https://github.com/dotnet/sdk - c1593c8729e8c0abfcf5b4fae0b6248dba81a063 + 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 + a10bbf218cbd333e13a5387661c73f9b4077bd48 diff --git a/eng/Versions.props b/eng/Versions.props index 586cd92d5..557faec50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23207.5 - 7.0.300-preview.23207.5 - 7.0.300-preview.23207.5 + 7.0.300-preview.23211.4 + 7.0.300-preview.23211.4 + 7.0.300-preview.23211.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6312afa324cce02a532b81f218ede4acc4d7417d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:21:43 -0700 Subject: [PATCH 15/47] [release/7.0.3xx] Update dependencies from dotnet/sdk (#16042) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a94168ac1..81ae6103f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 - + https://github.com/dotnet/sdk - 943f3d64d24d863e02346c2d89df6fc7aa8bc5a6 + 5752fcec04293de0c14fa875cd6e87876dbef4f7 @@ -133,9 +133,9 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest - 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 + 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 diff --git a/eng/Versions.props b/eng/Versions.props index 557faec50..2168799f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23211.4 - 7.0.300-preview.23211.4 - 7.0.300-preview.23211.4 + 7.0.300-preview.23211.7 + 7.0.300-preview.23211.7 + 7.0.300-preview.23211.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-release-20230324-04 + 17.6.0-release-20230405-08 From 2914abcb7d52663df373d635836b746de0648838 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 19:54:08 +0000 Subject: [PATCH 16/47] [release/7.0.2xx] Update dependencies from dotnet/arcade (#16050) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 284c51a49..67caa736d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2477cd3e2..6c068dce8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 756d7336a066c610bc6e3f4bd9c379f2d2b398d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 19:55:24 +0000 Subject: [PATCH 17/47] [release/7.0.3xx] Update dependencies from dotnet/arcade (#16051) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81ae6103f..8c7052794 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2168799f7..451b61c67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 8d15a10f0f83ba7147bc514353c06661007c7f6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 19:55:37 +0000 Subject: [PATCH 18/47] [release/7.0.4xx] Update dependencies from dotnet/arcade (#16052) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4997c5875..46e697475 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d977fb4a3..bc497e4fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 4cc13f21adf2f44a12283c8d6ea6819455dc08d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 20:34:00 +0000 Subject: [PATCH 19/47] Update dependencies from https://github.com/dotnet/sdk build 20230411.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23210.7 -> To Version 7.0.400-preview.23211.14 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-preview.1.10 -> To Version 6.7.0-preview.1.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46e697475..7032b82ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 7b81b0e381da87154e2fd9a81ee370c35b665fa1 + 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b - + https://github.com/dotnet/sdk - 7b81b0e381da87154e2fd9a81ee370c35b665fa1 + 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b - + https://github.com/dotnet/sdk - 7b81b0e381da87154e2fd9a81ee370c35b665fa1 + 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b - + https://github.com/dotnet/sdk - 7b81b0e381da87154e2fd9a81ee370c35b665fa1 + 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b @@ -158,9 +158,9 @@ cfc1d400eafec60a34d6e0ac4b0979054c03227a - + https://github.com/nuget/nuget.client - c3544ac6b1eeedc3967cd66275531d9e3636d5dd + 3a0c9a47e24642bb4a4465dec7b4d1c379367855 diff --git a/eng/Versions.props b/eng/Versions.props index bc497e4fa..3425331b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23210.7 - 7.0.400-preview.23210.7 - 7.0.400-preview.23210.7 + 7.0.400-preview.23211.14 + 7.0.400-preview.23211.14 + 7.0.400-preview.23211.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 555a668e452a98d53005eacb696f45024bb11c78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:39:29 -0700 Subject: [PATCH 20/47] [release/7.0.1xx] Update dependencies from dotnet/arcade (#16054) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 23 ----------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 11 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93f5df6c1..90806051e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,6 @@ - - - - - @@ -21,17 +16,8 @@ - - - - - - - - - @@ -56,17 +42,8 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b0b7e8a..a9cf6de78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ff347c7ab..1ac5855a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } } From 0be0ea84df9abf43113acda3f9d20bed611262b5 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:06:32 -0700 Subject: [PATCH 21/47] .NET Source-Build 7.0.105 April 2023 Updates (#16049) Co-authored-by: Matt Thalman --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1ac5855a1..f83018707 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.104 - 7.0.104 + 7.0.105 + 7.0.105 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 56136778d..88a5f3c55 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104" + "dotnet": "7.0.105" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From ff8565af3b232cf79f3afc0a644d1ba5c61eca63 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:08:55 -0700 Subject: [PATCH 22/47] Merging internal commits for release/7.0.1xx (#16046) Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Matt Mitchell (.NET) --- NuGet.config | 17 ++++++- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++---------- 3 files changed, 95 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 90806051e..907a39c16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,25 @@ + + - + + + + + + + @@ -39,11 +47,18 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9cf6de78..91a0017d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b + f75d9496cbb2fe61cfdb1299520c5c34a062a898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 https://github.com/dotnet/fsharp @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 2eac9157adc012e2956c7c5f33c15aeb0cfe7d6a + 7e646be438ea3fdd8fdab0553cd0e5b505174b65 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d - + https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index f83018707..7abd74ea4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23175.1 - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23176.1 @@ -56,46 +56,46 @@ - 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.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 - 7.0.104 - 7.0.104-servicing.23127.12 - 7.0.104-servicing.23127.12 + 7.0.105 + 7.0.105-servicing.23177.17 + 7.0.105-servicing.23177.17 $(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.23174.5 + 7.0.5-servicing.23174.5 + 7.0.5 + 7.0.5 + 7.0.5 + 7.0.5 2.1.0 - 7.0.4-servicing.23118.3 - 7.0.4-servicing.23118.3 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23177.5 + 7.0.5-servicing.23177.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 4bf2f29e58fc93d6e1258957f93afc7fc19603dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 23:52:27 +0000 Subject: [PATCH 23/47] Update dependencies from https://github.com/dotnet/sdk build 20230411.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23210.7 -> To Version 7.0.400-preview.23211.31 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-preview.1.10 -> To Version 6.7.0-preview.1.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7032b82ca..b672dde43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b + f7ad71ff9d020ded575cf403d0896fbf9486eb14 - + https://github.com/dotnet/sdk - 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b + f7ad71ff9d020ded575cf403d0896fbf9486eb14 - + https://github.com/dotnet/sdk - 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b + f7ad71ff9d020ded575cf403d0896fbf9486eb14 - + https://github.com/dotnet/sdk - 3200e214240e4bf8d6fdfc4d4df3567fb11aa10b + f7ad71ff9d020ded575cf403d0896fbf9486eb14 diff --git a/eng/Versions.props b/eng/Versions.props index 3425331b5..ce18021d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23211.14 - 7.0.400-preview.23211.14 - 7.0.400-preview.23211.14 + 7.0.400-preview.23211.31 + 7.0.400-preview.23211.31 + 7.0.400-preview.23211.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 661d7db8d1e7a0fb58c12969cfed12853f6309c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 03:11:30 +0000 Subject: [PATCH 24/47] Update dependencies from https://github.com/dotnet/sdk build 20230411.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23211.31 -> To Version 7.0.400-preview.23211.40 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23209.1 -> To Version 12.5.0-beta.23211.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b672dde43..8c77d12fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - f7ad71ff9d020ded575cf403d0896fbf9486eb14 + 704de1642494b2fd70b3be228fd323928208f804 - + https://github.com/dotnet/sdk - f7ad71ff9d020ded575cf403d0896fbf9486eb14 + 704de1642494b2fd70b3be228fd323928208f804 - + https://github.com/dotnet/sdk - f7ad71ff9d020ded575cf403d0896fbf9486eb14 + 704de1642494b2fd70b3be228fd323928208f804 - + https://github.com/dotnet/sdk - f7ad71ff9d020ded575cf403d0896fbf9486eb14 + 704de1642494b2fd70b3be228fd323928208f804 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 9ca38d4070014a8a68666e3b479854f08d2dcd0e + 31b8ef3cd2f9df4c44f0b9ac1fcba50afad8d9b0 - + https://github.com/dotnet/fsharp - 9ca38d4070014a8a68666e3b479854f08d2dcd0e + 31b8ef3cd2f9df4c44f0b9ac1fcba50afad8d9b0 diff --git a/eng/Versions.props b/eng/Versions.props index ce18021d2..d68885850 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23211.31 - 7.0.400-preview.23211.31 - 7.0.400-preview.23211.31 + 7.0.400-preview.23211.40 + 7.0.400-preview.23211.40 + 7.0.400-preview.23211.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2876e5d6938ad619ccac08f960cfe0189d951f16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 05:01:03 +0000 Subject: [PATCH 25/47] Update dependencies from https://github.com/dotnet/sdk build 20230411.46 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23211.40 -> To Version 7.0.400-preview.23211.46 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.23207.1 -> To Version 7.0.100-1.23211.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c77d12fd..1fbf7a812 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 704de1642494b2fd70b3be228fd323928208f804 + 49a86a63d9c38004b318f84283a1152696429364 - + https://github.com/dotnet/sdk - 704de1642494b2fd70b3be228fd323928208f804 + 49a86a63d9c38004b318f84283a1152696429364 - + https://github.com/dotnet/sdk - 704de1642494b2fd70b3be228fd323928208f804 + 49a86a63d9c38004b318f84283a1152696429364 - + https://github.com/dotnet/sdk - 704de1642494b2fd70b3be228fd323928208f804 + 49a86a63d9c38004b318f84283a1152696429364 @@ -138,9 +138,9 @@ 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 - + https://github.com/dotnet/linker - 08a09f27f664fb84368aa4b9eb862b13bf808579 + 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c linker diff --git a/eng/Versions.props b/eng/Versions.props index d68885850..0d419bf26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23211.40 - 7.0.400-preview.23211.40 - 7.0.400-preview.23211.40 + 7.0.400-preview.23211.46 + 7.0.400-preview.23211.46 + 7.0.400-preview.23211.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 13c3cc3b4432e9c7e9550a4400a8265a8e1729d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 19:46:09 +0000 Subject: [PATCH 26/47] Update dependencies from https://github.com/dotnet/sdk build 20230412.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23211.46 -> To Version 7.0.400-preview.23212.13 Dependency coherency updates Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview-23207-02 -> To Version 17.7.0-preview-23212-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fbf7a812..ab6269ca5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 49a86a63d9c38004b318f84283a1152696429364 + 25bde009ba03b8e773ace362876db2884499d8dd - + https://github.com/dotnet/sdk - 49a86a63d9c38004b318f84283a1152696429364 + 25bde009ba03b8e773ace362876db2884499d8dd - + https://github.com/dotnet/sdk - 49a86a63d9c38004b318f84283a1152696429364 + 25bde009ba03b8e773ace362876db2884499d8dd - + https://github.com/dotnet/sdk - 49a86a63d9c38004b318f84283a1152696429364 + 25bde009ba03b8e773ace362876db2884499d8dd @@ -149,13 +149,13 @@ 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 - + https://github.com/dotnet/msbuild - e2fa2d70f5b1d9f1b8a595391ee3d7c457b0fe26 + 073c84ec2bb2de1e709eb1326402a8760d5651d3 - + https://github.com/dotnet/msbuild - cfc1d400eafec60a34d6e0ac4b0979054c03227a + 073c84ec2bb2de1e709eb1326402a8760d5651d3 diff --git a/eng/Versions.props b/eng/Versions.props index 0d419bf26..f32f70052 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23211.46 - 7.0.400-preview.23211.46 - 7.0.400-preview.23211.46 + 7.0.400-preview.23212.13 + 7.0.400-preview.23212.13 + 7.0.400-preview.23212.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eec4c56c896ce3ab273d96a21157d7c495ce79a5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Apr 2023 15:23:40 -0500 Subject: [PATCH 27/47] Update SB test baselines (#16078) --- .../assets/baselines/MsftToSbSdk.diff | 2 +- .../assets/baselines/PoisonUsage.txt | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 593c7833e..bd443698c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -354,4 +354,4 @@ index ------------ -./sdk/x.y.z/vstest.console.exe ./sdk/x.y.z/vstest.console.runtimeconfig.json ./sdk/x.y.z/zh-Hans/ - ./sdk/x.y.z/zh-Hans/dotnet.resources.dll + ./sdk/x.y.z/zh-Hans/dotnet.resources.dll \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 9428e5b29..e29c81347 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -20,15 +20,6 @@ AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute From f06ea1c4bbfb449707ebf3b6eda7959dd5b8a190 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 21:27:49 +0000 Subject: [PATCH 28/47] Update dependencies from https://github.com/dotnet/sdk build 20230412.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23211.46 -> To Version 7.0.400-preview.23212.24 Dependency coherency updates Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview-23207-02 -> To Version 17.7.0-preview-23212-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab6269ca5..5a41bb669 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 25bde009ba03b8e773ace362876db2884499d8dd + 526660b609bd18eb5a6c086b27d13609f1d7a0f0 - + https://github.com/dotnet/sdk - 25bde009ba03b8e773ace362876db2884499d8dd + 526660b609bd18eb5a6c086b27d13609f1d7a0f0 - + https://github.com/dotnet/sdk - 25bde009ba03b8e773ace362876db2884499d8dd + 526660b609bd18eb5a6c086b27d13609f1d7a0f0 - + https://github.com/dotnet/sdk - 25bde009ba03b8e773ace362876db2884499d8dd + 526660b609bd18eb5a6c086b27d13609f1d7a0f0 diff --git a/eng/Versions.props b/eng/Versions.props index f32f70052..61113c5b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23212.13 - 7.0.400-preview.23212.13 - 7.0.400-preview.23212.13 + 7.0.400-preview.23212.24 + 7.0.400-preview.23212.24 + 7.0.400-preview.23212.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 714a994c0eb1f3e71f73922c4c3a692be8fc4b2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 08:29:30 +0000 Subject: [PATCH 29/47] Update dependencies from https://github.com/dotnet/test-templates build 20230413.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23204.1 -> To Version 1.1.0-rc.23213.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a41bb669..199f2c93d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 diff --git a/eng/Versions.props b/eng/Versions.props index 61113c5b6..47791bf16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 From 3e56e863592067dac854c98ee718934fd34d2598 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 08:29:37 +0000 Subject: [PATCH 30/47] Update dependencies from https://github.com/dotnet/test-templates build 20230413.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23204.1 -> To Version 1.1.0-rc.23213.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index a8b2060e2..9f41cb141 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,31 @@ - + + + + + + + + @@ -47,17 +54,22 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67caa736d..f1069a15c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 diff --git a/eng/Versions.props b/eng/Versions.props index 465aebd23..26345d72e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 From af2d581cbebd22835a149083fe7251e7e22b3599 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 17:15:03 +0000 Subject: [PATCH 31/47] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16099) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23211.2 to 12.5.0-beta.23212.12 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23211.2 to 7.0.400-beta.23212.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 199f2c93d..0252daaaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 526660b609bd18eb5a6c086b27d13609f1d7a0f0 + 2d01755a3ffd76e9318a1fed8d755ad0176eb682 - + https://github.com/dotnet/sdk - 526660b609bd18eb5a6c086b27d13609f1d7a0f0 + 2d01755a3ffd76e9318a1fed8d755ad0176eb682 - + https://github.com/dotnet/sdk - 526660b609bd18eb5a6c086b27d13609f1d7a0f0 + 2d01755a3ffd76e9318a1fed8d755ad0176eb682 - + https://github.com/dotnet/sdk - 526660b609bd18eb5a6c086b27d13609f1d7a0f0 + 2d01755a3ffd76e9318a1fed8d755ad0176eb682 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 31b8ef3cd2f9df4c44f0b9ac1fcba50afad8d9b0 + 706561c4ae01fe20554a901e129fa2b9c4abb0b6 - + https://github.com/dotnet/fsharp - 31b8ef3cd2f9df4c44f0b9ac1fcba50afad8d9b0 + 706561c4ae01fe20554a901e129fa2b9c4abb0b6 diff --git a/eng/Versions.props b/eng/Versions.props index 47791bf16..7532cb67f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23212.24 - 7.0.400-preview.23212.24 - 7.0.400-preview.23212.24 + 7.0.400-preview.23212.56 + 7.0.400-preview.23212.56 + 7.0.400-preview.23212.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d4a1900f7c5377991edb927cd2f4413d8dfb0ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 17:17:40 +0000 Subject: [PATCH 32/47] Update dependencies from https://github.com/dotnet/sdk build 20230413.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23212.12 -> To Version 12.5.0-beta.23213.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0252daaaf..7f36c2d68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 2d01755a3ffd76e9318a1fed8d755ad0176eb682 + 57502f525678dd05511bd9b513082d9a087020ed - + https://github.com/dotnet/sdk - 2d01755a3ffd76e9318a1fed8d755ad0176eb682 + 57502f525678dd05511bd9b513082d9a087020ed - + https://github.com/dotnet/sdk - 2d01755a3ffd76e9318a1fed8d755ad0176eb682 + 57502f525678dd05511bd9b513082d9a087020ed - + https://github.com/dotnet/sdk - 2d01755a3ffd76e9318a1fed8d755ad0176eb682 + 57502f525678dd05511bd9b513082d9a087020ed @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 706561c4ae01fe20554a901e129fa2b9c4abb0b6 + 4ac535c84c636b9fe5a91b88957152f75692b017 - + https://github.com/dotnet/fsharp - 706561c4ae01fe20554a901e129fa2b9c4abb0b6 + 4ac535c84c636b9fe5a91b88957152f75692b017 diff --git a/eng/Versions.props b/eng/Versions.props index 7532cb67f..eae09f2bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23212.56 - 7.0.400-preview.23212.56 - 7.0.400-preview.23212.56 + 7.0.400-preview.23213.5 + 7.0.400-preview.23213.5 + 7.0.400-preview.23213.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c7a7823d0e3c3dc4a695dbe6ccef21e8771895d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 18:28:41 +0000 Subject: [PATCH 33/47] Update dependencies from https://github.com/dotnet/sdk build 20230413.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 17 +++++++ eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++---------- 3 files changed, 94 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ee25bfce..21ef46c9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,22 @@ + + + + + + + + + + @@ -40,9 +50,16 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f36c2d68..6582c774d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + 265ddce1c1939672e1223e750544bb0443a8f74b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + d47e49e9c1e173ac90821f7e89cc38e710274241 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 57502f525678dd05511bd9b513082d9a087020ed + 95d959b536db2ec7d32401e5dd8543eafdb93857 - + https://github.com/dotnet/sdk - 57502f525678dd05511bd9b513082d9a087020ed + 95d959b536db2ec7d32401e5dd8543eafdb93857 - + https://github.com/dotnet/sdk - 57502f525678dd05511bd9b513082d9a087020ed + 95d959b536db2ec7d32401e5dd8543eafdb93857 - + https://github.com/dotnet/sdk - 57502f525678dd05511bd9b513082d9a087020ed + 95d959b536db2ec7d32401e5dd8543eafdb93857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b + f75d9496cbb2fe61cfdb1299520c5c34a062a898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d - + https://github.com/dotnet/emsdk - ba16583f6b055e5a0623d817a48f1f2f15629e6b + 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eae09f2bf..8319f0334 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23175.1 - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23176.1 @@ -56,46 +56,46 @@ - 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.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 - 7.0.400-preview.23213.5 - 7.0.400-preview.23213.5 - 7.0.400-preview.23213.5 + 7.0.400-preview.23213.11 + 7.0.400-preview.23213.11 + 7.0.400-preview.23213.11 $(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.23174.5 + 7.0.5-servicing.23174.5 + 7.0.5 + 7.0.5 + 7.0.5 + 7.0.5 2.1.0 - 7.0.4-servicing.23118.3 - 7.0.4-servicing.23118.3 - 7.0.4 - 7.0.4 + 7.0.5-servicing.23177.5 + 7.0.5-servicing.23177.5 + 7.0.5 + 7.0.5 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.4 - 7.0.4 + 7.0.5 + 7.0.5 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9bfec46612300b92c8eac581707988ccfb0a8a54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 19:42:51 +0000 Subject: [PATCH 34/47] Update dependencies from https://github.com/dotnet/sdk build 20230413.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6582c774d..87e26bf8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 95d959b536db2ec7d32401e5dd8543eafdb93857 + 376f389c38dbe6b562c67c0fec9fc662dc6293fd - + https://github.com/dotnet/sdk - 95d959b536db2ec7d32401e5dd8543eafdb93857 + 376f389c38dbe6b562c67c0fec9fc662dc6293fd - + https://github.com/dotnet/sdk - 95d959b536db2ec7d32401e5dd8543eafdb93857 + 376f389c38dbe6b562c67c0fec9fc662dc6293fd - + https://github.com/dotnet/sdk - 95d959b536db2ec7d32401e5dd8543eafdb93857 + 376f389c38dbe6b562c67c0fec9fc662dc6293fd @@ -158,9 +158,9 @@ 073c84ec2bb2de1e709eb1326402a8760d5651d3 - + https://github.com/nuget/nuget.client - 3a0c9a47e24642bb4a4465dec7b4d1c379367855 + 81a398e094281bcf00634252f0b460faffce3e55 diff --git a/eng/Versions.props b/eng/Versions.props index 8319f0334..a9f54258b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23213.11 - 7.0.400-preview.23213.11 - 7.0.400-preview.23213.11 + 7.0.400-preview.23213.18 + 7.0.400-preview.23213.18 + 7.0.400-preview.23213.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcf332e7671a93ec9b06d6795b77b8f9570a3753 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 23:55:16 +0000 Subject: [PATCH 35/47] Update dependencies from https://github.com/dotnet/sdk build 20230413.51 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.51 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87e26bf8f..86b9a3d2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 376f389c38dbe6b562c67c0fec9fc662dc6293fd + 5201f26fd697ce726778979d66dd9543bfb05a9c - + https://github.com/dotnet/sdk - 376f389c38dbe6b562c67c0fec9fc662dc6293fd + 5201f26fd697ce726778979d66dd9543bfb05a9c - + https://github.com/dotnet/sdk - 376f389c38dbe6b562c67c0fec9fc662dc6293fd + 5201f26fd697ce726778979d66dd9543bfb05a9c - + https://github.com/dotnet/sdk - 376f389c38dbe6b562c67c0fec9fc662dc6293fd + 5201f26fd697ce726778979d66dd9543bfb05a9c @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - 4ac535c84c636b9fe5a91b88957152f75692b017 + c48bb0a4124203624b2579c70f4619fbdf9358e6 - + https://github.com/dotnet/fsharp - 4ac535c84c636b9fe5a91b88957152f75692b017 + c48bb0a4124203624b2579c70f4619fbdf9358e6 diff --git a/eng/Versions.props b/eng/Versions.props index a9f54258b..967bbffc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23213.18 - 7.0.400-preview.23213.18 - 7.0.400-preview.23213.18 + 7.0.400-preview.23213.51 + 7.0.400-preview.23213.51 + 7.0.400-preview.23213.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3aefe0c4f19e96346f762080bcb0243496ffaf4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 05:42:24 +0000 Subject: [PATCH 36/47] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16115) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23213.4 to 12.5.0-beta.23213.7 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23213.4 to 7.0.400-beta.23213.7 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-3.23206.9 to 4.7.0-1.23213.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b9a3d2d..8d2b4b10f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 5201f26fd697ce726778979d66dd9543bfb05a9c + 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 - + https://github.com/dotnet/sdk - 5201f26fd697ce726778979d66dd9543bfb05a9c + 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 - + https://github.com/dotnet/sdk - 5201f26fd697ce726778979d66dd9543bfb05a9c + 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 - + https://github.com/dotnet/sdk - 5201f26fd697ce726778979d66dd9543bfb05a9c + 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - c48bb0a4124203624b2579c70f4619fbdf9358e6 + eae7fa03c096258e99d297b9ddaa1adb52ce8bf4 - + https://github.com/dotnet/fsharp - c48bb0a4124203624b2579c70f4619fbdf9358e6 + eae7fa03c096258e99d297b9ddaa1adb52ce8bf4 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 6bd2384c7889b7a141ba0c7a23aebc5b44f1f237 + a3e1c6a90a83af8633c73ffbf63876709231f173 diff --git a/eng/Versions.props b/eng/Versions.props index 967bbffc1..4cf545ea2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23213.51 - 7.0.400-preview.23213.51 - 7.0.400-preview.23213.51 + 7.0.400-preview.23213.67 + 7.0.400-preview.23213.67 + 7.0.400-preview.23213.67 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c70010ae6d8a083b12b5fdd27264163f1d0147ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Apr 2023 06:51:17 +0000 Subject: [PATCH 37/47] Update dependencies from https://github.com/dotnet/sdk build 20230413.70 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23213.67 -> To Version 7.0.400-preview.23213.70 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23213.8 -> To Version 4.7.0-1.23213.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ------ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 21ef46c9a..14435179b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -50,9 +47,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d2b4b10f..6b9ee04e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 + 377caa7104f34b5a99add09cc8d98f2fd422210e - + https://github.com/dotnet/sdk - 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 + 377caa7104f34b5a99add09cc8d98f2fd422210e - + https://github.com/dotnet/sdk - 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 + 377caa7104f34b5a99add09cc8d98f2fd422210e - + https://github.com/dotnet/sdk - 1fc9b404abd2b28ca1a84048d0e1ef7679b79376 + 377caa7104f34b5a99add09cc8d98f2fd422210e @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - a3e1c6a90a83af8633c73ffbf63876709231f173 + 0368609e1467563247e9b5e4e3fe8bff533d59b6 diff --git a/eng/Versions.props b/eng/Versions.props index 4cf545ea2..7024d337b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23213.67 - 7.0.400-preview.23213.67 - 7.0.400-preview.23213.67 + 7.0.400-preview.23213.70 + 7.0.400-preview.23213.70 + 7.0.400-preview.23213.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4d9c14963dbc7f3972529beb9da8739337cca03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 21:01:17 +0000 Subject: [PATCH 38/47] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16122) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.7.0-preview-23212-01 to 17.7.0-preview-23212-02 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.msbuild: from 17.7.0-preview-23212-01 to 17.7.0-preview-23212-02 (parent: Microsoft.NET.Sdk) --- NuGet.config | 8 -------- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 14435179b..9f2fa84e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,10 +20,6 @@ - - - - @@ -50,10 +46,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b9ee04e9..bbe86834d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 377caa7104f34b5a99add09cc8d98f2fd422210e + ee49b378438607a5ddca5a9345e5c811f30dbf14 - + https://github.com/dotnet/sdk - 377caa7104f34b5a99add09cc8d98f2fd422210e + ee49b378438607a5ddca5a9345e5c811f30dbf14 - + https://github.com/dotnet/sdk - 377caa7104f34b5a99add09cc8d98f2fd422210e + ee49b378438607a5ddca5a9345e5c811f30dbf14 - + https://github.com/dotnet/sdk - 377caa7104f34b5a99add09cc8d98f2fd422210e + ee49b378438607a5ddca5a9345e5c811f30dbf14 @@ -149,13 +149,13 @@ 0368609e1467563247e9b5e4e3fe8bff533d59b6 - + https://github.com/dotnet/msbuild - 073c84ec2bb2de1e709eb1326402a8760d5651d3 + cb5e760644d04def33c0cafcaef2a6f496fc68cc - + https://github.com/dotnet/msbuild - 073c84ec2bb2de1e709eb1326402a8760d5651d3 + cb5e760644d04def33c0cafcaef2a6f496fc68cc diff --git a/eng/Versions.props b/eng/Versions.props index 7024d337b..40d6a3778 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23213.70 - 7.0.400-preview.23213.70 - 7.0.400-preview.23213.70 + 7.0.400-preview.23214.15 + 7.0.400-preview.23214.15 + 7.0.400-preview.23214.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0f9a87bd8e2aa21f159b509d929f628e324e5e62 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Apr 2023 15:22:44 -0700 Subject: [PATCH 39/47] Include the swr file in the nuget package --- src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs | 2 +- src/redist/targets/GenerateMSIs.targets | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 7ce25b785..c327992c1 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Cli.Build { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) - .Where(f => !Path.GetExtension(f).Equals(".pdb", StringComparison.OrdinalIgnoreCase)) + .Where(f => !Path.GetExtension(f).Equals(".pdb", StringComparison.OrdinalIgnoreCase) || !Path.GetExtension(f).Equals(".swr", StringComparison.OrdinalIgnoreCase)) .ToList(); if (files.Any(f => !Path.GetFileName(f).Equals("_._"))) { diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..1f8682d3a 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -484,15 +484,18 @@ $(GenerateNupkgPowershellScript)" Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)"> + + + + + - - From 6c51fce344a622fcf39f243433c8798542a6d9a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 22:55:53 +0000 Subject: [PATCH 40/47] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16125) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.7.0-preview-23212-02 to 17.7.0-preview-23214-01 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.msbuild: from 17.7.0-preview-23212-02 to 17.7.0-preview-23214-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbe86834d..f5d60a9af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - ee49b378438607a5ddca5a9345e5c811f30dbf14 + 2c357b9d023ce19120ec9a3f80ca54da66c01544 - + https://github.com/dotnet/sdk - ee49b378438607a5ddca5a9345e5c811f30dbf14 + 2c357b9d023ce19120ec9a3f80ca54da66c01544 - + https://github.com/dotnet/sdk - ee49b378438607a5ddca5a9345e5c811f30dbf14 + 2c357b9d023ce19120ec9a3f80ca54da66c01544 - + https://github.com/dotnet/sdk - ee49b378438607a5ddca5a9345e5c811f30dbf14 + 2c357b9d023ce19120ec9a3f80ca54da66c01544 @@ -149,13 +149,13 @@ 0368609e1467563247e9b5e4e3fe8bff533d59b6 - + https://github.com/dotnet/msbuild - cb5e760644d04def33c0cafcaef2a6f496fc68cc + cc55017f88688cbe3f9aa810cdf44273adea76ea - + https://github.com/dotnet/msbuild - cb5e760644d04def33c0cafcaef2a6f496fc68cc + cc55017f88688cbe3f9aa810cdf44273adea76ea diff --git a/eng/Versions.props b/eng/Versions.props index 40d6a3778..e4998fb32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23214.15 - 7.0.400-preview.23214.15 - 7.0.400-preview.23214.15 + 7.0.400-preview.23214.18 + 7.0.400-preview.23214.18 + 7.0.400-preview.23214.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 38f62f0a3f8331ba534b1a538ff67b764c4327e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Apr 2023 04:02:43 +0000 Subject: [PATCH 41/47] Update dependencies from https://github.com/dotnet/sdk build 20230416.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23214.18 -> To Version 7.0.400-preview.23216.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.7.0-1.23213.11 -> To Version 4.7.0-1.23214.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f2fa84e9..5ee25bfce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5d60a9af..284698dd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 2c357b9d023ce19120ec9a3f80ca54da66c01544 + a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 - + https://github.com/dotnet/sdk - 2c357b9d023ce19120ec9a3f80ca54da66c01544 + a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 - + https://github.com/dotnet/sdk - 2c357b9d023ce19120ec9a3f80ca54da66c01544 + a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 - + https://github.com/dotnet/sdk - 2c357b9d023ce19120ec9a3f80ca54da66c01544 + a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 0368609e1467563247e9b5e4e3fe8bff533d59b6 + 9f323e7fa41ebe0c0bb2222265a59071d2d0e602 @@ -158,9 +158,9 @@ cc55017f88688cbe3f9aa810cdf44273adea76ea - + https://github.com/nuget/nuget.client - 81a398e094281bcf00634252f0b460faffce3e55 + d0bb0a180105de35a29ee89f52282a0eabd20588 diff --git a/eng/Versions.props b/eng/Versions.props index e4998fb32..8e0d9d699 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23214.18 - 7.0.400-preview.23214.18 - 7.0.400-preview.23214.18 + 7.0.400-preview.23216.8 + 7.0.400-preview.23216.8 + 7.0.400-preview.23216.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 39fd62ad13aa6ead77cd1ddcee2916036952b823 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Apr 2023 08:15:35 +0000 Subject: [PATCH 42/47] Update dependencies from https://github.com/dotnet/sdk build 20230417.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23216.8 -> To Version 7.0.400-preview.23217.1 Dependency coherency updates Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview-23214-01 -> To Version 17.7.0-preview-23217-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 284698dd3..bf4776c0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 + 15c9343712eab9703d5119fac54d443458960451 - + https://github.com/dotnet/sdk - a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 + 15c9343712eab9703d5119fac54d443458960451 - + https://github.com/dotnet/sdk - a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 + 15c9343712eab9703d5119fac54d443458960451 - + https://github.com/dotnet/sdk - a7ba87e42d79e0006d67c2d7ab024caa50fba4f0 + 15c9343712eab9703d5119fac54d443458960451 @@ -149,13 +149,13 @@ 9f323e7fa41ebe0c0bb2222265a59071d2d0e602 - + https://github.com/dotnet/msbuild - cc55017f88688cbe3f9aa810cdf44273adea76ea + 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 - + https://github.com/dotnet/msbuild - cc55017f88688cbe3f9aa810cdf44273adea76ea + 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 diff --git a/eng/Versions.props b/eng/Versions.props index 8e0d9d699..4734a34df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23216.8 - 7.0.400-preview.23216.8 - 7.0.400-preview.23216.8 + 7.0.400-preview.23217.1 + 7.0.400-preview.23217.1 + 7.0.400-preview.23217.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 377786839600b62e057a0ecfa4f76ce6930468d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 12:35:35 -0700 Subject: [PATCH 43/47] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16132) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf4776c0a..ee6691658 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 15c9343712eab9703d5119fac54d443458960451 + 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 - + https://github.com/dotnet/sdk - 15c9343712eab9703d5119fac54d443458960451 + 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 - + https://github.com/dotnet/sdk - 15c9343712eab9703d5119fac54d443458960451 + 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 - + https://github.com/dotnet/sdk - 15c9343712eab9703d5119fac54d443458960451 + 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - eae7fa03c096258e99d297b9ddaa1adb52ce8bf4 + fed05f7f183c8ce041b741bb05040541bcbbd356 - + https://github.com/dotnet/fsharp - eae7fa03c096258e99d297b9ddaa1adb52ce8bf4 + fed05f7f183c8ce041b741bb05040541bcbbd356 diff --git a/eng/Versions.props b/eng/Versions.props index 4734a34df..6d6c31145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23217.1 - 7.0.400-preview.23217.1 - 7.0.400-preview.23217.1 + 7.0.400-preview.23217.4 + 7.0.400-preview.23217.4 + 7.0.400-preview.23217.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 30d80432afe67b000fd6a29ceb3c0ac29ce75aaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Apr 2023 05:10:35 +0000 Subject: [PATCH 44/47] Update dependencies from https://github.com/dotnet/sdk build 20230417.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23217.4 -> To Version 7.0.400-preview.23217.32 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 12.5.0-beta.23216.1 -> To Version 12.5.0-beta.23217.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 27 --------------------------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97d1018eb..5ee25bfce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,27 +11,12 @@ - - - - - - - - - - - - - - - @@ -55,21 +40,9 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8636017..c9e635b16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 + 0d095a73f0afe1390bf9281bd1d85c722f961ddd - + https://github.com/dotnet/sdk - 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 + 0d095a73f0afe1390bf9281bd1d85c722f961ddd - + https://github.com/dotnet/sdk - 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 + 0d095a73f0afe1390bf9281bd1d85c722f961ddd - + https://github.com/dotnet/sdk - 481f96ae3ea2d549d53118a66a7e7b62e6d769c6 + 0d095a73f0afe1390bf9281bd1d85c722f961ddd @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - fed05f7f183c8ce041b741bb05040541bcbbd356 + 8c6666568d4fcf68c58840b30584d882daf60a3c - + https://github.com/dotnet/fsharp - fed05f7f183c8ce041b741bb05040541bcbbd356 + 8c6666568d4fcf68c58840b30584d882daf60a3c - + https://github.com/microsoft/vstest - 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 + 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 @@ -158,9 +158,9 @@ 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 - + https://github.com/nuget/nuget.client - d0bb0a180105de35a29ee89f52282a0eabd20588 + 7eaba9f3f68b8df63d5dcf10e2a8ef3591164ddf diff --git a/eng/Versions.props b/eng/Versions.props index f92a78c15..787c42c1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23217.4 - 7.0.400-preview.23217.4 - 7.0.400-preview.23217.4 + 7.0.400-preview.23217.32 + 7.0.400-preview.23217.32 + 7.0.400-preview.23217.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-release-20230405-08 + 17.6.0-release-20230324-04 From 704d2081633d9572eb056fe4b0d9f5c50743575f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Apr 2023 06:54:16 +0000 Subject: [PATCH 45/47] Update dependencies from https://github.com/dotnet/sdk build 20230417.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23217.4 -> To Version 7.0.400-preview.23217.37 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.5.0-beta.23216.1 -> To Version 12.5.0-beta.23217.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e635b16..53b15362c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 0d095a73f0afe1390bf9281bd1d85c722f961ddd + 12fc1691cb517bbf6b1933920e1bb910236f6392 - + https://github.com/dotnet/sdk - 0d095a73f0afe1390bf9281bd1d85c722f961ddd + 12fc1691cb517bbf6b1933920e1bb910236f6392 - + https://github.com/dotnet/sdk - 0d095a73f0afe1390bf9281bd1d85c722f961ddd + 12fc1691cb517bbf6b1933920e1bb910236f6392 - + https://github.com/dotnet/sdk - 0d095a73f0afe1390bf9281bd1d85c722f961ddd + 12fc1691cb517bbf6b1933920e1bb910236f6392 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 9f323e7fa41ebe0c0bb2222265a59071d2d0e602 + 0246e985ae4cd75c839315e23d3fbee91240c4e0 diff --git a/eng/Versions.props b/eng/Versions.props index 787c42c1c..1be7615e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23217.32 - 7.0.400-preview.23217.32 - 7.0.400-preview.23217.32 + 7.0.400-preview.23217.37 + 7.0.400-preview.23217.37 + 7.0.400-preview.23217.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93cac415c96caeba15cc84ee970980a1dac3316e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Apr 2023 01:04:08 +0000 Subject: [PATCH 46/47] Update dependencies from https://github.com/dotnet/sdk build 20230418.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23217.37 -> To Version 7.0.400-preview.23218.28 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.5.0-beta.23217.1 -> To Version 12.5.0-beta.23218.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b15362c..1d6008fbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 12fc1691cb517bbf6b1933920e1bb910236f6392 + 032210ae30fb2b4a78d7b773aa68785d642c3a22 - + https://github.com/dotnet/sdk - 12fc1691cb517bbf6b1933920e1bb910236f6392 + 032210ae30fb2b4a78d7b773aa68785d642c3a22 - + https://github.com/dotnet/sdk - 12fc1691cb517bbf6b1933920e1bb910236f6392 + 032210ae30fb2b4a78d7b773aa68785d642c3a22 - + https://github.com/dotnet/sdk - 12fc1691cb517bbf6b1933920e1bb910236f6392 + 032210ae30fb2b4a78d7b773aa68785d642c3a22 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - 8c6666568d4fcf68c58840b30584d882daf60a3c + 72c10e0588c38983714ceee34390d916f1af236c - + https://github.com/dotnet/fsharp - 8c6666568d4fcf68c58840b30584d882daf60a3c + 72c10e0588c38983714ceee34390d916f1af236c - + https://github.com/microsoft/vstest - 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 + 1541fc31ead99a358c649e7e9fa203e0dd4d20a5 diff --git a/eng/Versions.props b/eng/Versions.props index 1be7615e8..66a5ac749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23217.37 - 7.0.400-preview.23217.37 - 7.0.400-preview.23217.37 + 7.0.400-preview.23218.28 + 7.0.400-preview.23218.28 + 7.0.400-preview.23218.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-release-20230324-04 + 17.7.0-preview.23214.2 From 76e8816713cec5856d77ae056ca39f1c8a40c366 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Apr 2023 07:02:18 +0000 Subject: [PATCH 47/47] Update dependencies from https://github.com/dotnet/sdk build 20230418.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23218.28 -> To Version 7.0.400-preview.23218.33 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23218.5 -> To Version 12.5.0-beta.23218.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d6008fbd..eb196fc75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 032210ae30fb2b4a78d7b773aa68785d642c3a22 + 0c82e3b33325711fb4d5764e176d53e69e131aa2 - + https://github.com/dotnet/sdk - 032210ae30fb2b4a78d7b773aa68785d642c3a22 + 0c82e3b33325711fb4d5764e176d53e69e131aa2 - + https://github.com/dotnet/sdk - 032210ae30fb2b4a78d7b773aa68785d642c3a22 + 0c82e3b33325711fb4d5764e176d53e69e131aa2 - + https://github.com/dotnet/sdk - 032210ae30fb2b4a78d7b773aa68785d642c3a22 + 0c82e3b33325711fb4d5764e176d53e69e131aa2 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - 72c10e0588c38983714ceee34390d916f1af236c + 4db8caad416fbf9f37b42ae76c82a47341c3ca8a - + https://github.com/dotnet/fsharp - 72c10e0588c38983714ceee34390d916f1af236c + 4db8caad416fbf9f37b42ae76c82a47341c3ca8a @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 0246e985ae4cd75c839315e23d3fbee91240c4e0 + e784dac5521faafa4d536113bc1e64821f7f0eee diff --git a/eng/Versions.props b/eng/Versions.props index 66a5ac749..cd351d2a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23218.28 - 7.0.400-preview.23218.28 - 7.0.400-preview.23218.28 + 7.0.400-preview.23218.33 + 7.0.400-preview.23218.33 + 7.0.400-preview.23218.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)