Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite58c0cc

Browse files
committed
Fix: xbuild doesn't load FSharp.Build.dll when compiling .NET 2.0/3.5 projects with ToolsVersion=3.5
build a 2.0 FSharp.Build.dll and reference it
1 parent20d52ad commite58c0cc

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

‎src/fsharp/FSharp.Build/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ $(tmpdir)FSBuild.fs $(tmpdir)FSBuild.resources: FSBuild.txt
3333

3434
include$(topdir)/src/fsharp/targets.make
3535

36-
do-final: do-4-0
36+
do-final: do-2-0 do-4-0
3737

38-
clean: clean-4-0
38+
clean: clean-2-0 clean-4-0
3939

40-
install: install-lib-4 install-lib-4-5
40+
install: install-lib-2 install-lib-4 install-lib-4-5
4141

‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ Copyright (C) Microsoft Corporation. All rights reserved.
1717

1818
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1919

20-
<UsingTaskTaskName="Fsc"AssemblyFile="FSharp.Build.dll"/>
21-
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="FSharp.Build.dll"/>
20+
21+
<UsingTaskTaskName="Fsc"AssemblyFile="FSharp.Build.dll"Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll')" />
22+
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="FSharp.Build.dll"Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll')" />
23+
24+
<!-- The next two are for when the ToolsVersion is 3.5, i.e. we're referencing .NET 2.0-->
25+
<UsingTaskTaskName="Fsc"AssemblyFile="$(MSBuildExtensionsPath32)\..\2.0\FSharp.Build.dll"Condition="!Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll') AND Exists('$(MSBuildExtensionsPath32)\..\2.0\FSharp.Build.dll')" />
26+
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="$(MSBuildExtensionsPath32)\..\2.0\FSharp.Build.dll"Condition="!Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll') AND Exists('$(MSBuildExtensionsPath32)\..\2.0\FSharp.Build.dll')" />
27+
28+
2229

2330

2431
<PropertyGroup>
@@ -97,7 +104,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
97104
</ItemGroup>
98105

99106
<PropertyGroup>
100-
<CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
101107
<CoreCompileDependsOn></CoreCompileDependsOn>
102108
</PropertyGroup>
103109

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp