[#909] Compile the F# net4x compiler without reference to netstandard

dotnet-websharper · Feb 14, 2018 · 81fea38 · 81fea38
1 parent e7c0ade
commit 81fea38
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 47 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -18,6 +18,14 @@
     <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
     <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+
+    <!-- .net core fdd -->
+    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+
+    <!-- no extension is a shell script -->
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
+
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
@@ -45,10 +53,10 @@
     </PropertyGroup>
 
     <!-- If shasum and awk exist get the hashes -->
-    <Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
+    <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
         <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
     </Exec>
-    <Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
+    <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
         <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
     </Exec>
 
@@ -114,9 +122,11 @@
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+        <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+        <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
       </PackageReference>
     </ItemGroup>
 
@@ -138,9 +148,10 @@
       </DotNetCliToolReference>
     </ItemGroup>
 
+    <!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
     <PropertyGroup>
       <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
-    </PropertyGroup>
+    </PropertyGroup> -->
 
   </Target>
 

diff --git a/paket.lock b/paket.lock
@@ -885,4 +885,4 @@ GROUP wsbuild
 
 GIT
   remote: https://github.com/dotnet-websharper/build-script
-     (153af5eec8205cbbedb2d693b3125f4f5ad164b0)
+     (b325ab20b6449f09d40bfe85b555cea362b228e9)
diff --git a/src/compiler/WebSharper.Core.JavaScript/WebSharper.Core.JavaScript.fsproj b/src/compiler/WebSharper.Core.JavaScript/WebSharper.Core.JavaScript.fsproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/compiler/WebSharper.Core.JavaScript/paket.references b/src/compiler/WebSharper.Core.JavaScript/paket.references
@@ -1 +1,2 @@
-FSharp.Core
+FSharp.Core
+System.ValueTuple
diff --git a/src/compiler/WebSharper.Core/paket.references b/src/compiler/WebSharper.Core/paket.references
@@ -1,2 +1,3 @@
 System.Reflection.Emit.Lightweight
-FSharp.Core
+FSharp.Core
+System.ValueTuple
diff --git a/src/stdlib/WebSharper.Collections/WebSharper.Collections.fsproj b/src/stdlib/WebSharper.Collections/WebSharper.Collections.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Library</WebSharperProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/stdlib/WebSharper.Control/WebSharper.Control.fsproj b/src/stdlib/WebSharper.Control/WebSharper.Control.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Library</WebSharperProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/stdlib/WebSharper.JQuery/WebSharper.JQuery.fsproj b/src/stdlib/WebSharper.JQuery/WebSharper.JQuery.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Extension</WebSharperProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/stdlib/WebSharper.JavaScript/WebSharper.JavaScript.fsproj b/src/stdlib/WebSharper.JavaScript/WebSharper.JavaScript.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Extension</WebSharperProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/stdlib/WebSharper.Main.Proxies/WebSharper.Main.Proxies.fsproj b/src/stdlib/WebSharper.Main.Proxies/WebSharper.Main.Proxies.fsproj
@@ -245,8 +245,6 @@
     <ProjectReference Include="..\..\compiler\WebSharper.Core\WebSharper.Core.fsproj" />
     <ProjectReference Include="..\WebSharper.JavaScript\WebSharper.JavaScript.fsproj" />
     <ProjectReference Include="..\WebSharper.JQuery\WebSharper.JQuery.fsproj" />
-    <Reference Include="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <Reference Include="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </ItemGroup>
   <Import Project="..\..\..\msbuild\WebSharper.FSharp.Internal.targets" />
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />

diff --git a/src/stdlib/WebSharper.Main/WebSharper.Main.fsproj b/src/stdlib/WebSharper.Main/WebSharper.Main.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Library</WebSharperProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -27,8 +27,9 @@
     <ProjectReference Include="..\..\compiler\WebSharper.Core\WebSharper.Core.fsproj" />
     <ProjectReference Include="..\WebSharper.JavaScript\WebSharper.JavaScript.fsproj" />
     <ProjectReference Include="..\WebSharper.JQuery\WebSharper.JQuery.fsproj" />
-    <Reference Include="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <Reference Include="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+    <Reference Include="System.Web" />
   </ItemGroup>
   <Import Project="..\..\..\msbuild\WebSharper.FSharp.Internal.targets" />
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />

diff --git a/src/stdlib/WebSharper.Testing/WebSharper.Testing.fsproj b/src/stdlib/WebSharper.Testing/WebSharper.Testing.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <WebSharperProject>Library</WebSharperProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/tests/WarpTest/WarpTest.fsproj b/tests/WarpTest/WarpTest.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>WarpTest</RootNamespace>
     <AssemblyName>WarpTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
     <Name>WarpTest</Name>

diff --git a/tools/WebSharper.FSharp.paket.template b/tools/WebSharper.FSharp.paket.template
@@ -23,33 +23,8 @@ files
     ../build/Release/FSharp/net461/FSharp.Core.dll ==> tools
     ../build/Release/FSharp/net461/FSharp.Core.sigdata ==> tools
     ../build/Release/FSharp/net461/FSharp.Core.optdata ==> tools
-    ../build/Release/FSharp/net461/Microsoft.Extensions.DependencyModel.dll ==> tools
     ../build/Release/FSharp/net461/Mono.Cecil.dll ==> tools
     ../build/Release/FSharp/net461/Mono.Cecil.Mdb.dll ==> tools
     ../build/Release/FSharp/net461/Mono.Cecil.Pdb.dll ==> tools
-    ../build/Release/FSharp/net461/System.Collections.dll ==> tools
-    ../build/Release/FSharp/net461/System.Collections.Immutable.dll ==> tools
-    ../build/Release/FSharp/net461/System.Console.dll ==> tools
-    ../build/Release/FSharp/net461/System.Globalization.dll ==> tools
-    ../build/Release/FSharp/net461/System.IO.dll ==> tools
-    ../build/Release/FSharp/net461/System.IO.FileSystem.dll ==> tools
-    ../build/Release/FSharp/net461/System.Linq.dll ==> tools
-    ../build/Release/FSharp/net461/System.Reflection.dll ==> tools
-    ../build/Release/FSharp/net461/System.Reflection.Metadata.dll ==> tools
-    ../build/Release/FSharp/net461/System.Reflection.Primitives.dll ==> tools
-    ../build/Release/FSharp/net461/System.Resources.ResourceManager.dll ==> tools
-    ../build/Release/FSharp/net461/System.Runtime.dll ==> tools
-    ../build/Release/FSharp/net461/System.Runtime.Extensions.dll ==> tools
-    ../build/Release/FSharp/net461/System.Runtime.InteropServices.dll ==> tools
-    ../build/Release/FSharp/net461/System.Runtime.Numerics.dll ==> tools
-    ../build/Release/FSharp/net461/System.Security.Cryptography.Algorithms.dll ==> tools
-    ../build/Release/FSharp/net461/System.Security.Cryptography.Primitives.dll ==> tools
-    ../build/Release/FSharp/net461/System.Text.Encoding.dll ==> tools
-    ../build/Release/FSharp/net461/System.Text.Encoding.Extensions.dll ==> tools
-    ../build/Release/FSharp/net461/System.Threading.dll ==> tools
-    ../build/Release/FSharp/net461/System.Threading.Tasks.dll ==> tools
-    ../build/Release/FSharp/net461/System.ValueTuple.dll ==> tools
-    ../build/Release/FSharp/net461/System.Xml.XDocument.dll ==> tools
-    ../build/Release/FSharp/net461/netstandard.dll ==> tools
     ../build/Release/FSharp/net461/netstandard.dll.ref ==> tools
     ../src/compiler/WebSharper.FSharp/runngen.ps1 ==> tools
diff --git a/tools/WebSharper.Testing.paket.template b/tools/WebSharper.Testing.paket.template
@@ -12,3 +12,5 @@ dependencies
 files
     ../build/Release/netstandard2.0/WebSharper.Testing.dll ==> lib/netstandard2.0
     ../build/Release/netstandard2.0/WebSharper.Testing.xml ==> lib/netstandard2.0
+    ../build/Release/net461/WebSharper.Testing.dll ==> lib/net45
+    ../build/Release/net461/WebSharper.Testing.xml ==> lib/net45
diff --git a/tools/WebSharper.paket.template b/tools/WebSharper.paket.template
@@ -58,9 +58,6 @@ files
     ../build/Release/netstandard2.0/WebSharper.JQuery.dll ==> lib/netstandard2.0
     ../build/Release/netstandard2.0/WebSharper.JQuery.xml ==> lib/netstandard2.0
 
-    ../build/Release/FSharp/net461/netstandard.dll.ref ==> lib/netstandard2.0
-    ../build/Release/FSharp/net461/netstandard.dll.ref ==> lib/net461
-
     ../docs ==> docs
     ../src/htmllib/tags.csv ==> tools