Compile for net461 separately

dotnet-websharper · Feb 16, 2018 · e9102f0 · e9102f0
1 parent e7354f7
commit e9102f0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 220 deletions.
diff --git a/WebSharper.Piglets.Test/WebSharper.Piglets.Test.fsproj b/WebSharper.Piglets.Test/WebSharper.Piglets.Test.fsproj
@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
-    <WebSharperProject>Html</WebSharperProject>
-    <WebSharperSourceMap>true</WebSharperSourceMap>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.fs" />
-    <Compile Include="Site.fs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../WebSharper.Piglets\WebSharper.Piglets.fsproj" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <Reference Include="System.Web" />
-  </ItemGroup>
-  <Import Project="..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets" Condition="Exists('..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets')" />
-  <Import Project="..\.paket\Paket.Restore.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net461</TargetFrameworks>
+    <WebSharperProject>Html</WebSharperProject>
+    <WebSharperSourceMap>true</WebSharperSourceMap>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.fs" />
+    <Compile Include="Site.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../WebSharper.Piglets\WebSharper.Piglets.fsproj" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <Import Project="..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets" Condition="Exists('..\paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.targets')" />
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/WebSharper.Piglets/WebSharper.Piglets.fsproj b/WebSharper.Piglets/WebSharper.Piglets.fsproj
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Library</WebSharperProject>
     <WebSharperSourceMap>true</WebSharperSourceMap>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/nuget/WebSharper.Piglets.paket.template.in b/nuget/WebSharper.Piglets.paket.template.in
@@ -12,8 +12,8 @@ description
 tags
     Web JavaScript F# C#
 files
-    ../WebSharper.Piglets/bin/Release/netstandard2.0/WebSharper.Piglets.dll ==> lib/net461
-    ../WebSharper.Piglets/bin/Release/netstandard2.0/WebSharper.Piglets.xml ==> lib/net461
+    ../WebSharper.Piglets/bin/Release/net461/WebSharper.Piglets.dll ==> lib/net461
+    ../WebSharper.Piglets/bin/Release/net461/WebSharper.Piglets.xml ==> lib/net461
     ../WebSharper.Piglets/bin/Release/netstandard2.0/WebSharper.Piglets.dll ==> lib/netstandard2.0
     ../WebSharper.Piglets/bin/Release/netstandard2.0/WebSharper.Piglets.xml ==> lib/netstandard2.0
 dependencies