From ecc445fffcea7861447cde0d1c34d10210d168ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Apr 2022 03:39:15 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/sdk build 20220405.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22204.3 -> To Version 6.0.300-preview.22205.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.0.3-beta.22181.2 -> To Version 12.0.3-beta.22203.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95c591503..9f93453a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/sdk - 3c2c2e186f91025bc78ded47b35ddf3b765ee43e + 59d589e341c47593db9a9c503bdc4f53242fba48 - + https://github.com/dotnet/sdk - 3c2c2e186f91025bc78ded47b35ddf3b765ee43e + 59d589e341c47593db9a9c503bdc4f53242fba48 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 560f243910f407df33fd5cdf06e2a857684f4bc7 - + https://github.com/dotnet/fsharp - 31803ec27047f57c3fd06f3becddf2d369424d62 + 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/dotnet/fsharp - 31803ec27047f57c3fd06f3becddf2d369424d62 + 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/microsoft/vstest - 75765f2afc7425f47efde1a59a8eb86cf81658f9 + fd7a89629c321b139d393a224dde2021a98e7888 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 4f4a757510f260eb8ac121dd9f8e7706d13751fb + 0167599e0e1634ea3ed8d0e41390a3c0d9b3e4e9 diff --git a/eng/Versions.props b/eng/Versions.props index 980b7746f..69e7e3b22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22204.3 - 6.0.300-preview.22204.3 + 6.0.300-preview.22205.16 + 6.0.300-preview.22205.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-release-20220209-04 + 17.2.0-release-20220404-03 From 3bdac4d8372bf25b1c7c5fceb15cd9b3b165b1ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Apr 2022 06:47:59 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/sdk build 20220405.30 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22204.3 -> To Version 6.0.300-preview.22205.30 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 6.0.300-preview.22201.5 -> To Version 6.0.300-preview.22204.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 9f93453a8..2654f15e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 5ad577ee814db3c7473d904888c7db31129cf435 + 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/templating - 5ad577ee814db3c7473d904888c7db31129cf435 + 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/templating - 5ad577ee814db3c7473d904888c7db31129cf435 + 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/sdk - 59d589e341c47593db9a9c503bdc4f53242fba48 + 79124b91b7abd4f5ce51c488ed65cf0fd61848cb - + https://github.com/dotnet/sdk - 59d589e341c47593db9a9c503bdc4f53242fba48 + 79124b91b7abd4f5ce51c488ed65cf0fd61848cb diff --git a/eng/Versions.props b/eng/Versions.props index 69e7e3b22..7f3fb2b1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22201.5 + 6.0.300-preview.22204.1 @@ -56,8 +56,8 @@ - 6.0.300-preview.22205.16 - 6.0.300-preview.22205.16 + 6.0.300-preview.22205.30 + 6.0.300-preview.22205.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22201.5 + 6.0.300-preview.22204.1 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From d277a44e4c44461f2ad13b98cf0dfcf06bab2746 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 6 Apr 2022 21:52:48 +0000 Subject: [PATCH 3/3] Removed backported vstest source-build patch --- ...oject-target-frameworks-for-source-b.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch deleted file mode 100644 index 729c76c4e..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 23 Nov 2021 17:45:25 +0000 -Subject: [PATCH] Update nuspec project target frameworks for source-build - -This patch removes prebuilts caused from targetting netcoreapp1.0 - -Backported with https://github.com/microsoft/vstest/pull/3188 ---- - src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++- - src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -index 038fbf8..57cde8e 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -@@ -1,7 +1,8 @@ - - - Exe -- netcoreapp1.0 -+ netcoreapp1.0 -+ net6.0 - false - TestPlatform.Build.nuspec - version=$(Version) -diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -index 29198ba..19386eb 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -@@ -1,7 +1,8 @@ - - - Exe -- netcoreapp1.0 -+ netcoreapp1.0 -+ net6.0 - false - TestPlatform.CLI.nuspec - version=$(Version)