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

Commitb5360c9

Browse files
latkinVFSharpTeam
authored and
VFSharpTeam
committed
Refactoring the ILComparer tool project so that it can build from source, instead of requiring a checked-in binary (changeset 1225430)
1 parentfa4c26c commitb5360c9

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed
-7 KB
Binary file not shown.

‎tests/fsharpqa/testenv/bin/ILComparer.exe.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.
-15.5 KB
Binary file not shown.

‎tests/fsharpqa/testenv/src/ILComparer/ILComparer.fsproj‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<AssemblyName>ILComparer</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14+
<OpenBuildCondition=" '$(OpenBuild)' == ''">True</OpenBuild>
15+
<OpenDrop>..\..\..\..\..\$(Configuration)\net40\bin</OpenDrop>
1416
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
1517
<Name>HostedCompilerServer</Name>
1618
</PropertyGroup>
@@ -23,7 +25,7 @@
2325
<DefineConstants>DEBUG;TRACE</DefineConstants>
2426
<WarningLevel>3</WarningLevel>
2527
<PlatformTarget>AnyCPU</PlatformTarget>
26-
<DocumentationFile>bin\Debug\HostedCompilerServer.XML</DocumentationFile>
28+
<DocumentationFile>bin\Debug\ILComparer.XML</DocumentationFile>
2729
<Prefer32Bit>true</Prefer32Bit>
2830
</PropertyGroup>
2931
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
@@ -34,18 +36,25 @@
3436
<DefineConstants>TRACE</DefineConstants>
3537
<WarningLevel>3</WarningLevel>
3638
<PlatformTarget>AnyCPU</PlatformTarget>
37-
<DocumentationFile>bin\Release\HostedCompilerServer.XML</DocumentationFile>
39+
<DocumentationFile>bin\Release\ILComparer.XML</DocumentationFile>
3840
<Prefer32Bit>true</Prefer32Bit>
3941
</PropertyGroup>
4042
<ItemGroup>
4143
<ReferenceInclude="mscorlib" />
42-
<ReferenceInclude="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
43-
<Private>True</Private>
44-
</Reference>
4544
<ReferenceInclude="System" />
4645
<ReferenceInclude="System.Core" />
4746
<ReferenceInclude="System.Numerics" />
4847
</ItemGroup>
48+
<ItemGroupCondition=" '$(OpenBuild)' == 'True'">
49+
<ReferenceInclude="$(OpenDrop)\FSharp.Core.dll">
50+
<Private>True</Private>
51+
</Reference>
52+
</ItemGroup>
53+
<ItemGroupCondition=" '$(OpenBuild)' != 'True'">
54+
<ReferenceInclude="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
55+
<Private>True</Private>
56+
</Reference>
57+
</ItemGroup>
4958
<ItemGroup>
5059
<CompileInclude="Program.fs" />
5160
<NoneInclude="App.config" />
@@ -55,14 +64,18 @@
5564
</PropertyGroup>
5665
<Choose>
5766
<WhenCondition="'$(VisualStudioVersion)' == '11.0'">
58-
<PropertyGroupCondition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
67+
<PropertyGroupCondition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets') AND '$(OpenBuild)' != 'True'">
5968
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
6069
</PropertyGroup>
6170
</When>
6271
<Otherwise>
63-
<PropertyGroupCondition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
72+
<PropertyGroupCondition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets') AND '$(OpenBuild)' != 'True'">
6473
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
6574
</PropertyGroup>
75+
<PropertyGroupCondition=" '$(OpenBuild)' == 'True'">
76+
<FscToolPath>$(OpenDrop)</FscToolPath>
77+
<FSharpTargetsPath>$(OpenDrop)\Microsoft.FSharp.targets</FSharpTargetsPath>
78+
</PropertyGroup>
6679
</Otherwise>
6780
</Choose>
6881
<ImportProject="$(FSharpTargetsPath)" />

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp