diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch deleted file mode 100644 index f13e9de9f..000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 3 May 2022 18:50:25 +0000 -Subject: [PATCH] Upgrade Microsoft.Win32.Registry reference to 5.0.0 - -Backport: https://github.com/dotnet/fsharp/pull/13091 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index afefd9501..ff4d8ac89 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -208,7 +208,7 @@ - 5.0.0-preview.7.20364.11 - 5.0.0-preview.7.20364.11 - 16.11.0 -- 4.3.0 -+ 5.0.0 - 13.0.1 - 3.13.2 - 4.1.0 diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch b/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch deleted file mode 100644 index 71917a22a..000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch +++ /dev/null @@ -1,145 +0,0 @@ -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/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 index f2b059852..feaf36b71 100644 --- 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 @@ -222,6 +222,6 @@ index fe90e93ca..01b64e055 100644 net6.0 true + true - +