From 1abfb6882f2ba4918c456ea3a2d4f7a65f3bd3f1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Mar 2023 22:39:52 +0000 Subject: [PATCH 01/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.105 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0c5b2dd3..93c70a3d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,10 +8,14 @@ + + + + @@ -19,12 +23,16 @@ + + - + + + @@ -48,15 +56,21 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f059ff56..83900dd43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + 3a040c42636bdd9921691117c56b8b6aa00c653a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + 3a040c42636bdd9921691117c56b8b6aa00c653a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + 3a040c42636bdd9921691117c56b8b6aa00c653a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c1421b52282681e7b46f3e38ea0fc005897b076 + 3a040c42636bdd9921691117c56b8b6aa00c653a diff --git a/eng/Versions.props b/eng/Versions.props index 2212d881c..00dcb84d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.104 - 7.0.104-servicing.23127.12 - 7.0.104-servicing.23127.12 + 7.0.105 + 7.0.105-servicing.23157.13 + 7.0.105-servicing.23157.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 35165c5cb1eb5be812d66eae05df102c333de08d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 11:29:37 +0000 Subject: [PATCH 02/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230308.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.105 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93c70a3d6..aa34eb0e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83900dd43..fa3b26c6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a040c42636bdd9921691117c56b8b6aa00c653a + e9f13a063d51da1c707fdcf843216b814522d1f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a040c42636bdd9921691117c56b8b6aa00c653a + e9f13a063d51da1c707fdcf843216b814522d1f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a040c42636bdd9921691117c56b8b6aa00c653a + e9f13a063d51da1c707fdcf843216b814522d1f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a040c42636bdd9921691117c56b8b6aa00c653a + e9f13a063d51da1c707fdcf843216b814522d1f2 diff --git a/eng/Versions.props b/eng/Versions.props index 00dcb84d9..4c207508f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23157.13 - 7.0.105-servicing.23157.13 + 7.0.105-servicing.23158.2 + 7.0.105-servicing.23158.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b379f93e0e3d8ff3e396ddac2bfb81b1ca9cb88 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 00:31:12 +0000 Subject: [PATCH 03/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230308.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index aa34eb0e4..31fc84789 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa3b26c6f..2da2bba78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9f13a063d51da1c707fdcf843216b814522d1f2 + 78047cb201260b732a61cf3e61c892b0121b548f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9f13a063d51da1c707fdcf843216b814522d1f2 + 78047cb201260b732a61cf3e61c892b0121b548f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9f13a063d51da1c707fdcf843216b814522d1f2 + 78047cb201260b732a61cf3e61c892b0121b548f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9f13a063d51da1c707fdcf843216b814522d1f2 + 78047cb201260b732a61cf3e61c892b0121b548f diff --git a/eng/Versions.props b/eng/Versions.props index 6c48bd14d..6cb6720a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23158.2 - 7.0.105-servicing.23158.2 + 7.0.105-servicing.23158.30 + 7.0.105-servicing.23158.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 727f07d1aff7fe482c974f51c2251ca2ab2748a7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 12 Mar 2023 07:19:25 +0000 Subject: [PATCH 04/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230311.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 25 ++++++--------- eng/Version.Details.xml | 70 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 60 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31fc84789..1e7a5281f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,11 @@ - - - - + + @@ -22,15 +20,14 @@ - - - + - + + @@ -55,22 +52,18 @@ - - - - + - - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2da2bba78..2bf7de7e8 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 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 + 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e56abc45c4f8adc518abfc11a59849d616431e2c + 4832b8078e6b468795edf345efceab103b19c307 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78047cb201260b732a61cf3e61c892b0121b548f + 8f77d9d70f5b455cb2daa555ca8620f27018c882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78047cb201260b732a61cf3e61c892b0121b548f + 8f77d9d70f5b455cb2daa555ca8620f27018c882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78047cb201260b732a61cf3e61c892b0121b548f + 8f77d9d70f5b455cb2daa555ca8620f27018c882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78047cb201260b732a61cf3e61c892b0121b548f + 8f77d9d70f5b455cb2daa555ca8620f27018c882 diff --git a/eng/Versions.props b/eng/Versions.props index 6cb6720a1..d35db29b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,13 +50,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.23160.13 + 7.0.5-servicing.23160.13 + 7.0.5-servicing.23160.13 + 7.0.5-servicing.23160.13 + 7.0.5-servicing.23160.13 0.2.0 @@ -64,24 +64,24 @@ 7.0.105 - 7.0.105-servicing.23158.30 - 7.0.105-servicing.23158.30 + 7.0.105-servicing.23161.5 + 7.0.105-servicing.23161.5 $(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.23160.10 + 7.0.5-servicing.23160.10 + 7.0.5 + 7.0.5 + 7.0.5 + 7.0.5 2.1.0 From b068b50df6cc3bfc1b85e680bfb0c153eaba9c84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Mar 2023 20:57:07 +0000 Subject: [PATCH 05/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230314.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 Dependency coherency updates 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,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 | 18 +++++-------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++------- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1e7a5281f..c3b4b215a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,19 @@ - + - - - - - + - + - + @@ -52,12 +48,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bf7de7e8..a275886b1 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 - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a1baebc09b34a58fe2f8e1b29d4e1f7ca7dabbc + 71aa107082fd9d77e460bc428c634459ed94a4ab https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4832b8078e6b468795edf345efceab103b19c307 + 895737f22569d6641392d795de4bfa3c8b536ab8 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f77d9d70f5b455cb2daa555ca8620f27018c882 + f71f155d14ca270f8bb523cb0f57e5f103f01d42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f77d9d70f5b455cb2daa555ca8620f27018c882 + f71f155d14ca270f8bb523cb0f57e5f103f01d42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f77d9d70f5b455cb2daa555ca8620f27018c882 + f71f155d14ca270f8bb523cb0f57e5f103f01d42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f77d9d70f5b455cb2daa555ca8620f27018c882 + f71f155d14ca270f8bb523cb0f57e5f103f01d42 @@ -165,11 +165,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 d35db29b8..cbd45fdee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23160.13 - 7.0.5-servicing.23160.13 - 7.0.5-servicing.23160.13 - 7.0.5-servicing.23160.13 - 7.0.5-servicing.23160.13 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 0.2.0 @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23161.5 - 7.0.105-servicing.23161.5 + 7.0.105-servicing.23164.16 + 7.0.105-servicing.23164.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.5-servicing.23160.10 - 7.0.5-servicing.23160.10 + 7.0.5-servicing.23163.9 + 7.0.5-servicing.23163.9 7.0.5 7.0.5 7.0.5 From 78d3944039a81a3624472336d7f151d056e197a0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Mar 2023 17:57:34 +0000 Subject: [PATCH 06/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230315.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 Dependency coherency updates 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.Build,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 | 6 +++--- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index c3b4b215a..3ec1ca6af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a275886b1..c15f681ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f71f155d14ca270f8bb523cb0f57e5f103f01d42 + 6e265cc5b8f6b8e57963d6f12633428eb74f7533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f71f155d14ca270f8bb523cb0f57e5f103f01d42 + 6e265cc5b8f6b8e57963d6f12633428eb74f7533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f71f155d14ca270f8bb523cb0f57e5f103f01d42 + 6e265cc5b8f6b8e57963d6f12633428eb74f7533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f71f155d14ca270f8bb523cb0f57e5f103f01d42 + 6e265cc5b8f6b8e57963d6f12633428eb74f7533 @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 2eac9157adc012e2956c7c5f33c15aeb0cfe7d6a + f08e8816c9ccf6c811abb5116098c92c4c947d8e diff --git a/eng/Versions.props b/eng/Versions.props index cbd45fdee..d9a9f0b6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23164.16 - 7.0.105-servicing.23164.16 + 7.0.105-servicing.23165.13 + 7.0.105-servicing.23165.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d626dc42ef4b100d65a63239209fdc990aa59b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Mar 2023 22:57:09 +0000 Subject: [PATCH 07/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230315.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 Dependency coherency updates 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.Build,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 | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ec1ca6af..05649fb2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -48,12 +48,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c15f681ec..250b95492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 895737f22569d6641392d795de4bfa3c8b536ab8 + da34e6a3fff2a8e16edb099b70a7116cfe0599bb https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e265cc5b8f6b8e57963d6f12633428eb74f7533 + d9af037955adec17911f972eeded8623d0569f85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e265cc5b8f6b8e57963d6f12633428eb74f7533 + d9af037955adec17911f972eeded8623d0569f85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e265cc5b8f6b8e57963d6f12633428eb74f7533 + d9af037955adec17911f972eeded8623d0569f85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e265cc5b8f6b8e57963d6f12633428eb74f7533 + d9af037955adec17911f972eeded8623d0569f85 diff --git a/eng/Versions.props b/eng/Versions.props index d9a9f0b6e..dd17c6d98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 + 7.0.5-servicing.23164.16 + 7.0.5-servicing.23164.16 + 7.0.5-servicing.23164.16 + 7.0.5-servicing.23164.16 + 7.0.5-servicing.23164.16 0.2.0 @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23165.13 - 7.0.105-servicing.23165.13 + 7.0.105-servicing.23165.18 + 7.0.105-servicing.23165.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26df9795dbd7ce22309be07b4dac5db247abebe9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 Mar 2023 00:05:23 +0000 Subject: [PATCH 08/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230315.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 Dependency coherency updates 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.Build,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 | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05649fb2c..aaa5f0a60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 250b95492..a3037e3ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9af037955adec17911f972eeded8623d0569f85 + f83d5a6d66e444cc3f7213838b3de4f9f5541e9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9af037955adec17911f972eeded8623d0569f85 + f83d5a6d66e444cc3f7213838b3de4f9f5541e9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9af037955adec17911f972eeded8623d0569f85 + f83d5a6d66e444cc3f7213838b3de4f9f5541e9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9af037955adec17911f972eeded8623d0569f85 + f83d5a6d66e444cc3f7213838b3de4f9f5541e9f diff --git a/eng/Versions.props b/eng/Versions.props index dd17c6d98..61c759dcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23165.18 - 7.0.105-servicing.23165.18 + 7.0.105-servicing.23165.23 + 7.0.105-servicing.23165.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 54002b9aed80e18ca9510021ec125b5756aad8dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Mar 2023 20:32:49 +0000 Subject: [PATCH 09/37] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230317.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.105 -> To Version 7.0.105 Dependency coherency updates 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.Build,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 | 19 ++++--------------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index aaa5f0a60..ec1aab06f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,9 @@ - + - @@ -19,14 +18,9 @@ - + - - - - - @@ -48,19 +42,14 @@ - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3037e3ff..c6a8f115e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da34e6a3fff2a8e16edb099b70a7116cfe0599bb + 428bf197e6bafee8a5c1ac6e4dca413628c948d9 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f83d5a6d66e444cc3f7213838b3de4f9f5541e9f + 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f83d5a6d66e444cc3f7213838b3de4f9f5541e9f + 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f83d5a6d66e444cc3f7213838b3de4f9f5541e9f + 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f83d5a6d66e444cc3f7213838b3de4f9f5541e9f + 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 diff --git a/eng/Versions.props b/eng/Versions.props index 61c759dcd..4c53836d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23164.16 - 7.0.5-servicing.23164.16 - 7.0.5-servicing.23164.16 - 7.0.5-servicing.23164.16 - 7.0.5-servicing.23164.16 + 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 @@ -64,8 +64,8 @@ 7.0.105 - 7.0.105-servicing.23165.23 - 7.0.105-servicing.23165.23 + 7.0.105-servicing.23167.11 + 7.0.105-servicing.23167.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da24bbdc2b17fdace5d4122e8332c990d3cb7567 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 21:09:54 +0000 Subject: [PATCH 10/37] Merged PR 30132: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230322.16 - **Date Produced**: March 22, 2023 7:42:49 PM UTC - **Commit**: b50c05b6a97a7d33d1507869510bc0591d105222 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23167.11 to 7.0.105-servicing.23172.16][2] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23167.11 to 7.0.105-servicing.23172.16][2] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23167.11 to 7.0.105-servicing.23172.16][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.5][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.5][3] - **Microsoft.NETCore.App.Ref**: [from 7.0.5 to 7.0.5][4] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.5][4] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.5 to 7.0.5][4] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.5 to 7.0.5][4] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.2][4] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.5 to 7.0.5][5] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.5][5] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **dotnet-dev-certs**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **dotnet-user-jwts**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **dotnet-user-secrets**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23167.6][6] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12][4] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.4 to 7.0.4][7] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12][4] - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: [from 7.0.4 to 7.0.4][7] [2]: https://dev.azure.c... --- NuGet.config | 14 ++++---- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec1aab06f..fb32abc91 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 f22083dab..8a9ac2b49 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 + f37d6224b92c338a04689a63d6b38893a5eabfa7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 - + 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 - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + ad3813821b7402477314fb3e4b0eda73c2c8f39f https://github.com/dotnet/fsharp @@ -165,11 +165,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 fd2308d19..9d0e02e47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23167.6 @@ -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.105 - 7.0.105-servicing.23167.11 - 7.0.105-servicing.23167.11 + 7.0.105-servicing.23172.16 + 7.0.105-servicing.23172.16 $(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.5 + 7.0.4-servicing.23172.5 7.0.4 7.0.4 From fa3b30c99371cbf9856a891cafe6b75dd4b801b7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 00:15:41 +0000 Subject: [PATCH 11/37] Merged PR 30175: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 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.5 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23172.5 to 7.0.4-servicing.23172.8 (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.5-servicing.23167.6 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230322.23 - **Date Produced**: March 22, 2023 10:20:27 PM UTC - **Commit**: 390774e42ad931a53e09f8498c8f563ded6bf1f5 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23172.16 to 7.0.105-servicing.23172.23][1] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23172.16 to 7.0.105-servicing.23172.23][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23172.16 to 7.0.105-servicing.23172.23][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.5 to 7.0.4-servicing.23172.8][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23172.5 to 7.0.4-servicing.23172.8][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5][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.23167.6 to 7.0.5-servicing.2... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb32abc91..f86b532fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a9ac2b49..767e135b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f37d6224b92c338a04689a63d6b38893a5eabfa7 + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f37d6224b92c338a04689a63d6b38893a5eabfa7 + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f37d6224b92c338a04689a63d6b38893a5eabfa7 + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f37d6224b92c338a04689a63d6b38893a5eabfa7 + 01160c5c2036cc9bea70904bd5ea8e95d03dbe4d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50c05b6a97a7d33d1507869510bc0591d105222 + 390774e42ad931a53e09f8498c8f563ded6bf1f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50c05b6a97a7d33d1507869510bc0591d105222 + 390774e42ad931a53e09f8498c8f563ded6bf1f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50c05b6a97a7d33d1507869510bc0591d105222 + 390774e42ad931a53e09f8498c8f563ded6bf1f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50c05b6a97a7d33d1507869510bc0591d105222 + 390774e42ad931a53e09f8498c8f563ded6bf1f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b + 83187e9a232f5f54e4783a693ead665d4aa6caa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ad3813821b7402477314fb3e4b0eda73c2c8f39f + b529424dd2a05711abf1f8a18215a5a9b8f79861 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9d0e02e47..690fb7040 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.5-servicing.23167.6 + 7.0.5-servicing.23172.5 @@ -70,8 +70,8 @@ 7.0.105 - 7.0.105-servicing.23172.16 - 7.0.105-servicing.23172.16 + 7.0.105-servicing.23172.23 + 7.0.105-servicing.23172.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.4-servicing.23172.5 - 7.0.4-servicing.23172.5 + 7.0.4-servicing.23172.8 + 7.0.4-servicing.23172.8 7.0.4 7.0.4 From f28f54c669e922149c49dd6de0c039d0ee2c8fd2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 17:45:01 +0000 Subject: [PATCH 12/37] Merged PR 30195: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Build**: from 17.4.2 to 17.4.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230323.6 - **Date Produced**: March 23, 2023 4:01:54 PM UTC - **Commit**: a509712dd84270ef4d7ce8bd7a8c55f2521f02ca - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23172.23 to 7.0.105-servicing.23173.6][1] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23172.23 to 7.0.105-servicing.23173.6][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23172.23 to 7.0.105-servicing.23173.6][1] - **Microsoft.Build**: [from 17.4.2 to 17.4.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC390774e42a&targetVersion=GCa509712dd8&_a=files [2]: https://github.com/dotnet/msbuild/compare/f08e8816c9...7e646be438 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index f86b532fd..03cd636b0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,13 +12,13 @@ - + - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 767e135b9..c3cc05db5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 390774e42ad931a53e09f8498c8f563ded6bf1f5 + a509712dd84270ef4d7ce8bd7a8c55f2521f02ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 390774e42ad931a53e09f8498c8f563ded6bf1f5 + a509712dd84270ef4d7ce8bd7a8c55f2521f02ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 390774e42ad931a53e09f8498c8f563ded6bf1f5 + a509712dd84270ef4d7ce8bd7a8c55f2521f02ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 390774e42ad931a53e09f8498c8f563ded6bf1f5 + a509712dd84270ef4d7ce8bd7a8c55f2521f02ca @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - f08e8816c9ccf6c811abb5116098c92c4c947d8e + 7e646be438ea3fdd8fdab0553cd0e5b505174b65 diff --git a/eng/Versions.props b/eng/Versions.props index 690fb7040..224038c3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.105 - 7.0.105-servicing.23172.23 - 7.0.105-servicing.23172.23 + 7.0.105-servicing.23173.6 + 7.0.105-servicing.23173.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b19cfd6dd5273e123093ccf177e8f5e1b0f89698 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:20:55 +0000 Subject: [PATCH 13/37] Merged PR 30248: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 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:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230325.4 - **Date Produced**: March 25, 2023 4:53:27 PM UTC - **Commit**: 2571a47477bfbd9edfffb68b369a9b594c5a6531 - **Branch**: refs/heads/internal/release/7.0.1xx [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 03cd636b0..9e0da4d51 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 c3cc05db5..5f56a3a01 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 - a509712dd84270ef4d7ce8bd7a8c55f2521f02ca + 2571a47477bfbd9edfffb68b369a9b594c5a6531 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a509712dd84270ef4d7ce8bd7a8c55f2521f02ca + 2571a47477bfbd9edfffb68b369a9b594c5a6531 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a509712dd84270ef4d7ce8bd7a8c55f2521f02ca + 2571a47477bfbd9edfffb68b369a9b594c5a6531 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a509712dd84270ef4d7ce8bd7a8c55f2521f02ca + 2571a47477bfbd9edfffb68b369a9b594c5a6531 @@ -163,13 +163,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 224038c3b..f292617be 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.105 - 7.0.105-servicing.23173.6 - 7.0.105-servicing.23173.6 + 7.0.105-servicing.23175.4 + 7.0.105-servicing.23175.4 $(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 d2a1f98ffde4f54181e51f99cba9e1ddf85b1ad7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:53:26 +0000 Subject: [PATCH 14/37] Merged PR 30253: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230325.7 - **Date Produced**: March 25, 2023 7:16:32 PM UTC - **Commit**: bf6de98b81c28434a98f4e21c689e97f80eb0d40 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23175.4 to 7.0.105-servicing.23175.7][1] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23175.4 to 7.0.105-servicing.23175.7][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23175.4 to 7.0.105-servicing.23175.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2571a47477&targetVersion=GCbf6de98b81&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e0da4d51..b37c5514a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f56a3a01..bcf34a8c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2571a47477bfbd9edfffb68b369a9b594c5a6531 + bf6de98b81c28434a98f4e21c689e97f80eb0d40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2571a47477bfbd9edfffb68b369a9b594c5a6531 + bf6de98b81c28434a98f4e21c689e97f80eb0d40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2571a47477bfbd9edfffb68b369a9b594c5a6531 + bf6de98b81c28434a98f4e21c689e97f80eb0d40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2571a47477bfbd9edfffb68b369a9b594c5a6531 + bf6de98b81c28434a98f4e21c689e97f80eb0d40 diff --git a/eng/Versions.props b/eng/Versions.props index f292617be..966f72286 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.105 - 7.0.105-servicing.23175.4 - 7.0.105-servicing.23175.4 + 7.0.105-servicing.23175.7 + 7.0.105-servicing.23175.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74275029c9d8b5a19c2f9935161d36497a512a54 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 26 Mar 2023 21:46:10 +0000 Subject: [PATCH 15/37] Merged PR 30262: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 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:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230326.3 - **Date Produced**: March 26, 2023 8:03:09 PM UTC - **Commit**: 2c1ea754b0427e03c33db426b141eafcfb6b64e3 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23175.7 to 7.0.105-servicing.23176.3][1] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23175.7 to 7.0.105-servicing.23176.3][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23175.7 to 7.0.105-servicing.23176.3][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 b37c5514a..d53e4ae0e 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 bcf34a8c9..81adf6830 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 - bf6de98b81c28434a98f4e21c689e97f80eb0d40 + 2c1ea754b0427e03c33db426b141eafcfb6b64e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6de98b81c28434a98f4e21c689e97f80eb0d40 + 2c1ea754b0427e03c33db426b141eafcfb6b64e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6de98b81c28434a98f4e21c689e97f80eb0d40 + 2c1ea754b0427e03c33db426b141eafcfb6b64e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6de98b81c28434a98f4e21c689e97f80eb0d40 + 2c1ea754b0427e03c33db426b141eafcfb6b64e3 - + 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 966f72286..51cef5138 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.105 - 7.0.105-servicing.23175.7 - 7.0.105-servicing.23175.7 + 7.0.105-servicing.23176.3 + 7.0.105-servicing.23176.3 $(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 e1bc5e001c9b8e87d9f99e06eb7dbf04c508f450 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Mar 2023 00:00:26 +0000 Subject: [PATCH 16/37] Merged PR 30282: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 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:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230327.17 - **Date Produced**: March 27, 2023 9:13:48 PM UTC - **Commit**: c94d256dde93f7ff0580b88e24fae969b24a0551 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23176.3 to 7.0.105-servicing.23177.17][1] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23176.3 to 7.0.105-servicing.23177.17][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23176.3 to 7.0.105-servicing.23177.17][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=GC2c1ea754b0&targetVersion=GCc94d256dde&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC21bafd4940&targetVersion=GC265ddce1c1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- 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 d53e4ae0e..907a39c16 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 81adf6830..3990471c0 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 - 2c1ea754b0427e03c33db426b141eafcfb6b64e3 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2c1ea754b0427e03c33db426b141eafcfb6b64e3 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2c1ea754b0427e03c33db426b141eafcfb6b64e3 + c94d256dde93f7ff0580b88e24fae969b24a0551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2c1ea754b0427e03c33db426b141eafcfb6b64e3 + c94d256dde93f7ff0580b88e24fae969b24a0551 diff --git a/eng/Versions.props b/eng/Versions.props index 51cef5138..ae03caa27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.105 - 7.0.105-servicing.23176.3 - 7.0.105-servicing.23176.3 + 7.0.105-servicing.23177.17 + 7.0.105-servicing.23177.17 $(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 45d5bef5d59af4276e1c2bdd37a98cffcc4d6fda Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 Apr 2023 15:49:27 +0000 Subject: [PATCH 17/37] Merged PR 30397: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230413.41 - **Date Produced**: April 13, 2023 10:25:06 PM UTC - **Commit**: a0d596e816dda39f31990f6f7b03f7ca0bd76777 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.106][11] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23177.17 to 7.0.106-servicing.23213.41][11] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23177.17 to 7.0.106-servicing.23213.41][11] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23177.17 to 7.0.106-servicing.23213.41][11] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.5 to 7.0.6][12] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23177.5 to 7.0.6-servicing.23213.2][12] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.5-servicing.23177.5 to 7.0.6-servicing.23213.2][12] - **Microsoft.NETCore.App.Ref**: [from 7.0.5 to 7.0.6][13] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.5-servicing.23174.5 to 7.0.6-servicing.23212.12][13] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.6][13] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.5 to 7.0.6][13] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.5 to 7.0.6][13] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.5 to 7.0.6][14] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15][14] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.6][14] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15][14] - **dotnet-dev-certs**: [from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15][14] - **dotnet-user-jwts**: [from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15][14] - **dotnet-user-secrets**: [from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15][14] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.5 to 7.0.6][12] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.5 to 7.0.6][12] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.5-servicing.23176.1 to 7.0.6-servicing.23211.5][15] - **Microsoft.NET.Test.Sdk**: [from 17.4.0-release-20221019-01 to 17.4.1-release-20230405-06][16] - **NuGet.Build.Tasks**: [from 6.4.0-rc.123 to 6.4.2-rc.1][17] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23174.5 to 7.0.6-servicing.23212.12][13] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.5 to 7.0.6][18] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23174.5 to 7.0.6-se... --- NuGet.config | 26 +++++----- eng/Version.Details.xml | 110 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++--------- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 907a39c16..63a76b778 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,25 @@ - + - + + + + - - - + - - + @@ -47,18 +47,18 @@ - + + + + - - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91a0017d6..3583ca95c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c94d256dde93f7ff0580b88e24fae969b24a0551 + 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c94d256dde93f7ff0580b88e24fae969b24a0551 + 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c94d256dde93f7ff0580b88e24fae969b24a0551 + 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c94d256dde93f7ff0580b88e24fae969b24a0551 + 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f75d9496cbb2fe61cfdb1299520c5c34a062a898 + a7742f16a6b2750e39825e301560a6abbb44b6f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 + 153de16d5ed088a1c3ef9ba007a871d0995ef612 https://github.com/dotnet/fsharp @@ -133,9 +133,9 @@ 1d892dd78d5dcb261a1d26f72efb333834436a02 - + https://github.com/microsoft/vstest - c02ece877c62577810f893c44279ce79af820112 + 79d56b02b69a582cd90428878a5e9411ab7538f5 @@ -154,22 +154,22 @@ 7e646be438ea3fdd8fdab0553cd0e5b505174b65 - - https://github.com/nuget/nuget.client - da5b9fa1595e212914854a9ff4a18a6759ed4729 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 24f8150c97f9d26a7b5d77e983938e18d48e7d9f https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d + b0eec69ee7bdab81823db7d6482cb6cff9f07e48 - + https://github.com/dotnet/emsdk - 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d + b0eec69ee7bdab81823db7d6482cb6cff9f07e48 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7abd74ea4..7d25bf60c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.5-servicing.23175.1 + 7.0.6-servicing.23204.3 - 7.0.5-servicing.23176.1 + 7.0.6-servicing.23213.3 @@ -56,22 +56,22 @@ - 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 + 7.0.6 + 7.0.6 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 0.2.0 - 7.0.105 - 7.0.105-servicing.23177.17 - 7.0.105-servicing.23177.17 + 7.0.106 + 7.0.106-servicing.23213.58 + 7.0.106-servicing.23213.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.5-servicing.23174.5 - 7.0.5-servicing.23174.5 - 7.0.5 - 7.0.5 - 7.0.5 - 7.0.5 + 7.0.6-servicing.23212.12 + 7.0.6-servicing.23212.12 + 7.0.6 + 7.0.6 + 7.0.6 + 7.0.6 2.1.0 - 7.0.5-servicing.23177.5 - 7.0.5-servicing.23177.5 - 7.0.5 - 7.0.5 + 7.0.6-servicing.23213.6 + 7.0.6-servicing.23213.6 + 7.0.6 + 7.0.6 @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-release-20221019-01 + 17.4.1-release-20230405-06 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.5 - 7.0.5 + 7.0.6 + 7.0.6 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 70d623e5544344a8eb24be88645d850b39b1199f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 Apr 2023 18:16:29 +0000 Subject: [PATCH 18/37] Merged PR 30677: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.6-servicing.23204.3 to 7.0.6-servicing.23213.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.6-servicing.23213.3 to 7.0.6-servicing.23213.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230414.9 - **Date Produced**: April 14, 2023 4:23:59 PM UTC - **Commit**: 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.106 to 7.0.106][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.106-servicing.23213.58 to 7.0.106-servicing.23214.9][1] - **Microsoft.NET.Sdk**: [from 7.0.106-servicing.23213.58 to 7.0.106-servicing.23214.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.106-servicing.23213.58 to 7.0.106-servicing.23214.9][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.6 to 7.0.6][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23204.3 to 7.0.6-servicing.23213.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.6-servicing.23213.3 to 7.0.6-servicing.2... --- NuGet.config | 14 ++++---------- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63a76b778..4bf1dcf4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,15 +17,12 @@ - - - - + - + @@ -50,15 +47,12 @@ - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3583ca95c..441b53bbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 + 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 + 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 + 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c6a3fa39bb0378d9f28dfbdd75b1c17378dade2 + 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a7742f16a6b2750e39825e301560a6abbb44b6f7 + b3dce1f781e8f035f43da3d5eb11d4916d1be36f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 153de16d5ed088a1c3ef9ba007a871d0995ef612 + 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7d25bf60c..758d87f42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23204.3 + 7.0.6-servicing.23213.5 - 7.0.6-servicing.23213.3 + 7.0.6-servicing.23213.10 @@ -70,8 +70,8 @@ 7.0.106 - 7.0.106-servicing.23213.58 - 7.0.106-servicing.23213.58 + 7.0.106-servicing.23214.9 + 7.0.106-servicing.23214.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.6-servicing.23213.6 - 7.0.6-servicing.23213.6 + 7.0.6-servicing.23213.14 + 7.0.6-servicing.23213.14 7.0.6 7.0.6 From e666872c915f83015f9ace00be545ba8010aa99f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:21 +0000 Subject: [PATCH 19/37] Merged PR 30715: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230415.4 - **Date Produced**: April 15, 2023 5:33:26 PM UTC - **Commit**: 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.106 to 7.0.106][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.106-servicing.23214.9 to 7.0.106-servicing.23215.4][1] - **Microsoft.NET.Sdk**: [from 7.0.106-servicing.23214.9 to 7.0.106-servicing.23215.4][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.106-servicing.23214.9 to 7.0.106-servicing.23215.4][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.6][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13][2] - **dotnet-dev-certs**: [from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13][2] - **dotnet-user-jwts**: [from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13][2] - **dotnet-user-secrets**: [from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6d67e3e0ad&targetVersion=GC2a0eb01fb6&_a=files [2]: https://dev.azure.com... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4bf1dcf4e..50985bcc0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 441b53bbe..0780c8c52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef + 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef + 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef + 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d67e3e0ad6a04a2db66c3d698c12cc3f35a26ef + 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 diff --git a/eng/Versions.props b/eng/Versions.props index 758d87f42..90b0d5a94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.6 7.0.6 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 - 7.0.6-servicing.23212.15 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.106 - 7.0.106-servicing.23214.9 - 7.0.106-servicing.23214.9 + 7.0.106-servicing.23215.4 + 7.0.106-servicing.23215.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 885be3959da5f212a115b9c96c43ca101383529b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 17:20:52 +0000 Subject: [PATCH 20/37] Merged PR 30761: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230418.7 - **Date Produced**: April 18, 2023 3:37:25 PM UTC - **Commit**: b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.106 to 7.0.106][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.106-servicing.23215.4 to 7.0.106-servicing.23218.7][1] - **Microsoft.NET.Sdk**: [from 7.0.106-servicing.23215.4 to 7.0.106-servicing.23218.7][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.106-servicing.23215.4 to 7.0.106-servicing.23218.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.6][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-dev-certs**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-user-jwts**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-user-secrets**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2a0eb01fb6&targetVersion=GCb50d5e5d55&_a=files [2]: https://dev.azure.com/dnceng/in... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50985bcc0..2f6d8c615 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,25 @@ - + + + - + + @@ -44,14 +47,16 @@ - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0780c8c52..bcc919800 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 + b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 + b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 + b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a0eb01fb62e042a9f3a91ee257a85df08cf6589 + b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 diff --git a/eng/Versions.props b/eng/Versions.props index 90b0d5a94..cfe6e097a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.6 7.0.6 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.106 - 7.0.106-servicing.23215.4 - 7.0.106-servicing.23215.4 + 7.0.106-servicing.23218.7 + 7.0.106-servicing.23218.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22e736373bed8a0b073b55f41ac785b3f2f72233 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 19 May 2023 17:52:34 +0000 Subject: [PATCH 21/37] Merged PR 31378: Subtract an additional 1 from 60 Template version Revert this next month --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4bfed988e..0938a46db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 5b5c33488befa819017c103c8f75f10476c7e6f0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:25:53 +0000 Subject: [PATCH 22/37] Merged PR 31026: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230519.6 - **Date Produced**: May 19, 2023 4:59:11 PM UTC - **Commit**: 9911a9f5d7c62b8213e2b33323c7714f2261135b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.106 to 7.0.107][13] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.106-servicing.23218.7 to 7.0.107-servicing.23269.6][13] - **Microsoft.NET.Sdk**: [from 7.0.106-servicing.23218.7 to 7.0.107-servicing.23269.6][13] - **Microsoft.TemplateEngine.Cli**: [from 7.0.106-servicing.23218.7 to 7.0.107-servicing.23269.6][13] - **Microsoft.NETCore.App.Ref**: [from 7.0.6 to 7.0.7][14] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.7-servicing.23268.2][14] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][14] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.6 to 7.0.7][14] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.6 to 7.0.7][14] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.7][15] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23217.6 to 7.0.7-servicing.23268.10][15] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][15] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23217.6 to 7.0.7-servicing.23268.10][15] - **dotnet-dev-certs**: [from 7.0.6-servicing.23217.6 to 7.0.7-servicing.23268.10][15] - **dotnet-user-jwts**: [from 7.0.6-servicing.23217.6 to 7.0.7-servicing.23268.10][15] - **dotnet-user-secrets**: [from 7.0.6-servicing.23217.6 to 7.0.7-servicing.23268.10][15] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.7-servicing.23268.2][14] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.6 to 7.0.7][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.7-servicing.23268.2][14] - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: [from 7.0.6 to 7.0.7][16] [13]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb50d5e5d55&targetVersion=GC9911a9f5d7&_a=files [14]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe3acf029e6&targetVersion=GC4906b56cca&_a=files [15]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC4515d4e1d7&targetVersion=GC2be1f3d56a&_a=files [16]: https://github.com/dotnet/emsdk/compare/b0eec69ee7...b3cf128502 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [marker]: <> (Begin:Coherency Updates) ## Coherency Updat... --- NuGet.config | 19 +++++------ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 3 files changed, 65 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2f6d8c615..a9fe44769 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,23 @@ - + - - + - - + - + + @@ -47,16 +46,16 @@ - + - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 971277a8d..644b674c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 + 9911a9f5d7c62b8213e2b33323c7714f2261135b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 + 9911a9f5d7c62b8213e2b33323c7714f2261135b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 + 9911a9f5d7c62b8213e2b33323c7714f2261135b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b50d5e5d5518784f3382b1fa5a2e9bfea8ed2d53 + 9911a9f5d7c62b8213e2b33323c7714f2261135b @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 0938a46db..1ffacd6cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ - 7.0.6 - 7.0.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 + 7.0.7 + 7.0.7 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 0.2.0 - 7.0.106 - 7.0.106-servicing.23218.7 - 7.0.106-servicing.23218.7 + 7.0.107 + 7.0.107-servicing.23269.6 + 7.0.107-servicing.23269.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,12 +82,12 @@ - 7.0.6-servicing.23212.12 - 7.0.6-servicing.23212.12 - 7.0.6 - 7.0.6 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.2 + 7.0.7 + 7.0.7 + 7.0.7 + 7.0.7 2.1.0 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.6 - 7.0.6 + 7.0.7 + 7.0.7 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 94730f874db2b109b4c5866d175e8a15a4e94d07 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:32:22 +0000 Subject: [PATCH 23/37] Merged PR 31405: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.6 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.6-servicing.23213.5 to 7.0.7-servicing.23268.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.6-servicing.23213.10 to 7.0.7-servicing.23269.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230519.13 - **Date Produced**: May 19, 2023 8:25:09 PM UTC - **Commit**: aebead6511cc0eaa9fbb84ecc7e8100f72c56532 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23269.6 to 7.0.107-servicing.23269.13][1] - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23269.6 to 7.0.107-servicing.23269.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23269.6 to 7.0.107-servicing.23269.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.6 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.5 to 7.0.7-servicing.23268.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.6-servicing.23213.10 to 7.0.7-servicing.2... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9fe44769..8b7bd22e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,10 @@ - + - - - + @@ -51,12 +49,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 644b674c2..eace9bc39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 2c4afc9f20969377bcf289b20c039cab44deddbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9911a9f5d7c62b8213e2b33323c7714f2261135b + aebead6511cc0eaa9fbb84ecc7e8100f72c56532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9911a9f5d7c62b8213e2b33323c7714f2261135b + aebead6511cc0eaa9fbb84ecc7e8100f72c56532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9911a9f5d7c62b8213e2b33323c7714f2261135b + aebead6511cc0eaa9fbb84ecc7e8100f72c56532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9911a9f5d7c62b8213e2b33323c7714f2261135b + aebead6511cc0eaa9fbb84ecc7e8100f72c56532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b3dce1f781e8f035f43da3d5eb11d4916d1be36f + fafc9aa56432f1e5728f082b222c3ef519b3dd59 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 + bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1ffacd6cf..0f872a0d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23213.5 + 7.0.7-servicing.23268.2 - 7.0.6-servicing.23213.10 + 7.0.7-servicing.23269.2 @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23269.6 - 7.0.107-servicing.23269.6 + 7.0.107-servicing.23269.13 + 7.0.107-servicing.23269.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.6-servicing.23213.14 - 7.0.6-servicing.23213.14 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23269.4 + 7.0.7-servicing.23269.4 + 7.0.7 + 7.0.7 From a321d265bb755bc2053848ab456032cefda7aa02 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:47:53 +0000 Subject: [PATCH 24/37] Merged PR 31449: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.4 to 7.0.7-servicing.23269.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.4 to 7.0.7-servicing.23269.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23269.2 to 7.0.7-servicing.23269.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++-------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b7bd22e2..ca997a794 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,13 +16,13 @@ - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eace9bc39..16a42e5f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aebead6511cc0eaa9fbb84ecc7e8100f72c56532 + d8d21a47382bfae363f63054b91b91ed749aa3fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aebead6511cc0eaa9fbb84ecc7e8100f72c56532 + d8d21a47382bfae363f63054b91b91ed749aa3fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aebead6511cc0eaa9fbb84ecc7e8100f72c56532 + d8d21a47382bfae363f63054b91b91ed749aa3fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aebead6511cc0eaa9fbb84ecc7e8100f72c56532 + d8d21a47382bfae363f63054b91b91ed749aa3fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fafc9aa56432f1e5728f082b222c3ef519b3dd59 + 3632207d619ad47c9933baa5806b67b67d1a4b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 + e43abfbcc8ce872b9ba591d87ec791e3f25423c0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0f872a0d4..048e8d23c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.9 - 7.0.7-servicing.23269.2 + 7.0.7-servicing.23269.7 @@ -58,11 +58,11 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 0.2.0 @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23269.13 - 7.0.107-servicing.23269.13 + 7.0.107-servicing.23272.9 + 7.0.107-servicing.23272.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.7-servicing.23268.2 - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23269.6 + 7.0.7-servicing.23269.6 7.0.7 7.0.7 7.0.7 @@ -92,8 +92,8 @@ - 7.0.7-servicing.23269.4 - 7.0.7-servicing.23269.4 + 7.0.7-servicing.23269.8 + 7.0.7-servicing.23269.8 7.0.7 7.0.7 From 1633fdb585aa0e80f5b0428d6dc3413da7336d8d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 22 May 2023 19:38:58 +0000 Subject: [PATCH 25/37] Merged PR 31462: Add System.Reflection.Metadata to poison baseline This adds back System.Reflection.Metadata.dll to the poison baseline. It was originally removed in https://github.com/dotnet/installer/pull/16078 but now has showed up again. --- .../assets/baselines/PoisonUsage.txt | 9 +++++++++ 1 file changed, 9 insertions(+) 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 e29c81347..9428e5b29 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,6 +20,15 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute From d7fdfadcef003dd9bb3c8f35b75391ab39e9ad11 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:28:30 +0000 Subject: [PATCH 26/37] Merged PR 31461: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230522.17 - **Date Produced**: May 22, 2023 4:49:16 PM UTC - **Commit**: 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23272.9 to 7.0.107-servicing.23272.17][1] - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23272.9 to 7.0.107-servicing.23272.17][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23272.9 to 7.0.107-servicing.23272.17][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd8d21a4738&targetVersion=GC0f4b99cde6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca997a794..7017ca2e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16a42e5f5..f82a493cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8d21a47382bfae363f63054b91b91ed749aa3fb + 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8d21a47382bfae363f63054b91b91ed749aa3fb + 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8d21a47382bfae363f63054b91b91ed749aa3fb + 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8d21a47382bfae363f63054b91b91ed749aa3fb + 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 diff --git a/eng/Versions.props b/eng/Versions.props index 048e8d23c..6c975c580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23272.9 - 7.0.107-servicing.23272.9 + 7.0.107-servicing.23272.17 + 7.0.107-servicing.23272.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 331b42fb08f5d6ebfea3b0cf49674f3e27e9aa43 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 23:53:38 +0000 Subject: [PATCH 27/37] Merged PR 31473: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23269.7 to 7.0.7-servicing.23272.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230522.35 - **Date Produced**: May 22, 2023 11:17:28 PM UTC - **Commit**: 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23272.17 to 7.0.107-servicing.23272.35][1] - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23272.17 to 7.0.107-servicing.23272.35][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23272.17 to 7.0.107-servicing.23272.35][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23269.7 to 7.0.7-servicing.232... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7017ca2e9..bd9ddd912 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f82a493cc..3651811d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 + 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 + 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 + 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f4b99cde68a09ccb3f75bde5f27e1e407d36d05 + 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3632207d619ad47c9933baa5806b67b67d1a4b77 + e3bf366a7361267ba472521190d62c9d22f39b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e43abfbcc8ce872b9ba591d87ec791e3f25423c0 + 24923547018835429e8d08a35b6d1e9eec97b735 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c975c580..94f533e5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23268.9 + 7.0.7-servicing.23272.2 - 7.0.7-servicing.23269.7 + 7.0.7-servicing.23272.4 @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23272.17 - 7.0.107-servicing.23272.17 + 7.0.107-servicing.23272.35 + 7.0.107-servicing.23272.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23269.8 - 7.0.7-servicing.23269.8 + 7.0.7-servicing.23272.4 + 7.0.7-servicing.23272.4 7.0.7 7.0.7 From 0ab3af1a0b2275c961f135a7d790125128cd34cc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 24 May 2023 22:34:34 +0000 Subject: [PATCH 28/37] [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.2 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.4.3 to 17.4.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) --- NuGet.config | 20 +++++++++++++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 10 +++++----- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd9ddd912..c65e1fce8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,27 @@ + + + + - + - + - + + + @@ -44,14 +50,18 @@ + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3651811d1..31d2a8d15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 + d81ea50769921f9a2ccf3e331c861846a1ad150e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 + d81ea50769921f9a2ccf3e331c861846a1ad150e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 + d81ea50769921f9a2ccf3e331c861846a1ad150e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c21fffb983fc005c8596ed3f45fb7d4d3ab0115 + d81ea50769921f9a2ccf3e331c861846a1ad150e @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 7e646be438ea3fdd8fdab0553cd0e5b505174b65 + 8e9cb295288f13095e9b7739cc4cbb04e9d246d2 diff --git a/eng/Versions.props b/eng/Versions.props index 94f533e5a..c867ef053 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,20 +70,20 @@ 7.0.107 - 7.0.107-servicing.23272.35 - 7.0.107-servicing.23272.35 + 7.0.107-servicing.23274.10 + 7.0.107-servicing.23274.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.2 + 7.0.3 - 7.0.7-servicing.23269.6 - 7.0.7-servicing.23269.6 + 7.0.7-servicing.23274.4 + 7.0.7-servicing.23274.4 7.0.7 7.0.7 7.0.7 From c9144a3165c01c9aaef0860579e99706e536ded9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 05:21:12 +0000 Subject: [PATCH 29/37] Merged PR 31528: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230524.14 - **Date Produced**: May 24, 2023 10:03:23 PM UTC - **Commit**: 4506a4672022a4fb0c09a1555a263651c40257aa - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23274.10 to 7.0.107-servicing.23274.14][1] - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23274.10 to 7.0.107-servicing.23274.14][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23274.10 to 7.0.107-servicing.23274.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd81ea50769&targetVersion=GC4506a46720&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index c65e1fce8..0836a3c30 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31d2a8d15..06e9e921d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d81ea50769921f9a2ccf3e331c861846a1ad150e + 4506a4672022a4fb0c09a1555a263651c40257aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d81ea50769921f9a2ccf3e331c861846a1ad150e + 4506a4672022a4fb0c09a1555a263651c40257aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d81ea50769921f9a2ccf3e331c861846a1ad150e + 4506a4672022a4fb0c09a1555a263651c40257aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d81ea50769921f9a2ccf3e331c861846a1ad150e + 4506a4672022a4fb0c09a1555a263651c40257aa diff --git a/eng/Versions.props b/eng/Versions.props index c867ef053..28dfd3024 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23274.10 - 7.0.107-servicing.23274.10 + 7.0.107-servicing.23274.14 + 7.0.107-servicing.23274.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4b3a6701ae869fec0a8db700b4b51e4f1d86754 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 13:50:18 +0000 Subject: [PATCH 30/37] Merged PR 31538: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230524.21 - **Date Produced**: May 25, 2023 5:56:34 AM UTC - **Commit**: ec52fe565d3c175b6c2433710c0389af2dc51181 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23274.14 to 7.0.107-servicing.23274.21][1] - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23274.14 to 7.0.107-servicing.23274.21][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23274.14 to 7.0.107-servicing.23274.21][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-dev-certs**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-user-jwts**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-user-secrets**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4506a46720&targetVersion=GCec52fe565d&_a=files [2]: https://dev.azure.com/dnce... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0836a3c30..149c4aca1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -23,7 +21,7 @@ - + @@ -50,14 +48,12 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06e9e921d..f31a9ad99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4506a4672022a4fb0c09a1555a263651c40257aa + ec52fe565d3c175b6c2433710c0389af2dc51181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4506a4672022a4fb0c09a1555a263651c40257aa + ec52fe565d3c175b6c2433710c0389af2dc51181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4506a4672022a4fb0c09a1555a263651c40257aa + ec52fe565d3c175b6c2433710c0389af2dc51181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4506a4672022a4fb0c09a1555a263651c40257aa + ec52fe565d3c175b6c2433710c0389af2dc51181 diff --git a/eng/Versions.props b/eng/Versions.props index 28dfd3024..480dc66d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23274.14 - 7.0.107-servicing.23274.14 + 7.0.107-servicing.23274.21 + 7.0.107-servicing.23274.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf72c06963e2bb23c1abfd97a9ed50e47e155027 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 17:03:35 +0000 Subject: [PATCH 31/37] Merged PR 31550: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230525.8 - **Date Produced**: May 25, 2023 4:11:41 PM UTC - **Commit**: 68e0a72cb669f111b49ae42a5666e6306889ccc6 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23274.21 to 7.0.107-servicing.23275.8][1] - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23274.21 to 7.0.107-servicing.23275.8][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23274.21 to 7.0.107-servicing.23275.8][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5]... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 149c4aca1..fb9bd53aa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,12 +21,10 @@ - + - - - + @@ -53,12 +51,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f31a9ad99..811773cf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec52fe565d3c175b6c2433710c0389af2dc51181 + 68e0a72cb669f111b49ae42a5666e6306889ccc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec52fe565d3c175b6c2433710c0389af2dc51181 + 68e0a72cb669f111b49ae42a5666e6306889ccc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec52fe565d3c175b6c2433710c0389af2dc51181 + 68e0a72cb669f111b49ae42a5666e6306889ccc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec52fe565d3c175b6c2433710c0389af2dc51181 + 68e0a72cb669f111b49ae42a5666e6306889ccc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e3bf366a7361267ba472521190d62c9d22f39b14 + b4a5f0c6839363dea534f21736a9d0726c14b41c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 24923547018835429e8d08a35b6d1e9eec97b735 + 512eac4b458953da405f51ec0ae7766bcb7b32e5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 480dc66d2..64d9cc94e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23272.2 + 7.0.7-servicing.23274.5 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23274.5 @@ -70,8 +70,8 @@ 7.0.107 - 7.0.107-servicing.23274.21 - 7.0.107-servicing.23274.21 + 7.0.107-servicing.23275.8 + 7.0.107-servicing.23275.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23272.4 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23275.3 + 7.0.7-servicing.23275.3 7.0.7 7.0.7 From ac3b7f05fbfe0737583cf7a16f6b283370937fdd Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 13 Jun 2023 10:32:20 -0700 Subject: [PATCH 32/37] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0049e7ae9..508b19f76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 2)) + $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From b37e59c92efae27ec6b7b17dbde36b24a00ee607 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Jun 2023 11:27:45 -0700 Subject: [PATCH 33/37] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 2bf456f30..fb41f0bad 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.28 - 10.0.18362.28 - 10.0.19041.28 - 10.0.20348.28 - 10.0.22000.28 - 10.0.22621.28 + 10.0.17763.29 + 10.0.18362.29 + 10.0.19041.29 + 10.0.20348.29 + 10.0.22000.29 + 10.0.22621.29 From 306c38cab927b9eebc0fb457b0bd291951f8bc72 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:34:15 -0700 Subject: [PATCH 34/37] .NET Source-Build 7.0.107 June 2023 Updates (#16669) --- 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 7862c51df..ae67da26c 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.105 - 7.0.105 + 7.0.107 + 7.0.107 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 88a5f3c55..5782f6cac 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.105" + "dotnet": "7.0.107" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b121f8feeb07d3a434cb47fbf76394b5b687de44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 20:00:12 +0000 Subject: [PATCH 35/37] Update dependencies from https://github.com/dotnet/arcade build 20230531.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23281.4 --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 4 +-- 6 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index d207f7815..0724b3029 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,20 +10,21 @@ + + + + - - - @@ -45,15 +46,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea514f006..a51aec545 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4f7f640f2..c93a90617 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23211.2 + 7.0.0-beta.23281.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e3ba93980..ef337eac5 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -142,14 +146,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -217,7 +227,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -228,7 +238,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 550a365a9..d4c7ba82e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23281.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23281.4" } } From 51285ddca1080ffdf8fc79c88386e7cb07194d22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 20:27:17 +0000 Subject: [PATCH 36/37] [release/7.0.3xx] Update dependencies from dotnet/arcade (#16691) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 5 ----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0724b3029..ffac45e52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a51aec545..b3cbb5f9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f + 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/arcade - 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f + 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/arcade - 6a71ed4ba6a70e66abe9f9bdc4009fa1de35132f + 59ac824080b9807fd91dbc8a6d2b4447e74874ab https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c93a90617..f0f30eae3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23281.4 + 7.0.0-beta.23313.4 diff --git a/global.json b/global.json index d4c7ba82e..30cab30b8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.105", + "dotnet": "7.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23281.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23281.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23313.4" } } From 4f9a50fd1c7ffb6ef0019ab7fc9e6e46b08e7176 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 21:30:27 +0000 Subject: [PATCH 37/37] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23063.1 -> To Version 7.0.0-alpha.1.23219.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3cbb5f9f..a92a3984d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade 59ac824080b9807fd91dbc8a6d2b4447e74874ab - + https://github.com/dotnet/source-build-reference-packages - 9964206e0dd215eee4ed199b9041a94e16ba4c45 + 525b6c35cc5c5c9b80b47044be2e4e77858d505a