Skip to content

Commit 7cfe41e

Browse files
KevinRansomKevinRansom
authored
Merge pull request #1422 from KevinRansom/master
Clean up F# OSS build targets files.
2 parents af89a30 + 3cdf31d commit 7cfe41e

File tree

7 files changed

+97
-451
lines changed

7 files changed

+97
-451
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525

2626
<!-- Standard interpretations of Debug and Release configurations -->
2727
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
28-
<DebugType Condition=" '$(DebugType)' == '' ">full</DebugType>
28+
<DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
2929
<Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
3030
<ErrorReport Condition=" '$(ErrorReport)' == '' ">prompt</ErrorReport>
31-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
32-
<OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
31+
<OtherFlags>$(OtherFlags) --no-jit-optimize</OtherFlags>
3332
<DefineConstants Condition=" '$(ProjectLanguage)' != 'VisualBasic' ">DEBUG;TRACE;CODE_ANALYSIS;$(DefineConstants)</DefineConstants>
3433
<DefineConstants Condition=" '$(ProjectLanguage)' == 'VisualBasic' ">DEBUG=True,TRACE=True,CODE_ANALYSIS=True,$(DefineConstants)</DefineConstants>
3534
<SIGN_WITH_MSFT_KEY Condition=" '$(SIGN_WITH_MSFT_KEY)' == '' ">false</SIGN_WITH_MSFT_KEY>
@@ -56,6 +55,11 @@
5655
<WarningLevel Condition=" '$(WarningLevel)' == '' ">3</WarningLevel>
5756
</PropertyGroup>
5857

58+
<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists -->
59+
<PropertyGroup>
60+
<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
61+
</PropertyGroup>
62+
5963
<PropertyGroup>
6064
<DefineConstants Condition="'$(VisualStudioVersion)'=='12.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV12=True</DefineConstants>
6165
<DefineConstants Condition="'$(VisualStudioVersion)'=='12.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV12</DefineConstants>

‎src/FSharpSource.targets‎

Lines changed: 35 additions & 397 deletions
Large diffs are not rendered by default.

‎src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@
476476
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
477477
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
478478
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
479-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
480-
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1</HintPath></Reference>
479+
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath></Reference>
480+
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath></Reference>
481481
</ItemGroup>
482482
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
483483
<Import Project="$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.PowerPack.targets" />

‎src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,8 @@
527527
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
528528
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
529529
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
530-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
531-
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1</HintPath><Private>false</Private></Reference>
530+
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath></Reference>
531+
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath><Private>false</Private></Reference>
532532
</ItemGroup>
533533
<ItemGroup>
534534
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,8 @@
588588
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
589589
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
590590
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
591-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
592-
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1</HintPath></Reference>
591+
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath></Reference>
592+
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\\System.ValueTuple.dll</HintPath></Reference>
593593
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
594594
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
595595
<Name>FSharp.Core</Name>

‎tests/fsharp/core/tests_core.fs‎

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -163,51 +163,54 @@ module Events =
163163
do! run cfg dir
164164
})
165165

