Skip to content

Commit 56b17f2

Browse files
committed
make tests work without VS2013 installed
1 parent 64b8575 commit 56b17f2

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

tests/projects/Sample_VS2013_FSharp_Portable_Library_net45/Sample_VS2013_FSharp_Portable_Library_net45.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PropertyGroup>
4949
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
5050
</PropertyGroup>
51-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
51+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
5252
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5353
Other similar extension points exist, see Microsoft.Common.targets.
5454
<Target Name="BeforeBuild">

tests/projects/Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile259/Sample_VS2013_FSharp_Portable_Library_net451.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PropertyGroup>
4949
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
5050
</PropertyGroup>
51-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
51+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
5252
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5353
Other similar extension points exist, see Microsoft.Common.targets.
5454
<Target Name="BeforeBuild">

tests/projects/Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78/Sample_VS2013_FSharp_Portable_Library_net451.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PropertyGroup>
4949
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
5050
</PropertyGroup>
51-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
51+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
5252
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5353
Other similar extension points exist, see Microsoft.Common.targets.
5454
<Target Name="BeforeBuild">

tests/service/FsiTests.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ let ``EvalExpression parse failure nothrow``() =
151151
|> shouldEqual
152152
["exception Operation could not be completed due to earlier error";
153153
"error 1,5 - 1,8; Unexpected keyword 'let' or 'use' in binding";
154-
"error 1,1 - 1,4; The block following this 'let' is unfinished. Expect an expression."]
154+
"error 1,1 - 1,4; The block following this 'let' is unfinished. Every code block is an expression and must have a result. 'let' cannot be the final code element in a block. Consider giving this block an explicit result."]
155155

156156
[<Test>]
157157
let ``EvalInteraction typecheck failure``() =

tests/service/data/sqlite-net-spike/sqlite-net-spike.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<ItemGroup>
5454
<Compile Include="Program.fs" />
5555
</ItemGroup>
56-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
56+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
5757
<Choose>
5858
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhone' And $(TargetFrameworkVersion) == 'v8.0'">
5959
<PropertyGroup>

0 commit comments

Comments
 (0)