Skip to content

Commit 59ca9aa

Browse files
dseefelddseefeld
committed
Update FSharp.Build to build net5.0
1 parent 53e0059 commit 59ca9aa

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

‎patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index bb2f97270..6c344c880 100644
5858
<ItemGroup>
5959
<Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj">
6060
- <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
61-
+ <AdditionalProperties>TargetFramework=netcoreapp2.1</AdditionalProperties>
61+
+ <AdditionalProperties>TargetFramework=net5.0</AdditionalProperties>
6262
</Projects>
6363
<Projects Include="src\fsharp\fsc\fsc.fsproj">
6464
- <AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
@@ -119,7 +119,7 @@ index 3d36804a7..5a9e49bb0 100644
119119
<OutputType>Library</OutputType>
120120
- <TargetFramework Condition="'$(Configuration)' != 'Proto'">netstandard2.0</TargetFramework>
121121
- <TargetFrameworks Condition="'$(Configuration)' == 'Proto'">netstandard2.0</TargetFrameworks>
122-
+ <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
122+
+ <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</TargetFrameworks>
123123
<AssemblyName>FSharp.Build</AssemblyName>
124124
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
125125
<AllowCrossTargeting>true</AllowCrossTargeting>
@@ -149,7 +149,7 @@ index e75296aa7..d162af011 100644
149149
</ProjectReference>
150150
<ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj">
151151
- <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
152-
+ <AdditionalProperties>TargetFramework=netcoreapp2.1</AdditionalProperties>
152+
+ <AdditionalProperties>TargetFramework=net5.0</AdditionalProperties>
153153
</ProjectReference>
154154
<ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
155155
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
@@ -166,7 +166,7 @@ index f5cac7b09..933b63b1f 100644
166166
<dependency id="Microsoft.NETCore.Platforms" version="2.0.0" />
167167
<dependency id="NETStandard.Library" version="2.0.0" />
168168
<dependency id="System.Collections.Immutable" version="1.5.0" />
169-
@@ -46,21 +46,21 @@
169+
@@ -46,37 +46,37 @@
170170
this approach gives a very small deployment. Which is kind of necessary.
171171
-->
172172
<!-- assemblies -->
@@ -181,7 +181,7 @@ index f5cac7b09..933b63b1f 100644
181181
+ <file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\net5.0" />
182182
+ <file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.xml" target="lib\net5.0" />
183183
+ <file src="FSharp.Compiler.Private\$Configuration$\netstandard2.0\FSharp.Compiler.Private.dll" target="lib\net5.0" />
184-
+ <file src="FSharp.Build\$Configuration$\netstandard2.0\FSharp.Build.dll" target="lib\net5.0" />
184+
+ <file src="FSharp.Build\$Configuration$\net5.0\FSharp.Build.dll" target="lib\net5.0" />
185185
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
186186
- target="lib\netcoreapp3.1" />
187187
+ target="lib\net5.0" />
@@ -194,12 +194,17 @@ index f5cac7b09..933b63b1f 100644
194194

195195
<!-- additional files -->
196196
- <file src="fsc\$Configuration$\netcoreapp3.1\default.win32manifest" target="contentFiles\any\any" />
197+
- <file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
198+
- <file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
199+
- <file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
200+
- <file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
201+
- <file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
197202
+ <file src="fsc\$Configuration$\net5.0\default.win32manifest" target="contentFiles\any\any" />
198-
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
199-
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
200-
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
201-
@@ -68,15 +68,15 @@
202-
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
203+
+ <file src="FSharp.Build\$Configuration$\net5.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
204+
+ <file src="FSharp.Build\$Configuration$\net5.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
205+
+ <file src="FSharp.Build\$Configuration$\net5.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
206+
+ <file src="FSharp.Build\$Configuration$\net5.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
207+
+ <file src="FSharp.Build\$Configuration$\net5.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
203208

204209
<!-- resources -->
205210
- <file src="FSharp.Core\$Configuration$\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\netcoreapp3.1" />
@@ -211,7 +216,7 @@ index f5cac7b09..933b63b1f 100644
211216
- target="lib\netcoreapp3.1" />
212217
- <file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\netcoreapp3.1" />
213218
+ target="lib\net5.0" />
214-
+ <file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net5.0" />
219+
+ <file src="FSharp.Build\$Configuration$\net5.0\**\FSharp.Build.resources.dll" target="lib\net5.0" />
215220
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
216221
- target="lib\netcoreapp3.1" />
217222
+ target="lib\net5.0" />

0 commit comments

Comments
 (0)