diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 170fe99b2..a2831d574 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -5,20 +5,6 @@ true - - - - - - - - - $(InnerBuildArgs) /p:SkipBuildingInstallers=true diff --git a/eng/Versions.props b/eng/Versions.props index 0c6dd825e..f7a00d211 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,6 +90,10 @@ $(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion) $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + + + 5.8.0 + 5.0.3 diff --git a/eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch b/eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch deleted file mode 100644 index 65d055502..000000000 --- a/eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 17bdd83006fbd27b64453ecddcf785c17eaaef1b Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 29 Jun 2020 15:14:07 -0400 -Subject: [PATCH 1/3] Exclude test folder from source-build - ---- - test/Directory.Build.props | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/test/Directory.Build.props b/test/Directory.Build.props -index a953b97cc..26d486322 100644 ---- a/test/Directory.Build.props -+++ b/test/Directory.Build.props -@@ -1,4 +1,7 @@ - - - -+ -+ true -+ - --- -2.18.0 - diff --git a/eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch b/eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch deleted file mode 100644 index 32dedda90..000000000 --- a/eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e09da5670bfc8df488b65aee94de992a1c75a6a4 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 14 Sep 2020 18:43:27 -0500 -Subject: [PATCH] Add target rid to NetCoreAppHostRids - ---- - src/redist/targets/GenerateBundledVersions.targets | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets -index 7c6f72967..3ee0284e1 100644 ---- a/src/redist/targets/GenerateBundledVersions.targets -+++ b/src/redist/targets/GenerateBundledVersions.targets -@@ -99,6 +99,20 @@ - - - -+ -+ -+ - - - -- -- -+ -+ - - - --- -2.21.3 - diff --git a/eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch b/eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch deleted file mode 100644 index c31eec381..000000000 --- a/eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch +++ /dev/null @@ -1,103 +0,0 @@ -From d6aa940075f63d41603cbb2f3524958356d9abcf Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Fri, 4 Sep 2020 02:23:15 -0500 -Subject: [PATCH 4/4] ExcludeFromSourceBuild not working again - ---- - Microsoft.DotNet.Cli.sln | 7 ------ - src/SdkResolver/SdkResolver.csproj | 39 ------------------------------ - src/redist/redist.csproj | 4 ++-- - 3 files changed, 2 insertion(+), 48 deletions(-) - delete mode 100644 src/SdkResolver/SdkResolver.csproj - -diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln -index 22d771abd..3ab6577a8 100644 ---- a/Microsoft.DotNet.Cli.sln -+++ b/Microsoft.DotNet.Cli.sln -@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core- - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResolver\SdkResolver.csproj", "{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}" --EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}" - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}" -@@ -45,10 +43,6 @@ Global - {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU -- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.Build.0 = Release|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU -@@ -70,7 +64,6 @@ Global - {1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} -- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - EndGlobalSection ---- a/src/SdkResolver/SdkResolver.csproj -+++ /dev/null -@@ -1,39 +0,0 @@ -- -- -- -- $(CoreSdkTargetFramework) -- false -- false -- false -- false -- UNUSED -- true -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> -- <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> -- <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" /> -- <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> -- -- -- -- -- -- -diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj -index 35c3d4ad9..15601e98f 100644 ---- a/src/redist/redist.csproj -+++ b/src/redist/redist.csproj -@@ -12,7 +12,7 @@ - RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" - /> - -- -+ -- -+ - - --- -2.18.0 - diff --git a/eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch b/eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch deleted file mode 100644 index 4fc5bf023..000000000 --- a/eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5f34f12928157f5ed1c351dc217bf4bf5b62befe Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 14 Sep 2020 09:47:04 -0500 -Subject: [PATCH 5/5] Don't do this in source-build - - aspnetcore-targeting-pack.tar.gz not available. - ---- - src/redist/targets/GeneratePKG.targets | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets -index 82e55b18c..c78dc7b55 100644 ---- a/src/redist/targets/GeneratePKG.targets -+++ b/src/redist/targets/GeneratePKG.targets -@@ -128,7 +128,7 @@ - Inputs="@(GenerateSdkPkgInputs)" - Outputs="$(SdkPKGInstallerFile)" - DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs" -- Condition=" '$(OSName)' == 'osx' "> -+ Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' "> - - - -@@ -172,7 +172,7 @@ - Inputs="@(GenerateSdkProductArchiveInputs)" - Outputs="$(CombinedFrameworkSdkHostPKGInstallerFile)" - DependsOnTargets="GenerateSdkPkg" -- Condition=" '$(OSName)' == 'osx' "> -+ Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' "> - - - - -- -- - - - -@@ -45,8 +43,6 @@ - - - -- -- - - - -@@ -56,8 +52,6 @@ - - - -- -- - - - -@@ -68,8 +62,6 @@ - - - -- -- - - - --- -2.21.3 - diff --git a/eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch b/eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch deleted file mode 100644 index 9e917ee80..000000000 --- a/eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 992512755a9df08ccfd531f7507c298aa5b22112 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 29 Oct 2020 16:01:59 +0000 -Subject: [PATCH] Update blob versions to use ref pkg versions to track stable - versions - ---- - src/redist/targets/GenerateLayout.targets | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets -index 9e7249d..f1b11d4 100644 ---- a/src/redist/targets/GenerateLayout.targets -+++ b/src/redist/targets/GenerateLayout.targets -@@ -7,8 +7,8 @@ - - - -- $(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion) -- $(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion) -+ $(MicrosoftAspNetCoreAppRuntimePackageVersion) -+ $(MicrosoftNETCoreAppRuntimePackageVersion) - $(VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion) - - --- -1.8.3.1 - diff --git a/eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch b/eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch deleted file mode 100644 index 69d134b05..000000000 --- a/eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 13b15d6ef5ac2bf593825bd1c1b85020585e1751 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Thu, 8 Apr 2021 20:59:02 +0000 -Subject: [PATCH] Exclude internal tarball from source-build - ---- - src/redist/targets/GenerateArchives.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets -index e59e5d4..8a66679 100644 ---- a/src/redist/targets/GenerateArchives.targets -+++ b/src/redist/targets/GenerateArchives.targets -@@ -28,7 +28,7 @@ - IgnoreExitCode="$(IgnoreTarExitCode)"/> - - -Date: Thu, 8 Apr 2021 21:53:33 +0000 -Subject: [PATCH] Update GenerateMSI.targets build task ref to net5.0 - ---- - src/redist/targets/GenerateMSIs.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets -index 0c69a4d..397fb82 100644 ---- a/src/redist/targets/GenerateMSIs.targets -+++ b/src/redist/targets/GenerateMSIs.targets -@@ -1,7 +1,7 @@ - - - -- $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.Installers.dll -+ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net5.0\Microsoft.DotNet.Build.Tasks.Installers.dll - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll - - --- -1.8.3.1 - diff --git a/source-build.slnf b/source-build.slnf new file mode 100644 index 000000000..e5f65bf3b --- /dev/null +++ b/source-build.slnf @@ -0,0 +1,10 @@ +{ + "solution": { + "path": "Microsoft.DotNet.Cli.sln", + "projects": [ + "src\\Microsoft.Dotnet.Sdk.Internal\\Microsoft.Dotnet.Sdk.Internal.csproj", + "src\\core-sdk-tasks\\core-sdk-tasks.csproj", + "src\\redist\\redist.csproj", + ] + } +} \ No newline at end of file diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 00420b6ba..2e03bd0d1 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index e9c30d1da..c735a1fb8 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -12,8 +12,8 @@ RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" /> - - + + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index d1e84fdaa..5da7bfc28 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -27,9 +27,8 @@ - - - + + @@ -45,9 +44,9 @@ - - + + @@ -56,9 +55,9 @@ - - + + @@ -68,9 +67,9 @@ - - + + diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index e59e5d447..8a6667933 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -28,7 +28,7 @@ IgnoreExitCode="$(IgnoreTarExitCode)"/> + + + - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.Installers.dll - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll + netcoreapp3.1 + net5.0 + net472 + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 1d14596fa..700ee7ab7 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -139,7 +139,7 @@ Inputs="@(GenerateSdkPkgInputs)" Outputs="$(SdkPKGInstallerFile)" DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs" - Condition=" '$(OSName)' == 'osx' "> + Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' "> @@ -190,7 +190,7 @@ Inputs="@(GenerateSdkProductArchiveInputs)" Outputs="$(CombinedFrameworkSdkHostPKGInstallerFile)" DependsOnTargets="GenerateSdkPkg" - Condition=" '$(OSName)' == 'osx' "> + Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' "> + + true +