fix tests

fsprojects · Apr 11, 2017 · 1c5c0ab · 1c5c0ab
1 parent 3905f0a
commit 1c5c0ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/...s/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate b/...s/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\MultiTarget\build\MultiTarget.props" Condition="Exists('..\..\packages\MultiTarget\build\MultiTarget.props')" Label="Paket" />
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -69,15 +70,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.6')">
-      <PropertyGroup>
-        <__paket__MultiTarget_props>MultiTarget</__paket__MultiTarget_props>
-        <__paket__MultiTarget_targets>MultiTarget</__paket__MultiTarget_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <Import Project="..\..\packages\MultiTarget\build\$(__paket__MultiTarget_props).props" Condition="Exists('..\..\packages\MultiTarget\build\$(__paket__MultiTarget_props).props')" Label="Paket" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -120,5 +112,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\..\packages\MultiTarget\build\$(__paket__MultiTarget_targets).targets" Condition="Exists('..\..\packages\MultiTarget\build\$(__paket__MultiTarget_targets).targets')" Label="Paket" />
+  <Import Project="..\..\packages\MultiTarget\build\MultiTarget.targets" Condition="Exists('..\..\packages\MultiTarget\build\MultiTarget.targets')" Label="Paket" />
 </Project>
diff --git a/...ts/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate b/...ts/scenarios/i001578-transitive-ref/before/TestPaketDotNet/TestPaketDotNet.csprojtemplate
@@ -132,4 +132,5 @@
       </ItemGroup>
     </When>
   </Choose>
+  <Import Project="..\packages\Microsoft.Bcl.Build\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build\build\Microsoft.Bcl.Build.targets')" Label="Paket" />
 </Project>
diff --git a/...s/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate b/...s/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate
@@ -56,13 +56,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
-      <PropertyGroup>
-        <__paket__WebSharper_targets>WebSharper</__paket__WebSharper_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -126,5 +119,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\packages\WebSharper\build\$(__paket__WebSharper_targets).targets" Condition="Exists('..\packages\WebSharper\build\$(__paket__WebSharper_targets).targets')" Label="Paket" />
+  <Import Project="..\packages\WebSharper\build\WebSharper.targets" Condition="Exists('..\packages\WebSharper\build\WebSharper.targets')" Label="Paket" />
 </Project>
diff --git a/...01746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate b/...01746-hard-legacy/before/SilverlightClassLibrary1/SilverlightClassLibrary1.csprojtemplate
@@ -161,4 +161,5 @@
       </ItemGroup>
     </When>
   </Choose>
+  <Import Project="..\packages\Microsoft.Bcl.Build\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build\build\Microsoft.Bcl.Build.targets')" Label="Paket" />
 </Project>