From b776808a8608d886f5ba79636186d72f0706f78c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 02:48:37 +0000 Subject: [PATCH 01/67] Update dependencies from https://github.com/dotnet/sdk build 20230607.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23307.28 Dependency coherency updates 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 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.20 (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 9149b8704..e5c6de7b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 54dab738de58291ebefc8ff0569a799efaff5d82 - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a - + https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + abf68d8e609527d0953d1cb44a7f1b392dda795a https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 6ce52a339247f9a848ff97fa418070b65de92b4d + b08ba0bb08746453077eb49f74978a582634925e - + https://github.com/dotnet/sdk - 6ce52a339247f9a848ff97fa418070b65de92b4d + b08ba0bb08746453077eb49f74978a582634925e - + https://github.com/dotnet/sdk - 6ce52a339247f9a848ff97fa418070b65de92b4d + b08ba0bb08746453077eb49f74978a582634925e - + https://github.com/dotnet/sdk - 6ce52a339247f9a848ff97fa418070b65de92b4d + b08ba0bb08746453077eb49f74978a582634925e diff --git a/eng/Versions.props b/eng/Versions.props index 80894a610..8ca4324b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 + 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23307.20 0.2.0 - 8.0.100-preview.6.23307.24 - 8.0.100-preview.6.23307.24 - 8.0.100-preview.6.23307.24 + 8.0.100-preview.6.23307.28 + 8.0.100-preview.6.23307.28 + 8.0.100-preview.6.23307.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98fb9cb2989943e8adffb23e9f096dbc5740b8bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 04:30:59 +0000 Subject: [PATCH 02/67] Update dependencies from https://github.com/dotnet/sdk build 20230607.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23307.33 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.8 (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 e5c6de7b5..9b51e1fb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - b08ba0bb08746453077eb49f74978a582634925e + f001dce4a98c16facc41f100b895c8c3d289e162 - + https://github.com/dotnet/sdk - b08ba0bb08746453077eb49f74978a582634925e + f001dce4a98c16facc41f100b895c8c3d289e162 - + https://github.com/dotnet/sdk - b08ba0bb08746453077eb49f74978a582634925e + f001dce4a98c16facc41f100b895c8c3d289e162 - + https://github.com/dotnet/sdk - b08ba0bb08746453077eb49f74978a582634925e + f001dce4a98c16facc41f100b895c8c3d289e162 @@ -142,9 +142,9 @@ 8381658bfb847e67b4f41a997411e8a804e1ecb4 - + https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 + b8e0ce05a84ba6591514d496604bbebf2e652e7a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8ca4324b7..4990194d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23307.28 - 8.0.100-preview.6.23307.28 - 8.0.100-preview.6.23307.28 + 8.0.100-preview.6.23307.33 + 8.0.100-preview.6.23307.33 + 8.0.100-preview.6.23307.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23307.4 + 8.0.0-preview.6.23307.8 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 - 8.0.0-preview.6.23307.4 + 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.8 2.1.0 From 3485a2a3cac4f48bb6e5c780aa9ebc76cf14d246 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 05:46:44 +0000 Subject: [PATCH 03/67] Update dependencies from https://github.com/dotnet/sdk build 20230607.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23307.34 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.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.8 (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 9b51e1fb7..09fde3a5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - f001dce4a98c16facc41f100b895c8c3d289e162 + 4c470d5e36e712ca438ae3eb10142169a9c79c70 - + https://github.com/dotnet/sdk - f001dce4a98c16facc41f100b895c8c3d289e162 + 4c470d5e36e712ca438ae3eb10142169a9c79c70 - + https://github.com/dotnet/sdk - f001dce4a98c16facc41f100b895c8c3d289e162 + 4c470d5e36e712ca438ae3eb10142169a9c79c70 - + https://github.com/dotnet/sdk - f001dce4a98c16facc41f100b895c8c3d289e162 + 4c470d5e36e712ca438ae3eb10142169a9c79c70 diff --git a/eng/Versions.props b/eng/Versions.props index 4990194d9..f59fb0997 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23307.33 - 8.0.100-preview.6.23307.33 - 8.0.100-preview.6.23307.33 + 8.0.100-preview.6.23307.34 + 8.0.100-preview.6.23307.34 + 8.0.100-preview.6.23307.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e672ee5efc93f2b2ab7745d14545a9ef5cbfbb9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 06:33:19 +0000 Subject: [PATCH 04/67] Update dependencies from https://github.com/dotnet/sdk build 20230607.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23307.36 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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.8 (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 09fde3a5c..601a2c063 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 4c470d5e36e712ca438ae3eb10142169a9c79c70 + c4d4bd3350710588b61539312bc0e69cc1c7c86e - + https://github.com/dotnet/sdk - 4c470d5e36e712ca438ae3eb10142169a9c79c70 + c4d4bd3350710588b61539312bc0e69cc1c7c86e - + https://github.com/dotnet/sdk - 4c470d5e36e712ca438ae3eb10142169a9c79c70 + c4d4bd3350710588b61539312bc0e69cc1c7c86e - + https://github.com/dotnet/sdk - 4c470d5e36e712ca438ae3eb10142169a9c79c70 + c4d4bd3350710588b61539312bc0e69cc1c7c86e @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime b8e0ce05a84ba6591514d496604bbebf2e652e7a - + https://github.com/dotnet/roslyn - 826e1770eedb6d8d44a054c9e3ea6569e7ec5970 + 91afe0903adf80236bb7ccffc042a16f53520877 diff --git a/eng/Versions.props b/eng/Versions.props index f59fb0997..366c5ee8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23307.34 - 8.0.100-preview.6.23307.34 - 8.0.100-preview.6.23307.34 + 8.0.100-preview.6.23307.36 + 8.0.100-preview.6.23307.36 + 8.0.100-preview.6.23307.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23306.1 + 4.7.0-3.23307.8 From 079aba8caff71679a5b952b196a4cc13968cc5a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 07:15:49 +0000 Subject: [PATCH 05/67] Update dependencies from https://github.com/dotnet/sdk build 20230607.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23307.37 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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.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 601a2c063..5c9c97ce9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - c4d4bd3350710588b61539312bc0e69cc1c7c86e + 537cac6158596594adcb948e69f899a071e123df - + https://github.com/dotnet/sdk - c4d4bd3350710588b61539312bc0e69cc1c7c86e + 537cac6158596594adcb948e69f899a071e123df - + https://github.com/dotnet/sdk - c4d4bd3350710588b61539312bc0e69cc1c7c86e + 537cac6158596594adcb948e69f899a071e123df - + https://github.com/dotnet/sdk - c4d4bd3350710588b61539312bc0e69cc1c7c86e + 537cac6158596594adcb948e69f899a071e123df @@ -142,9 +142,9 @@ 8381658bfb847e67b4f41a997411e8a804e1ecb4 - + https://github.com/dotnet/runtime - b8e0ce05a84ba6591514d496604bbebf2e652e7a + d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 366c5ee8e..6c6e998f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23307.36 - 8.0.100-preview.6.23307.36 - 8.0.100-preview.6.23307.36 + 8.0.100-preview.6.23307.37 + 8.0.100-preview.6.23307.37 + 8.0.100-preview.6.23307.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.9 - 8.0.0-preview.6.23307.8 - 8.0.0-preview.6.23307.8 - 8.0.0-preview.6.23307.8 - 8.0.0-preview.6.23307.8 - 8.0.0-preview.6.23307.8 - 8.0.0-preview.6.23307.8 + 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.9 2.1.0 From 83f059e8a876b7363bb9e0ad8974705764044fde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 09:35:20 +0000 Subject: [PATCH 06/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.1 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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.10 (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 5c9c97ce9..b36cd8c00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 537cac6158596594adcb948e69f899a071e123df + ef3787c32bc3369dd139a5d9d2593309cb89d0c6 - + https://github.com/dotnet/sdk - 537cac6158596594adcb948e69f899a071e123df + ef3787c32bc3369dd139a5d9d2593309cb89d0c6 - + https://github.com/dotnet/sdk - 537cac6158596594adcb948e69f899a071e123df + ef3787c32bc3369dd139a5d9d2593309cb89d0c6 - + https://github.com/dotnet/sdk - 537cac6158596594adcb948e69f899a071e123df + ef3787c32bc3369dd139a5d9d2593309cb89d0c6 @@ -142,9 +142,9 @@ 8381658bfb847e67b4f41a997411e8a804e1ecb4 - + https://github.com/dotnet/runtime - d0c25155a46d5b1955189a64df1c1c53e3e6b2c8 + c361f917c38a53c0952164792f219fef411c4596 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 6c6e998f8..dca2df2f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23307.37 - 8.0.100-preview.6.23307.37 - 8.0.100-preview.6.23307.37 + 8.0.100-preview.6.23308.1 + 8.0.100-preview.6.23308.1 + 8.0.100-preview.6.23308.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.10 - 8.0.0-preview.6.23307.9 - 8.0.0-preview.6.23307.9 - 8.0.0-preview.6.23307.9 - 8.0.0-preview.6.23307.9 - 8.0.0-preview.6.23307.9 - 8.0.0-preview.6.23307.9 + 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23307.10 2.1.0 From 81796d9603957a709d1d4c2e726be6dfdba2fbc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 13:28:47 +0000 Subject: [PATCH 07/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.10 (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 b36cd8c00..a40b8a6c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - ef3787c32bc3369dd139a5d9d2593309cb89d0c6 + f8831a640e1876655e44dbf87a6e2f74f9c308a2 - + https://github.com/dotnet/sdk - ef3787c32bc3369dd139a5d9d2593309cb89d0c6 + f8831a640e1876655e44dbf87a6e2f74f9c308a2 - + https://github.com/dotnet/sdk - ef3787c32bc3369dd139a5d9d2593309cb89d0c6 + f8831a640e1876655e44dbf87a6e2f74f9c308a2 - + https://github.com/dotnet/sdk - ef3787c32bc3369dd139a5d9d2593309cb89d0c6 + f8831a640e1876655e44dbf87a6e2f74f9c308a2 diff --git a/eng/Versions.props b/eng/Versions.props index dca2df2f9..f0f7c4774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23308.1 - 8.0.100-preview.6.23308.1 - 8.0.100-preview.6.23308.1 + 8.0.100-preview.6.23308.2 + 8.0.100-preview.6.23308.2 + 8.0.100-preview.6.23308.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7b136132580de5796d4dde8eb3cd42642e55c70a Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 8 Jun 2023 15:46:51 +0000 Subject: [PATCH 08/67] Remove backported runtime source-build patch --- ...ch-to-self-hosted-NativeAOT-compiler.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch diff --git a/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch b/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch deleted file mode 100644 index 15d6c5514..000000000 --- a/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Mon, 20 Mar 2023 15:35:53 -0500 -Subject: [PATCH] Revert switch to self-hosted NativeAOT compiler - -Backport: https://github.com/dotnet/runtime/issues/83695 ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj -index db48433db73..982bbc78427 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj -@@ -12,6 +12,7 @@ - $(RuntimeBinDir)ilc-published/ - false - false -+ false - true - $(ROOTFS_DIR) - true From ed64f7fc3454497b71fef6ee703d691b98d066fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 17:59:29 +0000 Subject: [PATCH 09/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.3 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.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.10 (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 a40b8a6c0..32659ea9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - f8831a640e1876655e44dbf87a6e2f74f9c308a2 + 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 - + https://github.com/dotnet/sdk - f8831a640e1876655e44dbf87a6e2f74f9c308a2 + 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 - + https://github.com/dotnet/sdk - f8831a640e1876655e44dbf87a6e2f74f9c308a2 + 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 - + https://github.com/dotnet/sdk - f8831a640e1876655e44dbf87a6e2f74f9c308a2 + 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 diff --git a/eng/Versions.props b/eng/Versions.props index f0f7c4774..77a156e2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23308.2 - 8.0.100-preview.6.23308.2 - 8.0.100-preview.6.23308.2 + 8.0.100-preview.6.23308.3 + 8.0.100-preview.6.23308.3 + 8.0.100-preview.6.23308.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 04eb8920e05db3a25e69633e74b8ccacd3a656e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 19:01:41 +0000 Subject: [PATCH 10/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.5 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.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23307.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32659ea9a..632ce80c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 + d95f508c78cca5b0fb4c4d372affc1c8de4a891e - + https://github.com/dotnet/sdk - 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 + d95f508c78cca5b0fb4c4d372affc1c8de4a891e - + https://github.com/dotnet/sdk - 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 + d95f508c78cca5b0fb4c4d372affc1c8de4a891e - + https://github.com/dotnet/sdk - 68a57a94f07ff437ecafb5c35cd7bbd2350f0ae9 + d95f508c78cca5b0fb4c4d372affc1c8de4a891e @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 927b58e4743a8fa2164c24a47cbd9853b435d605 - + https://github.com/dotnet/fsharp - b265c68604681242d3a83db3f0f7b1bb97db4b93 + f8b9333279689716d4a1db4f222f4183dbdf17b3 - + https://github.com/dotnet/fsharp - b265c68604681242d3a83db3f0f7b1bb97db4b93 + f8b9333279689716d4a1db4f222f4183dbdf17b3 @@ -151,9 +151,9 @@ 91afe0903adf80236bb7ccffc042a16f53520877 - + https://github.com/dotnet/msbuild - a6a0ee16b7d202186a6c44f1c5aebe30ddc63ab2 + 855f745b9fc53ca34a443ff97cdef63915828da2 diff --git a/eng/Versions.props b/eng/Versions.props index 77a156e2e..2661cf9f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23308.3 - 8.0.100-preview.6.23308.3 - 8.0.100-preview.6.23308.3 + 8.0.100-preview.6.23308.5 + 8.0.100-preview.6.23308.5 + 8.0.100-preview.6.23308.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72971ad4649c4061af1f28a829393e63fed6ef40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 20:16:27 +0000 Subject: [PATCH 11/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.7 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.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23308.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++---------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 632ce80c2..d7ce9708a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 - + https://github.com/dotnet/aspnetcore - abf68d8e609527d0953d1cb44a7f1b392dda795a + 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - d95f508c78cca5b0fb4c4d372affc1c8de4a891e + f8b013b93428b0e91046e1e9caba0672a962e3e7 - + https://github.com/dotnet/sdk - d95f508c78cca5b0fb4c4d372affc1c8de4a891e + f8b013b93428b0e91046e1e9caba0672a962e3e7 - + https://github.com/dotnet/sdk - d95f508c78cca5b0fb4c4d372affc1c8de4a891e + f8b013b93428b0e91046e1e9caba0672a962e3e7 - + https://github.com/dotnet/sdk - d95f508c78cca5b0fb4c4d372affc1c8de4a891e + f8b013b93428b0e91046e1e9caba0672a962e3e7 @@ -137,14 +137,14 @@ f8b9333279689716d4a1db4f222f4183dbdf17b3 - + https://github.com/microsoft/vstest - 8381658bfb847e67b4f41a997411e8a804e1ecb4 + 11b375cec01792f2f37e3aaf199c0dc71aaa8786 - + https://github.com/dotnet/runtime - c361f917c38a53c0952164792f219fef411c4596 + 7ee574d795949b5977e986cc8a6b2f697c75f5c2 https://github.com/dotnet/roslyn @@ -156,9 +156,9 @@ 855f745b9fc53ca34a443ff97cdef63915828da2 - + https://github.com/nuget/nuget.client - 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 + 698361e8e7bcf18140438d601a2aafa7b5ba2ffb diff --git a/eng/Versions.props b/eng/Versions.props index 2661cf9f8..a2e9dffe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23307.20 - 8.0.0-preview.6.23307.20 - 8.0.0-preview.6.23307.20 - 8.0.0-preview.6.23307.20 - 8.0.0-preview.6.23307.20 - 8.0.0-preview.6.23307.20 - 8.0.0-preview.6.23307.20 + 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.1 0.2.0 - 8.0.100-preview.6.23308.5 - 8.0.100-preview.6.23308.5 - 8.0.100-preview.6.23308.5 + 8.0.100-preview.6.23308.7 + 8.0.100-preview.6.23308.7 + 8.0.100-preview.6.23308.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23307.10 - 8.0.0-preview.6.23307.10 - 8.0.0-preview.6.23307.10 - 8.0.0-preview.6.23307.10 - 8.0.0-preview.6.23307.10 - 8.0.0-preview.6.23307.10 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 2.1.0 @@ -123,7 +123,7 @@ - 6.7.0-preview.3.57 + 6.7.0-preview.3.59 @@ -225,7 +225,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23307.1 + 17.7.0-preview.23308.1 8.0.0-alpha.1.22557.12 From de8ffd0ed7e78d83785048939ec0525874d1dd09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jun 2023 23:01:37 +0000 Subject: [PATCH 12/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.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.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.4 -> To Version 8.0.0-preview.6.23308.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 d7ce9708a..761355c29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - f8b013b93428b0e91046e1e9caba0672a962e3e7 + 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 - + https://github.com/dotnet/sdk - f8b013b93428b0e91046e1e9caba0672a962e3e7 + 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 - + https://github.com/dotnet/sdk - f8b013b93428b0e91046e1e9caba0672a962e3e7 + 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 - + https://github.com/dotnet/sdk - f8b013b93428b0e91046e1e9caba0672a962e3e7 + 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 diff --git a/eng/Versions.props b/eng/Versions.props index a2e9dffe3..5840bc23f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23308.7 - 8.0.100-preview.6.23308.7 - 8.0.100-preview.6.23308.7 + 8.0.100-preview.6.23308.12 + 8.0.100-preview.6.23308.12 + 8.0.100-preview.6.23308.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0d7bf59ae059b75511db0d87b95af6743f38a0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 00:07:17 +0000 Subject: [PATCH 13/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23308.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 761355c29..f47d99f9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 + bcbb8c600f8e6b0f41dc920920bda96b65191872 - + https://github.com/dotnet/windowsdesktop - 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 + bcbb8c600f8e6b0f41dc920920bda96b65191872 - + https://github.com/dotnet/windowsdesktop - 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 + bcbb8c600f8e6b0f41dc920920bda96b65191872 - + https://github.com/dotnet/windowsdesktop - 1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423 + bcbb8c600f8e6b0f41dc920920bda96b65191872 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 + 71b028139db50776a60e360266ccb5fbc8d24af9 - + https://github.com/dotnet/sdk - 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 + 71b028139db50776a60e360266ccb5fbc8d24af9 - + https://github.com/dotnet/sdk - 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 + 71b028139db50776a60e360266ccb5fbc8d24af9 - + https://github.com/dotnet/sdk - 2fb6ca8cdecdd2922a348ffd41c16658d1f34b71 + 71b028139db50776a60e360266ccb5fbc8d24af9 - + https://github.com/dotnet/winforms - 7e85d02f5bbbf8535064a47f38eab63539c54e11 + 4aa5492d8d9ad0a4925bc6846f118111f126c9e8 - + https://github.com/dotnet/wpf - 927b58e4743a8fa2164c24a47cbd9853b435d605 + f7d1692f969cd9f8dea2f9864a64d66b4b30cd83 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/roslyn - 91afe0903adf80236bb7ccffc042a16f53520877 + 8412ca0553a1c4b041900732575991266c72d532 diff --git a/eng/Versions.props b/eng/Versions.props index 5840bc23f..56085b2f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.6.23306.1 + 8.0.0-preview.6.23307.2 - 8.0.0-preview.6.23307.2 + 8.0.0-preview.6.23307.3 @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23308.12 - 8.0.100-preview.6.23308.12 - 8.0.100-preview.6.23308.12 + 8.0.100-preview.6.23308.14 + 8.0.100-preview.6.23308.14 + 8.0.100-preview.6.23308.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23307.8 + 4.7.0-3.23308.4 @@ -108,10 +108,10 @@ - 8.0.0-preview.6.23307.1 - 8.0.0-preview.6.23307.1 - 8.0.0-preview.6.23307.1 - 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23308.2 + 8.0.0-preview.6.23308.2 + 8.0.0-preview.6.23308.2 + 8.0.0-preview.6.23308.2 From a8363ca8ac260bb9d2a2b80a60511ad7e275dafd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 00:49:29 +0000 Subject: [PATCH 14/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23308.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 f47d99f9f..05e64b652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 7ee574d795949b5977e986cc8a6b2f697c75f5c2 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 - + https://github.com/dotnet/aspnetcore - 62c1334c8d33ca669a6eef6c0e38a806e043f7c2 + 6575b289081b9f85fb30d01c7b306d1ec5d00a68 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 71b028139db50776a60e360266ccb5fbc8d24af9 + 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 - + https://github.com/dotnet/sdk - 71b028139db50776a60e360266ccb5fbc8d24af9 + 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 - + https://github.com/dotnet/sdk - 71b028139db50776a60e360266ccb5fbc8d24af9 + 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 - + https://github.com/dotnet/sdk - 71b028139db50776a60e360266ccb5fbc8d24af9 + 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 diff --git a/eng/Versions.props b/eng/Versions.props index 56085b2f0..9211c393c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23308.1 - 8.0.0-preview.6.23308.1 - 8.0.0-preview.6.23308.1 - 8.0.0-preview.6.23308.1 - 8.0.0-preview.6.23308.1 - 8.0.0-preview.6.23308.1 - 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23308.5 0.2.0 - 8.0.100-preview.6.23308.14 - 8.0.100-preview.6.23308.14 - 8.0.100-preview.6.23308.14 + 8.0.100-preview.6.23308.16 + 8.0.100-preview.6.23308.16 + 8.0.100-preview.6.23308.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fa226a224703e25268b05b7f593724a6fca38b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 06:14:37 +0000 Subject: [PATCH 15/67] Update dependencies from https://github.com/dotnet/sdk build 20230608.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23308.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23308.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05e64b652..069362e01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - bcbb8c600f8e6b0f41dc920920bda96b65191872 + f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 - + https://github.com/dotnet/windowsdesktop - bcbb8c600f8e6b0f41dc920920bda96b65191872 + f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 - + https://github.com/dotnet/windowsdesktop - bcbb8c600f8e6b0f41dc920920bda96b65191872 + f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 - + https://github.com/dotnet/windowsdesktop - bcbb8c600f8e6b0f41dc920920bda96b65191872 + f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 + c8d4ef8387835310e2669735675a386ffd42d9c0 - + https://github.com/dotnet/sdk - 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 + c8d4ef8387835310e2669735675a386ffd42d9c0 - + https://github.com/dotnet/sdk - 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 + c8d4ef8387835310e2669735675a386ffd42d9c0 - + https://github.com/dotnet/sdk - 8a5f4770ac1d5c6dd6058176375dd27bdc4f06a7 + c8d4ef8387835310e2669735675a386ffd42d9c0 https://github.com/dotnet/winforms 4aa5492d8d9ad0a4925bc6846f118111f126c9e8 - + https://github.com/dotnet/wpf - f7d1692f969cd9f8dea2f9864a64d66b4b30cd83 + dcb50bab52fd04b5b26c1140f29533e3ca840276 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9211c393c..2c05b280b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 8.0.0-preview.6.23307.3 + 8.0.0-preview.6.23308.1 @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23308.16 - 8.0.100-preview.6.23308.16 - 8.0.100-preview.6.23308.16 + 8.0.100-preview.6.23308.23 + 8.0.100-preview.6.23308.23 + 8.0.100-preview.6.23308.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -108,10 +108,10 @@ - 8.0.0-preview.6.23308.2 - 8.0.0-preview.6.23308.2 - 8.0.0-preview.6.23308.2 - 8.0.0-preview.6.23308.2 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.3 From 523aa0fdf0a6f7557fe19df75be45e47639c3a77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 07:49:35 +0000 Subject: [PATCH 16/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23308.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++--------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 069362e01..e314aa159 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - c8d4ef8387835310e2669735675a386ffd42d9c0 + 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff - + https://github.com/dotnet/sdk - c8d4ef8387835310e2669735675a386ffd42d9c0 + 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff - + https://github.com/dotnet/sdk - c8d4ef8387835310e2669735675a386ffd42d9c0 + 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff - + https://github.com/dotnet/sdk - c8d4ef8387835310e2669735675a386ffd42d9c0 + 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff @@ -142,9 +142,9 @@ 11b375cec01792f2f37e3aaf199c0dc71aaa8786 - + https://github.com/dotnet/runtime - 7ee574d795949b5977e986cc8a6b2f697c75f5c2 + 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 https://github.com/dotnet/roslyn @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 63af043d58bd8d471da0e236e6255611e061cc4e + 116fc0fea5482fb88618eb96d7b00c1d65e6cea4 diff --git a/eng/Versions.props b/eng/Versions.props index 2c05b280b..44994bec4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23308.23 - 8.0.100-preview.6.23308.23 - 8.0.100-preview.6.23308.23 + 8.0.100-preview.6.23309.1 + 8.0.100-preview.6.23309.1 + 8.0.100-preview.6.23309.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.15 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.15 2.1.0 @@ -238,7 +238,7 @@ 13.1.462-net8-p3 16.1.1250-net8-p3 - 8.0.0-preview.6.23301.1 + 8.0.0-preview.6.23307.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 6386802169daac76cfacc44498c559982e56270a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 10:54:44 +0000 Subject: [PATCH 17/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23308.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 e314aa159..b61a0f0a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff + e336061db3180ce24cbdb05dfd772804a626d63f - + https://github.com/dotnet/sdk - 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff + e336061db3180ce24cbdb05dfd772804a626d63f - + https://github.com/dotnet/sdk - 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff + e336061db3180ce24cbdb05dfd772804a626d63f - + https://github.com/dotnet/sdk - 0e3e17c28a54c70ff0470a3fcfed5c79b4e0b8ff + e336061db3180ce24cbdb05dfd772804a626d63f @@ -142,9 +142,9 @@ 11b375cec01792f2f37e3aaf199c0dc71aaa8786 - + https://github.com/dotnet/runtime - 9bcf52342b5a6573ecd2c81fbfd541df0ebc42f4 + 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 44994bec4..54603cc17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.1 - 8.0.100-preview.6.23309.1 - 8.0.100-preview.6.23309.1 + 8.0.100-preview.6.23309.4 + 8.0.100-preview.6.23309.4 + 8.0.100-preview.6.23309.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.17 - 8.0.0-preview.6.23308.15 - 8.0.0-preview.6.23308.15 - 8.0.0-preview.6.23308.15 - 8.0.0-preview.6.23308.15 - 8.0.0-preview.6.23308.15 - 8.0.0-preview.6.23308.15 + 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23308.17 2.1.0 From c1a67dda9cd8481f41f1c35ba847aeaa539c7f3d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 9 Jun 2023 13:46:36 +0000 Subject: [PATCH 18/67] Remove backported source-build patch --- ...ilt-assets-during-source-build-for-r.patch | 229 ------------------ 1 file changed, 229 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch diff --git a/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch deleted file mode 100644 index e86f6d864..000000000 --- a/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric Erhardt -Date: Tue, 19 Oct 2021 11:12:25 -0500 -Subject: [PATCH] Eliminate pre-built assets during source-build for - roslyn-analyzers - -This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP. - -* Remove SourceBuildPackageVersionPropsPath at the top of Versions.props. The PVP from source-build will be imported after the repo's Versions.props -* Workaround naming collisions with DocumentBasedFixAllProvider. The latest Roslyn has a class with the same name. -* Remove hard-coded versions to Microsoft.CodeAnalysis in ResxSourceGenerator, Roslyn.Diagnostics.Analyzers, and GenerateDocumentationAndConfigFiles, so the latest gets picked up. -* Exclude ReleaseNotesUtil from source-build since it brings in the 3.1 app host. This tool shouldn't be needed during source-build. -* Disable BannedApiAnalyzers when in source-build. Other previously built code analysis packages are disabled already. - -Contributes to https://github.com/dotnet/source-build/issues/2420 -Contributes to https://github.com/dotnet/source-build/issues/2527 - -Backport: https://github.com/dotnet/source-build/issues/3049 ---- - eng/Versions.props | 14 -------------- - src/Directory.Build.targets | 5 +++-- - .../Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs | 2 +- - ....CodeAnalysis.ResxSourceGenerator.CSharp.csproj | 1 - - ...Analysis.ResxSourceGenerator.VisualBasic.csproj | 1 - - ...crosoft.CodeAnalysis.ResxSourceGenerator.csproj | 1 - - ...harpDisableRuntimeMarshalling.FixAllProvider.cs | 2 +- - .../DoNotDirectlyAwaitATask.Fixer.cs | 2 +- - .../Roslyn.Diagnostics.CSharp.Analyzers.csproj | 2 +- - .../Core/Roslyn.Diagnostics.Analyzers.csproj | 1 - - ...Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj | 2 +- - .../GenerateDocumentationAndConfigFiles.csproj | 1 - - ...umentationAndConfigFilesForBrokenRuntime.csproj | 4 +--- - src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj | 1 + - .../Runtime/UseExceptionThrowHelpersFixer.cs | 2 +- - 15 files changed, 11 insertions(+), 30 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index a467fb579..acd5db8bc 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -1,18 +1,4 @@ - -- -- -- -- $(SystemCollectionsImmutableVersion) -- 5.0.0 -- $(SystemReflectionMetadataVersion) -- 5.0.0 -- $(MicrosoftCodeAnalysisVersion) -- 3.8.0 -- - - 3.3.5 - beta1 -diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets -index c7c28fd9f..e5be9e028 100644 ---- a/src/Directory.Build.targets -+++ b/src/Directory.Build.targets -@@ -35,8 +35,9 @@ - AnalyzerReleases\$(AssemblyName)\AnalyzerReleases.Shipped.md - - -- -- -+ -+ -+ - - - -diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs -index 7a6877e0e..a0cbd06e7 100644 ---- a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs -+++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs -@@ -48,7 +48,7 @@ private async Task ConvertKindToIsKindAsync(Document document, TextSpa - - protected abstract void FixDiagnostic(DocumentEditor editor, SyntaxNode nodeToFix); - -- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider -+ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider - { - private readonly PreferIsKindFix _fixer; - -diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj -index 114e30a43..e38f8549f 100644 ---- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj -+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj -@@ -7,7 +7,6 @@ - - - *$(MSBuildProjectFile)* -- 4.0.1 - - - -diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj -index a44df8a50..cba084cd5 100644 ---- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj -+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj -@@ -7,7 +7,6 @@ - - - *$(MSBuildProjectFile)* -- 4.0.1 - - - -diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj -index 46a4fca6b..c9fa15584 100644 ---- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj -+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj -@@ -7,7 +7,6 @@ - - - *$(MSBuildProjectFile)* -- 4.0.1 - - - -diff --git a/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs b/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs -index 4bb27f03d..6d93ac3f7 100644 ---- a/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs -+++ b/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs -@@ -15,7 +15,7 @@ namespace Microsoft.NetCore.Analyzers.InteropServices - { - public sealed partial class CSharpDisableRuntimeMarshallingFixer - { -- private class CustomFixAllProvider : DocumentBasedFixAllProvider -+ private class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider - { - public static readonly CustomFixAllProvider Instance = new(); - -diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs -index 331c0a4fe..492d0d4c1 100644 ---- a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs -+++ b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs -@@ -74,7 +74,7 @@ public sealed override FixAllProvider GetFixAllProvider() - return CustomFixAllProvider.Instance; - } - -- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider -+ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider - { - public static readonly CustomFixAllProvider Instance = new(); - -diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj -index e62266894..b858d7097 100644 ---- a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj -+++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj -@@ -10,7 +10,7 @@ - - - -- -+ - - - -\ No newline at end of file -diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj -index 60450aee0..3489028d4 100644 ---- a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj -+++ b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj -@@ -7,7 +7,6 @@ - Restore would conclude that there is a cyclic dependency between us and the Roslyn.Diagnostics.Analyzers package. - --> - *$(MSBuildProjectFile)* -- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) - - - -diff --git a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj -index 509a3c069..737a2cf24 100644 ---- a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj -+++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj -@@ -7,7 +7,7 @@ - - - -- -+ - - - -\ No newline at end of file -diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj -index c00a9ab5d..74f5f4d5a 100644 ---- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj -+++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj -@@ -5,7 +5,6 @@ - true - false - true -- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) - - - -diff --git a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj -index fa2233feb..f19ae8d4d 100644 ---- a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj -+++ b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj -@@ -12,8 +12,6 @@ - - - -- -- -- -+ - - -diff --git a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs -index 82a3e986c..336bd2a52 100644 ---- a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs -+++ b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs -@@ -121,7 +121,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context) - other is not null ? new SyntaxNode[] { arg, other } : new SyntaxNode[] { arg })).WithTriviaFrom(node)); - } - -- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider -+ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider - { - public static readonly CustomFixAllProvider Instance = new(); - From 4e96db1a2ef770bbd12107c53f9ef71a029ffb12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 17:14:22 +0000 Subject: [PATCH 19/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,System.CommandLine,Microsoft.SourceBuild.Intermediate.command-line-api From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36b5c4916..70a6af992 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 + 36743469801fe8d0e8e5c205e6dcbdf890ecd08d - + https://github.com/dotnet/windowsdesktop - f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 + 36743469801fe8d0e8e5c205e6dcbdf890ecd08d - + https://github.com/dotnet/windowsdesktop - f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 + 36743469801fe8d0e8e5c205e6dcbdf890ecd08d - + https://github.com/dotnet/windowsdesktop - f5db6cbd715613139c7cdcb6e4fbfed7cc2f9b06 + 36743469801fe8d0e8e5c205e6dcbdf890ecd08d - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 https://github.com/dotnet/aspnetcore @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - e336061db3180ce24cbdb05dfd772804a626d63f + 80896301a295a97fbafbe06838bc62c83ac70767 - + https://github.com/dotnet/sdk - e336061db3180ce24cbdb05dfd772804a626d63f + 80896301a295a97fbafbe06838bc62c83ac70767 - + https://github.com/dotnet/sdk - e336061db3180ce24cbdb05dfd772804a626d63f + 80896301a295a97fbafbe06838bc62c83ac70767 - + https://github.com/dotnet/sdk - e336061db3180ce24cbdb05dfd772804a626d63f + 80896301a295a97fbafbe06838bc62c83ac70767 - + https://github.com/dotnet/winforms - 4aa5492d8d9ad0a4925bc6846f118111f126c9e8 + d1bc1dcbb46683856006675c126ce9ce0c47d682 - + https://github.com/dotnet/wpf - dcb50bab52fd04b5b26c1140f29533e3ca840276 + 941fd6d72c33ee935471239e8d3190823248e4b7 - + https://github.com/dotnet/fsharp - f8b9333279689716d4a1db4f222f4183dbdf17b3 + 2c79c7695546980561fc1559a71465cf47ce01d7 - + https://github.com/dotnet/fsharp - f8b9333279689716d4a1db4f222f4183dbdf17b3 + 2c79c7695546980561fc1559a71465cf47ce01d7 @@ -142,18 +142,18 @@ 11b375cec01792f2f37e3aaf199c0dc71aaa8786 - + https://github.com/dotnet/runtime - 3181f9c925ba65a7bbab0dc310a8abc1e3bfe68e + fa0d21579125aaf954e1e0d5084842d69feba299 https://github.com/dotnet/roslyn 8412ca0553a1c4b041900732575991266c72d532 - + https://github.com/dotnet/msbuild - 855f745b9fc53ca34a443ff97cdef63915828da2 + c6daff1259eb3c2a42d53f664f82c3c8a66c6166 @@ -191,13 +191,13 @@ 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 - + https://github.com/dotnet/command-line-api - 8374d5fca634a93458c84414b1604c12f765d1ab + 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/command-line-api - 8374d5fca634a93458c84414b1604c12f765d1ab + 02fe27cd6a9b001c8feb7938e6ef4b3799745759 diff --git a/eng/Versions.props b/eng/Versions.props index 11cce5c6c..abe278d2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.6.23307.2 + 8.0.0-preview.6.23308.4 - 8.0.0-preview.6.23308.1 + 8.0.0-preview.6.23309.1 @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.4 - 8.0.100-preview.6.23309.4 - 8.0.100-preview.6.23309.4 + 8.0.100-preview.6.23309.5 + 8.0.100-preview.6.23309.5 + 8.0.100-preview.6.23309.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,24 +94,24 @@ - 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23309.1 - 8.0.0-preview.6.23308.17 - 8.0.0-preview.6.23308.17 - 8.0.0-preview.6.23308.17 - 8.0.0-preview.6.23308.17 - 8.0.0-preview.6.23308.17 - 8.0.0-preview.6.23308.17 + 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.1 2.1.0 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 - 8.0.0-preview.6.23308.3 + 8.0.0-preview.6.23309.2 + 8.0.0-preview.6.23309.2 + 8.0.0-preview.6.23309.2 + 8.0.0-preview.6.23309.2 From 4909d6f49169400324de352b8e901a1e6f5c25e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 18:22:28 +0000 Subject: [PATCH 20/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,System.CommandLine,Microsoft.SourceBuild.Intermediate.command-line-api From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 70a6af992..0d6f4bbb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf - + https://github.com/dotnet/aspnetcore - 6575b289081b9f85fb30d01c7b306d1ec5d00a68 + 68545a0868fb5874fb8a21a03a8ba0ae711b40cf https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 80896301a295a97fbafbe06838bc62c83ac70767 + fdde62b280d8cb6be8d0107a1adeb916e32862bb - + https://github.com/dotnet/sdk - 80896301a295a97fbafbe06838bc62c83ac70767 + fdde62b280d8cb6be8d0107a1adeb916e32862bb - + https://github.com/dotnet/sdk - 80896301a295a97fbafbe06838bc62c83ac70767 + fdde62b280d8cb6be8d0107a1adeb916e32862bb - + https://github.com/dotnet/sdk - 80896301a295a97fbafbe06838bc62c83ac70767 + fdde62b280d8cb6be8d0107a1adeb916e32862bb diff --git a/eng/Versions.props b/eng/Versions.props index abe278d2b..e0d1ca193 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23308.5 - 8.0.0-preview.6.23308.5 - 8.0.0-preview.6.23308.5 - 8.0.0-preview.6.23308.5 - 8.0.0-preview.6.23308.5 - 8.0.0-preview.6.23308.5 - 8.0.0-preview.6.23308.5 + 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23309.4 0.2.0 - 8.0.100-preview.6.23309.5 - 8.0.100-preview.6.23309.5 - 8.0.100-preview.6.23309.5 + 8.0.100-preview.6.23309.6 + 8.0.100-preview.6.23309.6 + 8.0.100-preview.6.23309.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a75117c1f0dc9553f8381c0803a4a5856f4ff20d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 19:11:51 +0000 Subject: [PATCH 21/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,System.CommandLine,Microsoft.SourceBuild.Intermediate.command-line-api From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 0d6f4bbb3..16cd72dc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - fdde62b280d8cb6be8d0107a1adeb916e32862bb + 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d - + https://github.com/dotnet/sdk - fdde62b280d8cb6be8d0107a1adeb916e32862bb + 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d - + https://github.com/dotnet/sdk - fdde62b280d8cb6be8d0107a1adeb916e32862bb + 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d - + https://github.com/dotnet/sdk - fdde62b280d8cb6be8d0107a1adeb916e32862bb + 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d diff --git a/eng/Versions.props b/eng/Versions.props index e0d1ca193..143fb1d93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.6 - 8.0.100-preview.6.23309.6 - 8.0.100-preview.6.23309.6 + 8.0.100-preview.6.23309.7 + 8.0.100-preview.6.23309.7 + 8.0.100-preview.6.23309.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b69a99275f88209917c523d5a5a6fc75ac17d2c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 19:52:50 +0000 Subject: [PATCH 22/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,System.CommandLine,Microsoft.SourceBuild.Intermediate.command-line-api From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 16cd72dc9..78946ea95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d + 2265fb195cb4f48d83b0f94adea56d47227d8433 - + https://github.com/dotnet/sdk - 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d + 2265fb195cb4f48d83b0f94adea56d47227d8433 - + https://github.com/dotnet/sdk - 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d + 2265fb195cb4f48d83b0f94adea56d47227d8433 - + https://github.com/dotnet/sdk - 487dbf7bfa63b13f3cd1182c7b13ac9d78454a2d + 2265fb195cb4f48d83b0f94adea56d47227d8433 diff --git a/eng/Versions.props b/eng/Versions.props index 143fb1d93..e5f97ba22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.7 - 8.0.100-preview.6.23309.7 - 8.0.100-preview.6.23309.7 + 8.0.100-preview.6.23309.8 + 8.0.100-preview.6.23309.8 + 8.0.100-preview.6.23309.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 257ead8eeaadbfd4c36d5759e344099c5abaf2f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 21:28:08 +0000 Subject: [PATCH 23/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,System.CommandLine,Microsoft.SourceBuild.Intermediate.command-line-api From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 78946ea95..3f3f2807e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 2265fb195cb4f48d83b0f94adea56d47227d8433 + 593714c6764690dd5d90b60ecc8d1e46c27ce44f - + https://github.com/dotnet/sdk - 2265fb195cb4f48d83b0f94adea56d47227d8433 + 593714c6764690dd5d90b60ecc8d1e46c27ce44f - + https://github.com/dotnet/sdk - 2265fb195cb4f48d83b0f94adea56d47227d8433 + 593714c6764690dd5d90b60ecc8d1e46c27ce44f - + https://github.com/dotnet/sdk - 2265fb195cb4f48d83b0f94adea56d47227d8433 + 593714c6764690dd5d90b60ecc8d1e46c27ce44f diff --git a/eng/Versions.props b/eng/Versions.props index e5f97ba22..1b877173a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.8 - 8.0.100-preview.6.23309.8 - 8.0.100-preview.6.23309.8 + 8.0.100-preview.6.23309.9 + 8.0.100-preview.6.23309.9 + 8.0.100-preview.6.23309.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 405de3412502e1e60045cf0c681f685a61edd713 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Jun 2023 22:09:07 +0000 Subject: [PATCH 24/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 3f3f2807e..4b76fcd8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 593714c6764690dd5d90b60ecc8d1e46c27ce44f + 3eec09ed467e487b45e3d20994ade76ae58425d7 - + https://github.com/dotnet/sdk - 593714c6764690dd5d90b60ecc8d1e46c27ce44f + 3eec09ed467e487b45e3d20994ade76ae58425d7 - + https://github.com/dotnet/sdk - 593714c6764690dd5d90b60ecc8d1e46c27ce44f + 3eec09ed467e487b45e3d20994ade76ae58425d7 - + https://github.com/dotnet/sdk - 593714c6764690dd5d90b60ecc8d1e46c27ce44f + 3eec09ed467e487b45e3d20994ade76ae58425d7 diff --git a/eng/Versions.props b/eng/Versions.props index 1b877173a..6eb822dc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.9 - 8.0.100-preview.6.23309.9 - 8.0.100-preview.6.23309.9 + 8.0.100-preview.6.23309.10 + 8.0.100-preview.6.23309.10 + 8.0.100-preview.6.23309.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d07a4f5eb7e1ecf68df403762ec8ebefb7cfb7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Jun 2023 00:01:30 +0000 Subject: [PATCH 25/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 4b76fcd8e..452d2188c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 3eec09ed467e487b45e3d20994ade76ae58425d7 + 1827b750f2517b8cafe3c034b6c9a6e6942a63ef - + https://github.com/dotnet/sdk - 3eec09ed467e487b45e3d20994ade76ae58425d7 + 1827b750f2517b8cafe3c034b6c9a6e6942a63ef - + https://github.com/dotnet/sdk - 3eec09ed467e487b45e3d20994ade76ae58425d7 + 1827b750f2517b8cafe3c034b6c9a6e6942a63ef - + https://github.com/dotnet/sdk - 3eec09ed467e487b45e3d20994ade76ae58425d7 + 1827b750f2517b8cafe3c034b6c9a6e6942a63ef diff --git a/eng/Versions.props b/eng/Versions.props index 6eb822dc2..9bd51f516 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.10 - 8.0.100-preview.6.23309.10 - 8.0.100-preview.6.23309.10 + 8.0.100-preview.6.23309.12 + 8.0.100-preview.6.23309.12 + 8.0.100-preview.6.23309.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e1d1e10dcf2c6460b5a2a84eb63c33ad00e5c0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Jun 2023 04:40:07 +0000 Subject: [PATCH 26/67] Update dependencies from https://github.com/dotnet/sdk build 20230609.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23309.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.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 452d2188c..4748b0a49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 1827b750f2517b8cafe3c034b6c9a6e6942a63ef + 4660c5c4ead143f198f601821a27a85910bd14d4 - + https://github.com/dotnet/sdk - 1827b750f2517b8cafe3c034b6c9a6e6942a63ef + 4660c5c4ead143f198f601821a27a85910bd14d4 - + https://github.com/dotnet/sdk - 1827b750f2517b8cafe3c034b6c9a6e6942a63ef + 4660c5c4ead143f198f601821a27a85910bd14d4 - + https://github.com/dotnet/sdk - 1827b750f2517b8cafe3c034b6c9a6e6942a63ef + 4660c5c4ead143f198f601821a27a85910bd14d4 diff --git a/eng/Versions.props b/eng/Versions.props index 9bd51f516..89c098965 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23309.12 - 8.0.100-preview.6.23309.12 - 8.0.100-preview.6.23309.12 + 8.0.100-preview.6.23309.13 + 8.0.100-preview.6.23309.13 + 8.0.100-preview.6.23309.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dcfa0e741494387ede5daeea46473bfc2dc9f4cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Jun 2023 17:53:32 +0000 Subject: [PATCH 27/67] Update dependencies from https://github.com/dotnet/sdk build 20230610.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23310.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.2 (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 4748b0a49..f74a50ba3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 4660c5c4ead143f198f601821a27a85910bd14d4 + 5570d5bf4e52abe0978342a1074e4501849b7606 - + https://github.com/dotnet/sdk - 4660c5c4ead143f198f601821a27a85910bd14d4 + 5570d5bf4e52abe0978342a1074e4501849b7606 - + https://github.com/dotnet/sdk - 4660c5c4ead143f198f601821a27a85910bd14d4 + 5570d5bf4e52abe0978342a1074e4501849b7606 - + https://github.com/dotnet/sdk - 4660c5c4ead143f198f601821a27a85910bd14d4 + 5570d5bf4e52abe0978342a1074e4501849b7606 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime fa0d21579125aaf954e1e0d5084842d69feba299 - + https://github.com/dotnet/roslyn - 8412ca0553a1c4b041900732575991266c72d532 + ef55b116221d058f68eee08923315959aef3b314 diff --git a/eng/Versions.props b/eng/Versions.props index 89c098965..14cb9e74b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23309.13 - 8.0.100-preview.6.23309.13 - 8.0.100-preview.6.23309.13 + 8.0.100-preview.6.23310.1 + 8.0.100-preview.6.23310.1 + 8.0.100-preview.6.23310.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23308.4 + 4.7.0-3.23309.13 From ec8fe99ea5f6c556fa8bfc8c8c63b0e41d824c85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 11 Jun 2023 07:17:39 +0000 Subject: [PATCH 28/67] Update dependencies from https://github.com/dotnet/sdk build 20230610.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23310.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23309.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f74a50ba3..394e083cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 36743469801fe8d0e8e5c205e6dcbdf890ecd08d - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d - + https://github.com/dotnet/aspnetcore - 68545a0868fb5874fb8a21a03a8ba0ae711b40cf + 1dd4224807819dcc4f86b2b5f9976546bd623c7d https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 5570d5bf4e52abe0978342a1074e4501849b7606 + 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d - + https://github.com/dotnet/sdk - 5570d5bf4e52abe0978342a1074e4501849b7606 + 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d - + https://github.com/dotnet/sdk - 5570d5bf4e52abe0978342a1074e4501849b7606 + 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d - + https://github.com/dotnet/sdk - 5570d5bf4e52abe0978342a1074e4501849b7606 + 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d @@ -142,9 +142,9 @@ 11b375cec01792f2f37e3aaf199c0dc71aaa8786 - + https://github.com/dotnet/runtime - fa0d21579125aaf954e1e0d5084842d69feba299 + 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 14cb9e74b..d4a638ded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23309.4 - 8.0.0-preview.6.23309.4 - 8.0.0-preview.6.23309.4 - 8.0.0-preview.6.23309.4 - 8.0.0-preview.6.23309.4 - 8.0.0-preview.6.23309.4 - 8.0.0-preview.6.23309.4 + 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23310.2 0.2.0 - 8.0.100-preview.6.23310.1 - 8.0.100-preview.6.23310.1 - 8.0.100-preview.6.23310.1 + 8.0.100-preview.6.23310.2 + 8.0.100-preview.6.23310.2 + 8.0.100-preview.6.23310.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.7 - 8.0.0-preview.6.23309.1 - 8.0.0-preview.6.23309.1 - 8.0.0-preview.6.23309.1 - 8.0.0-preview.6.23309.1 - 8.0.0-preview.6.23309.1 - 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23309.7 2.1.0 From 1ed80301f5e80abc634e4fc8952e550e384e3a97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 06:37:39 +0000 Subject: [PATCH 29/67] Update dependencies from https://github.com/dotnet/sdk build 20230611.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23311.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 394e083cc..07d7f6261 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 36743469801fe8d0e8e5c205e6dcbdf890ecd08d + 5afd6b59ab0840667ab0a2cede374ff3c89569ce - + https://github.com/dotnet/windowsdesktop - 36743469801fe8d0e8e5c205e6dcbdf890ecd08d + 5afd6b59ab0840667ab0a2cede374ff3c89569ce - + https://github.com/dotnet/windowsdesktop - 36743469801fe8d0e8e5c205e6dcbdf890ecd08d + 5afd6b59ab0840667ab0a2cede374ff3c89569ce - + https://github.com/dotnet/windowsdesktop - 36743469801fe8d0e8e5c205e6dcbdf890ecd08d + 5afd6b59ab0840667ab0a2cede374ff3c89569ce https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d + 21f63eabbffd15ea697f35615f54648aa38db105 - + https://github.com/dotnet/sdk - 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d + 21f63eabbffd15ea697f35615f54648aa38db105 - + https://github.com/dotnet/sdk - 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d + 21f63eabbffd15ea697f35615f54648aa38db105 - + https://github.com/dotnet/sdk - 7cc96dfbcc6470dbe574f222b4cb1fb067c2d74d + 21f63eabbffd15ea697f35615f54648aa38db105 - + https://github.com/dotnet/winforms - d1bc1dcbb46683856006675c126ce9ce0c47d682 + 30fbeed442e75d30ebabd1eaf481f0261261733e - + https://github.com/dotnet/wpf - 941fd6d72c33ee935471239e8d3190823248e4b7 + 163404b6540f1383a8d7072891e77737a8150ef6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d4a638ded..736b5368a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.6.23308.4 + 8.0.0-preview.6.23310.1 - 8.0.0-preview.6.23309.1 + 8.0.0-preview.6.23310.2 @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23310.2 - 8.0.100-preview.6.23310.2 - 8.0.100-preview.6.23310.2 + 8.0.100-preview.6.23311.2 + 8.0.100-preview.6.23311.2 + 8.0.100-preview.6.23311.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -108,10 +108,10 @@ - 8.0.0-preview.6.23309.2 - 8.0.0-preview.6.23309.2 - 8.0.0-preview.6.23309.2 - 8.0.0-preview.6.23309.2 + 8.0.0-preview.6.23311.1 + 8.0.0-preview.6.23311.1 + 8.0.0-preview.6.23311.1 + 8.0.0-preview.6.23311.1 From 724bff0f2633622f5464f74a5b0fc05aab7687da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 09:26:59 +0000 Subject: [PATCH 30/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07d7f6261..4e080df60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 21f63eabbffd15ea697f35615f54648aa38db105 + 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec - + https://github.com/dotnet/sdk - 21f63eabbffd15ea697f35615f54648aa38db105 + 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec - + https://github.com/dotnet/sdk - 21f63eabbffd15ea697f35615f54648aa38db105 + 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec - + https://github.com/dotnet/sdk - 21f63eabbffd15ea697f35615f54648aa38db105 + 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - ef55b116221d058f68eee08923315959aef3b314 + 4cbfec964e59687cd9cc8601df42b936c9c06f63 @@ -156,9 +156,9 @@ c6daff1259eb3c2a42d53f664f82c3c8a66c6166 - + https://github.com/nuget/nuget.client - 698361e8e7bcf18140438d601a2aafa7b5ba2ffb + 3ee1febd1dd53a958afa55b97d7b90f1eb0d0fcd diff --git a/eng/Versions.props b/eng/Versions.props index 736b5368a..ed575cbdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23311.2 - 8.0.100-preview.6.23311.2 - 8.0.100-preview.6.23311.2 + 8.0.100-preview.6.23312.2 + 8.0.100-preview.6.23312.2 + 8.0.100-preview.6.23312.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23309.13 + 4.7.0-3.23311.1 @@ -123,7 +123,7 @@ - 6.7.0-preview.3.59 + 6.7.0-preview.3.65 From f30bcdfc0ae8f19b94ec59279f279429c2122b43 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 12 Jun 2023 12:38:03 +0000 Subject: [PATCH 31/67] Remove backported source-build patches --- .../0001-Target-net8.0-for-source-build.patch | 96 ------------------- .../0002-Add-dependencies-for-PVP-flow.patch | 47 --------- 2 files changed, 143 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-Target-net8.0-for-source-build.patch delete mode 100644 src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-Target-net8.0-for-source-build.patch b/src/SourceBuild/patches/nuget-client/0001-Target-net8.0-for-source-build.patch deleted file mode 100644 index d9c0e85ff..000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Target-net8.0-for-source-build.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Wed, 31 May 2023 16:04:51 +0000 -Subject: [PATCH] Target net8.0 for source-build - -Backport: https://github.com/NuGet/NuGet.Client/pull/5193 ---- - build/common.project.props | 8 ++++---- - build/common.targets | 2 +- - eng/source-build/global.json | 2 +- - .../NuGet.Configuration/NuGet.Configuration.csproj | 2 +- - .../NuGet.PackageManagement.csproj | 2 +- - 5 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 0e32eb737..de8b07140 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -12,7 +12,7 @@ - v4.7.2 - net472 - netcoreapp3.1 -- net7.0 -+ net8.0 - net7.0 - net7.0;net8.0 - netstandard2.0 -@@ -20,14 +20,14 @@ - $(NETCoreTargetFramework) - $(TargetFrameworksExe);netcoreapp5.0 - $(NETCoreTargetFramework);netcoreapp5.0 -- $(TargetFrameworksExe);net7.0 -+ $(TargetFrameworksExe) - $(NETFXTargetFramework);netcoreapp5.0 - netcoreapp5.0 -- net7.0 -+ $(NETCoreTargetFramework) - $(NETFXTargetFramework);$(NetStandardVersion) - $(NETCoreTargetFramework);$(NetStandardVersion) - $(TargetFrameworksLibrary);netcoreapp5.0 -- $(TargetFrameworksLibrary);net7.0 -+ $(TargetFrameworksLibrary) - $(NETFXTargetFramework);$(NETCoreTestTargetFrameworks) - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ - $(RepositoryRootDirectory)build\ -diff --git a/build/common.targets b/build/common.targets -index 51b38ba04..dc53d7557 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -6,7 +6,7 @@ - true - - -- -+ - $(DefineConstants);IS_CORECLR - true - -diff --git a/eng/source-build/global.json b/eng/source-build/global.json -index ba3ce2cfc..43d452859 100644 ---- a/eng/source-build/global.json -+++ b/eng/source-build/global.json -@@ -1,6 +1,6 @@ - { - "tools": { -- "dotnet": "7.0.100" -+ "dotnet": "8.0.100-preview.3.23178.7" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21309.7" -diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index a246feeb9..eea152eb6 100644 ---- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -@@ -26,7 +26,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index be1727a5b..38658b221 100644 ---- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -@@ -32,7 +32,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch b/src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch deleted file mode 100644 index 96725b832..000000000 --- a/src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Wed, 7 Jun 2023 03:03:22 +0000 -Subject: [PATCH] Add dependencies for PVP flow - -Backport: https://github.com/NuGet/NuGet.Client/pull/5207 ---- - eng/Version.Details.xml | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index ff6bc71b5..bbadad4c0 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -5,4 +5,31 @@ - See https://github.com/dotnet/arcade/issues/2396 for details. - See https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#details-file for schema. - --> -+ -+ -+ -+ -+ https://github.com/dotnet/msbuild -+ 80f618ad45d38475773fd1a6eaa059f118a0ad5a -+ -+ -+ https://github.com/dotnet/runtime -+ 8470979eb44c2218025515234d3e01138bd74afb -+ -+ -+ https://github.com/dotnet/runtime -+ 8470979eb44c2218025515234d3e01138bd74afb -+ -+ -+ https://github.com/aspnet/xdt -+ d4d088b6a9c793525b1a27a119cb66ba4587bb39 -+ -+ -+ https://github.com/dotnet/corefx -+ 30ab651fcb4354552bd4891619a0bdd81e0ebdbf -+ -+ - -\ No newline at end of file From f471bce174357ba647195cffb8432ebc3f697f2f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 12 Jun 2023 12:47:59 +0000 Subject: [PATCH 32/67] Update command-line-api dependency to be coherent --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc802fe5d..f3bf3b57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -191,13 +191,13 @@ 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 - + https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + 8374d5fca634a93458c84414b1604c12f765d1ab - + https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + 8374d5fca634a93458c84414b1604c12f765d1ab From 2f82830558f821170ec66d1f4adaf11eafe25275 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 15:08:19 +0000 Subject: [PATCH 33/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 f3bf3b57d..39a80c9b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec + aa62ed32e46b901b55fed2b68de91af3df3129af - + https://github.com/dotnet/sdk - 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec + aa62ed32e46b901b55fed2b68de91af3df3129af - + https://github.com/dotnet/sdk - 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec + aa62ed32e46b901b55fed2b68de91af3df3129af - + https://github.com/dotnet/sdk - 8a73c5510b45f23c94d41ff0b3a04e067f20e0ec + aa62ed32e46b901b55fed2b68de91af3df3129af diff --git a/eng/Versions.props b/eng/Versions.props index 6a308d719..f52333842 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23312.2 - 8.0.100-preview.6.23312.2 - 8.0.100-preview.6.23312.2 + 8.0.100-preview.6.23312.5 + 8.0.100-preview.6.23312.5 + 8.0.100-preview.6.23312.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 283e9075487c4ad268103bebe0191737549f1da7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 18:39:53 +0000 Subject: [PATCH 34/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39a80c9b7..68ede4b1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b - + https://github.com/dotnet/aspnetcore - 1dd4224807819dcc4f86b2b5f9976546bd623c7d + 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - aa62ed32e46b901b55fed2b68de91af3df3129af + 5e5f343898f4e992361f7d1aed0198c003e4abe2 - + https://github.com/dotnet/sdk - aa62ed32e46b901b55fed2b68de91af3df3129af + 5e5f343898f4e992361f7d1aed0198c003e4abe2 - + https://github.com/dotnet/sdk - aa62ed32e46b901b55fed2b68de91af3df3129af + 5e5f343898f4e992361f7d1aed0198c003e4abe2 - + https://github.com/dotnet/sdk - aa62ed32e46b901b55fed2b68de91af3df3129af + 5e5f343898f4e992361f7d1aed0198c003e4abe2 @@ -128,18 +128,18 @@ https://github.com/dotnet/wpf 163404b6540f1383a8d7072891e77737a8150ef6 - + https://github.com/dotnet/fsharp - 2c79c7695546980561fc1559a71465cf47ce01d7 + 10402cf8fcb7e9d7323f61422af1437dc954dd5e - + https://github.com/dotnet/fsharp - 2c79c7695546980561fc1559a71465cf47ce01d7 + 10402cf8fcb7e9d7323f61422af1437dc954dd5e - + https://github.com/microsoft/vstest - 11b375cec01792f2f37e3aaf199c0dc71aaa8786 + c8c1d439ac284448fa0fb66c8f078d52b9727595 diff --git a/eng/Versions.props b/eng/Versions.props index f52333842..62cd0bcbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23310.2 - 8.0.0-preview.6.23310.2 - 8.0.0-preview.6.23310.2 - 8.0.0-preview.6.23310.2 - 8.0.0-preview.6.23310.2 - 8.0.0-preview.6.23310.2 - 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.5 0.2.0 - 8.0.100-preview.6.23312.5 - 8.0.100-preview.6.23312.5 - 8.0.100-preview.6.23312.5 + 8.0.100-preview.6.23312.7 + 8.0.100-preview.6.23312.7 + 8.0.100-preview.6.23312.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -225,7 +225,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23308.1 + 17.7.0-preview.23309.3 8.0.0-alpha.1.22557.12 From f5c4ef29f2940e3350de7f177ecbca9dce1c8a95 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 12 Jun 2023 19:09:38 +0000 Subject: [PATCH 35/67] Remove backported source-build patch --- ...ies-needed-for-source-build-PVP-flow.patch | 143 ------------------ 1 file changed, 143 deletions(-) delete mode 100644 src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch diff --git a/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch b/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch deleted file mode 100644 index d87fa3002..000000000 --- a/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Thu, 8 Jun 2023 22:21:02 +0000 -Subject: [PATCH] Add dependencies needed for source-build PVP flow - -Backport: https://github.com/dotnet/sdk/pull/33039 ---- - eng/Version.Details.xml | 68 +++++++++++++++++++++++++++++++++++++++++ - eng/Versions.props | 28 ++++++++--------- - 2 files changed, 82 insertions(+), 14 deletions(-) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 2bf363fc70..a242f463ee 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -112,15 +112,83 @@ - https://github.com/dotnet/aspnetcore - 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 - -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ - - https://github.com/nuget/nuget.client - 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 - -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ -+ -+ https://github.com/nuget/nuget.client -+ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 -+ - - https://github.com/microsoft/vstest - 8381658bfb847e67b4f41a997411e8a804e1ecb4 - - -+ -+ https://github.com/microsoft/vstest -+ 8381658bfb847e67b4f41a997411e8a804e1ecb4 -+ -+ -+ https://github.com/microsoft/vstest -+ 8381658bfb847e67b4f41a997411e8a804e1ecb4 -+ - - https://github.com/dotnet/runtime - 54dab738de58291ebefc8ff0569a799efaff5d82 -diff --git a/eng/Versions.props b/eng/Versions.props -index dfa5c80636..ee10eec2d2 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -61,25 +61,25 @@ - - - 6.7.0-preview.3.57 -- $(NuGetBuildTasksPackageVersion) -+ 6.7.0-preview.3.57 - 6.0.0-rc.278 -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetBuildTasksPackageVersion) -- $(NuGetPackagingPackageVersion) -- $(NuGetProjectModelPackageVersion) -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 -+ 6.7.0-preview.3.57 - - - - 17.7.0-preview.23307.1 -- $(MicrosoftNETTestSdkPackageVersion) -- $(MicrosoftNETTestSdkPackageVersion) -+ 17.7.0-preview.23307.1 -+ 17.7.0-preview.23307.1 - - - From f3a87d08dd3c8a1e07d5b531b9c6bd173d224bf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 19:32:50 +0000 Subject: [PATCH 36/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 8c717f06b..de708d7d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 5e5f343898f4e992361f7d1aed0198c003e4abe2 + 0aba9530e372047bb8ad574647c6d103e5bec43c - + https://github.com/dotnet/sdk - 5e5f343898f4e992361f7d1aed0198c003e4abe2 + 0aba9530e372047bb8ad574647c6d103e5bec43c - + https://github.com/dotnet/sdk - 5e5f343898f4e992361f7d1aed0198c003e4abe2 + 0aba9530e372047bb8ad574647c6d103e5bec43c - + https://github.com/dotnet/sdk - 5e5f343898f4e992361f7d1aed0198c003e4abe2 + 0aba9530e372047bb8ad574647c6d103e5bec43c diff --git a/eng/Versions.props b/eng/Versions.props index 62cd0bcbd..3884c2f58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23312.7 - 8.0.100-preview.6.23312.7 - 8.0.100-preview.6.23312.7 + 8.0.100-preview.6.23312.9 + 8.0.100-preview.6.23312.9 + 8.0.100-preview.6.23312.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 838dec543e5520159cd1eee212279ae7a482dec5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 12 Jun 2023 19:35:37 +0000 Subject: [PATCH 37/67] Remove backported source-build patch --- ...Additional-dependencies-for-PVP-flow.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch diff --git a/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch b/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch deleted file mode 100644 index bd5c6af1d..000000000 --- a/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 12 Jun 2023 16:08:48 +0000 -Subject: [PATCH 2/2] Additional dependencies for PVP flow - -Backport: https://github.com/dotnet/sdk/pull/33179 ---- - eng/Version.Details.xml | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index a242f463ee..645c3720c9 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -381,6 +381,21 @@ - 27e584661980ee6d82c419a2a471ae505b7d122e - - -+ -+ -+ https://github.com/dotnet/runtime -+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 -+ -+ -+ -+ https://github.com/dotnet/runtime -+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 -+ -+ -+ -+ https://github.com/dotnet/runtime -+ d099f075e45d2aa6007a22b71b45a08758559f80 -+ - - - From 82de75eedd096ba94c0e3c72c9ad3b7bb2c0a537 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 20:47:59 +0000 Subject: [PATCH 38/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de708d7d4..1f90da789 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 0aba9530e372047bb8ad574647c6d103e5bec43c + dd76c53f817f64a417009ff17efd8bfa0d7b9d1f - + https://github.com/dotnet/sdk - 0aba9530e372047bb8ad574647c6d103e5bec43c + dd76c53f817f64a417009ff17efd8bfa0d7b9d1f - + https://github.com/dotnet/sdk - 0aba9530e372047bb8ad574647c6d103e5bec43c + dd76c53f817f64a417009ff17efd8bfa0d7b9d1f - + https://github.com/dotnet/sdk - 0aba9530e372047bb8ad574647c6d103e5bec43c + dd76c53f817f64a417009ff17efd8bfa0d7b9d1f @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - 4cbfec964e59687cd9cc8601df42b936c9c06f63 + 2cea5f806cd2f95ad6892f71691fd6625c442d98 @@ -156,9 +156,9 @@ c6daff1259eb3c2a42d53f664f82c3c8a66c6166 - + https://github.com/nuget/nuget.client - 3ee1febd1dd53a958afa55b97d7b90f1eb0d0fcd + 5db75f340001f0e33d5cc5a1ba8922c3a641b2f0 diff --git a/eng/Versions.props b/eng/Versions.props index 3884c2f58..137fb7851 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23312.9 - 8.0.100-preview.6.23312.9 - 8.0.100-preview.6.23312.9 + 8.0.100-preview.6.23312.11 + 8.0.100-preview.6.23312.11 + 8.0.100-preview.6.23312.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23311.1 + 4.7.0-3.23312.1 @@ -123,7 +123,7 @@ - 6.7.0-preview.3.65 + 6.7.0-preview.3.67 From 1a26ebd346ac5c115657dd873deb1276ae9ee7c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 20:56:09 +0000 Subject: [PATCH 39/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 1f90da789..22c84d27b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - dd76c53f817f64a417009ff17efd8bfa0d7b9d1f + d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 - + https://github.com/dotnet/sdk - dd76c53f817f64a417009ff17efd8bfa0d7b9d1f + d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 - + https://github.com/dotnet/sdk - dd76c53f817f64a417009ff17efd8bfa0d7b9d1f + d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 - + https://github.com/dotnet/sdk - dd76c53f817f64a417009ff17efd8bfa0d7b9d1f + d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 diff --git a/eng/Versions.props b/eng/Versions.props index 137fb7851..16908a549 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23312.11 - 8.0.100-preview.6.23312.11 - 8.0.100-preview.6.23312.11 + 8.0.100-preview.6.23312.12 + 8.0.100-preview.6.23312.12 + 8.0.100-preview.6.23312.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 739910232c80c92a5934dc5c10ca72d182c26f26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 22:08:06 +0000 Subject: [PATCH 40/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 22c84d27b..b685db00b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 + b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 - + https://github.com/dotnet/sdk - d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 + b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 - + https://github.com/dotnet/sdk - d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 + b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 - + https://github.com/dotnet/sdk - d1264e2b3e149e22c71f254e89ea3ba9d1b9f077 + b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 diff --git a/eng/Versions.props b/eng/Versions.props index 16908a549..94663bb57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23312.12 - 8.0.100-preview.6.23312.12 - 8.0.100-preview.6.23312.12 + 8.0.100-preview.6.23312.16 + 8.0.100-preview.6.23312.16 + 8.0.100-preview.6.23312.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c989d9116ac1dd8dee6442e5518bd1c0bd2a355 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Jun 2023 22:51:03 +0000 Subject: [PATCH 41/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 b685db00b..84be5dd7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 + e464056ff97bf8b355a9fd338fa8060e5aa951a1 - + https://github.com/dotnet/sdk - b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 + e464056ff97bf8b355a9fd338fa8060e5aa951a1 - + https://github.com/dotnet/sdk - b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 + e464056ff97bf8b355a9fd338fa8060e5aa951a1 - + https://github.com/dotnet/sdk - b79be9ef10d906cd39ce40dfa1cc2d0fcc6de031 + e464056ff97bf8b355a9fd338fa8060e5aa951a1 diff --git a/eng/Versions.props b/eng/Versions.props index 94663bb57..61a8afa7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23312.16 - 8.0.100-preview.6.23312.16 - 8.0.100-preview.6.23312.16 + 8.0.100-preview.6.23312.18 + 8.0.100-preview.6.23312.18 + 8.0.100-preview.6.23312.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 294f48692dce0dffe629133eea294142178ca7e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 02:49:32 +0000 Subject: [PATCH 42/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.31 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84be5dd7d..612d2c8ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - e464056ff97bf8b355a9fd338fa8060e5aa951a1 + dfb799af80077a0d3ea441f475bd367ecbb534f0 - + https://github.com/dotnet/sdk - e464056ff97bf8b355a9fd338fa8060e5aa951a1 + dfb799af80077a0d3ea441f475bd367ecbb534f0 - + https://github.com/dotnet/sdk - e464056ff97bf8b355a9fd338fa8060e5aa951a1 + dfb799af80077a0d3ea441f475bd367ecbb534f0 - + https://github.com/dotnet/sdk - e464056ff97bf8b355a9fd338fa8060e5aa951a1 + dfb799af80077a0d3ea441f475bd367ecbb534f0 @@ -151,9 +151,9 @@ 2cea5f806cd2f95ad6892f71691fd6625c442d98 - + https://github.com/dotnet/msbuild - c6daff1259eb3c2a42d53f664f82c3c8a66c6166 + df97a4b69224643b4af407f41b33f8c9762af3c0 diff --git a/eng/Versions.props b/eng/Versions.props index 61a8afa7a..4729ac243 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23312.18 - 8.0.100-preview.6.23312.18 - 8.0.100-preview.6.23312.18 + 8.0.100-preview.6.23312.31 + 8.0.100-preview.6.23312.31 + 8.0.100-preview.6.23312.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 952c1797dc6633c63156f10dcf8090e01faa93df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 06:50:38 +0000 Subject: [PATCH 43/67] Update dependencies from https://github.com/dotnet/sdk build 20230612.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23312.34 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 612d2c8ef..9b374f450 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 - + https://github.com/dotnet/aspnetcore - 013ce82fb4f65247ecf7aa83f5c43434f9f6e15b + 239b00d00cb271ab3719ef3843570727778c11f6 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - dfb799af80077a0d3ea441f475bd367ecbb534f0 + 2b79147770a0991b172244e4e165cf4e5a57d8ce - + https://github.com/dotnet/sdk - dfb799af80077a0d3ea441f475bd367ecbb534f0 + 2b79147770a0991b172244e4e165cf4e5a57d8ce - + https://github.com/dotnet/sdk - dfb799af80077a0d3ea441f475bd367ecbb534f0 + 2b79147770a0991b172244e4e165cf4e5a57d8ce - + https://github.com/dotnet/sdk - dfb799af80077a0d3ea441f475bd367ecbb534f0 + 2b79147770a0991b172244e4e165cf4e5a57d8ce diff --git a/eng/Versions.props b/eng/Versions.props index 4729ac243..fc29a3759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23312.5 - 8.0.0-preview.6.23312.5 - 8.0.0-preview.6.23312.5 - 8.0.0-preview.6.23312.5 - 8.0.0-preview.6.23312.5 - 8.0.0-preview.6.23312.5 - 8.0.0-preview.6.23312.5 + 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23312.29 0.2.0 - 8.0.100-preview.6.23312.31 - 8.0.100-preview.6.23312.31 - 8.0.100-preview.6.23312.31 + 8.0.100-preview.6.23312.34 + 8.0.100-preview.6.23312.34 + 8.0.100-preview.6.23312.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 347f484d2385b0e04014e9532f5cdc4bc6adc69c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 08:28:04 +0000 Subject: [PATCH 44/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 9b374f450..b795c07cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 2b79147770a0991b172244e4e165cf4e5a57d8ce + 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad - + https://github.com/dotnet/sdk - 2b79147770a0991b172244e4e165cf4e5a57d8ce + 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad - + https://github.com/dotnet/sdk - 2b79147770a0991b172244e4e165cf4e5a57d8ce + 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad - + https://github.com/dotnet/sdk - 2b79147770a0991b172244e4e165cf4e5a57d8ce + 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - 2cea5f806cd2f95ad6892f71691fd6625c442d98 + ab8c29904efcb101d74005098d3a6aa97562fb39 diff --git a/eng/Versions.props b/eng/Versions.props index fc29a3759..c68331b50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23312.34 - 8.0.100-preview.6.23312.34 - 8.0.100-preview.6.23312.34 + 8.0.100-preview.6.23313.1 + 8.0.100-preview.6.23313.1 + 8.0.100-preview.6.23313.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23312.1 + 4.7.0-3.23312.17 From de6884e02a475c749236db8c965568e48e6b1610 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 13 Jun 2023 15:36:15 +0000 Subject: [PATCH 45/67] Patch for nuget.client#5228 --- ...Security.Cryptography.Xml-dependency.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch b/src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch new file mode 100644 index 000000000..43c508259 --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch @@ -0,0 +1,64 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Tue, 13 Jun 2023 15:16:45 +0000 +Subject: [PATCH] Add System.Security.Cryptography.Xml dependency + +Backport: https://github.com/NuGet/NuGet.Client/pull/5228 +--- + Directory.Packages.props | 14 ++++++++------ + eng/Version.Details.xml | 4 ++++ + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index e1b991802..75ac7356a 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -14,17 +14,19 @@ + 16.8.0 + + 16.11.0 +- +- +- 6.0.1 +- 4.7.1 ++ + + +- ++ ++ ++ + 6.0.0 + 6.0.0 + 3.0.0 + 4.5.0 ++ ++ 6.0.1 ++ 4.7.1 + + + +@@ -96,7 +98,7 @@ + + + +- ++ + + + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 3d01f5de6..38e1eba71 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -34,5 +34,9 @@ + https://github.com/dotnet/corefx + 30ab651fcb4354552bd4891619a0bdd81e0ebdbf + ++ ++ https://github.com/dotnet/runtime ++ 55fb7ef977e7d120dc12f0960edcff0739d7ee0e ++ + + +\ No newline at end of file From 48d635cf711c4c8e39e8b4ed74f313a58aab274b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 17:19:48 +0000 Subject: [PATCH 46/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 b795c07cb..102f73893 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad + d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b - + https://github.com/dotnet/sdk - 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad + d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b - + https://github.com/dotnet/sdk - 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad + d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b - + https://github.com/dotnet/sdk - 1b6574cff21a4ab2e0bd25dffdf0b9287b52f8ad + d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b diff --git a/eng/Versions.props b/eng/Versions.props index c68331b50..8b40eae51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23313.1 - 8.0.100-preview.6.23313.1 - 8.0.100-preview.6.23313.1 + 8.0.100-preview.6.23313.2 + 8.0.100-preview.6.23313.2 + 8.0.100-preview.6.23313.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b967d7961f4f5c6f9a78089515f318e4ed874764 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 13 Jun 2023 10:22:23 -0700 Subject: [PATCH 47/67] Disable a new sdk test that requires testassets.props to exist --- test/SdkTests/TestConfig.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 6da9c5284..defd5a5de 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -61,5 +61,9 @@ Skip="true" Issue="" Reason="Test doesn't work with newer RIDs"/> + From de411eea684a6951fc757aeb0900aa3817b0db2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 18:31:42 +0000 Subject: [PATCH 48/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 102f73893..07bdbe1bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b + 09a013f2b33c4a548c4dd1f218ae04e932476d53 - + https://github.com/dotnet/sdk - d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b + 09a013f2b33c4a548c4dd1f218ae04e932476d53 - + https://github.com/dotnet/sdk - d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b + 09a013f2b33c4a548c4dd1f218ae04e932476d53 - + https://github.com/dotnet/sdk - d1773f68a8bbdaa7e2228a7f2f8f0ac341dfd65b + 09a013f2b33c4a548c4dd1f218ae04e932476d53 diff --git a/eng/Versions.props b/eng/Versions.props index 8b40eae51..080854e89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23313.2 - 8.0.100-preview.6.23313.2 - 8.0.100-preview.6.23313.2 + 8.0.100-preview.6.23313.5 + 8.0.100-preview.6.23313.5 + 8.0.100-preview.6.23313.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c6bdf916be9c577e2a2d8ae5776a136f7438c36f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 19:41:51 +0000 Subject: [PATCH 49/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 07bdbe1bb..93757c767 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 239b00d00cb271ab3719ef3843570727778c11f6 + 6fabf15438525e28fb148af9fd6eb727b39160dd https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 09a013f2b33c4a548c4dd1f218ae04e932476d53 + 0b0618533c3079011ee03e3b143ea3235dd50360 - + https://github.com/dotnet/sdk - 09a013f2b33c4a548c4dd1f218ae04e932476d53 + 0b0618533c3079011ee03e3b143ea3235dd50360 - + https://github.com/dotnet/sdk - 09a013f2b33c4a548c4dd1f218ae04e932476d53 + 0b0618533c3079011ee03e3b143ea3235dd50360 - + https://github.com/dotnet/sdk - 09a013f2b33c4a548c4dd1f218ae04e932476d53 + 0b0618533c3079011ee03e3b143ea3235dd50360 diff --git a/eng/Versions.props b/eng/Versions.props index 080854e89..1858dfe63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23312.29 - 8.0.0-preview.6.23312.29 - 8.0.0-preview.6.23312.29 - 8.0.0-preview.6.23312.29 - 8.0.0-preview.6.23312.29 - 8.0.0-preview.6.23312.29 - 8.0.0-preview.6.23312.29 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 0.2.0 - 8.0.100-preview.6.23313.5 - 8.0.100-preview.6.23313.5 - 8.0.100-preview.6.23313.5 + 8.0.100-preview.6.23313.9 + 8.0.100-preview.6.23313.9 + 8.0.100-preview.6.23313.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cb06f2485d72e497f8c09f1d3a19cf6a6c0e4784 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 20:54:48 +0000 Subject: [PATCH 50/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 93757c767..9856ba841 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 0b0618533c3079011ee03e3b143ea3235dd50360 + cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c - + https://github.com/dotnet/sdk - 0b0618533c3079011ee03e3b143ea3235dd50360 + cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c - + https://github.com/dotnet/sdk - 0b0618533c3079011ee03e3b143ea3235dd50360 + cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c - + https://github.com/dotnet/sdk - 0b0618533c3079011ee03e3b143ea3235dd50360 + cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - ab8c29904efcb101d74005098d3a6aa97562fb39 + 7aa5af7785e69c05b40db65f5529787634305bf7 diff --git a/eng/Versions.props b/eng/Versions.props index 1858dfe63..43a502d5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23313.9 - 8.0.100-preview.6.23313.9 - 8.0.100-preview.6.23313.9 + 8.0.100-preview.6.23313.10 + 8.0.100-preview.6.23313.10 + 8.0.100-preview.6.23313.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23312.17 + 4.7.0-3.23313.3 From 20d403a1b2ab11a594a49e21075888fe6a4f4561 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 22:08:03 +0000 Subject: [PATCH 51/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 9856ba841..2b2ab4c27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c + 20d422d021d989ebe2d0332ae92ce930992ad3eb - + https://github.com/dotnet/sdk - cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c + 20d422d021d989ebe2d0332ae92ce930992ad3eb - + https://github.com/dotnet/sdk - cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c + 20d422d021d989ebe2d0332ae92ce930992ad3eb - + https://github.com/dotnet/sdk - cebe87f9ed565b458fb9b5e8159ece0ce6f5e31c + 20d422d021d989ebe2d0332ae92ce930992ad3eb diff --git a/eng/Versions.props b/eng/Versions.props index 43a502d5f..354d739e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 0.2.0 - 8.0.100-preview.6.23313.10 - 8.0.100-preview.6.23313.10 - 8.0.100-preview.6.23313.10 + 8.0.100-preview.6.23313.20 + 8.0.100-preview.6.23313.20 + 8.0.100-preview.6.23313.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22751193ead0762cd6f79a1e1d5361ea0ddaed7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jun 2023 23:19:36 +0000 Subject: [PATCH 52/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 2b2ab4c27..3532ef946 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 6fabf15438525e28fb148af9fd6eb727b39160dd https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 20d422d021d989ebe2d0332ae92ce930992ad3eb + 553a62f6f96c5f772ea7418f1318856f3e176724 - + https://github.com/dotnet/sdk - 20d422d021d989ebe2d0332ae92ce930992ad3eb + 553a62f6f96c5f772ea7418f1318856f3e176724 - + https://github.com/dotnet/sdk - 20d422d021d989ebe2d0332ae92ce930992ad3eb + 553a62f6f96c5f772ea7418f1318856f3e176724 - + https://github.com/dotnet/sdk - 20d422d021d989ebe2d0332ae92ce930992ad3eb + 553a62f6f96c5f772ea7418f1318856f3e176724 diff --git a/eng/Versions.props b/eng/Versions.props index 354d739e6..68746eef8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.3 0.2.0 - 8.0.100-preview.6.23313.20 - 8.0.100-preview.6.23313.20 - 8.0.100-preview.6.23313.20 + 8.0.100-preview.6.23313.15 + 8.0.100-preview.6.23313.15 + 8.0.100-preview.6.23313.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b4b3cd373f7cf19dcc52bdae6a2444877268fb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 00:27:01 +0000 Subject: [PATCH 53/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3532ef946..b2fb4ee2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd - + https://github.com/dotnet/aspnetcore - 6fabf15438525e28fb148af9fd6eb727b39160dd + 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 553a62f6f96c5f772ea7418f1318856f3e176724 + 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e - + https://github.com/dotnet/sdk - 553a62f6f96c5f772ea7418f1318856f3e176724 + 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e - + https://github.com/dotnet/sdk - 553a62f6f96c5f772ea7418f1318856f3e176724 + 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e - + https://github.com/dotnet/sdk - 553a62f6f96c5f772ea7418f1318856f3e176724 + 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 163404b6540f1383a8d7072891e77737a8150ef6 - + https://github.com/dotnet/fsharp - 10402cf8fcb7e9d7323f61422af1437dc954dd5e + 9482fd43971200222e7b6f5cd163b7a9fab32751 - + https://github.com/dotnet/fsharp - 10402cf8fcb7e9d7323f61422af1437dc954dd5e + 9482fd43971200222e7b6f5cd163b7a9fab32751 @@ -156,9 +156,9 @@ df97a4b69224643b4af407f41b33f8c9762af3c0 - + https://github.com/nuget/nuget.client - 5db75f340001f0e33d5cc5a1ba8922c3a641b2f0 + 566ced13280613f419b8b057583c0dd8f6ced724 diff --git a/eng/Versions.props b/eng/Versions.props index 68746eef8..fb0585f07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 - 8.0.0-preview.6.23313.3 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.10 0.2.0 - 8.0.100-preview.6.23313.15 - 8.0.100-preview.6.23313.15 - 8.0.100-preview.6.23313.15 + 8.0.100-preview.6.23313.25 + 8.0.100-preview.6.23313.25 + 8.0.100-preview.6.23313.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -123,7 +123,7 @@ - 6.7.0-preview.3.67 + 6.7.0-preview.3.71 From a4cf539d095f9521b2a0758826d2489cb88c5e58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 04:00:15 +0000 Subject: [PATCH 54/67] Update dependencies from https://github.com/dotnet/sdk build 20230613.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23313.40 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 b2fb4ee2d..585e2a30f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e + 666657afe8d2582a399c30ed2e4b6b6ffa061977 - + https://github.com/dotnet/sdk - 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e + 666657afe8d2582a399c30ed2e4b6b6ffa061977 - + https://github.com/dotnet/sdk - 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e + 666657afe8d2582a399c30ed2e4b6b6ffa061977 - + https://github.com/dotnet/sdk - 961ed9867a1206ef2a2ac98f3d5ccc01da9d7d4e + 666657afe8d2582a399c30ed2e4b6b6ffa061977 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - 7aa5af7785e69c05b40db65f5529787634305bf7 + 521dc4d383e3916e7f902397f47ada3acb45541f diff --git a/eng/Versions.props b/eng/Versions.props index fb0585f07..573bb705c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23313.25 - 8.0.100-preview.6.23313.25 - 8.0.100-preview.6.23313.25 + 8.0.100-preview.6.23313.40 + 8.0.100-preview.6.23313.40 + 8.0.100-preview.6.23313.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23313.3 + 4.7.0-3.23313.13 From 57db1db6848cb1de62692be34b7fa0f6e8d59d58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 10:41:43 +0000 Subject: [PATCH 55/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23311.1 (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 585e2a30f..0fdd2fe1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 - + https://github.com/dotnet/aspnetcore - 0e8f1dc281e78cf33e9c04cf6e44408b1b40bbbd + 62b68b5584c88427c93bd78cac9723439f387234 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 666657afe8d2582a399c30ed2e4b6b6ffa061977 + fc249afe2ecc7190047807a4076fa76acee12da8 - + https://github.com/dotnet/sdk - 666657afe8d2582a399c30ed2e4b6b6ffa061977 + fc249afe2ecc7190047807a4076fa76acee12da8 - + https://github.com/dotnet/sdk - 666657afe8d2582a399c30ed2e4b6b6ffa061977 + fc249afe2ecc7190047807a4076fa76acee12da8 - + https://github.com/dotnet/sdk - 666657afe8d2582a399c30ed2e4b6b6ffa061977 + fc249afe2ecc7190047807a4076fa76acee12da8 diff --git a/eng/Versions.props b/eng/Versions.props index 573bb705c..90e26418f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 - 8.0.0-preview.6.23313.10 + 8.0.0-preview.6.23313.26 + 8.0.0-preview.6.23313.26 + 8.0.0-preview.6.23313.26 + 8.0.0-preview.6.23313.26 + 8.0.0-preview.6.23313.26 + 8.0.0-preview.6.23313.26 + 8.0.0-preview.6.23313.26 0.2.0 - 8.0.100-preview.6.23313.40 - 8.0.100-preview.6.23313.40 - 8.0.100-preview.6.23313.40 + 8.0.100-preview.6.23314.2 + 8.0.100-preview.6.23314.2 + 8.0.100-preview.6.23314.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d6ab12e274d22138460fdc9a3202950018076e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 18:10:47 +0000 Subject: [PATCH 56/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fdd2fe1b..fb3120045 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 5afd6b59ab0840667ab0a2cede374ff3c89569ce + 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f - + https://github.com/dotnet/windowsdesktop - 5afd6b59ab0840667ab0a2cede374ff3c89569ce + 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f - + https://github.com/dotnet/windowsdesktop - 5afd6b59ab0840667ab0a2cede374ff3c89569ce + 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f - + https://github.com/dotnet/windowsdesktop - 5afd6b59ab0840667ab0a2cede374ff3c89569ce + 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f https://github.com/dotnet/runtime @@ -102,44 +102,44 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - fc249afe2ecc7190047807a4076fa76acee12da8 + c58672df75206bf2a195cd656c4f698c8e20c415 - + https://github.com/dotnet/sdk - fc249afe2ecc7190047807a4076fa76acee12da8 + c58672df75206bf2a195cd656c4f698c8e20c415 - + https://github.com/dotnet/sdk - fc249afe2ecc7190047807a4076fa76acee12da8 + c58672df75206bf2a195cd656c4f698c8e20c415 - + https://github.com/dotnet/sdk - fc249afe2ecc7190047807a4076fa76acee12da8 + c58672df75206bf2a195cd656c4f698c8e20c415 - + https://github.com/dotnet/winforms - 30fbeed442e75d30ebabd1eaf481f0261261733e + b44b05c164a8470beab4cf98343ee83f49019e61 - + https://github.com/dotnet/wpf - 163404b6540f1383a8d7072891e77737a8150ef6 + af278d382b59d43a36db7dfe88cd17b0aed314be - + https://github.com/dotnet/fsharp - 9482fd43971200222e7b6f5cd163b7a9fab32751 + 21d16660279e91cdcc5f523b536dcc67a87294f6 - + https://github.com/dotnet/fsharp - 9482fd43971200222e7b6f5cd163b7a9fab32751 + 21d16660279e91cdcc5f523b536dcc67a87294f6 - + https://github.com/microsoft/vstest - c8c1d439ac284448fa0fb66c8f078d52b9727595 + a006b59a7af55448b69ea835f0037437f363c25f diff --git a/eng/Versions.props b/eng/Versions.props index 90e26418f..c20617f0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.6.23310.1 + 8.0.0-preview.6.23313.8 - 8.0.0-preview.6.23310.2 + 8.0.0-preview.6.23313.4 @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23314.2 - 8.0.100-preview.6.23314.2 - 8.0.100-preview.6.23314.2 + 8.0.100-preview.6.23314.8 + 8.0.100-preview.6.23314.8 + 8.0.100-preview.6.23314.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -108,10 +108,10 @@ - 8.0.0-preview.6.23311.1 - 8.0.0-preview.6.23311.1 - 8.0.0-preview.6.23311.1 - 8.0.0-preview.6.23311.1 + 8.0.0-preview.6.23314.2 + 8.0.0-preview.6.23314.2 + 8.0.0-preview.6.23314.2 + 8.0.0-preview.6.23314.2 @@ -225,7 +225,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23309.3 + 17.7.0-preview-23313-04 8.0.0-alpha.1.22557.12 From d473dfcdea1edd44823c88a18545a40c201b4528 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 19:24:07 +0000 Subject: [PATCH 57/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb3120045..883a50d05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - c58672df75206bf2a195cd656c4f698c8e20c415 + 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 - + https://github.com/dotnet/sdk - c58672df75206bf2a195cd656c4f698c8e20c415 + 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 - + https://github.com/dotnet/sdk - c58672df75206bf2a195cd656c4f698c8e20c415 + 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 - + https://github.com/dotnet/sdk - c58672df75206bf2a195cd656c4f698c8e20c415 + 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - 521dc4d383e3916e7f902397f47ada3acb45541f + bb804d5634bcd790848d3019f3e24df14d9f4ff0 @@ -156,9 +156,9 @@ df97a4b69224643b4af407f41b33f8c9762af3c0 - + https://github.com/nuget/nuget.client - 566ced13280613f419b8b057583c0dd8f6ced724 + 288a4790bfbf856a4e847ec9cc342b6d1d57f3c3 diff --git a/eng/Versions.props b/eng/Versions.props index c20617f0f..f3c10e803 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23314.8 - 8.0.100-preview.6.23314.8 - 8.0.100-preview.6.23314.8 + 8.0.100-preview.6.23314.12 + 8.0.100-preview.6.23314.12 + 8.0.100-preview.6.23314.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23313.13 + 4.7.0-3.23314.1 @@ -123,7 +123,7 @@ - 6.7.0-preview.3.71 + 6.7.0-preview.3.77 From 6fa4b318db7fc9b50f65f5d644f933dcedd78622 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 21:12:49 +0000 Subject: [PATCH 58/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.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 416d24f2e..9b9bf3de1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 + 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 - + https://github.com/dotnet/sdk - 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 + 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 - + https://github.com/dotnet/sdk - 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 + 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 - + https://github.com/dotnet/sdk - 0b5cc0fbb2d67cded37f582ee21d2db6a70b0872 + 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 diff --git a/eng/Versions.props b/eng/Versions.props index f3c10e803..4a444c299 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23314.12 - 8.0.100-preview.6.23314.12 - 8.0.100-preview.6.23314.12 + 8.0.100-preview.6.23314.15 + 8.0.100-preview.6.23314.15 + 8.0.100-preview.6.23314.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f8e43486ff96961834321194acfa029d8c4a757 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 21:57:35 +0000 Subject: [PATCH 59/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.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 9b9bf3de1..08f5fa170 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 + 5e6eaebab7f481c2038a7353bda59b8af3af455f - + https://github.com/dotnet/sdk - 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 + 5e6eaebab7f481c2038a7353bda59b8af3af455f - + https://github.com/dotnet/sdk - 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 + 5e6eaebab7f481c2038a7353bda59b8af3af455f - + https://github.com/dotnet/sdk - 21da3f32c2ad8825e31d2a26bf8fff0cfa17d9e1 + 5e6eaebab7f481c2038a7353bda59b8af3af455f diff --git a/eng/Versions.props b/eng/Versions.props index 4a444c299..cd59a6c17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23314.15 - 8.0.100-preview.6.23314.15 - 8.0.100-preview.6.23314.15 + 8.0.100-preview.6.23314.16 + 8.0.100-preview.6.23314.16 + 8.0.100-preview.6.23314.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6740c6b9aafa2f1261fef4cde1a4c732f3eb3c6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jun 2023 22:41:01 +0000 Subject: [PATCH 60/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.2 (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 08f5fa170..8b34831f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 5e6eaebab7f481c2038a7353bda59b8af3af455f + 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 - + https://github.com/dotnet/sdk - 5e6eaebab7f481c2038a7353bda59b8af3af455f + 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 - + https://github.com/dotnet/sdk - 5e6eaebab7f481c2038a7353bda59b8af3af455f + 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 - + https://github.com/dotnet/sdk - 5e6eaebab7f481c2038a7353bda59b8af3af455f + 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - bb804d5634bcd790848d3019f3e24df14d9f4ff0 + 10c6d3650140bafd1c2010d485038a06b38830c9 diff --git a/eng/Versions.props b/eng/Versions.props index cd59a6c17..861099184 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23314.16 - 8.0.100-preview.6.23314.16 - 8.0.100-preview.6.23314.16 + 8.0.100-preview.6.23314.18 + 8.0.100-preview.6.23314.18 + 8.0.100-preview.6.23314.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23314.1 + 4.7.0-3.23314.2 From a62adcd8eb874bfb32c70f18e1d3e1d8a46182a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 07:14:34 +0000 Subject: [PATCH 61/67] Update dependencies from https://github.com/dotnet/sdk build 20230614.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23314.30 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.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 8b34831f7..2d8a1a063 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f + c32d6fc5793f1788d7f366d19adcfb1be377f2ba - + https://github.com/dotnet/windowsdesktop - 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f + c32d6fc5793f1788d7f366d19adcfb1be377f2ba - + https://github.com/dotnet/windowsdesktop - 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f + c32d6fc5793f1788d7f366d19adcfb1be377f2ba - + https://github.com/dotnet/windowsdesktop - 0aa4eb1e0fdb01eb9e6f7ffbef16d55368528d2f + c32d6fc5793f1788d7f366d19adcfb1be377f2ba https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 + 0e3a76b00a441b9b6652aa38ac58218dce50f09a - + https://github.com/dotnet/sdk - 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 + 0e3a76b00a441b9b6652aa38ac58218dce50f09a - + https://github.com/dotnet/sdk - 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 + 0e3a76b00a441b9b6652aa38ac58218dce50f09a - + https://github.com/dotnet/sdk - 7cbb54bdc175e5ff8061d47675e9a36b62b15dc1 + 0e3a76b00a441b9b6652aa38ac58218dce50f09a - + https://github.com/dotnet/winforms - b44b05c164a8470beab4cf98343ee83f49019e61 + 0cc57e403de2bb076ad290742e1425b669884ff9 - + https://github.com/dotnet/wpf - af278d382b59d43a36db7dfe88cd17b0aed314be + 86fa6c6e01d0397d6289906625888e2ea3103f63 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - 10c6d3650140bafd1c2010d485038a06b38830c9 + b287fd9d4d1bdcef184c7e6b366c3ac9af775dfe diff --git a/eng/Versions.props b/eng/Versions.props index 861099184..def8f46fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.6.23313.8 + 8.0.0-preview.6.23313.13 - 8.0.0-preview.6.23313.4 + 8.0.0-preview.6.23314.2 @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23314.18 - 8.0.100-preview.6.23314.18 - 8.0.100-preview.6.23314.18 + 8.0.100-preview.6.23314.30 + 8.0.100-preview.6.23314.30 + 8.0.100-preview.6.23314.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23314.2 + 4.7.0-3.23314.8 @@ -108,10 +108,10 @@ - 8.0.0-preview.6.23314.2 - 8.0.0-preview.6.23314.2 - 8.0.0-preview.6.23314.2 - 8.0.0-preview.6.23314.2 + 8.0.0-preview.6.23314.9 + 8.0.0-preview.6.23314.9 + 8.0.0-preview.6.23314.9 + 8.0.0-preview.6.23314.9 From 037a08134c81a5cd6893e532c927bb653806d2af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 10:05:10 +0000 Subject: [PATCH 62/67] Update dependencies from https://github.com/dotnet/sdk build 20230615.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23315.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.9 (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 2d8a1a063..c709563df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 0e3a76b00a441b9b6652aa38ac58218dce50f09a + 020eb9f27a20c9d379480ef1c17e175a41af4fb7 - + https://github.com/dotnet/sdk - 0e3a76b00a441b9b6652aa38ac58218dce50f09a + 020eb9f27a20c9d379480ef1c17e175a41af4fb7 - + https://github.com/dotnet/sdk - 0e3a76b00a441b9b6652aa38ac58218dce50f09a + 020eb9f27a20c9d379480ef1c17e175a41af4fb7 - + https://github.com/dotnet/sdk - 0e3a76b00a441b9b6652aa38ac58218dce50f09a + 020eb9f27a20c9d379480ef1c17e175a41af4fb7 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee - + https://github.com/dotnet/roslyn - b287fd9d4d1bdcef184c7e6b366c3ac9af775dfe + b76cd4524d29ef01b28a68e63eb3a39a9215e363 diff --git a/eng/Versions.props b/eng/Versions.props index def8f46fa..3cf505fde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23314.30 - 8.0.100-preview.6.23314.30 - 8.0.100-preview.6.23314.30 + 8.0.100-preview.6.23315.9 + 8.0.100-preview.6.23315.9 + 8.0.100-preview.6.23315.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23314.8 + 4.7.0-3.23314.9 From 40220bae21afcbb49f96493be2d118669a0c1ad2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 10:49:02 +0000 Subject: [PATCH 63/67] Update dependencies from https://github.com/dotnet/sdk build 20230615.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23315.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++--------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c709563df..2c7d347d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop c32d6fc5793f1788d7f366d19adcfb1be377f2ba - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 020eb9f27a20c9d379480ef1c17e175a41af4fb7 + 1da98bf55bd739ce516da661d02e53966531a20a - + https://github.com/dotnet/sdk - 020eb9f27a20c9d379480ef1c17e175a41af4fb7 + 1da98bf55bd739ce516da661d02e53966531a20a - + https://github.com/dotnet/sdk - 020eb9f27a20c9d379480ef1c17e175a41af4fb7 + 1da98bf55bd739ce516da661d02e53966531a20a - + https://github.com/dotnet/sdk - 020eb9f27a20c9d379480ef1c17e175a41af4fb7 + 1da98bf55bd739ce516da661d02e53966531a20a @@ -142,9 +142,9 @@ a006b59a7af55448b69ea835f0037437f363c25f - + https://github.com/dotnet/runtime - 37c0371ab3f7651d64a6dfe4c2e8677206fa34ee + 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 https://github.com/dotnet/roslyn @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 116fc0fea5482fb88618eb96d7b00c1d65e6cea4 + 1640faa87e2e7656bf20dfe38eb8ea3cc3b9e806 diff --git a/eng/Versions.props b/eng/Versions.props index 3cf505fde..93a29e2c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23315.9 - 8.0.100-preview.6.23315.9 - 8.0.100-preview.6.23315.9 + 8.0.100-preview.6.23315.12 + 8.0.100-preview.6.23315.12 + 8.0.100-preview.6.23315.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23314.14 - 8.0.0-preview.6.23309.7 - 8.0.0-preview.6.23309.7 - 8.0.0-preview.6.23309.7 - 8.0.0-preview.6.23309.7 - 8.0.0-preview.6.23309.7 - 8.0.0-preview.6.23309.7 + 8.0.0-preview.6.23314.14 + 8.0.0-preview.6.23314.14 + 8.0.0-preview.6.23314.14 + 8.0.0-preview.6.23314.14 + 8.0.0-preview.6.23314.14 + 8.0.0-preview.6.23314.14 2.1.0 @@ -238,7 +238,7 @@ 13.1.462-net8-p3 16.1.1250-net8-p3 - 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23312.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 20b1c5eaa0e0d9c6885e4c78af40319ce913e884 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 12:12:18 +0000 Subject: [PATCH 64/67] Update dependencies from https://github.com/dotnet/sdk build 20230615.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23315.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.9 (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 2c7d347d6..a09b800f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 1da98bf55bd739ce516da661d02e53966531a20a + 05850247bb4614b6ad84ede6d9b80bf41cd70614 - + https://github.com/dotnet/sdk - 1da98bf55bd739ce516da661d02e53966531a20a + 05850247bb4614b6ad84ede6d9b80bf41cd70614 - + https://github.com/dotnet/sdk - 1da98bf55bd739ce516da661d02e53966531a20a + 05850247bb4614b6ad84ede6d9b80bf41cd70614 - + https://github.com/dotnet/sdk - 1da98bf55bd739ce516da661d02e53966531a20a + 05850247bb4614b6ad84ede6d9b80bf41cd70614 diff --git a/eng/Versions.props b/eng/Versions.props index 93a29e2c6..c54c8fcba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23315.12 - 8.0.100-preview.6.23315.12 - 8.0.100-preview.6.23315.12 + 8.0.100-preview.6.23315.13 + 8.0.100-preview.6.23315.13 + 8.0.100-preview.6.23315.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2525d24b1216236378cc903c54bcb56076232c24 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 15 Jun 2023 12:49:49 +0000 Subject: [PATCH 65/67] Remove backported nuget source-build patch --- ...Security.Cryptography.Xml-dependency.patch | 64 ------------------- 1 file changed, 64 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch b/src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch deleted file mode 100644 index 43c508259..000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Add-System.Security.Cryptography.Xml-dependency.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Tue, 13 Jun 2023 15:16:45 +0000 -Subject: [PATCH] Add System.Security.Cryptography.Xml dependency - -Backport: https://github.com/NuGet/NuGet.Client/pull/5228 ---- - Directory.Packages.props | 14 ++++++++------ - eng/Version.Details.xml | 4 ++++ - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index e1b991802..75ac7356a 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -14,17 +14,19 @@ - 16.8.0 - - 16.11.0 -- -- -- 6.0.1 -- 4.7.1 -+ - - -- -+ -+ -+ - 6.0.0 - 6.0.0 - 3.0.0 - 4.5.0 -+ -+ 6.0.1 -+ 4.7.1 - - - -@@ -96,7 +98,7 @@ - - - -- -+ - - - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 3d01f5de6..38e1eba71 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -34,5 +34,9 @@ - https://github.com/dotnet/corefx - 30ab651fcb4354552bd4891619a0bdd81e0ebdbf - -+ -+ https://github.com/dotnet/runtime -+ 55fb7ef977e7d120dc12f0960edcff0739d7ee0e -+ - - -\ No newline at end of file From afabf5db0b9573ff4a219481ffc71fe08c0c87bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 13:59:28 +0000 Subject: [PATCH 66/67] Update dependencies from https://github.com/dotnet/sdk build 20230615.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23307.24 -> To Version 8.0.100-preview.6.23315.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.6.23307.1 -> To Version 8.0.0-preview.6.23314.9 (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 4cdc7b6f2..1055aa53d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 05850247bb4614b6ad84ede6d9b80bf41cd70614 + 1a17b18064c9bbf7dcb2155a03f2c92fe657fba1 - + https://github.com/dotnet/sdk - 05850247bb4614b6ad84ede6d9b80bf41cd70614 + 1a17b18064c9bbf7dcb2155a03f2c92fe657fba1 - + https://github.com/dotnet/sdk - 05850247bb4614b6ad84ede6d9b80bf41cd70614 + 1a17b18064c9bbf7dcb2155a03f2c92fe657fba1 - + https://github.com/dotnet/sdk - 05850247bb4614b6ad84ede6d9b80bf41cd70614 + 1a17b18064c9bbf7dcb2155a03f2c92fe657fba1 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 0a0fa137097595ad8ec0e2aa9ecffb524cd5df95 - + https://github.com/dotnet/roslyn - b76cd4524d29ef01b28a68e63eb3a39a9215e363 + 7a7690eaf161de8dd7b603aa612f9f7ab8683796 diff --git a/eng/Versions.props b/eng/Versions.props index f7c26d375..4b33c921c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,16 +81,16 @@ - 8.0.100-preview.6.23315.13 - 8.0.100-preview.6.23315.13 - 8.0.100-preview.6.23315.13 + 8.0.100-preview.6.23315.14 + 8.0.100-preview.6.23315.14 + 8.0.100-preview.6.23315.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23314.9 + 4.7.0-3.23315.1 From 358ce76cb77aac0a4e85052fad230c3b5b2e7651 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 15 Jun 2023 14:19:00 +0000 Subject: [PATCH 67/67] Disable failing FSharp source-build smoke test --- .../WebScenarioTests.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index b621705b9..680b0d430 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -29,10 +29,16 @@ public class WebScenarioTests : SmokeTests foreach (DotNetLanguage language in new[] { DotNetLanguage.CSharp, DotNetLanguage.FSharp }) { yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Web, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex); - yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; + // TODO: Re-enable once https://github.com/dotnet/runtime/pull/87518 flows to the public feeds. Note, the smoke-tests pull Microsoft.Extensions.DependencyModel + // from a public feed - not a source build feed. + //yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); } + // TODO: Remove once https://github.com/dotnet/runtime/pull/87518 flows to the public feeds. Note, the smoke-tests pull Microsoft.Extensions.DependencyModel + // from a public feed - not a source build feed. + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);