diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 235bd9487..c4d48178a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,10 @@ https://github.com/dotnet/arcade c336f6cb59bd52dfe2a844c738ec044affc57634 - + https://github.com/dotnet/source-build-reference-packages - 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 + fc184172bf8144f7c91a7bc0226b7d90c5821576 + https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index a5abbd6b2..e17bb090d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,8 +162,20 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.11 - 0.1.0-6.0.100-19 + + 0.1.0-6.0.100-bootstrap.29 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 5ee0cf7f0..cb1a5adfe 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -88,9 +88,7 @@ $(GitHubRepositoryName) 1.0.0 1.0.0 - - - 2f7c1a94d6c9f8f9173ebadf2ec2ba512b2b4576 + @(RootRepoCommitSha) @(RootRepoUri) @(RootRepoCommitCount) $(GitHubRepositoryName) @@ -248,6 +246,20 @@ + + + + + + + + + + + + @@ -294,7 +306,9 @@ - + + AfterTargets="Build" + DependsOnTargets=" + CheckIfPrebuiltsExistToPack; + CreatePrebuiltsTarballIfPrebuiltsExist"/> + + + + + + + + + + $(PrivateSourceBuiltPrebuiltsPackageVersionPrefix)$([MSBuild]::Add($(PrivateSourceBuiltPrebuiltsPackageVersionSuffix), 1)) $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(TarballFileVersion).tar.gz diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 365caa902..4701139f6 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -22,6 +22,6 @@ 0.1.0-6.0.100- - 30 + 36 diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 64536436d..69dab2b18 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -151,6 +151,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/arcade.proj b/src/SourceBuild/tarball/content/repos/arcade.proj index 7c743ded7..fbf8b3a48 100644 --- a/src/SourceBuild/tarball/content/repos/arcade.proj +++ b/src/SourceBuild/tarball/content/repos/arcade.proj @@ -25,6 +25,7 @@ + @@ -32,33 +33,13 @@ + + + + - - - - - - - - - - - - - - %(PreviouslySourceBuiltNuGetPackageInfo.PackageVersion) - $(BuildCommand) /p:NuGetVersion=$(PreviouslySourceBuiltNuGetVersion) - - - diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 8be2152e4..85d4e6015 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -23,6 +23,18 @@ $(ProjectDirectory)NuGet.config + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj new file mode 100644 index 000000000..21734d18d --- /dev/null +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -0,0 +1,23 @@ + + + + + $(ProjectDirectory)eng\common\build$(ShellExtension) $(StandardSourceBuildArgs) + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index b77de5f30..a03a69fc5 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -4,6 +4,12 @@ $(StandardSourceBuildArgs) $(BuildCommandArgs) /p:TreatWarningsAsErrors=false + + $(BuildCommandArgs) --sourcebuild $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 1208a937a..eab516290 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -54,6 +54,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj b/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj index 3c7dc4453..3d7882a5b 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj @@ -2,12 +2,8 @@ - - $(StandardSourceBuildArgs.Replace('/p:DotNetPackageVersionPropsPath="$(PackageVersionPropsPath)"', '')) + $(StandardSourceBuildArgs) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) - $(BuildCommandArgs) /p:SourceBuildPackageVersionPropsPath="$(PackageVersionPropsPath)" $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 7a8980227..6aeeebdf2 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -19,6 +19,23 @@ $(ProjectDirectory)global.json + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props index 0f83bfc44..b1e9e6adb 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.common.props +++ b/src/SourceBuild/tarball/content/repos/runtime.common.props @@ -32,6 +32,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 9cb477726..22f91b0eb 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -42,6 +42,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repos/templating.proj index be7f3414d..7cc53299c 100644 --- a/src/SourceBuild/tarball/content/repos/templating.proj +++ b/src/SourceBuild/tarball/content/repos/templating.proj @@ -15,6 +15,7 @@ + diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 689d64def..a64453ba0 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -246,21 +246,39 @@ function doCommand() { wait $! echo " terminated with exit code $?" | tee -a "$logFile" elif [ "$1" == "multi-rid-publish" ]; then - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - } + if [ "$lang" == "F#" ]; then + # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 + runPublishScenarios() { + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true + } + else + runPublishScenarios() { + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + } + fi if [ "$projectOutput" == "true" ]; then runPublishScenarios | tee -a "$logFile" else runPublishScenarios >> "$logFile" 2>&1 fi else - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" + if [ "$lang" == "F#" ]; then + # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 + if [ "$projectOutput" == "true" ]; then + "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile" + else + "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1 + fi else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 + if [ "$projectOutput" == "true" ]; then + "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" + else + "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 + fi fi fi if [ $? -eq 0 ]; then @@ -304,7 +322,8 @@ function runAllTests() { doCommand VB xunit new restore test doCommand VB mstest new restore test - doCommand F# console new restore build run multi-rid-publish + # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 + doCommand F# console new restore build multi-rid-publish doCommand F# classlib new restore build multi-rid-publish doCommand F# xunit new restore test doCommand F# mstest new restore test @@ -329,12 +348,16 @@ function runWebTests() { doCommand C# mvc "$@" new restore build run multi-rid-publish doCommand C# webapi "$@" new restore build multi-rid-publish doCommand C# razor "$@" new restore build run multi-rid-publish - doCommand C# blazorwasm "$@" new restore build run publish + # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 + # doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish - doCommand F# web "$@" new restore build run multi-rid-publish - doCommand F# mvc "$@" new restore build run multi-rid-publish - doCommand F# webapi "$@" new restore build run multi-rid-publish + # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 + doCommand F# web "$@" new restore build multi-rid-publish + # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 + # doCommand F# mvc "$@" new restore build run multi-rid-publish + # "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554 + doCommand F# webapi "$@" new restore build multi-rid-publish } function runXmlDocTests() { @@ -517,6 +540,7 @@ function runXmlDocTests() { System.Xml.Serialization.xml System.Xml.xml System.Xml.XmlDocument.xml + WindowsBase.xml ) aspnetcoreappIgnoreList=( diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 3835e019c..c5494dedd 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -46,8 +46,16 @@ WorkingDirectory="$(PrebuiltSourceBuiltPackagesPath)" Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' == ''" /> - + + + + + diff --git a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch index f14acf094..b1cdb03da 100644 --- a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch +++ b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch @@ -5,8 +5,7 @@ Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0 --- .../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj | 1 + - .../src/VisualStudioComponent.cs | 4 ++++ - 2 files changed, 5 insertions(+) + 1 files changed, 1 insertions(+) diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj index ae34705a..bda5d581 100644 @@ -20,22 +19,6 @@ index ae34705a..bda5d581 100644 true Latest true -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs -index ee7e9d6d..b69b6823 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs -@@ -247,7 +247,11 @@ public TaskItem Generate(string projectPath) - // processing direct pack dependencies - if (workload.Extends?.Count() > 0) - { -+#if NET6_0 -+ foreach (WorkloadId dependency in workload.Extends) -+#else - foreach (WorkloadDefinitionId dependency in workload.Extends) -+#endif - { - // Component dependencies, aka. workload extensions only have minimum version dependencies. - component.AddDependency($"{Utils.ToSafeId(dependency.ToString())}", new Version("1.0.0.0"), maxVersion: null); -- 2.29.2 diff --git a/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch b/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch deleted file mode 100644 index acb46223f..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4577f60202649281d2c96c4d8b67d331b7e71c35 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 10 Sep 2021 13:52:54 +0000 -Subject: [PATCH] Respond to WorkloadDefinition breaking API change - -See https://github.com/dotnet/arcade/issues/7880 for details ---- - .../src/GenerateWorkloadMsis.cs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -index 50340821..a65453f2 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -@@ -121,6 +121,7 @@ private IEnumerable GetWorkloadPacks() - // platform includes Windows - var workloads = manifests.SelectMany(m => m.Workloads). - Select(w => w.Value). -+ OfType(). - Where(wd => (wd.Platforms == null) || wd.Platforms.Any(p => p.StartsWith("win"))); - - var packIds = workloads.Where(w => w.Packs != null).SelectMany(w => w.Packs).Distinct(); --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch index 6aba415a7..5ed742d7b 100644 --- a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch +++ b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch @@ -13,13 +13,13 @@ Temporary workaround until source-build is built with recent source-built. 1 file changed, 4 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props -index 960eb6c9..fa87aaac 100644 +index 37feef5..c5aee85 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,6 +18,10 @@ false - + + + $(NoWarn);NU1603 + diff --git a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch new file mode 100644 index 000000000..188312413 --- /dev/null +++ b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch @@ -0,0 +1,124 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 8 Oct 2021 16:15:42 -0700 +Subject: [PATCH] Disable Workloads WiX dependency in source-build + +This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014 + +The patch is temporary, pending upstream fix and dependency flow. +--- + .../src/{FileRow.cs => FileRow.wix.cs} | 0 + ...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0 + .../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0 + ...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0 + ...erateVisualStudioMsiPackageProject.wix.cs} | 0 + ...cs => GenerateVisualStudioWorkload.wix.cs} | 0 + ...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0 + ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++--- + ...{MsiProperties.cs => MsiProperties.wix.cs} | 0 + .../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0 + ...elatedProduct.cs => RelatedProduct.wix.cs} | 0 + 11 files changed, 20 insertions(+), 3 deletions(-) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%) + rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%) + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +index 19cf67b5..2d02b7f4 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj ++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +@@ -11,6 +11,16 @@ + $(NoWarn);NU5127 + false + Microsoft.DotNet.Build.Tasks.Workloads ++ ++ ++ true + + + +@@ -19,13 +29,16 @@ + + + +- + +- ++ + + + +- ++ ++ ++ ++ ++ + + + +@@ -48,6 +61,10 @@ + + + ++ ++ ++ ++ + + + +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs +diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs +similarity index 100% +rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs +rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch new file mode 100644 index 000000000..7d5d03116 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 22 Oct 2021 13:26:33 -0500 +Subject: [PATCH] Fix MicrosoftExtensionsVersion + +Move it to eng/Versions.props to make it overridable, and rename it to match an +actual package ID. + +Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be +source-compatible with the 6.0 version of these packages. + +See https://github.com/dotnet/format/issues/1400 +--- + Directory.Packages.props | 7 +++---- + eng/Versions.props | 1 + + src/Logging/SimpleConsoleLogger.cs | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 6b628c2..9b579ea 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -2,7 +2,6 @@ + + + +- 5.0.0 + + 6.0.0-preview.4.221 + +@@ -25,9 +24,9 @@ + + + +- +- +- ++ ++ ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index b1990aa..f6ddbbd 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -15,6 +15,7 @@ + + 16.11.0 + 3.3.2 ++ 5.0.0 + + 4.0.0-6.21526.21 + +diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs +index c361f84..fd8015c 100644 +--- a/src/Logging/SimpleConsoleLogger.cs ++++ b/src/Logging/SimpleConsoleLogger.cs +@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging + _minimalErrorLevel = minimalErrorLevel; + } + +- public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) ++ public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) + { + if (!IsEnabled(logLevel)) + { diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch new file mode 100644 index 000000000..d9a483852 --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0001-Disable-apphost-on-downlevel-frameworks-during-sourc.patch @@ -0,0 +1,167 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 19 Oct 2021 16:11:51 -0500 +Subject: [PATCH] Disable apphost on downlevel frameworks during source-build + +During source-build, disable apphost build for 'fsi' and 'fsc', and +'fsyacc', 'fslex', and 'AssemblyCheck' during the bootstrap build. + +Creating an apphost for a net5.0 project while building with a net6.0 +SDK downloads the apphost pack as a prebuilt. Stopping the projects from +creating the apphost removes the prebuilt for source-build. + +To make disabling the apphost work in the bootstrapping build, add a +check to eng/build.sh to skip the bootstrap build if we're currently +running the "outer" source-build. That gives source-build the ability to +run bootstrapping on its own terms. Now, when eng/SourceBuild.props runs +bootstrapping, it can pass the DotNetBuildFromSource property through +the environment so it takes effect. + +See: https://github.com/dotnet/fsharp/issues/12282 + +PR: https://github.com/dotnet/fsharp/pull/12286 +--- + eng/SourceBuild.props | 2 +- + eng/build.sh | 51 ++++++++++--------- + .../AssemblyCheck/AssemblyCheck.fsproj | 1 + + src/buildtools/fslex/fslex.fsproj | 1 + + src/buildtools/fsyacc/fsyacc.fsproj | 1 + + src/fsharp/fsc/fsc.fsproj | 1 + + src/fsharp/fsi/fsi.fsproj | 1 + + 7 files changed, 34 insertions(+), 24 deletions(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 22c929f28..903ee00d3 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -41,7 +41,7 @@ + ++ EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" /> + + + +diff --git a/eng/build.sh b/eng/build.sh +index 9a2aa0083..6af422237 100755 +--- a/eng/build.sh ++++ b/eng/build.sh +@@ -240,29 +240,34 @@ function BuildSolution { + node_reuse=false + + # build bootstrap tools +- bootstrap_config=Proto +- bootstrap_dir=$artifacts_dir/Bootstrap +- if [[ "$force_bootstrap" == true ]]; then +- rm -fr $bootstrap_dir +- fi +- if [ ! -f "$bootstrap_dir/fslex.dll" ]; then +- BuildMessage="Error building tools" +- MSBuild "$repo_root/src/buildtools/buildtools.proj" \ +- /restore \ +- /p:Configuration=$bootstrap_config +- +- mkdir -p "$bootstrap_dir" +- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex +- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc +- fi +- if [ ! -f "$bootstrap_dir/fsc.exe" ]; then +- BuildMessage="Error building bootstrap" +- MSBuild "$repo_root/proto.proj" \ +- /restore \ +- /p:Configuration=$bootstrap_config \ +- +- +- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc ++ # source_build=true means we are currently in the outer/wrapper source-build, ++ # and building bootstrap needs to wait. The source-build targets will run this ++ # script again without setting source_build=true when it is done setting up ++ # the build environment. See 'eng/SourceBuild.props'. ++ if [[ "$source_build" != true ]]; then ++ bootstrap_config=Proto ++ bootstrap_dir=$artifacts_dir/Bootstrap ++ if [[ "$force_bootstrap" == true ]]; then ++ rm -fr $bootstrap_dir ++ fi ++ if [ ! -f "$bootstrap_dir/fslex.dll" ]; then ++ BuildMessage="Error building tools" ++ MSBuild "$repo_root/src/buildtools/buildtools.proj" \ ++ /restore \ ++ /p:Configuration=$bootstrap_config ++ ++ mkdir -p "$bootstrap_dir" ++ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex ++ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc ++ fi ++ if [ ! -f "$bootstrap_dir/fsc.exe" ]; then ++ BuildMessage="Error building bootstrap" ++ MSBuild "$repo_root/proto.proj" \ ++ /restore \ ++ /p:Configuration=$bootstrap_config ++ ++ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc ++ fi + fi + + if [[ "$skip_build" != true ]]; then +diff --git a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj +index 464b6ef78..5c78bbe6d 100644 +--- a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj ++++ b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj +@@ -4,6 +4,7 @@ + Exe + net5.0 + true ++ false + + + +diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj +index 1959ce59c..3d63bf6bf 100644 +--- a/src/buildtools/fslex/fslex.fsproj ++++ b/src/buildtools/fslex/fslex.fsproj +@@ -5,6 +5,7 @@ + net5.0 + INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) + true ++ false + + + +diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj +index 5d1b7141f..63b63c5de 100644 +--- a/src/buildtools/fsyacc/fsyacc.fsproj ++++ b/src/buildtools/fsyacc/fsyacc.fsproj +@@ -5,6 +5,7 @@ + net5.0 + INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) + true ++ false + + + +diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj +index 7fa31fc21..04025c297 100644 +--- a/src/fsharp/fsc/fsc.fsproj ++++ b/src/fsharp/fsc/fsc.fsproj +@@ -12,6 +12,7 @@ + $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 + true + true ++ false + + + +diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj +index 9fd9b1333..eace6c166 100644 +--- a/src/fsharp/fsi/fsi.fsproj ++++ b/src/fsharp/fsi/fsi.fsproj +@@ -13,6 +13,7 @@ + fsi.res + true + true ++ false + + + diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch new file mode 100644 index 000000000..b5b0a84f6 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 12 Oct 2021 18:14:59 -0500 +Subject: [PATCH] Disable BannedApiAnalyzers during source-build + +BannedApiAnalyzers has some intentional old dependencies and it's not feasible +to build it during source-build. Remove this usage to remove a prebuilt. +https://github.com/dotnet/msbuild/issues/6961 +--- + eng/Packages.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Packages.props b/eng/Packages.props +index 0f478634f..3cc09a008 100644 +--- a/eng/Packages.props ++++ b/eng/Packages.props +@@ -45,11 +45,11 @@ + + + ++ + + + + +- + + + diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch new file mode 100644 index 000000000..da26d2cb7 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch @@ -0,0 +1,50 @@ +From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 20 Oct 2021 15:19:29 -0500 +Subject: [PATCH] Restore building all TFMs for source-build + +Required for omnisharp, nuget-client, templating, sdk + +Background Issue: https://github.com/dotnet/source-build/issues/2542 +Patch removal issue: https://github.com/dotnet/source-build/issues/2556 +--- + src/Build/Microsoft.Build.csproj | 3 +-- + src/Directory.Build.props | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj +index f75408633..8dc86355a 100644 +--- a/src/Build/Microsoft.Build.csproj ++++ b/src/Build/Microsoft.Build.csproj +@@ -4,8 +4,7 @@ + + + +- net6.0 +- $(FullFrameworkTFM);net6.0 ++ $(FullFrameworkTFM);net6.0 + $(RuntimeOutputTargetFrameworks) + Microsoft.Build + Microsoft.Build +diff --git a/src/Directory.Build.props b/src/Directory.Build.props +index b0e233194..7e0c7d8c8 100644 +--- a/src/Directory.Build.props ++++ b/src/Directory.Build.props +@@ -27,13 +27,12 @@ + + + $(FullFrameworkTFM);netstandard2.0 +- netstandard2.0 + $(FullFrameworkTFM) + AnyCPU + + + net6.0 +- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) ++ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) + $(FullFrameworkTFM) + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch new file mode 100644 index 000000000..5d545aba2 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -0,0 +1,104 @@ +From a75f4b17c3595079f69ea00041182368adea14c9 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 20 Oct 2021 21:49:51 +0000 +Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop + +Removes prebuilts. + +Background Issue: https://github.com/dotnet/source-build/issues/2542 +--- + eng/Packages.props | 3 --- + src/Build/Microsoft.Build.csproj | 4 +++- + src/Directory.BeforeCommon.targets | 2 +- + src/Samples/Directory.Build.props | 1 + + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- + src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- + 6 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/eng/Packages.props b/eng/Packages.props +index 2de607c5d..1668addc9 100644 +--- a/eng/Packages.props ++++ b/eng/Packages.props +@@ -46,9 +46,6 @@ + + + +- +- +- + + + +diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj +index d08e337c5..3b173aee5 100644 +--- a/src/Build/Microsoft.Build.csproj ++++ b/src/Build/Microsoft.Build.csproj +@@ -38,8 +38,10 @@ + + + +- ++ + ++ ++ + + + +diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets +index 913c97b12..320bffa56 100644 +--- a/src/Directory.BeforeCommon.targets ++++ b/src/Directory.BeforeCommon.targets +@@ -99,7 +99,7 @@ + $(DefineConstants);FEATURE_DEBUGGER + $(DefineConstants);FEATURE_WIN32_REGISTRY + $(DefineConstants);FEATURE_WORKINGSET +- $(DefineConstants);FEATURE_VISUALSTUDIOSETUP ++ $(DefineConstants);FEATURE_VISUALSTUDIOSETUP + $(DefineConstants);FEATURE_MSCOREE + + +diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props +index 6b9d6cd9f..317ef14a6 100644 +--- a/src/Samples/Directory.Build.props ++++ b/src/Samples/Directory.Build.props +@@ -8,6 +8,7 @@ + false + + false ++ true + + + +diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj +index d8f81bf99..3a5514094 100644 +--- a/src/Tasks/Microsoft.Build.Tasks.csproj ++++ b/src/Tasks/Microsoft.Build.Tasks.csproj +@@ -999,8 +999,10 @@ + + + +- ++ + ++ ++ + + + +diff --git a/src/Utilities/Microsoft.Build.Utilities.csproj b/src/Utilities/Microsoft.Build.Utilities.csproj +index 09634e723..72d838d9d 100644 +--- a/src/Utilities/Microsoft.Build.Utilities.csproj ++++ b/src/Utilities/Microsoft.Build.Utilities.csproj +@@ -25,7 +25,7 @@ + + + +- ++ + + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch deleted file mode 100644 index 1cb91f3d3..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 335f32e48fd5604cdb1340ec04d6503a3e43d783 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Tue, 17 Aug 2021 21:09:35 +0000 -Subject: [PATCH] Don't use PublicApiAnalyzer on source-build - -CSC : warning AD0001: Analyzer 'Microsoft.CodeAnalysis.PublicApiAnalyzers.DeclarePublicApiAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. -CSC : error CS2001: Source file '/repos/installer2/artifacts/tarball/src/nuget-client.7363366401b43f4ea250394db8dad3707e9a9636/src/NuGet.Core/NuGet.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt' could not be found. - ---- - build/common.targets | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/common.targets b/build/common.targets -index 2c387f576..cf5a70c62 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -65,6 +65,11 @@ - - - -+ -+ -+ false -+ -+ - - - true --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch new file mode 100644 index 000000000..34d37ba0b --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -0,0 +1,296 @@ +From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001 +From: Matt Mitchell +Date: Sat, 23 Oct 2021 16:41:24 -0700 +Subject: [PATCH] Remove uneeded source build patches and re-patch + +--- + build/common.project.props | 16 ++++++---------- + build/packages.targets | 3 ++- + .../NuGet.Build.Tasks.Pack.csproj | 4 ++-- + .../NuGet.CommandLine.XPlat.csproj | 2 +- + .../SignCommand/CertificateProvider.cs | 4 ++-- + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - + .../NuGet.Configuration.csproj | 3 +-- + .../NuGet.Frameworks/NuGet.Frameworks.csproj | 3 +-- + .../NuGet.PackageManagement.csproj | 2 +- + .../Signing/Authoring/SignPackageRequest.cs | 2 ++ + .../NuGet.Packaging/Signing/Cms/NativeUtility.cs | 2 ++ + .../HttpSource/HttpRequestMessageExtensions.cs | 6 +++--- + .../HttpSource/HttpRetryHandler.cs | 2 +- + .../HttpSourceAuthenticationHandler.cs | 2 +- + .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - + 15 files changed, 25 insertions(+), 28 deletions(-) + +diff --git a/build/common.project.props b/build/common.project.props +index 79a935391..65e482b83 100644 +--- a/build/common.project.props ++++ b/build/common.project.props +@@ -10,24 +10,20 @@ + + + +- $(DotNetBuildFromSource) + PackageReference + v4.7.2 + net472 +- netcoreapp2.1 +- net6.0 ++ net6.0 + netcoreapp5.0 +- netstandard2.0 +- net6.0 ++ $(DotNetBuildFromSource) ++ netstandard2.0;net6.0 + $(NETFXTargetFramework);$(NETCoreTargetFramework) + $(NETCoreTargetFramework) +- $(TargetFrameworksExe);netcoreapp5.0 +- $(NETCoreTargetFramework);netcoreapp5.0 +- $(TargetFrameworksExe);net6.0 ++ $(TargetFrameworksExe);net6.0 ++ $(NETCoreTargetFramework);net6.0 + $(NETFXTargetFramework);$(NetStandardVersion) + $(NetStandardVersion) +- $(TargetFrameworksLibrary);netcoreapp5.0 +- $(TargetFrameworksLibrary);net6.0 ++ $(TargetFrameworksLibrary);net6.0 + $(NETFXTargetFramework);netcoreapp5.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ + $(RepositoryRootDirectory)build\ +diff --git a/build/packages.targets b/build/packages.targets +index c11557248..0e7dd7861 100644 +--- a/build/packages.targets ++++ b/build/packages.targets +@@ -10,6 +10,7 @@ + 5.0.0 + 2.14.0-rtm-832 + 17.0.0-beta1-10402-05 ++ 5.0.1-rtm.21063.7 + + + +@@ -33,7 +34,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +index c94acffd8..f4d083e52 100644 +--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj ++++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +@@ -177,7 +177,7 @@ + + ilmerge\ + Desktop/ +- CoreCLR/ ++ CoreCLR/ + + + +@@ -189,7 +189,7 @@ + + $(PackagePathDir) + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +index 21015c00a..e306cdee4 100644 +--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj ++++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +@@ -18,7 +18,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs +index c6ea71243..beac41889 100644 +--- a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs ++++ b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs +@@ -115,7 +115,7 @@ public static async Task GetCertificatesAsync(Certif + + return resultCollection; + } +- ++#pragma warning disable CS1998 + private static async Task LoadCertificateFromFileAsync(CertificateSourceOptions options) + { + X509Certificate2 cert; +@@ -154,7 +154,7 @@ private static async Task LoadCertificateFromFileAsync(Certifi + + return cert; + } +- ++#pragma warning restore CS1998 + private static X509Certificate2Collection LoadCertificateFromStore(CertificateSourceOptions options) + { + X509Certificate2Collection resultCollection = null; +diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +index e30a079eb..c2b8fe241 100644 +--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj ++++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +@@ -5,7 +5,6 @@ + + Common utilities and interfaces for all NuGet libraries. + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + $(NoWarn);CS1591;CS1574 + true +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +index bbc5ba480..18b597c74 100644 +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +@@ -6,7 +6,6 @@ + NuGet's configuration settings implementation. + $(NoWarn);CS1591 + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + true + true +@@ -29,7 +28,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +index b78b1f2ea..a89b516c6 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +@@ -4,8 +4,7 @@ + + + NuGet's understanding of target frameworks. +- $(TargetFrameworksLibrary);netstandard2.0 +- $(TargetFrameworksLibrary);net40 ++ $(TargetFrameworksLibrary);netstandard2.0 + + $(NoWarn);CS1591;CS1574;CS1573 + true +diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +index dfbfcaa8d..a6bb51d6b 100644 +--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj ++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +@@ -35,7 +35,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs +index e0cfae99f..ce19f2d6e 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs +@@ -98,7 +98,9 @@ protected virtual void Dispose(bool disposing) + Chain?.Dispose(); + + #if IS_SIGNING_SUPPORTED ++#pragma warning disable CA1416 + PrivateKey?.Dispose(); ++#pragma warning restore CA1416 + #endif + } + +diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs +index 565ac60b7..d57e38a65 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs +@@ -120,7 +120,9 @@ internal static SignedCms NativeSign(CmsSigner cmsSigner, byte[] data, CngKey pr + + signerInfo.cbSize = (uint)Marshal.SizeOf(signerInfo); + signerInfo.pCertInfo = MarshalUtility.PtrToStructure(cmsSigner.Certificate.Handle).pCertInfo; ++#pragma warning disable CA1416 + signerInfo.hCryptProvOrhNCryptKey = privateKey.Handle.DangerousGetHandle(); ++#pragma warning restore CA1416 + signerInfo.HashAlgorithm.pszObjId = cmsSigner.DigestAlgorithm.Value; + + if (cmsSigner.SignerIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier) +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs +index 7c9595268..1ca751850 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs +@@ -34,7 +34,7 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage request) + clone.Headers.TryAddWithoutValidation(header.Key, header.Value); + } + +-#if NET5_0 ++#if NET5_0 || NET6_0 + var clonedOptions = (IDictionary)clone.Options; + foreach (var option in request.Options) + { +@@ -118,7 +118,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest + throw new ArgumentNullException(nameof(configuration)); + } + +-#if NET5_0 ++#if NET5_0 || NET6_0 + request.Options.Set(new HttpRequestOptionsKey(NuGetConfigurationKey), configuration); + #else + request.Properties[NuGetConfigurationKey] = configuration; +@@ -128,7 +128,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest + private static T GetProperty(this HttpRequestMessage request, string key) + { + +-#if NET5_0 ++#if NET5_0 || NET6_0 + if (request.Options.TryGetValue(new HttpRequestOptionsKey(key), out T result)) + #else + object result; +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +index c7bcb54bb..30d86fcc9 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) + headerStopwatch = new Stopwatch(); + stopwatches.Add(headerStopwatch); + } +-#if NET5_0 ++#if NET5_0 || NET6_0 + requestMessage.Options.Set(new HttpRequestOptionsKey>(StopwatchPropertyName), stopwatches); + #else + requestMessage.Properties[StopwatchPropertyName] = stopwatches; +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs +index b9ab58ce7..ebf738e52 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs +@@ -98,7 +98,7 @@ protected override async Task SendAsync(HttpRequestMessage + { + List stopwatches = null; + +-#if NET5_0 ++#if NET5_0 || NET6_0 + if (request.Options.TryGetValue( + new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), + out stopwatches)) +diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +index 180293944..8498664b9 100644 +--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj ++++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +@@ -4,7 +4,6 @@ + + + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + NuGet's implementation of Semantic Versioning. + semver;semantic versioning +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch deleted file mode 100644 index 6be953ae4..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e0e1d72dfa8881244a76c3dbcc63aa73c05546f4 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Tue, 17 Aug 2021 21:13:07 +0000 -Subject: [PATCH] Update netcoreapp TFMs to 6.0 - ---- - build/common.project.props | 10 +++++----- - build/common.targets | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 80433ed60..8acc4e0bb 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -13,17 +13,17 @@ - PackageReference - v4.7.2 - net472 -- netcoreapp2.1 -+ net6.0 - netcoreapp5.0 - $(DotNetBuildFromSource) -- netstandard2.0 -+ net6.0 - $(NETFXTargetFramework);$(NETCoreTargetFramework) - $(NETCoreTargetFramework) -- $(TargetFrameworksExe);netcoreapp5.0 -- $(NETCoreTargetFramework);netcoreapp5.0 -+ $(TargetFrameworksExe);net6.0 -+ $(NETCoreTargetFramework);net6.0 - $(NETFXTargetFramework);$(NetStandardVersion) - $(NetStandardVersion) -- $(TargetFrameworksLibrary);netcoreapp5.0 -+ $(TargetFrameworksLibrary);net6.0 - $(NETFXTargetFramework);netcoreapp5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ - $(RepositoryRootDirectory)build\ -diff --git a/build/common.targets b/build/common.targets -index cf5a70c62..8827686a7 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -6,7 +6,7 @@ - true - - -- -+ - $(DefineConstants);IS_CORECLR - true - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch deleted file mode 100644 index 714b0ea00..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fecc40e502197e65804177b2aec49a7a5422ed6e Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & - System.ComponentModel.Composition - ---- - build/packages.targets | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/build/packages.targets b/build/packages.targets -index 6f72ac3fd..8317f3903 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -15,6 +15,12 @@ - 2.4.1 - - -+ -+ -+ 3.0.0 -+ 4.5.0 -+ -+ - - - -@@ -42,10 +48,10 @@ - - - -- -+ - - -- -+ - + ilmerge\ +- Desktop/ ++ Desktop/ + CoreCLR/ + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch new file mode 100644 index 000000000..972048de5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -0,0 +1,211 @@ +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 a naming collison 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 +--- + 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 - + .../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 + + 13 files changed, 9 insertions(+), 28 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 46d30b3bd..635f8bb5c 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.4 + 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)* +- 3.9.0 + + + +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)* +- 3.9.0 + + + +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)* +- 3.9.0 + + + +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 738fdebf2..6d13947ce 100644 +--- a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs ++++ b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs +@@ -82,7 +82,7 @@ private class MyCodeAction : DocumentChangeAction + } + } + +- 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/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj +index fe90e93ca..01b64e055 100644 +--- a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj ++++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj +@@ -3,6 +3,7 @@ + Exe + netcoreapp3.1 + true ++ true + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch deleted file mode 100644 index 350692304..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eb67cc234b0073d8b210c3ae42b5efe481bd0900 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 20 Jul 2021 09:41:52 -0500 -Subject: [PATCH 1/2] Patch out version check for source-build scenarios. - -The immediate cause for removing this was that NuGet is not yet built at this point in the source-build process. Roslyn tries to use a reference package to run this task but fails (the usual "reference packages cannot be used at runtime" error). Additionally, this is not really a valid check in source-build - we give each repo the SDK and MSBuild that we expect it to use, and want to override its opinions about what it should be using. - ---- - eng/targets/Imports.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets -index 15b067deb04..303b10c40cd 100644 ---- a/eng/targets/Imports.targets -+++ b/eng/targets/Imports.targets -@@ -159,7 +159,7 @@ - - - -- -+ - - - --- -2.18.0 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch new file mode 100644 index 000000000..2f0a10ecd --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Thu, 21 Oct 2021 23:15:23 +0000 +Subject: [PATCH] lift version of Microsoft.CodeAnalysis.Common dependencies to + previously source built versions + +--- + .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +index 7eae8afa275..a50822a6aeb 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +@@ -27,5 +27,9 @@ + + + ++ ++ ++ ++ + + +\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch new file mode 100644 index 000000000..8e3884438 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch @@ -0,0 +1,33 @@ +From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Tue, 19 Oct 2021 11:39:32 -0500 +Subject: [PATCH] Apply arcade-powered source-build patches (#55823) + +Don't include desktop artifacts that don't exist in source-build. +Source-build doesn't have these artifacts available, even when we eventually will +build desktop TFMs, because Roslyn is one of the first builds in source-build. +Instead Roslyn is picking up reference packages that don't have the `lib` directory +which is causing a build failure. This disables the attempt to grab these desktop +artifacts so source-build just skips them instead. + +Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823 +--- + .../DesktopCompilerArtifacts.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets +index c8b87ab6958..107ff051b51 100644 +--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets ++++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets +@@ -20,7 +20,7 @@ + VS training data to the assemblies they produce. + --> + +- ++ + + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch deleted file mode 100644 index cd22d08b5..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a235579b23a9aaf3f30202a69e92b93f7c569107 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 20 Jul 2021 14:20:14 -0500 -Subject: [PATCH 2/2] Don't include desktop artifacts that don't exist in - source-build. - -This fixes a bad intersection of a couple of things going on in the source-build Roslyn build. -- Roslyn.Extensions project that builds before this normally will restore a net46 version of System.Numerics.Vectors, but it sets it to CopyLocal and is building for net472, so this net46 DLL is output to the net472 folder. -- We don't build Roslyn.Extensions for net472 for other reasons, so we are missing this DLL but not the output from that project (we just get the .NET Core folders). -- DesktopCompilerArtifacts tries to specifically call out the System.Numerics.Vectors (and some other) DLLs because they are treated differently (NGEN is not supported for them). -- So the missing DLL, instead of just being ignored because of a wildcard, comes up as error trying to build these packages. -- We want full-framework Roslyn artifacts downstream but we don't ever run the fullfx Roslyn compiler, so we need these packages but not the CopyLocal fullfx DLLs. - -So we keep the net472 build for these but remove the specifically-called out artifacts that we don't need. - ---- - .../Microsoft.Net.Compilers.Toolset.Package.csproj | 4 ++-- - .../Microsoft.Net.Compilers.Package.csproj | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj -index 9e646ebab5b..7b598978fd1 100644 ---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj -+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj -@@ -23,7 +23,7 @@ - - $(NoWarn);NU5100;NU5128 - -- <_DependsOn Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts -+ <_DependsOn Condition="'$(TargetFramework)' == 'net472' and '$(DotNetBuildFromSource)' != 'true'">InitializeDesktopCompilerArtifacts - <_DependsOn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">InitializeCoreClrCompilerArtifacts - - -@@ -57,6 +57,6 @@ - - - -- -+ - - -diff --git a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj -index 05f74e26ce6..c33e557c249 100644 ---- a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj -+++ b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj -@@ -31,13 +31,13 @@ - - - -- <_File Include="@(DesktopCompilerArtifact)" TargetDir="tools"/> -- <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tools"/> -+ <_File Include="@(DesktopCompilerArtifact)" TargetDir="tools" Condition="'$(DotNetBuildFromSource)' != 'true'" /> -+ <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tools" Condition="'$(DotNetBuildFromSource)' != 'true'" /> - <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" TargetDir="build" /> - - - - - -- -+ - --- -2.18.0 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch b/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch new file mode 100644 index 000000000..28d60fc27 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0003-remove-Microsoft.DotNet-prebuilts.patch @@ -0,0 +1,25 @@ +From 7260c572b1ce424f7ff3a64aa3227417c6a7a676 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Fri, 8 Oct 2021 00:56:41 +0000 +Subject: [PATCH] remove Microsoft.DotNet prebuilts + +Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159 +--- + eng/Tools.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Tools.props b/eng/Tools.props +index 1579b510558..944448855ee 100644 +--- a/eng/Tools.props ++++ b/eng/Tools.props +@@ -1,6 +1,6 @@ + + +- ++ + + + +- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" ++ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" + + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch new file mode 100644 index 000000000..b128d21f3 --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch @@ -0,0 +1,66 @@ +From 3540e85a194dda1e5448e0aab3212c8aeb5a1aff Mon Sep 17 00:00:00 2001 +From: Eric Erhardt +Date: Fri, 22 Oct 2021 20:48:25 +0000 +Subject: [PATCH] Build Microsoft.NET.Build.Tasks for netfx + +Required for omnisharp to work with a source-built .NET SDK. + +Patch removal issue: https://github.com/dotnet/sdk/issues/22281 +--- + .../Microsoft.DotNet.Compatibility.csproj | 1 - + .../Microsoft.DotNet.PackageValidation.csproj | 1 - + .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 - + .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 - + 4 files changed, 4 deletions(-) + +diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj +index 92624be845..f9f8e46329 100644 +--- a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj ++++ b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj +@@ -2,7 +2,6 @@ + + + net6.0;net472 +- net6.0 + true + true + Open +diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +index 7a8b648652..4241f4577e 100644 +--- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj ++++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +@@ -2,7 +2,6 @@ + + + net6.0;net472 +- net6.0 + Open + + +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 13ada82225..280fbdc83e 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,7 +16,6 @@ + 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 604ef43bf2..bce39c67d4 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,7 +13,6 @@ + The MSBuild targets and properties for building .NET Core projects. + Library + $(SdkTargetFramework);net472 +- $(SdkTargetFramework) + annotations + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch b/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch deleted file mode 100644 index a78c3d97f..000000000 --- a/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c0ec49b887cae58bb860a18982115c5910f29821 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 14 Sep 2021 22:54:01 +0000 -Subject: [PATCH] pin nuget versions - -Temporary fix for https://github.com/dotnet/source-build/issues/2455 to unblock source-build ---- - Directory.Build.targets | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 0dc99916..7c45fda3 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -12,9 +12,9 @@ - - - -- -- -- -+ -+ -+ - - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch b/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch deleted file mode 100644 index aa1e198cc..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 752ab8ab199bd1d99353658cb676a6612508333b Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 21:31:01 +0000 -Subject: [PATCH] Drop vstest.console netcoreapp2.1 support - -Workaround for https://github.com/microsoft/vstest/issues/3044 ---- - src/vstest.console/vstest.console.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj -index 1343e6d9..7c555591 100644 ---- a/src/vstest.console/vstest.console.csproj -+++ b/src/vstest.console/vstest.console.csproj -@@ -8,7 +8,7 @@ - - vstest.console - netcoreapp2.1;net451 -- netcoreapp2.1;net6.0 -+ net6.0 - true - Exe - false --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch deleted file mode 100644 index bd4c13409..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 071dfef93e5431a415bd9298f2ed8aaf9a22524f Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 11 Oct 2021 19:35:15 +0000 -Subject: [PATCH] Don't publish for win runtime identifier in source-build - -See https://github.com/microsoft/vstest/pull/3096 ---- - src/testhost.x86/testhost.x86.csproj | 2 +- - src/testhost/testhost.csproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj -index 7eb5cd15..09856522 100644 ---- a/src/testhost.x86/testhost.x86.csproj -+++ b/src/testhost.x86/testhost.x86.csproj -@@ -19,7 +19,7 @@ - app.manifest - - -- win7-x86 -+ win7-x86 - false - $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 - -diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj -index a780e4e9..ba0fd259 100644 ---- a/src/testhost/testhost.csproj -+++ b/src/testhost/testhost.csproj -@@ -16,7 +16,7 @@ - app.manifest - - -- win7-x64 -+ win7-x64 - false - $(AssemblyName).$(TargetFramework) - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch new file mode 100644 index 000000000..1194e09a5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch @@ -0,0 +1,27 @@ +From e5fa6b10f5e4bcb14e3930e4eeae7181765529ee Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 21 Oct 2021 16:29:32 -0500 +Subject: [PATCH] Also build for netstandard2.0 to support NuGet. + +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2557. + +--- + .../Microsoft.Web.XmlTransform.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj +index 7cb81d1..f272d7f 100644 +--- a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj ++++ b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj +@@ -3,7 +3,7 @@ + + + +- netstandard2.1 ++ netstandard2.0;netstandard2.1 + AnyCPU + true + false +-- +2.31.1 + diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed at /usr/local/share/dotnet +

