Skip to content

Commit

Permalink
Assorted test fixes found when running tests on internal infra
Browse files Browse the repository at this point in the history
- Older NUnit used internally compares collections differently
  - Has trouble with nested collections
  - Enforces that empty collections have the same type (newer NUnit is lax about this)
- Add `NoMT` test tag to various new tests that don't support mixed .NET version testing (i.e. .NET 2/4 multitargeting)
- Make sure all IDE bits build with correct versions of VS SDK dependencies
  - IDE unit tests were all failing with latest VS RC installed
- Various small tweaks to account for versioning and file paths used by VS

closes #482

commit 539225b
Author: latkin <latkin@microsoft.com>
Date:   Tue Jun 2 12:35:30 2015 -0700

    Add missing project file

commit f8d9fe8
Author: latkin <latkin@microsoft.com>
Date:   Tue Jun 2 07:27:43 2015 -0700

    Another core unit tests fix

commit f6d830b
Author: latkin <latkin@microsoft.com>
Date:   Thu May 28 13:33:08 2015 -0700

    Use correct, consistent versions of VS binaries

commit 827044c
Author: VFSharpTeam <vfsharpteam@microsoft.com>
Date:   Thu May 28 10:01:23 2015 -0700

    More test fixes

commit fe8661f
Author: latkin <latkin@microsoft.com>
Date:   Wed May 27 16:36:37 2015 -0700

    First batch
  • Loading branch information
latkin committed Jun 2, 2015
1 parent 322d27f commit 275b832
Show file tree
Hide file tree
Showing 20 changed files with 117 additions and 96 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ type ArrayModule() =
member this.ChunkBySize() =

// int Seq
Assert.AreEqual([| [|1..4|]; [|5..8|] |], Array.chunkBySize 4 [|1..8|])
Assert.AreEqual([| [|1..4|]; [|5..8|]; [|9..10|] |], Array.chunkBySize 4 [|1..10|])
Assert.AreEqual([| [|1|]; [|2|]; [|3|]; [|4|] |], Array.chunkBySize 1 [|1..4|])
Assert.IsTrue([| [|1..4|]; [|5..8|] |] = Array.chunkBySize 4 [|1..8|])
Assert.IsTrue([| [|1..4|]; [|5..8|]; [|9..10|] |] = Array.chunkBySize 4 [|1..10|])
Assert.IsTrue([| [|1|]; [|2|]; [|3|]; [|4|] |] = Array.chunkBySize 1 [|1..4|])

// string Seq
Assert.AreEqual([| [|"a"; "b"|]; [|"c";"d"|]; [|"e"|] |], Array.chunkBySize 2 [|"a";"b";"c";"d";"e"|])
Assert.IsTrue([| [|"a"; "b"|]; [|"c";"d"|]; [|"e"|] |] = Array.chunkBySize 2 [|"a";"b";"c";"d";"e"|])

// empty Seq
Assert.AreEqual([||], Array.chunkBySize 3 [||])
Assert.IsTrue([||] = Array.chunkBySize 3 [||])

// null Seq
let nullArr:_[] = null
Expand All @@ -172,18 +172,18 @@ type ArrayModule() =
member this.SplitInto() =

// int array
Assert.AreEqual([| [|1..4|]; [|5..7|]; [|8..10|] |], Array.splitInto 3 [|1..10|])
Assert.AreEqual([| [|1..4|]; [|5..8|]; [|9..11|] |], Array.splitInto 3 [|1..11|])
Assert.AreEqual([| [|1..4|]; [|5..8|]; [|9..12|] |], Array.splitInto 3 [|1..12|])
Assert.IsTrue([| [|1..4|]; [|5..7|]; [|8..10|] |] = Array.splitInto 3 [|1..10|])
Assert.IsTrue([| [|1..4|]; [|5..8|]; [|9..11|] |] = Array.splitInto 3 [|1..11|])
Assert.IsTrue([| [|1..4|]; [|5..8|]; [|9..12|] |] = Array.splitInto 3 [|1..12|])

Assert.AreEqual([| [|1..2|]; [|3|]; [|4|]; [|5|] |], Array.splitInto 4 [|1..5|])
Assert.AreEqual([| [|1|]; [|2|]; [|3|]; [|4|] |], Array.splitInto 20 [|1..4|])
Assert.IsTrue([| [|1..2|]; [|3|]; [|4|]; [|5|] |] = Array.splitInto 4 [|1..5|])
Assert.IsTrue([| [|1|]; [|2|]; [|3|]; [|4|] |] = Array.splitInto 20 [|1..4|])

// string array
Assert.AreEqual([| [|"a"; "b"|]; [|"c";"d"|]; [|"e"|] |], Array.splitInto 3 [|"a";"b";"c";"d";"e"|])
Assert.IsTrue([| [|"a"; "b"|]; [|"c";"d"|]; [|"e"|] |] = Array.splitInto 3 [|"a";"b";"c";"d";"e"|])

// empty array
Assert.AreEqual([| |], Array.splitInto 3 [| |])
Assert.IsTrue([| |] = Array.splitInto 3 [| |])

// null array
let nullArr:_[] = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ type ListModule() =
member this.ChunkBySize() =

// int list
Assert.AreEqual([ [1..4]; [5..8] ], List.chunkBySize 4 [1..8])
Assert.AreEqual([ [1..4]; [5..8]; [9..10] ], List.chunkBySize 4 [1..10])
Assert.AreEqual([ [1]; [2]; [3]; [4] ], List.chunkBySize 1 [1..4])
Assert.IsTrue([ [1..4]; [5..8] ] = List.chunkBySize 4 [1..8])
Assert.IsTrue([ [1..4]; [5..8]; [9..10] ] = List.chunkBySize 4 [1..10])
Assert.IsTrue([ [1]; [2]; [3]; [4] ] = List.chunkBySize 1 [1..4])

// string list
Assert.AreEqual([ ["a"; "b"]; ["c";"d"]; ["e"] ], List.chunkBySize 2 ["a";"b";"c";"d";"e"])
Assert.IsTrue([ ["a"; "b"]; ["c";"d"]; ["e"] ] = List.chunkBySize 2 ["a";"b";"c";"d";"e"])

// empty list
Assert.AreEqual([], List.chunkBySize 3 [])
Assert.IsTrue([] = List.chunkBySize 3 [])

// invalidArg
CheckThrowsArgumentException (fun () -> List.chunkBySize 0 [1..10] |> ignore)
Expand All @@ -132,18 +132,18 @@ type ListModule() =
member this.SplitInto() =

// int list
Assert.AreEqual([ [1..4]; [5..7]; [8..10] ], List.splitInto 3 [1..10])
Assert.AreEqual([ [1..4]; [5..8]; [9..11] ], List.splitInto 3 [1..11])
Assert.AreEqual([ [1..4]; [5..8]; [9..12] ], List.splitInto 3 [1..12])
Assert.IsTrue([ [1..4]; [5..7]; [8..10] ] = List.splitInto 3 [1..10])
Assert.IsTrue([ [1..4]; [5..8]; [9..11] ] = List.splitInto 3 [1..11])
Assert.IsTrue([ [1..4]; [5..8]; [9..12] ] = List.splitInto 3 [1..12])

Assert.AreEqual([ [1..2]; [3]; [4]; [5] ], List.splitInto 4 [1..5])
Assert.AreEqual([ [1]; [2]; [3]; [4] ], List.splitInto 20 [1..4])
Assert.IsTrue([ [1..2]; [3]; [4]; [5] ] = List.splitInto 4 [1..5])
Assert.IsTrue([ [1]; [2]; [3]; [4] ] = List.splitInto 20 [1..4])

// string list
Assert.AreEqual([ ["a"; "b"]; ["c";"d"]; ["e"] ], List.splitInto 3 ["a";"b";"c";"d";"e"])
Assert.IsTrue([ ["a"; "b"]; ["c";"d"]; ["e"] ] = List.splitInto 3 ["a";"b";"c";"d";"e"])

// empty list
Assert.AreEqual([], List.splitInto 3 [])
Assert.IsTrue([] = List.splitInto 3 [])

// invalidArg
CheckThrowsArgumentException (fun () -> List.splitInto 0 [1..10] |> ignore)
Expand Down Expand Up @@ -335,7 +335,7 @@ type ListModule() =
Assert.AreEqual(expectedStrList, List.except strList2 strList1)

// empty list
let emptyIntList = []
let emptyIntList : int list = []
Assert.AreEqual([1..100], List.except emptyIntList intList1)
Assert.AreEqual(emptyIntList, List.except intList1 emptyIntList)
Assert.AreEqual(emptyIntList, List.except emptyIntList emptyIntList)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -811,12 +811,12 @@ type ListModule02() =
Assert.AreEqual(["str1";"str2"], List.truncate 2 ["str1";"str2";"str3"])

// empty list
Assert.AreEqual([], List.truncate 0 [])
Assert.AreEqual([], List.truncate 1 [])
Assert.AreEqual(([] : int list), List.truncate 0 ([] : int list))
Assert.AreEqual(([] : int list), List.truncate 1 ([] : int list))