166-
167-
module ``FSI-Shadowcopy`` =
168-
169-
[<Test>]
170-
// "%FSI%" %fsi_flags% < test1.fsx
171-
[<FSharpSuiteTestCase("core/fsi-shadowcopy", "")>]
172-
// "%FSI%" %fsi_flags% --shadowcopyreferences- < test1.fsx
173-
[<FSharpSuiteTestCase("core/fsi-shadowcopy", "--shadowcopyreferences-")>]
174-
let ``shadowcopy disabled`` (flags: string) = check (attempt {
175-
let { Directory = dir; Config = cfg } = testContext ()
176-
177-
let ``exec <`` l p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = Some(RedirectInput(l)) } p >> checkResult
178-
let ``fsi <`` = Printf.ksprintf (fun flags l -> Commands.fsi (``exec <`` l) cfg.FSI flags [])
179-
let fileguard = (Commands.getfullpath dir) >> FileGuard.create
180-
181-
// if exist test1.ok (del /f /q test1.ok)
182-
use testOkFile = fileguard "test1.ok"
183-
184-
do! ``fsi <`` "%s %s" cfg.fsi_flags flags "test1.fsx"
185-
186-
// if NOT EXIST test1.ok goto SetError
187-
do! testOkFile |> NUnitConf.checkGuardExists
188-
})
189-
190-
[<Test>]
191-
// "%FSI%" %fsi_flags% /shadowcopyreferences+ < test2.fsx
192-
[<FSharpSuiteTestCase("core/fsi-shadowcopy", "/shadowcopyreferences+")>]
193-
// "%FSI%" %fsi_flags% --shadowcopyreferences < test2.fsx
194-
[<FSharpSuiteTestCase("core/fsi-shadowcopy", "--shadowcopyreferences")>]
195-
let ``shadowcopy enabled`` (flags: string) = check (attempt {
196-
let { Directory = dir; Config = cfg } = testContext ()
197-
198-
let ``exec <`` l p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = Some(RedirectInput(l)) } p >> checkResult
199-
let ``fsi <`` = Printf.ksprintf (fun flags l -> Commands.fsi (``exec <`` l) cfg.FSI flags [])
200-
let fileguard = (Commands.getfullpath dir) >> FileGuard.create
201-
202-
// if exist test2.ok (del /f /q test2.ok)
203-
use testOkFile = fileguard "test2.ok"
204-
205-
// "%FSI%" %fsi_flags% /shadowcopyreferences+ < test2.fsx
206-
do! ``fsi <`` "%s %s" cfg.fsi_flags flags "test2.fsx"
207-
208-
// if NOT EXIST test2.ok goto SetError
209-
do! testOkFile |> NUnitConf.checkGuardExists
210-
})
166+
//
167+
// Shadowcopy does not work for public signed assemblies
168+
// =====================================================
169+
//
170+
//module ``FSI-Shadowcopy`` =
171+
//
172+
// [<Test>]
173+
// // "%FSI%" %fsi_flags% < test1.fsx
174+
// [<FSharpSuiteTestCase("core/fsi-shadowcopy", "")>]
175+
// // "%FSI%" %fsi_flags% --shadowcopyreferences- < test1.fsx
176+
// [<FSharpSuiteTestCase("core/fsi-shadowcopy", "--shadowcopyreferences-")>]
177+
// let ``shadowcopy disabled`` (flags: string) = check (attempt {
178+
// let { Directory = dir; Config = cfg } = testContext ()
179+
//
180+
// let ``exec <`` l p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = Some(RedirectInput(l)) } p >> checkResult
181+
// let ``fsi <`` = Printf.ksprintf (fun flags l -> Commands.fsi (``exec <`` l) cfg.FSI flags [])
182+
// let fileguard = (Commands.getfullpath dir) >> FileGuard.create
183+
//
184+
// // if exist test1.ok (del /f /q test1.ok)
185+
// use testOkFile = fileguard "test1.ok"
186+
//
187+
// do! ``fsi <`` "%s %s" cfg.fsi_flags flags "test1.fsx"
188+
//
189+
// // if NOT EXIST test1.ok goto SetError
190+
// do! testOkFile |> NUnitConf.checkGuardExists
191+
// })
192+
//
193+
// [<Test>]
194+
// // "%FSI%" %fsi_flags% /shadowcopyreferences+ < test2.fsx
195+
// [<FSharpSuiteTestCase("core/fsi-shadowcopy", "/shadowcopyreferences+")>]
196+
// // "%FSI%" %fsi_flags% --shadowcopyreferences < test2.fsx
197+
// [<FSharpSuiteTestCase("core/fsi-shadowcopy", "--shadowcopyreferences")>]
198+
// let ``shadowcopy enabled`` (flags: string) = check (attempt {
199+
// let { Directory = dir; Config = cfg } = testContext ()
200+
//
201+
// let ``exec <`` l p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = Some(RedirectInput(l)) } p >> checkResult
202+
// let ``fsi <`` = Printf.ksprintf (fun flags l -> Commands.fsi (``exec <`` l) cfg.FSI flags [])
203+
// let fileguard = (Commands.getfullpath dir) >> FileGuard.create
204+
//
205+
// // if exist test2.ok (del /f /q test2.ok)
206+
// use testOkFile = fileguard "test2.ok"
207+
//
208+
// // "%FSI%" %fsi_flags% /shadowcopyreferences+ < test2.fsx
209+
// do! ``fsi <`` "%s %s" cfg.fsi_flags flags "test2.fsx"
210+
//
211+
// // if NOT EXIST test2.ok goto SetError
212+
// do! testOkFile |> NUnitConf.checkGuardExists
213+
// })
211214

212215

213216

‎tests/fsharpqa/testenv/bin/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/HostedCompilerServer.*
55
/ILComparer.*
66
/diff.*
7+
/System.Collections.Immutable.*
78
/x86/
89
/AMD64/
910
/nunit/

0 commit comments

Comments
 (0)