diff --git a/eng/SourceBuild.Version.Details.xml b/eng/SourceBuild.Version.Details.xml index 8f75652bb..ecdf80ec1 100644 --- a/eng/SourceBuild.Version.Details.xml +++ b/eng/SourceBuild.Version.Details.xml @@ -47,6 +47,11 @@ 566b53a66b0afa573f0dae33d07c8de9685aa5c8 + + https://github.com/dotnet/sdk + 5fab7585de482237f470634489b969a1bd03e063 + + https://github.com/dotnet/symreader 1968a003d845d119a9d38ac4daaeea22897f7daf diff --git a/eng/Versions.props b/eng/Versions.props index 0f87b6d59..f9e542353 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,7 +159,7 @@ 15.7.179 15.7.179 0.1.0-6.0.100-bootstrap.11 - 0.1.0-6.0.100-5 + 0.1.0-6.0.100-6 diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index ad64b4f8a..b47c3db3a 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -23,6 +23,6 @@ 0.1.0-6.0.100-bootstrap.11 0.1.0-6.0.100- - 5 + 6 diff --git a/src/SourceBuild/tarball/content/patches/sdk/0001-Update-reference-versions-to-be-source-buildable.patch b/src/SourceBuild/tarball/content/patches/sdk/0001-Update-reference-versions-to-be-source-buildable.patch new file mode 100644 index 000000000..dc62d78b9 --- /dev/null +++ b/src/SourceBuild/tarball/content/patches/sdk/0001-Update-reference-versions-to-be-source-buildable.patch @@ -0,0 +1,41 @@ +From c57808231260cc3467b98d97c3249a59db9757f2 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Mon, 9 Aug 2021 13:43:41 +0000 +Subject: [PATCH] Update reference versions to be source buildable + +Update CodeAnalysis version reference to utilize Versions.props in order to work with source build. +--- + eng/Versions.props | 1 + + .../Microsoft.NET.Sdk.Razor.SourceGenerators.csproj | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 07cca8a35..8fb6dffaf 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -122,6 +122,7 @@ + + + 4.0.0-2.21359.14 ++ 4.0.0-2.21359.14 + 4.0.0-2.21359.14 + 4.0.0-2.21359.14 + 4.0.0-2.21359.14 +diff --git a/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj b/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj +index 1213ec4db..81697986c 100644 +--- a/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj ++++ b/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj +@@ -15,8 +15,8 @@ + + +- +- ++ ++ + + + +-- +2.29.2 + diff --git a/src/SourceBuild/tarball/content/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch b/src/SourceBuild/tarball/content/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch new file mode 100644 index 000000000..07af492d3 --- /dev/null +++ b/src/SourceBuild/tarball/content/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch @@ -0,0 +1,27 @@ +From 4d2c2370dc85e658508fd0943e47b0d6559f42d5 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Mon, 9 Aug 2021 14:03:33 +0000 +Subject: [PATCH] NoWarn NU1605 until DeploymentTools is in SourceBuild + +src/Cli/dotnet/dotnet.csproj : error NU1605: Detected package downgrade: Newtonsoft.Json from 12.0.3 to 12.0.2. Reference the package directly from the project to select a different version. + +Error stems from Microsoft.Deployment.DotNet.Releases not being source built and referencing a newer version. Temporary fix until the DeploymentTools repo is added to source-build (https://github.com/dotnet/source-build/issues/2365). +--- + src/Cli/dotnet/dotnet.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj +index 4ff965a4d..f9609824b 100644 +--- a/src/Cli/dotnet/dotnet.csproj ++++ b/src/Cli/dotnet/dotnet.csproj +@@ -12,6 +12,7 @@ + Microsoft.DotNet.Cli + false + true ++ $(NoWarn);NU1605 + + + +-- +2.29.2 + diff --git a/src/SourceBuild/tarball/content/patches/sdk/0003-Remove-472-TFM-from-source-build.patch b/src/SourceBuild/tarball/content/patches/sdk/0003-Remove-472-TFM-from-source-build.patch new file mode 100644 index 000000000..29c8a7c26 --- /dev/null +++ b/src/SourceBuild/tarball/content/patches/sdk/0003-Remove-472-TFM-from-source-build.patch @@ -0,0 +1,53 @@ +From 6009d921575a4474c66b812bdb914237ddb04cc2 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Mon, 9 Aug 2021 15:27:19 +0000 +Subject: [PATCH] Remove 472 TFM from source build + +src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj : error NU1202: Package Microsoft.Build 17.0.0 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package Microsoft.Build 17.0.0 supports: net6.0 (.NETCoreApp,Version=v6.0) +src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj : error NU1202: Package Microsoft.Build 17.0.0 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package Microsoft.Build 17.0.0 supports: net6.0 (.NETCoreApp,Version=v6.0) +.dotnet/sdk/6.0.100-preview.5.21225.11/Microsoft.Common.CurrentVersion.targets(1717,5): error : Project '../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj' targets 'net6.0'. It cannot be referenced by a project that targets '.NETFramework,Version=v4.7.2'. +--- + .../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 + + .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 + + .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 + + 3 files changed, 3 insertions(+) + +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 c10a6224c..66a26913b 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 +@@ -2,6 +2,7 @@ + + + $(SdkTargetFramework);net472 ++ $(SdkTargetFramework) + true + MicrosoftAspNetCore + true +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 280fbdc83..13ada8222 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 +@@ -16,6 +16,7 @@ + Library + Microsoft.NET.Build.Tasks + $(SdkTargetFramework);net472 ++ $(SdkTargetFramework) + + + +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 e7ff48146..c98ed27cf 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 +@@ -13,6 +13,7 @@ + The MSBuild targets and properties for building .NET Core projects. + Library + $(SdkTargetFramework);net472 ++ $(SdkTargetFramework) + annotations + + +-- +2.29.2 + diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 6ef3fb2f4..0ebbdf3af 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -52,6 +52,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index cad87db5a..31cab5aa7 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -1,22 +1,14 @@ - - sdk - - - --pack --configuration $(Configuration) + $(StandardSourceBuildArgs) + $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir) true $(BuildCommandArgs) -v $(LogVerbosity) - $(BuildCommandArgs) -bl - $(BuildCommandArgs) -ci - $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) - $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) - $(BuildCommandArgs) /p:Projects=$(ProjectDirectory)source-build.slnf $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) - $(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs) + $(StandardSourceBuildCommand) $(BuildCommandArgs) $(ProjectDirectory)NuGet.config @@ -34,29 +26,23 @@ true false - - $(SourceBuiltPackagesPath) - $(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) - $(EnvironmentRestoreSources)%3Bhttps://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json - - - - - + - - - - + + +