Update previous source built (#13876)

* --no-edit * Enable Tarball Build CI * Add runtime patch for System.Text.Json version * Add sdk patch * Update missing XML doc baseline Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-06-13 20:10:02 -05:00 · 2022-06-13 20:10:02 -05:00 · 693b8eb2cc
commit 693b8eb2cc
parent d3ce508e97
12 changed files with 290 additions and 116 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -210,9 +210,9 @@
      <Uri>https://github.com/dotnet/arcade</Uri>
      <Sha>569a3f07467a9ebf55b78bbf92ab10b85e597819</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22261.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22270.1">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>c71ce108eda9f657c9f58a613a1fe56b6b08235d</Sha>
+      <Sha>3dbb19f76474f2f22749b2e64d34c15178381ffb</Sha>
      <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22271-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
--- 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.
    -->
-    <PrivateSourceBuiltArtifactsPackageVersion>6.0.104</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-7.0.100-bootstrap.3</PrivateSourceBuiltArtifactsPackageVersion>
  </PropertyGroup>
  <!-- Workload manifest package versions -->
  <PropertyGroup>
--- 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
--- a/src/SourceBuild/tarball/content/repos/fsharp.proj
+++ b/src/SourceBuild/tarball/content/repos/fsharp.proj
@ -29,5 +29,12 @@
    <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
  </ItemGroup>

+  <Target Name="SetArcadeSdkDir"
+          BeforeTargets="Build">
+    <ItemGroup>
+      <EnvironmentVariables Include="ArcadeSdkDir=$(ToolPackageExtractDir)%(UseSourceBuiltSdkOverride.Identity)/" />
+    </ItemGroup>
+  </Target>
+
  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
--- a/src/SourceBuild/tarball/content/repos/roslyn.proj
+++ b/src/SourceBuild/tarball/content/repos/roslyn.proj
@ -11,6 +11,8 @@
    <!-- issue: https://github.com/dotnet/source-build/issues/1719 -->
    <BuildCommandArgs>$(BuildCommandArgs) /p:UsingToolMicrosoftNetCompilers=false</BuildCommandArgs>
    <BuildCommandArgs>$(BuildCommandArgs) /p:RepoRoot=$(ProjectDirectory)</BuildCommandArgs>
+    <!-- Investigate how to remove this specialization for source-build: https://github.com/dotnet/source-build/issues/2889 -->
+    <BuildCommandArgs>$(BuildCommandArgs) /p:SuppressTfmSupportBuildWarnings=true</BuildCommandArgs>

    <BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>

--- 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
--- 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
@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+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 @@
+     <MicrosoftDiagnosticsRuntimeUtilitiesVersion>2.0.250401</MicrosoftDiagnosticsRuntimeUtilitiesVersion>
+     <MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
+     <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.64</MicrosoftDiagnosticsTracingTraceEventVersion>
+-    <MicrosoftExtensionsLoggingVersion>2.1.1</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsLoggingPinnedVersion>2.1.1</MicrosoftExtensionsLoggingPinnedVersion>
+     <!-- Need version that understands UseAppFilters sentinel. -->
+     <MicrosoftExtensionsLoggingEventSourceVersion>5.0.1</MicrosoftExtensionsLoggingEventSourceVersion>
+     <SystemCommandLineVersion>2.0.0-beta1.20468.1</SystemCommandLineVersion>
+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 @@
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
+     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+     <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
+     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
+     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+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 @@
+ 
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+   </ItemGroup>
+ 
+   <ItemGroup>
+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 @@
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" GeneratePathProperty="true" />
+     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+   </ItemGroup>
+ 
+ </Project>
--- 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
@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-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 @@
-     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
-   </PropertyGroup>
- 
-  <Target Name="ApplySourceBuildPatchFiles"
-          Condition="
-            '$(ArcadeBuildFromSource)' == 'true' and
-            '$(ArcadeInnerBuildFromSource)' == 'true'"
-          BeforeTargets="Execute">
-    <ItemGroup>
-      <SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
-    </ItemGroup>
-
-    <Exec
-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
-      WorkingDirectory="$(RepoRoot)"
-      Condition="'@(SourceBuildPatchFile)' != ''" />
-  </Target>
-
-   <!--
-     The build script passes in the full path of the sln to build.  This must be overridden in order to build
-     the cloned source in the inner build.
-   -->
-   <Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
-     <PropertyGroup>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln"</InnerBuildArgs>
-+      <InnerBuildArgs>$(InnerBuildArgs) '/p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln;$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"'</InnerBuildArgs>
-     </PropertyGroup>
-   </Target>
- 
-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 @@
-     <PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
-     <PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
-     <NoDefaultExcludes>true</NoDefaultExcludes>
-+    <ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
-   </PropertyGroup>
- 
-+  <ItemGroup>
-+    <ProjectReference Include="..\fsc\fsc.fsproj">
-+      <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
-+    </ProjectReference>
-+    <ProjectReference Include="..\fsi\fsi.fsproj">
-+      <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
-+    </ProjectReference>
-+    <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" Targets="Restore;Build;Pack">
-+      <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
-+    </ProjectReference>
-+    <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Targets="Restore;Build;Pack">
-+      <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
-+    </ProjectReference>
-+  </ItemGroup>
-+
-   <ItemGroup>
-     <NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
-     <NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />
--- a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch
+++ 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 <codecutter@hotmail.com>
+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 @@
+   -->
+   <Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
+     <PropertyGroup>
+-      <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln"</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"</InnerBuildArgs>
+     </PropertyGroup>
+   </Target>
+ 
+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 @@
+ 
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFramework Condition="'$(Configuration)' != 'Proto'">netstandard2.0</TargetFramework>
+-    <TargetFrameworks Condition="'$(Configuration)' == 'Proto'">netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+     <AssemblyName>FSharp.Build</AssemblyName>
+     <NoWarn>$(NoWarn);75</NoWarn> <!-- InternalCommandLineOption -->
+     <AllowCrossTargeting>true</AllowCrossTargeting>
+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 @@
+     <PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
+     <PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
+     <NoDefaultExcludes>true</NoDefaultExcludes>
+    <ArcadeSdkDir Condition="'$(ArcadeSdkDir)' == ''">$(NuGetPackageRoot)microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\</ArcadeSdkDir>
+    <_BuildReleasePackagesTargets>$(ArcadeSdkDir)tools\BuildReleasePackages.targets</_BuildReleasePackagesTargets>
+   </PropertyGroup>
+ 
+  <Import Project="$(_BuildReleasePackagesTargets)" />
+
+   <ItemGroup>
+     <NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
+     <NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />
+@@ -19,6 +23,33 @@
+     <NuspecProperty Include="artifactsPackagesDir=$(ArtifactsPackagesDir)" />
+   </ItemGroup>
+ 
+-  <Target Name="Build" />
+  <ItemGroup>
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj">
+        <AdditionalProperties>TargetFrameworks=netstandard2.1;netstandard2.0</AdditionalProperties>
+    </DependentProjects>
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Build\FSharp.Build.fsproj">
+        <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
+    </DependentProjects>
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
+        <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
+    </DependentProjects>
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj">
+        <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
+    </DependentProjects>
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+        <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
+    </DependentProjects>
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\fsi\fsi.fsproj" />
+    <DependentProjects Include="$(MSBuildThisFileDirectory)..\fsc\fsc.fsproj" />
+  </ItemGroup>
+
+  <Target Name="PackDependentProjectsCore">
+    <MSBuild Projects="@(DependentProjects)" Targets="Restore;Build;Pack" Properties="Restore=true;Pack=true;Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
+  </Target>
+
+  <Target Name="PackDependentProjects"
+    BeforeTargets="Build"
+    DependsOnTargets="PackDependentProjectsCore;PackageReleasePackages">
+  </Target>
+ 
+ </Project>
+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 @@
+       <NgenArchitecture>All</NgenArchitecture>
+       <NgenPriority>2</NgenPriority>
+       <Private>True</Private>
+-      <AdditionalProperties>TargetFramework=$(DependencyTargetFramework)</AdditionalProperties>
+      <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
+     </ProjectReference>
+ 
+     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
--- a/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch
+++ b/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-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 @@
-         <file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll"              target="lib\net6.0" />
-         <file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
-                                                                                                            target="lib\net6.0" />
-        <file src="$artifactsPackagesDir$Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg"     target="contentFiles\Shipping" />
-        <file src="$artifactsPackagesDir$Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg"             target="contentFiles\Release" />
-        <file src="$artifactsPackagesDir$Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg"
-                                                                                                           target="contentFiles\Shipping" />
-        <file src="$artifactsPackagesDir$Release\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg"
-+        <file src="$artifactsPackagesDir$\FSharp.Core.$fSharpCorePackageVersion$*nupkg"             target="contentFiles\Release" />
-+        <file src="$artifactsPackagesDir$\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg"
-                                                                                                            target="contentFiles\Release" />
-         <file src="FSharp.Build\$Configuration$\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props"
-                                                                                                            target="contentFiles\Shipping" />
--- 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
@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+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 @@
+     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
+     <PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.1" />
+-    <PackageReference Include="System.Text.Json" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" PrivateAssets="all" />
+   </ItemGroup>
+ 
+   <Target Name="GetFilesToPackage" Returns="@(FilesToPackage)">
--- a/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch
+++ 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 <msimons@microsoft.com>
+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 @@
+     <NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
+     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
+     <NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
+    <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
+     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
+     <SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
+     <MicrosoftDotNetSignToolVersion>7.0.0-beta.22310.1</MicrosoftDotNetSignToolVersion>
+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. -->
+     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" IncludeAssets="none" />
+-    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" IncludeAssets="none" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" IncludeAssets="none" />
+     <PackageDownload Include="System.Collections.Immutable" Version="[5.0.0]" GeneratePathProperty="true" />
+     <PackageDownload Include="System.Reflection.Metadata" Version="[5.0.0]" GeneratePathProperty="true" />
+   </ItemGroup>