From 9666583e54684a73ff3456ce77fdb740eb315c2a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Sat, 20 Jun 2020 18:54:24 -0400 Subject: [PATCH 01/20] Conditionally include PrecompileScript --- .../ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj b/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj index 12c447b89d39..ac1c228ea860 100644 --- a/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj +++ b/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj @@ -11,7 +11,7 @@ - + Date: Tue, 4 May 2021 10:45:10 -0700 Subject: [PATCH 02/20] Add reference and update to use PVP --- .../Microsoft.DotNet.Cli.Utils.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index fc48b536dbbb..33903521a84c 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -42,6 +42,7 @@ - + + From 2e39d7bb200c8628ba85bb9f8c42b11f60f09046 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 9 Feb 2021 14:26:06 +0000 Subject: [PATCH 03/20] Remove test projects --- source-build.slnf | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 source-build.slnf diff --git a/source-build.slnf b/source-build.slnf new file mode 100644 index 000000000000..2b3e27f0976d --- /dev/null +++ b/source-build.slnf @@ -0,0 +1,41 @@ +{ + "solution": { + "path": "sdk.sln", + "projects": [ + "src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj", + "src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj", + "src\\BuiltInTools\\AspNetCoreDeltaApplier\\Microsoft.Extensions.AspNetCoreDeltaApplier.csproj", + "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", + "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", + "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", + "src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj", + "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", + "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj", + "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj", + "src\\Cli\\dotnet\\dotnet.csproj", + "src\\Compatibility\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj", + "src\\Layout\\redist\\redist.csproj", + "src\\Layout\\tool_fsharp\\tool_fsc.csproj", + "src\\Layout\\tool_msbuild\\tool_msbuild.csproj", + "src\\Layout\\tool_nuget\\tool_nuget.csproj", + "src\\Layout\\toolset-tasks\\toolset-tasks.csproj", + "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj", + "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj", + "src\\RazorSdk\\SourceGenerators\\Microsoft.NET.Sdk.Razor.SourceGenerators.csproj", + "src\\RazorSdk\\Tasks\\Microsoft.NET.Sdk.Razor.Tasks.csproj", + "src\\RazorSdk\\Tool\\Microsoft.NET.Sdk.Razor.Tool.csproj", + "src\\Resolvers\\Microsoft.DotNet.MSBuildSdkResolver\\Microsoft.DotNet.MSBuildSdkResolver.csproj", + "src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj", + "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", + "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", + "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", + "src\\Resolvers\\WorkloadManifestValidator\\WorkloadManifestValidator.csproj", + "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", + "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj", + "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj", + "src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj", + "src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj", + "src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj" + ] + } +} From 5a67f9b973cec66f04e89a4db0fbf22f91f8d17b Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 1 Jul 2020 21:40:38 +0000 Subject: [PATCH 04/20] Exclude System.Text.Json when calling PublishTestCli --- src/Layout/redist/targets/GenerateLayout.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 83325abecf3b..4122f1a8f1b4 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -117,6 +117,7 @@ + From e2b1346d21a88e7b3453ce391b96188002ec9243 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 4 Sep 2020 04:01:01 -0500 Subject: [PATCH 05/20] Patch out Windows Desktop targets --- .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props index a9480a836d93..61ecc22b7520 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props @@ -146,7 +146,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + From 8b0288ebbe6b4effa42f12c5e7bc8ee7f37853d9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 12 Aug 2020 14:26:52 -0500 Subject: [PATCH 06/20] PlatformAbstractions is not produced in source-build --- .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index d6612d5d79cd..af47e3c223b5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -48,6 +48,7 @@ + From d1683582cc5705bbad27e1a18bb712e99e840b28 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 8 Sep 2020 12:20:40 -0500 Subject: [PATCH 07/20] Use source-built MSBuild for F#. --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index 1b3d68a0c742..aa9ab9d6c247 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,6 +101,7 @@ $(MicrosoftBuildFrameworkPackageVersion) $(MicrosoftBuildUtilitiesCorePackageVersion) $(MicrosoftBuildTasksCorePackageVersion) + $(MicrosoftBuildPackageVersion) From 6436f10f071382719f544a1e9bd2f80d02e86ddc Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 16 Sep 2020 18:00:45 -0500 Subject: [PATCH 08/20] Use source-built Nuget --- src/Layout/toolset-tasks/toolset-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Layout/toolset-tasks/toolset-tasks.csproj b/src/Layout/toolset-tasks/toolset-tasks.csproj index e3f4eaab0d86..43aa38b20512 100644 --- a/src/Layout/toolset-tasks/toolset-tasks.csproj +++ b/src/Layout/toolset-tasks/toolset-tasks.csproj @@ -8,7 +8,7 @@ - + From 9dba9dcf5fe40c320193435823d319cc97f3bb59 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 4 Nov 2020 14:03:23 -0600 Subject: [PATCH 09/20] Remove unused Microsoft.Win32.Registry/4.6.0 ref This project restores a prebuilt Microsoft.Win32.Registry reference, but it doesn't end up in the SDK: the DLL from the net5.0 shared framework is already present. Remove this unnecessary PackageReference to remove the prebuilt. --- src/Cli/dotnet/dotnet.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 4df160046b8f..9c65232310a8 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -85,7 +85,6 @@ - From 46912e2ae7cd8857f1d1f3c6b5e36d6ecf10232d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 5 Nov 2020 14:23:06 +0000 Subject: [PATCH 10/20] Use PVP version of System.Text.Json --- .../Microsoft.DotNet.TemplateLocator.csproj | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj index edccd5b292f2..bfa57f8bfd96 100644 --- a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj +++ b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj index 68743a69ccac..35fc75564b54 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj @@ -22,7 +22,7 @@ - + From 90dc79f3989c773536d6048ef255de3eae2615dc Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 28 Oct 2020 14:31:39 +0100 Subject: [PATCH 11/20] vstest: build for .NET 6 --- src/Layout/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 4122f1a8f1b4..a92e0fa8f2ef 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -108,7 +108,7 @@ - $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/netcoreapp2.1/ + $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/net6.0/ From 100f212cd0ea775857478cda1d2be521846bc08d Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 10 Dec 2020 16:50:34 -0600 Subject: [PATCH 12/20] Lift NETStandard.Library to SBRP version --- .../Microsoft.NET.Build.Extensions.Tasks.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj index 20d6fd9a0613..280fbdc83e61 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj @@ -47,6 +47,8 @@ + + From 2ea318445e25a80a4cf2d76182011cbd158146a4 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 2 Feb 2021 09:18:31 -0500 Subject: [PATCH 13/20] Ensure WebSdk projects finish before PublishNetSdks --- src/Layout/redist/targets/GenerateLayout.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index a92e0fa8f2ef..0eb5817dc1ae 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -76,6 +76,12 @@ + + + + + + $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.Web From a62f449f857af3b5cc0c7bd955ea6210f9f37c20 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 9 Feb 2021 14:45:52 +0000 Subject: [PATCH 14/20] Remove dotnet-hello test projects --- .../v1/dotnet-hello/dotnet-hello.csproj | 16 ---------------- .../v2/dotnet-hello/dotnet-hello.csproj | 15 --------------- .../BuildTestPackages.targets | 16 ---------------- 3 files changed, 47 deletions(-) delete mode 100644 src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj delete mode 100644 src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj deleted file mode 100644 index 48a78a6e741f..000000000000 --- a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 1.0.0 - - - - netcoreapp2.2 - dotnet-hello - Exe - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 - true - - - diff --git a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj deleted file mode 100644 index 8956d362f444..000000000000 --- a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - 2.0.0 - - - - netcoreapp2.2 - dotnet-hello - Exe - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 - true - - diff --git a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets index 962c06d35e4f..2a88a2fc22a9 100644 --- a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets +++ b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets @@ -84,22 +84,6 @@ $(Version) True - - dotnet-hello - dotnet-hello.csproj - True - True - 1.0.0 - True - - - dotnet-hello - dotnet-hello.csproj - True - True - 2.0.0 - True - dotnet-outputsframeworkversion-netcoreapp1.0 dotnet-outputsframeworkversion-netcoreapp1.0.csproj From 1db2fd8c74a123186007da78892fe3f132663898 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Tue, 4 May 2021 14:01:55 -0700 Subject: [PATCH 15/20] Adding source build to CI --- .vsts-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 75ff8c51ca49..e0873e4088e6 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -142,6 +142,12 @@ stages: _PublishType: none _SignType: test + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml parameters: From 80fdaf4bb44ca33d380a452a88b1aa3ec395ca48 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Tue, 4 May 2021 14:02:03 -0700 Subject: [PATCH 16/20] Fix sourcebuild patches --- eng/SourceBuild.props | 14 --- ...nditionally-include-PrecompileScript.patch | 25 ------ ...-Add-reference-and-update-to-use-PVP.patch | 24 ------ .../0006-Remove-test-projects.patch | 61 ------------- ...ext.Json-when-calling-PublishTestCli.patch | 24 ------ ...08-Patch-out-Windows-Desktop-targets.patch | 25 ------ ...ions-is-not-produced-in-source-build.patch | 24 ------ .../0010-Use-source-built-MSBuild-for-F.patch | 24 ------ .../0011-Use-source-built-Nuget.patch | 25 ------ ...d-Microsoft.Win32.Registry-4.6.0-ref.patch | 28 ------ ...-Use-PVP-version-of-System.Text.Json.patch | 39 --------- .../0014-vstest-build-for-.NET-6.patch | 25 ------ ...-NETStandard.Library-to-SBRP-version.patch | 25 ------ ...rojects-finish-before-PublishNetSdks.patch | 29 ------- ...18-Remove-dotnet-hello-test-projects.patch | 86 ------------------- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- src/Layout/toolset-tasks/toolset-tasks.csproj | 1 + 17 files changed, 2 insertions(+), 479 deletions(-) delete mode 100644 eng/source-build-patches/0003-Conditionally-include-PrecompileScript.patch delete mode 100644 eng/source-build-patches/0005-Add-reference-and-update-to-use-PVP.patch delete mode 100644 eng/source-build-patches/0006-Remove-test-projects.patch delete mode 100644 eng/source-build-patches/0007-Exclude-System.Text.Json-when-calling-PublishTestCli.patch delete mode 100644 eng/source-build-patches/0008-Patch-out-Windows-Desktop-targets.patch delete mode 100644 eng/source-build-patches/0009-PlatformAbstractions-is-not-produced-in-source-build.patch delete mode 100644 eng/source-build-patches/0010-Use-source-built-MSBuild-for-F.patch delete mode 100644 eng/source-build-patches/0011-Use-source-built-Nuget.patch delete mode 100644 eng/source-build-patches/0012-Remove-unused-Microsoft.Win32.Registry-4.6.0-ref.patch delete mode 100644 eng/source-build-patches/0013-Use-PVP-version-of-System.Text.Json.patch delete mode 100644 eng/source-build-patches/0014-vstest-build-for-.NET-6.patch delete mode 100644 eng/source-build-patches/0016-Lift-NETStandard.Library-to-SBRP-version.patch delete mode 100644 eng/source-build-patches/0018-Ensure-WebSdk-projects-finish-before-PublishNetSdks.patch delete mode 100644 eng/source-build-patches/0018-Remove-dotnet-hello-test-projects.patch diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 0266f682811b..8bc7785fb45d 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -5,20 +5,6 @@ true - - - - - - - - - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf" diff --git a/eng/source-build-patches/0003-Conditionally-include-PrecompileScript.patch b/eng/source-build-patches/0003-Conditionally-include-PrecompileScript.patch deleted file mode 100644 index 87c464d21d10..000000000000 --- a/eng/source-build-patches/0003-Conditionally-include-PrecompileScript.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c1ec6ffdeb85e7fc1f4652b85b721b084f0ae97d Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Sat, 20 Jun 2020 18:54:24 -0400 -Subject: [PATCH] Conditionally include PrecompileScript - ---- - .../ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj b/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj -index da033cd6b..ab7ff3133 100644 ---- a/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj -+++ b/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj -@@ -11,7 +11,7 @@ - - - -- -+ - -Date: Sat, 20 Jun 2020 19:00:57 -0400 -Subject: [PATCH] Add reference and update to use PVP - ---- - .../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 513b246b9..ec9bfa366 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -26,6 +26,7 @@ - - - -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0006-Remove-test-projects.patch b/eng/source-build-patches/0006-Remove-test-projects.patch deleted file mode 100644 index 1ada6082f650..000000000000 --- a/eng/source-build-patches/0006-Remove-test-projects.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e32a3f9383636d72bed268ba2ed03ffc8bf8a7b Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 9 Feb 2021 14:26:06 +0000 -Subject: [PATCH] Remove test projects - ---- - source-build.slnf | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - create mode 100644 source-build.slnf - -diff --git a/source-build.slnf b/source-build.slnf -new file mode 100644 -index 000000000..1a4cba8fb ---- /dev/null -+++ b/source-build.slnf -@@ -0,0 +1,41 @@ -+{ -+ "solution": { -+ "path": "sdk.sln", -+ "projects": [ -+ "src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj", -+ "src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj", -+ "src\\BuiltInTools\\AspNetCoreDeltaApplier\\Microsoft.Extensions.AspNetCoreDeltaApplier.csproj", -+ "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", -+ "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", -+ "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", -+ "src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj", -+ "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", -+ "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj", -+ "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj", -+ "src\\Cli\\dotnet\\dotnet.csproj", -+ "src\\Compatibility\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj", -+ "src\\Layout\\redist\\redist.csproj", -+ "src\\Layout\\tool_fsharp\\tool_fsc.csproj", -+ "src\\Layout\\tool_msbuild\\tool_msbuild.csproj", -+ "src\\Layout\\tool_nuget\\tool_nuget.csproj", -+ "src\\Layout\\toolset-tasks\\toolset-tasks.csproj", -+ "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj", -+ "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj", -+ "src\\RazorSdk\\SourceGenerators\\Microsoft.NET.Sdk.Razor.SourceGenerators.csproj", -+ "src\\RazorSdk\\Tasks\\Microsoft.NET.Sdk.Razor.Tasks.csproj", -+ "src\\RazorSdk\\Tool\\Microsoft.NET.Sdk.Razor.Tool.csproj", -+ "src\\Resolvers\\Microsoft.DotNet.MSBuildSdkResolver\\Microsoft.DotNet.MSBuildSdkResolver.csproj", -+ "src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj", -+ "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", -+ "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", -+ "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", -+ "src\\Resolvers\\WorkloadManifestValidator\\WorkloadManifestValidator.csproj", -+ "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", -+ "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj", -+ "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj", -+ "src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj", -+ "src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj", -+ "src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj" -+ ] -+ } -+} - --- -2.21.3 - diff --git a/eng/source-build-patches/0007-Exclude-System.Text.Json-when-calling-PublishTestCli.patch b/eng/source-build-patches/0007-Exclude-System.Text.Json-when-calling-PublishTestCli.patch deleted file mode 100644 index 4781916f893f..000000000000 --- a/eng/source-build-patches/0007-Exclude-System.Text.Json-when-calling-PublishTestCli.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c4f1049265429a2f9ed0478dd21cbbe0171d5685 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 1 Jul 2020 21:40:38 +0000 -Subject: [PATCH] Exclude System.Text.Json when calling PublishTestCli - ---- - src/Layout/redist/targets/GenerateLayout.targets | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index c3713a8d4..8d4fc0d42 100644 ---- a/src/Layout/redist/targets/GenerateLayout.targets -+++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -105,6 +105,7 @@ - - - -+ - - --- -2.25.4 - diff --git a/eng/source-build-patches/0008-Patch-out-Windows-Desktop-targets.patch b/eng/source-build-patches/0008-Patch-out-Windows-Desktop-targets.patch deleted file mode 100644 index d43bc084d95e..000000000000 --- a/eng/source-build-patches/0008-Patch-out-Windows-Desktop-targets.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bcb3f9ecc874ba8a5d648af9ea35651465ed1976 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Fri, 4 Sep 2020 04:01:01 -0500 -Subject: [PATCH] Patch out Windows Desktop targets - ---- - .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props -index 4523af8c9..e7d515a49 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props -@@ -146,7 +146,7 @@ Copyright (c) .NET Foundation. All rights reserved. - - - -- -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0009-PlatformAbstractions-is-not-produced-in-source-build.patch b/eng/source-build-patches/0009-PlatformAbstractions-is-not-produced-in-source-build.patch deleted file mode 100644 index 80f8c516f9ce..000000000000 --- a/eng/source-build-patches/0009-PlatformAbstractions-is-not-produced-in-source-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8b3b7f9b2573c8448827586e66d5cff854a9526d Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 12 Aug 2020 14:26:52 -0500 -Subject: [PATCH] PlatformAbstractions is not produced in source-build - ---- - .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index 3f345a481..6baf86487 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -49,6 +49,7 @@ - - - -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0010-Use-source-built-MSBuild-for-F.patch b/eng/source-build-patches/0010-Use-source-built-MSBuild-for-F.patch deleted file mode 100644 index 736074657f34..000000000000 --- a/eng/source-build-patches/0010-Use-source-built-MSBuild-for-F.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 36233ce4ad5492b6022b59a1fec876800d6608a9 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 8 Sep 2020 12:20:40 -0500 -Subject: [PATCH] Use source-built MSBuild for F#. - ---- - eng/Versions.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 7c7c0a349..cc43f479f 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -97,6 +97,7 @@ - $(MicrosoftBuildFrameworkPackageVersion) - $(MicrosoftBuildUtilitiesCorePackageVersion) - $(MicrosoftBuildTasksCorePackageVersion) -+ $(MicrosoftBuildPackageVersion) - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0011-Use-source-built-Nuget.patch b/eng/source-build-patches/0011-Use-source-built-Nuget.patch deleted file mode 100644 index 05923ad89f6d..000000000000 --- a/eng/source-build-patches/0011-Use-source-built-Nuget.patch +++ /dev/null @@ -1,25 +0,0 @@ -From daf013d980e33690cdbd3b3cd9e064c6216f1f95 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 16 Sep 2020 18:00:45 -0500 -Subject: [PATCH] Use source-built Nuget - ---- - src/Layout/toolset-tasks/toolset-tasks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Layout/toolset-tasks/toolset-tasks.csproj b/src/Layout/toolset-tasks/toolset-tasks.csproj -index 4a16caa3f..a85de078a 100644 ---- a/src/Layout/toolset-tasks/toolset-tasks.csproj -+++ b/src/Layout/toolset-tasks/toolset-tasks.csproj -@@ -8,7 +8,7 @@ - - - -- -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0012-Remove-unused-Microsoft.Win32.Registry-4.6.0-ref.patch b/eng/source-build-patches/0012-Remove-unused-Microsoft.Win32.Registry-4.6.0-ref.patch deleted file mode 100644 index ac578b98d882..000000000000 --- a/eng/source-build-patches/0012-Remove-unused-Microsoft.Win32.Registry-4.6.0-ref.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 395a179c47e851cec462fdff421b77bdc23ee3df Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Wed, 4 Nov 2020 14:03:23 -0600 -Subject: [PATCH] Remove unused Microsoft.Win32.Registry/4.6.0 ref - -This project restores a prebuilt Microsoft.Win32.Registry reference, but -it doesn't end up in the SDK: the DLL from the net5.0 shared framework -is already present. Remove this unnecessary PackageReference to remove -the prebuilt. ---- - src/Cli/dotnet/dotnet.csproj | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj -index c6a20563e..babd0423a 100644 ---- a/src/Cli/dotnet/dotnet.csproj -+++ b/src/Cli/dotnet/dotnet.csproj -@@ -73,7 +73,6 @@ - - - -- - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0013-Use-PVP-version-of-System.Text.Json.patch b/eng/source-build-patches/0013-Use-PVP-version-of-System.Text.Json.patch deleted file mode 100644 index 85400d00faf6..000000000000 --- a/eng/source-build-patches/0013-Use-PVP-version-of-System.Text.Json.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c8c8d9853eb8431064d88e5135db83f5e31dd58c Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 5 Nov 2020 14:23:06 +0000 -Subject: [PATCH] Use PVP version of System.Text.Json - ---- - .../Microsoft.DotNet.TemplateLocator.csproj | 2 +- - .../Microsoft.NET.Sdk.WorkloadManifestReader.csproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj -index 910e50c6f..c39ef136e 100644 ---- a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj -+++ b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj -@@ -55,7 +55,7 @@ - - - -- -+ - - - -diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj -index 4c151eaad..2bac54eff 100644 ---- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj -+++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj -@@ -20,7 +20,7 @@ - - - -- -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0014-vstest-build-for-.NET-6.patch b/eng/source-build-patches/0014-vstest-build-for-.NET-6.patch deleted file mode 100644 index 4a5dbb86718b..000000000000 --- a/eng/source-build-patches/0014-vstest-build-for-.NET-6.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b37a2d81893c7d5dbebec3e1e9a9bf969ac916b7 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 28 Oct 2020 14:31:39 +0100 -Subject: [PATCH] vstest: build for .NET 6 - ---- - src/Layout/redist/targets/GenerateLayout.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 8d4fc0d42..5b26387c1 100644 ---- a/src/Layout/redist/targets/GenerateLayout.targets -+++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -96,7 +96,7 @@ - - -- $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/netcoreapp2.1/ -+ $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/net6.0/ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0016-Lift-NETStandard.Library-to-SBRP-version.patch b/eng/source-build-patches/0016-Lift-NETStandard.Library-to-SBRP-version.patch deleted file mode 100644 index 10ee70e56de3..000000000000 --- a/eng/source-build-patches/0016-Lift-NETStandard.Library-to-SBRP-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dbb34fad0ce227d50b8a053eeaa1cfe1288f1dcb Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Thu, 10 Dec 2020 16:50:34 -0600 -Subject: [PATCH] Lift NETStandard.Library to SBRP version - ---- - .../Microsoft.NET.Build.Extensions.Tasks.csproj | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -index ff2cd522c..5e4458794 100644 ---- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj -@@ -48,6 +48,8 @@ - - - -+ -+ - - - --- -2.25.4 - diff --git a/eng/source-build-patches/0018-Ensure-WebSdk-projects-finish-before-PublishNetSdks.patch b/eng/source-build-patches/0018-Ensure-WebSdk-projects-finish-before-PublishNetSdks.patch deleted file mode 100644 index e910785642db..000000000000 --- a/eng/source-build-patches/0018-Ensure-WebSdk-projects-finish-before-PublishNetSdks.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4ba8044a223fb7ed001ce777c8112e231bcee7f8 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 2 Feb 2021 09:18:31 -0500 -Subject: [PATCH] Ensure WebSdk projects finish before PublishNetSdks - ---- - src/Layout/redist/targets/GenerateLayout.targets | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 48b0303..d45fda2 100644 ---- a/src/Layout/redist/targets/GenerateLayout.targets -+++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -70,6 +70,12 @@ - - -+ -+ -+ -+ -+ -+ - - $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk - $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.Web --- -1.8.3.1 - diff --git a/eng/source-build-patches/0018-Remove-dotnet-hello-test-projects.patch b/eng/source-build-patches/0018-Remove-dotnet-hello-test-projects.patch deleted file mode 100644 index 6b7e8941814a..000000000000 --- a/eng/source-build-patches/0018-Remove-dotnet-hello-test-projects.patch +++ /dev/null @@ -1,86 +0,0 @@ -From ad95c68e357e26246f1ab0ab33a5ec0c25f9f39f Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 9 Feb 2021 14:45:52 +0000 -Subject: [PATCH] Remove dotnet-hello test projects - ---- - .../v1/dotnet-hello/dotnet-hello.csproj | 16 ---------------- - .../v2/dotnet-hello/dotnet-hello.csproj | 15 --------------- - .../BuildTestPackages.targets | 16 ---------------- - 3 files changed, 47 deletions(-) - delete mode 100644 src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj - delete mode 100644 src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj - -diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj -deleted file mode 100644 -index 48a78a6e7..000000000 ---- a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj -+++ /dev/null -@@ -1,16 +0,0 @@ -- -- -- -- -- 1.0.0 -- -- -- -- netcoreapp2.2 -- dotnet-hello -- Exe -- win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 -- true -- -- -- -diff --git a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj -deleted file mode 100644 -index 8956d362f..000000000 ---- a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj -+++ /dev/null -@@ -1,15 +0,0 @@ -- -- -- -- -- 2.0.0 -- -- -- -- netcoreapp2.2 -- dotnet-hello -- Exe -- win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 -- true -- -- -diff --git a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets -index 962c06d35..2a88a2fc2 100644 ---- a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets -+++ b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets -@@ -84,22 +84,6 @@ - $(Version) - True - -- -- dotnet-hello -- dotnet-hello.csproj -- True -- True -- 1.0.0 -- True -- -- -- dotnet-hello -- dotnet-hello.csproj -- True -- True -- 2.0.0 -- True -- - - dotnet-outputsframeworkversion-netcoreapp1.0 - dotnet-outputsframeworkversion-netcoreapp1.0.csproj --- -2.21.3 - diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 33903521a84c..2f9ac9ccb3b4 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -43,6 +43,6 @@ - + diff --git a/src/Layout/toolset-tasks/toolset-tasks.csproj b/src/Layout/toolset-tasks/toolset-tasks.csproj index 43aa38b20512..b7ab9f2b9c52 100644 --- a/src/Layout/toolset-tasks/toolset-tasks.csproj +++ b/src/Layout/toolset-tasks/toolset-tasks.csproj @@ -2,6 +2,7 @@ $(SdkTargetFramework);net472 $(SdkTargetFramework) + true From 45b7b2bc0871172dc0cd07212175121bc42cb256 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 5 May 2021 10:02:05 -0700 Subject: [PATCH 17/20] Fix source build test issues --- .vsts-ci.yml | 11 +++++------ src/Layout/redist/targets/GenerateLayout.targets | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e0873e4088e6..080609d744e6 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -60,6 +60,11 @@ stages: _PublishType: blob _SignType: real _Test: '' + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/build.yml parameters: @@ -142,12 +147,6 @@ stages: _PublishType: none _SignType: test - - template: /eng/common/templates/job/source-build.yml - parameters: - platform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml parameters: diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 0eb5817dc1ae..67feb0599c8f 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -114,7 +114,9 @@ - $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/net6.0/ + netcoreapp2.1 + net6.0 + $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ From cba4b390d43f65eedc2222a0899db9bf2e30b19f Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 6 May 2021 11:12:23 -0700 Subject: [PATCH 18/20] Adding dotnet-hello assets back --- .../v1/dotnet-hello/dotnet-hello.csproj | 16 ++++++++++++++++ .../v2/dotnet-hello/dotnet-hello.csproj | 15 +++++++++++++++ .../BuildTestPackages.targets | 16 ++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj create mode 100644 src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj new file mode 100644 index 000000000000..48a78a6e741f --- /dev/null +++ b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -0,0 +1,16 @@ + + + + + 1.0.0 + + + + netcoreapp2.2 + dotnet-hello + Exe + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 + true + + + diff --git a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj new file mode 100644 index 000000000000..8956d362f444 --- /dev/null +++ b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -0,0 +1,15 @@ + + + + + 2.0.0 + + + + netcoreapp2.2 + dotnet-hello + Exe + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 + true + + diff --git a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets index 2a88a2fc22a9..962c06d35e4f 100644 --- a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets +++ b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets @@ -84,6 +84,22 @@ $(Version) True + + dotnet-hello + dotnet-hello.csproj + True + True + 1.0.0 + True + + + dotnet-hello + dotnet-hello.csproj + True + True + 2.0.0 + True + dotnet-outputsframeworkversion-netcoreapp1.0 dotnet-outputsframeworkversion-netcoreapp1.0.csproj From 508305570a8cea384b83d18d55294f524f6147c4 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 6 May 2021 12:51:29 -0700 Subject: [PATCH 19/20] PR feedback: --- .../dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj | 1 + .../dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj | 1 + .../ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj index 48a78a6e741f..67433cd86b68 100644 --- a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -11,6 +11,7 @@ Exe win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 true + true diff --git a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj index 8956d362f444..d332211745aa 100644 --- a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -11,5 +11,6 @@ Exe win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 true + true diff --git a/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj b/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj index ac1c228ea860..ff90346f3d59 100644 --- a/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj +++ b/src/Tests/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj @@ -4,6 +4,7 @@ $(ToolsetTargetFramework) Exe false + true @@ -11,7 +12,7 @@ - + Date: Thu, 13 May 2021 15:26:39 +0000 Subject: [PATCH 20/20] Update solution filter with renamed project --- source-build.slnf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source-build.slnf b/source-build.slnf index 2b3e27f0976d..f0f7b2014900 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -4,7 +4,7 @@ "projects": [ "src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj", "src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj", - "src\\BuiltInTools\\AspNetCoreDeltaApplier\\Microsoft.Extensions.AspNetCoreDeltaApplier.csproj", + "src\\BuiltInTools\\DotNetDeltaApplier\\Microsoft.Extensions.DotNetDeltaApplier.csproj", "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj",