diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fc8a7451b78..509d19b4a6fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/arcade 569a3f07467a9ebf55b78bbf92ab10b85e597819 - + https://github.com/dotnet/source-build-reference-packages - c71ce108eda9f657c9f58a613a1fe56b6b08235d + 3dbb19f76474f2f22749b2e64d34c15178381ffb diff --git a/eng/Versions.props b/eng/Versions.props index 902e4e336a11..26773c558ee8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -190,7 +190,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.104 + 0.1.0-7.0.100-bootstrap.3 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index d3d3ee284e45..a2d550fcef46 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -80,13 +80,9 @@ jobs: # This prevents allocation of additional agents if the tarball build legs should be skipped. # Only build the tarball if the PR touches source-build source. - script: | - echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" - - # if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' - # then - # echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" - # fi + if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' + then + echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" + fi displayName: Tarball Build Check name: Tarball_Build_Check - # Disable tarball CI for 7.0 Preview 5 since source-build in not fully supported. - condition: false \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index a07f8c36b44c..bc9a10be7077 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -29,5 +29,12 @@ + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 157e817a625a..29e53696fb6b 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -11,6 +11,8 @@ $(BuildCommandArgs) /p:UsingToolMicrosoftNetCompilers=false $(BuildCommandArgs) /p:RepoRoot=$(ProjectDirectory) + + $(BuildCommandArgs) /p:SuppressTfmSupportBuildWarnings=true $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 3032849b8a72..90d655d52371 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -2,10 +2,10 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyz Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.xml +Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.CSharp.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.Core.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Primitives.xml @@ -267,4 +267,4 @@ NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml +NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml \ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch b/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch new file mode 100644 index 000000000000..79c8da94f939 --- /dev/null +++ b/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch @@ -0,0 +1,67 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 2 Jun 2022 19:27:41 +0000 +Subject: [PATCH] Pin the Microsoft.Extensions.Logging version so that + source-build does not pick up latest + +--- + eng/Versions.props | 2 +- + .../Microsoft.Diagnostics.Monitoring.EventPipe.csproj | 2 +- + .../Microsoft.Diagnostics.NETCore.Client.csproj | 2 +- + src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index b4edc421..17c6f9d3 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -48,7 +48,7 @@ + 2.0.250401 + 16.9.0-beta1.21055.5 + 2.0.64 +- 2.1.1 ++ 2.1.1 + + 5.0.1 + 2.0.0-beta1.20468.1 +diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj +index 733d18da..db90173d 100644 +--- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj ++++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj +@@ -29,7 +29,7 @@ + + + +- ++ + + + +diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj +index 929f82d0..5cb2d582 100644 +--- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj ++++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj +@@ -20,7 +20,7 @@ + + + +- ++ + + + +diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj +index 73fd6f82..3afa7132 100644 +--- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj ++++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj +@@ -22,8 +22,8 @@ + + + +- +- ++ ++ + + + diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch deleted file mode 100644 index 5291396adc65..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 23 May 2022 19:09:18 +0000 -Subject: [PATCH] Add Microsoft.FSharp.Compiler to source-build - -Backport issue: Tracking issue: https://github.com/dotnet/fsharp/issues/13174 ---- - eng/SourceBuild.props | 17 +---------------- - .../Microsoft.FSharp.Compiler.csproj | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+), 16 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 903ee00d3..b8402e043 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -5,28 +5,13 @@ - true - - -- -- -- -- -- -- -- -- - - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln" -+ $(InnerBuildArgs) '/p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln;$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"' - - - -diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -index eaeac80f3..417beac4e 100644 ---- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -@@ -9,8 +9,24 @@ - .NET Core compatible version of the F# compiler fsc.exe. - /blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion) - true -+ false - - -+ -+ -+ TargetFramework=net6.0 -+ -+ -+ TargetFramework=net6.0 -+ -+ -+ TargetFramework=netstandard2.0 -+ -+ -+ TargetFramework=netstandard2.0 -+ -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch b/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch new file mode 100644 index 000000000000..71917a22ab61 --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch @@ -0,0 +1,145 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kevin Ransom +Date: Thu, 2 Jun 2022 17:09:16 -0700 +Subject: [PATCH] fix 13174 + +Backport: https://github.com/dotnet/fsharp/pull/13239 +--- + eng/Build.ps1 | 4 ++- + eng/SourceBuild.props | 2 +- + src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +- + .../Microsoft.FSharp.Compiler.csproj | 32 ++++++++++++++++++- + src/fsharp/Microsoft.FSharp.Compiler/Program.cs | 2 +- + .../VisualFSharp.Core.targets | 2 +- + 6 files changed, 38 insertions(+), 7 deletions(-) + +diff --git a/eng/Build.ps1 b/eng/Build.ps1 +index 424cbe6c5..ce23ae7da 100644 +--- a/eng/Build.ps1 ++++ b/eng/Build.ps1 +@@ -61,6 +61,7 @@ param ( + [string]$officialSkipTests = "false", + [switch]$noVisualStudio, + [switch]$sourceBuild, ++ [switch]$skipBuild, + + [parameter(ValueFromRemainingArguments = $true)][string[]]$properties) + +@@ -114,6 +115,7 @@ function Print-Usage() { + Write-Host " -useGlobalNuGetCache Use global NuGet cache." + Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported." + Write-Host " -sourceBuild Simulate building for source-build." ++ Write-Host " -skipbuild Skip building product" + Write-Host "" + Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild." + } +@@ -458,7 +460,7 @@ try { + } + + $script:BuildMessage = "Failure building product" +- if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish) { ++ if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild) { + if ($noVisualStudio) { + BuildSolution "FSharp.sln" + } +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 903ee00d3..86c24c1b4 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -26,7 +26,7 @@ + --> + + +- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln" ++ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln" + + + +diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj +index f293b92a0..b87e2def5 100644 +--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj ++++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj +@@ -4,8 +4,7 @@ + + + Library +- netstandard2.0 +- netstandard2.0 ++ netstandard2.0 + FSharp.Build + $(NoWarn);75 + true +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj +index eaeac80f3..e078498d7 100644 +--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj +@@ -9,8 +9,12 @@ + .NET Core compatible version of the F# compiler fsc.exe. + /blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion) + true ++ $(NuGetPackageRoot)microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\ ++ <_BuildReleasePackagesTargets>$(ArcadeSdkDir)tools\BuildReleasePackages.targets + + ++ ++ + + + +@@ -19,6 +23,33 @@ + + + +- ++ ++ ++ TargetFrameworks=netstandard2.1;netstandard2.0 ++ ++ ++ TargetFrameworks=netstandard2.0 ++ ++ ++ TargetFrameworks=netstandard2.0 ++ ++ ++ TargetFrameworks=netstandard2.0 ++ ++ ++ TargetFrameworks=netstandard2.0 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs +index c52f10378..0be8ed50b 100644 +--- a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs +@@ -1,2 +1,2 @@ +-// See https://aka.ms/new-console-template for more information ++// See https://aka.ms/new-console-template for more information + return 0; +\ No newline at end of file +diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets +index 966cffad5..9b932e87e 100644 +--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets ++++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets +@@ -33,7 +33,7 @@ + All + 2 + True +- TargetFramework=$(DependencyTargetFramework) ++ TargetFramework=netstandard2.0 + + + diff --git a/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch b/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch deleted file mode 100644 index 057dcbc7b393..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 17 May 2022 23:23:42 +0000 -Subject: [PATCH] Update to handle Microsoft.FSharp.Compiler to handle no NuGet repack support in source-build - -Tracking issue: https://github.com/dotnet/source-build/issues/2873 ---- - .../Microsoft.FSharp.Compiler.nuspec | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec -index ee67b15c5..b3f926f2f 100644 ---- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec -+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec -@@ -54,11 +54,8 @@ - - -- -- -- -- -+ - diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-System.Text.Json-version-ref.patch b/src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-System.Text.Json-version-ref.patch new file mode 100644 index 000000000000..c1ab02e5756d --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-System.Text.Json-version-ref.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 10 Jun 2022 19:00:40 +0000 +Subject: [PATCH] Refactor wasmappbuilder's System.Text.Json version reference to + a versions.props property + +Backport: https://github.com/dotnet/runtime/pull/70582 +--- + src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +index 7c8465c6bc0..58f9a843fd3 100644 +--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj ++++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +@@ -21,7 +21,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch new file mode 100644 index 000000000000..489c1379907a --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 10 Jun 2022 20:31:15 +0000 +Subject: [PATCH] Define SystemCollectionsImmutableVersion Versions.props + +--- + eng/Versions.props | 1 + + .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 08c828d775..8e359a44cb 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -29,6 +29,7 @@ + 2.0.1-servicing-26011-01 + 13.0.1 + $(NewtonsoftJsonPackageVersion) ++ 6.0.0 + 4.0.0 + 6.0.0 + 7.0.0-beta.22310.1 +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 1a6ba41771..38a5b931db 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 +@@ -74,7 +74,7 @@ + Also download an old version and (later in the target ReferenceOlderSCIandSRM) + pass them to the compiler. --> + +- ++ + + +