The following was installed

  • .NET SDK {DOTNETSDKVERSION}
  • .NET Runtime {DOTNETRUNTIMEVERSION}
    • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -5,7 +5,7 @@
    -

    The following was installed at /usr/local/share/dotnet +

    The following was installed

    • .NET SDK {DOTNETSDKVERSION}
    • .NET Runtime {DOTNETRUNTIMEVERSION}
      • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -5,7 +5,7 @@
      -

      The following was installed at /usr/local/share/dotnet +

      The following was installed

      • .NET SDK {DOTNETSDKVERSION}
      • .NET Runtime {DOTNETRUNTIMEVERSION}
        • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -5,7 +5,7 @@
        -

        The following was installed at /usr/local/share/dotnet +

        The following was installed

        • .NET SDK {DOTNETSDKVERSION}
        • .NET Runtime {DOTNETRUNTIMEVERSION}
          • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -5,7 +5,7 @@
          -

          The following was installed at /usr/local/share/dotnet +

          The following was installed

          • .NET SDK {DOTNETSDKVERSION}
          • .NET Runtime {DOTNETRUNTIMEVERSION}
            • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -5,7 +5,7 @@
            -

            The following was installed at /usr/local/share/dotnet +

            The following was installed

            • .NET SDK {DOTNETSDKVERSION}
            • .NET Runtime {DOTNETRUNTIMEVERSION}
              • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -5,7 +5,7 @@
              -

              The following was installed at /usr/local/share/dotnet +

              The following was installed

              • .NET SDK {DOTNETSDKVERSION}
              • .NET Runtime {DOTNETRUNTIMEVERSION}
                • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -5,7 +5,7 @@
                -

                The following was installed at /usr/local/share/dotnet +

                The following was installed

                • .NET SDK {DOTNETSDKVERSION}
                • .NET Runtime {DOTNETRUNTIMEVERSION}
                  • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -5,7 +5,7 @@
                  -

                  The following was installed at /usr/local/share/dotnet +

                  The following was installed

                  • .NET SDK {DOTNETSDKVERSION}
                  • .NET Runtime {DOTNETRUNTIMEVERSION}
                    • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -5,7 +5,7 @@
                    -

                    The following was installed at /usr/local/share/dotnet +

                    The following was installed

                    • .NET SDK {DOTNETSDKVERSION}
                    • .NET Runtime {DOTNETRUNTIMEVERSION}
                      • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -5,7 +5,7 @@
                      -

                      The following was installed at /usr/local/share/dotnet +

                      The following was installed

                      • .NET SDK {DOTNETSDKVERSION}
                      • .NET Runtime {DOTNETRUNTIMEVERSION}
                        • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -5,7 +5,7 @@
                        -

                        The following was installed at /usr/local/share/dotnet +

                        The following was installed

                        • .NET SDK {DOTNETSDKVERSION}
                        • .NET Runtime {DOTNETRUNTIMEVERSION}
                          • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -5,7 +5,7 @@
                          -

                          The following was installed at /usr/local/share/dotnet +

                          The following was installed

                          • .NET SDK {DOTNETSDKVERSION}
                          • .NET Runtime {DOTNETRUNTIMEVERSION}
                            • diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index a3750f939..7159a3518 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -5,7 +5,7 @@
                            -

                            The following was installed at /usr/local/share/dotnet +

                            The following was installed

                            • .NET SDK {DOTNETSDKVERSION}
                            • .NET Runtime {DOTNETRUNTIMEVERSION}
                              • diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index b8aaaaf9c..6cc30060f 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -424,6 +424,13 @@ namespace EndToEnd.Tests { buildArgs += $" --framework {framework}"; } + + // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved. + if (language == "F#") + { + buildArgs += $" /p:_NETCoreSdkIsPreview=true"; + } + string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 90df9ccb2..0a0459230 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -163,12 +163,6 @@ - - - - - - ]]>