mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable fsharp build in source-build tarball (#13738)

Browse source
This commit is contained in:
Michael Simons 2022-05-10 08:50:32 -05:00 committed by GitHub
parent da9dcce306
commit ccef905a85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/tarball/content/repos/known-good.proj
View file

@ -58,7 +58,7 @@
<RepositoryReference Include="test-templates" />
<!-- Tier 5 -->
<!-- <RepositoryReference Include="fsharp" /> -->
<RepositoryReference Include="fsharp" />
<!-- <RepositoryReference Include="sdk" /> -->
<RepositoryReference Include="vstest" />

23
src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch Normal file
View file

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
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 @@
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETTestSdkVersion>16.11.0</MicrosoftNETTestSdkVersion>
- <MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>
+ <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<NUnitVersion>3.13.2</NUnitVersion>
<NUnit3TestAdapterVersion>4.1.0</NUnit3TestAdapterVersion>