From 9514db96a62db541d3ab1aafa768f31165a8e6ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 17:54:12 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.9 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7581d90828d4..66ebe610b561 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 diff --git a/eng/Versions.props b/eng/Versions.props index d5998438a48a..48897949a61c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.6 - 8.0.100-preview.4.23206.6 - 8.0.100-preview.4.23206.6 + 8.0.100-preview.4.23206.9 + 8.0.100-preview.4.23206.9 + 8.0.100-preview.4.23206.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a1a2ca5c5a0ea7ee07d7250bbe4d8e63d3c813c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 17:55:47 +0000 Subject: [PATCH 02/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.10 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230323-05 -> To Version 17.7.0-preview.23205.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66ebe610b561..dd193531eb72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 @@ -137,9 +137,9 @@ 15e94b3cb730ed90d454141e0d4c10a28d9efe1d - + https://github.com/microsoft/vstest - 2d656fe2133f89248825419fb8ffac5505486906 + 27666deccccf3fc8ed40f04d2fe80e36e6186181 diff --git a/eng/Versions.props b/eng/Versions.props index 48897949a61c..ef66efc8de99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.9 - 8.0.100-preview.4.23206.9 - 8.0.100-preview.4.23206.9 + 8.0.100-preview.4.23206.10 + 8.0.100-preview.4.23206.10 + 8.0.100-preview.4.23206.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -218,7 +218,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230323-05 + 17.7.0-preview.23205.10 8.0.0-alpha.1.22557.12 From 42fc8ea6c0e1691cb66b235a2e777e4d5421c4d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 18:40:33 +0000 Subject: [PATCH 03/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.11 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++-------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd193531eb72..c8765c35145a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 599cce2fff315dd2c6d712436e890837cdc3ff3e - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 5b37dd5fea143baefbef2bd83836188af0815a30 @@ -142,18 +142,18 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 https://github.com/dotnet/roslyn 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 - + https://github.com/dotnet/msbuild - 413571dea9ebb0023f26e5c0f5cd514d30b61465 + 171676d8179a0032a2890c3d0ad6f9e245ca1f5c diff --git a/eng/Versions.props b/eng/Versions.props index ef66efc8de99..a28b9c119926 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 0.2.0 - 8.0.100-preview.4.23206.10 - 8.0.100-preview.4.23206.10 - 8.0.100-preview.4.23206.10 + 8.0.100-preview.4.23206.11 + 8.0.100-preview.4.23206.11 + 8.0.100-preview.4.23206.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 2.1.0 From af4f9561a6d7835e0b4edc5c6b9d78ad3192f381 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 19:51:42 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6614e11a81b..383a57617c44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a28b9c119926..a6ca5f5c9c76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.11 - 8.0.100-preview.4.23206.11 - 8.0.100-preview.4.23206.11 + 8.0.100-preview.4.23206.12 + 8.0.100-preview.4.23206.12 + 8.0.100-preview.4.23206.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 2.1.0 From 5dae3ba7233429e7caeffae0c1c5f0e37c1bef26 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 6 Apr 2023 21:01:10 +0000 Subject: [PATCH 05/22] Remove backported source-build runtime patch --- ...1-Fix-for-item-based-msbuild-pattern.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch diff --git a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch deleted file mode 100644 index f5e666d768f9..000000000000 --- a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 1 Mar 2023 00:08:32 +0000 -Subject: [PATCH] Fix for item-based msbuild pattern - -Backport: https://github.com/dotnet/runtime/issues/82795 ---- - src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -index 251336540b5..72a3537a5ce 100644 ---- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -+++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -@@ -346,7 +346,13 @@ Copyright (c) .NET Foundation. All rights reserved. - _CreateR2RImages; - _CreateR2RSymbols"> - -- -+ -+ <_R2RCrossgenTelemetry Include="PublishReadyToRunUseCrossgen2" Value="$(PublishReadyToRunUseCrossgen2)" /> -+ <_R2RCrossgenTelemetry Include="Crossgen2PackVersion" Value="%(ResolvedCrossgen2Pack.NuGetPackageVersion)" /> -+ <_R2RCrossgenTelemetry Include="CompileListCount" Value="@(_ReadyToRunCompileList->Count())" /> -+ <_R2RCrossgenTelemetry Include="FailedCount" Value="@(_ReadyToRunCompilationFailures->Count())" /> -+ -+ - - - From f0281c6e5ddb15f5c10008f97aa7386f9fa4ec27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 21:53:30 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 383a57617c44..85a01b91756f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 diff --git a/eng/Versions.props b/eng/Versions.props index a6ca5f5c9c76..f5270e35f2a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.12 - 8.0.100-preview.4.23206.12 - 8.0.100-preview.4.23206.12 + 8.0.100-preview.4.23206.19 + 8.0.100-preview.4.23206.19 + 8.0.100-preview.4.23206.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4a46450c6e972af34898a2ad3ba6cc5258bf2da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 02:46:14 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.20 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85a01b91756f..e171e6131f1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 + 17b5a7bffde6925326d36fa02c8c5d756054f6fe - + https://github.com/dotnet/sdk - ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 + 17b5a7bffde6925326d36fa02c8c5d756054f6fe - + https://github.com/dotnet/sdk - ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 + 17b5a7bffde6925326d36fa02c8c5d756054f6fe - + https://github.com/dotnet/sdk - ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 + 17b5a7bffde6925326d36fa02c8c5d756054f6fe diff --git a/eng/Versions.props b/eng/Versions.props index f5270e35f2a9..26eceaeb550d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.19 - 8.0.100-preview.4.23206.19 - 8.0.100-preview.4.23206.19 + 8.0.100-preview.4.23206.20 + 8.0.100-preview.4.23206.20 + 8.0.100-preview.4.23206.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82aceab6fa3604173a8abc42e1a658da1a176686 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 03:41:10 +0000 Subject: [PATCH 08/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.22 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e171e6131f1e..4c9b5d8e59d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 26eceaeb550d..c222edb0b506 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.20 - 8.0.100-preview.4.23206.20 - 8.0.100-preview.4.23206.20 + 8.0.100-preview.4.23206.22 + 8.0.100-preview.4.23206.22 + 8.0.100-preview.4.23206.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 2.1.0 From e3d848b253110034af6d4b2d1c332a35d7261991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 06:23:25 +0000 Subject: [PATCH 09/22] Update dependencies from https://github.com/dotnet/sdk build 20230406.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.24 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c9b5d8e59d8..8be574beec22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f diff --git a/eng/Versions.props b/eng/Versions.props index c222edb0b506..335272601b48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 0.2.0 - 8.0.100-preview.4.23206.22 - 8.0.100-preview.4.23206.22 - 8.0.100-preview.4.23206.22 + 8.0.100-preview.4.23206.24 + 8.0.100-preview.4.23206.24 + 8.0.100-preview.4.23206.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 791c0da9afdad0ae6b59a69595a73fef630842d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 10:02:11 +0000 Subject: [PATCH 10/22] Update dependencies from https://github.com/dotnet/sdk build 20230407.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.19 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8be574beec22..56100882cde0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 335272601b48..323a8aac9f4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.24 - 8.0.100-preview.4.23206.24 - 8.0.100-preview.4.23206.24 + 8.0.100-preview.4.23207.2 + 8.0.100-preview.4.23207.2 + 8.0.100-preview.4.23207.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 2.1.0 From e7654ddf2635efd230832e1c6abce0123e8752bc Mon Sep 17 00:00:00 2001 From: mmitche Date: Fri, 7 Apr 2023 08:24:53 -0700 Subject: [PATCH 11/22] Update to new darclib --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56100882cde0..15954b7d7f54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade-services - b2a77aac8c64f46101abc98fdb07a6131fae3625 + ba02feddac8c1a1c9a262af41396a28153edba22 - + https://github.com/dotnet/arcade-services - b2a77aac8c64f46101abc98fdb07a6131fae3625 + ba02feddac8c1a1c9a262af41396a28153edba22 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 323a8aac9f4c..ad868dec0ca5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23128.1 + 1.1.0-beta.23206.1 From 62e7e228e82f98e946abb33306d64a855f2b6455 Mon Sep 17 00:00:00 2001 From: mmitche Date: Fri, 7 Apr 2023 09:39:11 -0700 Subject: [PATCH 12/22] Update to new darc --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b23f9971f1c3..37a4653de91a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23128.1", + "version": "1.1.0-beta.23206.1", "commands": [ "darc" ] From 8910f1219ecd970feb6698b77a04277283832baa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 17:51:47 +0000 Subject: [PATCH 13/22] Update dependencies from https://github.com/dotnet/sdk build 20230407.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15954b7d7f54..dda210b1e5fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ad868dec0ca5..4be0f8b476c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23207.2 - 8.0.100-preview.4.23207.2 - 8.0.100-preview.4.23207.2 + 8.0.100-preview.4.23207.4 + 8.0.100-preview.4.23207.4 + 8.0.100-preview.4.23207.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 2.1.0 From 0bf74dd9756f281039f88dc3889b6108f4b47f24 Mon Sep 17 00:00:00 2001 From: mmitche Date: Fri, 7 Apr 2023 10:57:59 -0700 Subject: [PATCH 14/22] Workaround VMR issues --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37a4653de91a..72e747ba0216 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23206.1", + "version": "1.1.0-beta.23207.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15954b7d7f54..29e7407cbfa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - - https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + + https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services + 05ebb88cb4c733d71012613696743f0c81b67c8a - - https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + + https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services + 05ebb88cb4c733d71012613696743f0c81b67c8a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ad868dec0ca5..1e6beaed7209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23206.1 + 1.1.0-beta.23207.1 From f2ab5e030380a860a487687836e2130134a0fdb9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 7 Apr 2023 12:21:52 -0700 Subject: [PATCH 15/22] Revert "Workaround VMR issues" This reverts commit 0bf74dd9756f281039f88dc3889b6108f4b47f24. --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 72e747ba0216..37a4653de91a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23207.1", + "version": "1.1.0-beta.23206.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d207a28ac40..dda210b1e5fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - - https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services - 05ebb88cb4c733d71012613696743f0c81b67c8a + + https://github.com/dotnet/arcade-services + ba02feddac8c1a1c9a262af41396a28153edba22 - - https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services - 05ebb88cb4c733d71012613696743f0c81b67c8a + + https://github.com/dotnet/arcade-services + ba02feddac8c1a1c9a262af41396a28153edba22 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ee4544b9fc12..4be0f8b476c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23207.1 + 1.1.0-beta.23206.1 From 3c3093ae3e76b61d2d0ea468c9f8cb02c79f4766 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 7 Apr 2023 12:21:59 -0700 Subject: [PATCH 16/22] Revert "Update to new darc" This reverts commit 62e7e228e82f98e946abb33306d64a855f2b6455. --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37a4653de91a..b23f9971f1c3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23206.1", + "version": "1.1.0-beta.23128.1", "commands": [ "darc" ] From 583654007f183b74a7553a943f0f43ab432db303 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 7 Apr 2023 12:22:06 -0700 Subject: [PATCH 17/22] Revert "Update to new darclib" This reverts commit e7654ddf2635efd230832e1c6abce0123e8752bc. --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dda210b1e5fc..7544e7c8d8bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + b2a77aac8c64f46101abc98fdb07a6131fae3625 - + https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + b2a77aac8c64f46101abc98fdb07a6131fae3625 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4be0f8b476c6..fe7b02e773af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23206.1 + 1.1.0-beta.23128.1 From fc24dbff83f60dd2474f2c79997682354d7f76f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 20:23:36 +0000 Subject: [PATCH 18/22] Update dependencies from https://github.com/dotnet/sdk build 20230407.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.9 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7544e7c8d8bb..be9ac7ee3b6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a diff --git a/eng/Versions.props b/eng/Versions.props index fe7b02e773af..51db118af4ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 0.2.0 - 8.0.100-preview.4.23207.4 - 8.0.100-preview.4.23207.4 - 8.0.100-preview.4.23207.4 + 8.0.100-preview.4.23207.9 + 8.0.100-preview.4.23207.9 + 8.0.100-preview.4.23207.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55f7cdb7aa4d25caf5d51f10c2c0a2bf32df9890 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 21:14:36 +0000 Subject: [PATCH 19/22] Update dependencies from https://github.com/dotnet/sdk build 20230407.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9ac7ee3b6b..a8be3f4f8fc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c diff --git a/eng/Versions.props b/eng/Versions.props index 51db118af4ce..bec077e103ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23207.9 - 8.0.100-preview.4.23207.9 - 8.0.100-preview.4.23207.9 + 8.0.100-preview.4.23207.8 + 8.0.100-preview.4.23207.8 + 8.0.100-preview.4.23207.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 45d2ff390d1c0c6bf6d3419b9535034965837ba7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 22:57:22 +0000 Subject: [PATCH 20/22] Update dependencies from https://github.com/dotnet/sdk build 20230407.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8be3f4f8fc4..3364fe21c053 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 diff --git a/eng/Versions.props b/eng/Versions.props index bec077e103ce..ab14602d4aba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 0.2.0 - 8.0.100-preview.4.23207.8 - 8.0.100-preview.4.23207.8 - 8.0.100-preview.4.23207.8 + 8.0.100-preview.4.23207.14 + 8.0.100-preview.4.23207.14 + 8.0.100-preview.4.23207.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f68e0331328631da755d9f3ce2c4bfd13c47b91b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Apr 2023 00:33:19 +0000 Subject: [PATCH 21/22] Update dependencies from https://github.com/dotnet/sdk build 20230407.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3364fe21c053..73af080d22e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede diff --git a/eng/Versions.props b/eng/Versions.props index ab14602d4aba..36632c98ce53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23207.14 - 8.0.100-preview.4.23207.14 - 8.0.100-preview.4.23207.14 + 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23207.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0cd8f5573bb4737e0932a3623f990c75b75dd272 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 09:45:28 -0500 Subject: [PATCH 22/22] Manually fix vstest version to match sdk --- 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 73af080d22e3..80821a16d28c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -137,9 +137,9 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest - 27666deccccf3fc8ed40f04d2fe80e36e6186181 + 2d656fe2133f89248825419fb8ffac5505486906