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

Commit5d26513

Browse files
committed
Improve FSI debugging experience for OSS build
1 parent584093c commit5d26513

File tree

5 files changed

+526
-20
lines changed

5 files changed

+526
-20
lines changed

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<OtherFlagsCondition=" '$(TargetFramework)'=='portable259'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
2525
</PropertyGroup>
2626

27-
2827
<ItemGroup>
2928
<CustomAdditionalCompileInputsInclude="$(FSharpSourcesRoot)\..\Proto\$(protoCLIDir)\bin\fsc-proto.exe">
3029
<Visible>false</Visible>
@@ -206,24 +205,23 @@
206205
'$(TargetFramework)' == 'portable47' OR
207206
'$(TargetFramework)' == 'XNA\5.0' OR
208207
'$(TargetFramework)' == 'sl3-wp'"/>
209-
<ReferenceInclude="System.Observable"Condition="'$(TargetFramework)' == 'sl3-wp'"/>
208+
<ReferenceInclude="System.Observable"Condition="'$(TargetFramework)' == 'sl3-wp'"/>
210209
<ReferenceInclude="System.Core"Condition="'$(TargetFramework)' == 'sl5' OR
211210
'$(TargetFramework)' == 'portable47' OR
212211
'$(TargetFramework)' == 'XNA\5.0' OR
213212
'$(TargetFramework)' == 'sl3-wp'"/>
214213
</ItemGroup>
214+
215215
<!-- References-->
216216
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
217217
<!-- Hook compilation phase to do custom work-->
218-
<PropertyGroup>
219-
<PrepareForRunDependsOn>$(PrepareForRunDependsOn);CopyToBuiltBin</PrepareForRunDependsOn>
220-
</PropertyGroup>
221-
<TargetName="CopyToBuiltBin">
222-
<CopySourceFiles="$(IntermediateOutputPath)\FSharp.Core.sigdata"DestinationFolder="$(OutputPath)"SkipUnchangedFiles="true">
223-
<OutputTaskParameter="DestinationFiles"ItemName="FileWrites" />
224-
</Copy>
225-
<CopySourceFiles="$(IntermediateOutputPath)\FSharp.Core.optdata"DestinationFolder="$(OutputPath)"SkipUnchangedFiles="true">
226-
<OutputTaskParameter="DestinationFiles"ItemName="FileWrites" />
227-
</Copy>
218+
219+
<TargetName="CopyToBuiltBin"BeforeTargets="BuiltProjectOutputGroup"AfterTargets="CoreCompile" >
220+
<ItemGroup>
221+
<BuiltProjectOutputGroupKeyOutputInclude="$(IntermediateOutputPath)\FSharp.Core.sigdata" />
222+
<BuiltProjectOutputGroupKeyOutputInclude="$(IntermediateOutputPath)\FSharp.Core.optdata" />
223+
</ItemGroup>
224+
<CopySourceFiles="$(IntermediateOutputPath)\FSharp.Core.sigdata"DestinationFolder="$(OutputPath)"SkipUnchangedFiles="true" />
225+
<CopySourceFiles="$(IntermediateOutputPath)\FSharp.Core.optdata"DestinationFolder="$(OutputPath)"SkipUnchangedFiles="true" />
228226
</Target>
229227
</Project>

‎src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@
77
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
88
<PropertyGroup>
99
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
10-
<!--
11-
fsc.exe and fsi.exe only runs on x86 (emulates on ia64, x64) due to
12-
Win32 DLLs and memory mapping dependencies...
13-
-->
14-
<PlatformTarget>anycpu</PlatformTarget>
10+
<PlatformTarget>AnyCPU</PlatformTarget>
1511
<ProjectGuid>{8b3e283d-b5fe-4055-9d80-7e3a32f3967b}</ProjectGuid>
1612
<OutputType>Exe</OutputType>
1713
<NoWarn>$(NoWarn);62</NoWarn>
18-
<AssemblyName>fsiAnyCpu</AssemblyName>
14+
<AssemblyName>FsiAnyCPU</AssemblyName>
1915
<BaseAddress>0x0A000000</BaseAddress>
2016
<DefineConstants>EXTENSIONTYPING;COMPILER;$(DefineConstants)</DefineConstants>
2117
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v3.5</TargetFrameworkVersion>

0 commit comments

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