// negative count
Assert.AreEqual([], List.truncate -1 [1..5])
Assert.AreEqual([], List.truncate System.Int32.MinValue [1..5])
Assert.AreEqual(([] : int list), List.truncate -1 [1..5])
Assert.AreEqual(([] : int list), List.truncate System.Int32.MinValue [1..5])

()

Expand Down Expand Up @@ -984,7 +984,7 @@ type ListModule02() =
{
InputList = [1..10]
WindowSize = 25
ExpectedList = []
ExpectedList = ([] : int list list)
Exception = None
} |> testWindowed
{
Expand All @@ -994,15 +994,15 @@ type ListModule02() =
Exception = None
} |> testWindowed
{
InputList = []
InputList = ([] : int list)
WindowSize = 2
ExpectedList = []
ExpectedList = ([] : int list list)
Exception = None
} |> testWindowed
{
InputList = [1..10]
WindowSize = 0
ExpectedList = []
ExpectedList = ([] : int list list)
Exception = Some typeof<ArgumentException>
} |> testWindowed

Expand All @@ -1029,7 +1029,7 @@ type ListModule02() =
if windowSize <= 0 then
CheckThrowsArgumentException (fun () -> List.windowed windowSize [1..arraySize] |> ignore)
elif arraySize < windowSize then
Assert.AreEqual(([] : int[] list), List.windowed windowSize [1..arraySize])
Assert.AreEqual(([] : int list list), List.windowed windowSize [1..arraySize])
else
Assert.AreEqual(expectedLists.[arraySize, windowSize], List.windowed windowSize [1..arraySize])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
SOURCE=E_ValidIdentifier04.fs # E_ValidIdentifier04.fs

SOURCE=backtickmoduleandtypenames.fsx # backtickmoduleandtypenames.fsx
SOURCE=backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1 # backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1
NoMT SOURCE=backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1 # backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1

SOURCE=StructNotAllowDoKeyword.fs # StructNotAllowDoKeyword.fs
SOURCE=E_MissingQualification.fs SCFLAGS="--test:ErrorRanges" # E_MissingQualification.fs
Expand Down
20 changes: 10 additions & 10 deletions tests/fsharpqa/Source/InteractiveSession/Misc/env.lst
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@ NoMT SOURCE=E_NoNoFrameworkWithFSCore.fs COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="-
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo" # RelativeHashRResolution05_fscrelative

# via FSC, invoking like `fsc.exe --simpleresolution path\script.fsx`
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution01_fscsimple
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution02_fscsimple
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution03_fscsimple
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution04_fscsimple
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution05_fscsimple
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution01_fscsimple
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution02_fscsimple
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution03_fscsimple
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution04_fscsimple
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution05_fscsimple

# via FSC, invoking like `fsc.exe ..\path\path\script.fsx`
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution01_fscrelativesimple
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution02_fscrelativesimple
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution03_fscrelativesimple
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution04_fscrelativesimple
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%" # RelativeHashRResolution05_fscrelativesimple
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution01_fscrelativesimple
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution02_fscrelativesimple
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution03_fscrelativesimple
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution04_fscrelativesimple
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:\"%FSCOREDLLPATH%\"" # RelativeHashRResolution05_fscrelativesimple
2 changes: 1 addition & 1 deletion tests/fsharpqa/Source/MultiTargeting/env.lst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ NOMONO SOURCE=E_BadPathToFSharpCore.fsx SCFLAGS="--noframework -r %W
# FSharp.Core is checked in for this test to verify a particular error message related to it. It shouldn't be accidentally picked up by other tests since it isn't in the working directory for them
NOMONO SOURCE=E_UseBinaryIncompatibleLibrary.fs SCFLAGS="--noframework -r ..\\Common\\FSharp.Core.dll" # E_UseBinaryIncompatibleLibrary.fs

SOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx QuotedCommaTypeName_author.fs QuotedCommaTypeName_consumer.fsx 0,8" # QuotedCommaTypeName
ReqOpen SOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx QuotedCommaTypeName_author.fs QuotedCommaTypeName_consumer.fsx 0,8" # QuotedCommaTypeName
8 changes: 4 additions & 4 deletions tests/fsharpqa/Source/Optimizations/AssemblyBoundary/env.lst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SOURCE=test01.fs SCFLAGS="--optimize+ -r:lib01.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib01.fs" # test01.fs
SOURCE=test02.fs SCFLAGS="--optimize+ -r:lib02.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib02.fs" # test02.fs
SOURCE=test03.fs SCFLAGS="--optimize+ -r:lib03.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib03.fs" # test03.fs
SOURCE=test04.fs SCFLAGS="--optimize+ -r:lib04.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib04.fs" # test04.fs
NoMT SOURCE=test01.fs SCFLAGS="--optimize+ -r:lib01.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib01.fs" # test01.fs
NoMT SOURCE=test02.fs SCFLAGS="--optimize+ -r:lib02.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib02.fs" # test02.fs
NoMT SOURCE=test03.fs SCFLAGS="--optimize+ -r:lib03.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib03.fs" # test03.fs
NoMT SOURCE=test04.fs SCFLAGS="--optimize+ -r:lib04.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib04.fs" # test04.fs

SOURCE=InlineWithPrivateValues01.fs SCFLAGS="-r:TypeLib01.dll" PRECMD="\$FSC_PIPE -a --optimize+ TypeLib01.fs" # InlineWithPrivateValuesStruct
SOURCE=InlineWithPrivateValues01.fs SCFLAGS="-r:TypeLib02.dll" PRECMD="\$FSC_PIPE -a --optimize+ TypeLib02.fs" # InlineWithPrivateValuesRef
4 changes: 2 additions & 2 deletions tests/fsharpqa/Source/Optimizations/Inlining/env.lst
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll" # Match01.fs
SOURCE=Match02.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match02.dll" # Match02.fs
NoMT SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll" # Match01.fs
NoMT SOURCE=Match02.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match02.dll" # Match02.fs
8 changes: 4 additions & 4 deletions tests/fsharpqa/testenv/bin/runall.pl
Original file line number Diff line number Diff line change
Expand Up @@ -2797,14 +2797,14 @@ sub get_env_file
$envlist[$envnum][4]{uc($1)} and $sublist[$envnum][4]{$var} = $envlist[$envnum][4]{uc($1)};
}

if($var == "FSIMODE")
if($var eq "FSIMODE")
{
$sublist[$envnum][1] = $sublist[$envnum][1] . ",FSI";
$sublist[$envnum][1] = $sublist[$envnum][1] . ",FSI,NoMT";
}

if($var == "SCFLAGS" && $sublist[$envnum][4]{$var} =~ /--noframework\b/)
if($var eq "SCFLAGS" && $sublist[$envnum][4]{$var} =~ /--noframework\b/)
{
$sublist[$envnum][1] = $sublist[$envnum][1] . ",NoCrossVer";
$sublist[$envnum][1] = $sublist[$envnum][1] . ",NoCrossVer,NoMT";
}
} else {
print_noise("Bad assignment '$_', skipping...\n", 1);
Expand Down
7 changes: 6 additions & 1 deletion tests/fsharpqa/testenv/src/ExecAssembly/ExecAssembly.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Program.fs" />
<None Include="App.config" />
</ItemGroup>
<ItemGroup Condition=" '$(OpenBuild)' != 'True' ">
<None Include="closed\App.config" />
</ItemGroup>
<ItemGroup Condition=" '$(OpenBuild)' == 'True' ">
<None Include="open\App.config" />
</ItemGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
Expand Down
19 changes: 19 additions & 0 deletions tests/fsharpqa/testenv/src/ExecAssembly/closed/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity
name="FSharp.Core"
publicKeyToken="b03f5f7f11d50a3a"
culture="neutral"/>
<bindingRedirect
oldVersion="2.0.0.0-4.3.1.0"
newVersion="4.4.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion tests/fsharpqa/testenv/src/diff/diff.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<OpenBuild Condition=" '$(OpenBuild)' == '' ">True</OpenBuild>
<OpenDrop>..\..\..\..\..\$(Configuration)\net40\bin</OpenDrop>
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>HostedCompilerServer</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down
11 changes: 5 additions & 6 deletions vsintegration/src/Salsa/Salsa.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,20 @@
<Reference Include="VSLangProj" />
<Reference Include="VSLangProj80" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Threading" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Shell.Design" />
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
<Reference Include="Microsoft.VisualStudio.CommonIDE" />
<Reference Include="Microsoft.VisualStudio.CommonIDE, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
<Reference Include="Microsoft.VisualStudio.Text.Data" />
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="nunit.framework">
<Private>True</Private>
<HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/unittests/Unittests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<Reference Include="Microsoft.VisualStudio.Shell.Design" />
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.Text.Data.dll" />
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
<Reference Include="Microsoft.VisualStudio.CommonIDE" />
Expand Down
Loading

0 comments on commit 275b832

Please sign in to comment.