More of it builds

Hopac · Mar 23, 2018 · 8e5d612 · 8e5d612
1 parent d0b9e56
commit 8e5d612
Show file tree

Hide file tree

Showing 18 changed files with 88 additions and 15,041 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
       sudo: required
       dist: trusty
       mono: none
-      dotnet: 1.0.0-preview2-003121
+      dotnet: 2.1.4
   exclude:
     - env: CONFIGS=Release
 

diff --git a/Benchmarks/AsyncOverhead/AsyncOverhead.fsproj b/Benchmarks/AsyncOverhead/AsyncOverhead.fsproj
diff --git a/Benchmarks/Cell/Cell.fsproj b/Benchmarks/Cell/Cell.fsproj
diff --git a/Benchmarks/Chameneos/Chameneos.fsproj b/Benchmarks/Chameneos/Chameneos.fsproj
diff --git a/Benchmarks/CmlLCH/CmlLCH.fsproj b/Benchmarks/CmlLCH/CmlLCH.fsproj
diff --git a/Benchmarks/CounterActor/CounterActor.fsproj b/Benchmarks/CounterActor/CounterActor.fsproj
diff --git a/Benchmarks/Fibonacci/Fibonacci.fsproj b/Benchmarks/Fibonacci/Fibonacci.fsproj
diff --git a/Benchmarks/PingPong/PingPong.fsproj b/Benchmarks/PingPong/PingPong.fsproj
diff --git a/Benchmarks/PostMailbox/PostMailbox.fsproj b/Benchmarks/PostMailbox/PostMailbox.fsproj
diff --git a/Benchmarks/PrimesStream/PrimesStream.fsproj b/Benchmarks/PrimesStream/PrimesStream.fsproj
diff --git a/Benchmarks/ReaderWriter/ReaderWriter.fsproj b/Benchmarks/ReaderWriter/ReaderWriter.fsproj
diff --git a/Benchmarks/Skynet/Skynet.fsproj b/Benchmarks/Skynet/Skynet.fsproj
diff --git a/Benchmarks/StartRing/StartRing.fsproj b/Benchmarks/StartRing/StartRing.fsproj
diff --git a/Benchmarks/Streams/Streams.fsproj b/Benchmarks/Streams/Streams.fsproj
diff --git a/Benchmarks/ThreadRing/ThreadRing.fsproj b/Benchmarks/ThreadRing/ThreadRing.fsproj
diff --git a/Examples/Misc/Misc.fsproj b/Examples/Misc/Misc.fsproj
@@ -7,6 +7,7 @@
     <AssemblyName>Examples</AssemblyName>
     <TargetFramework>net45</TargetFramework>
     <Name>Misc</Name>
+    <StartWorkingDirectory>$(MSBuildProjectDirectory)\</StartWorkingDirectory>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <DebugSymbols>true</DebugSymbols>
     <Tailcalls>true</Tailcalls>

diff --git a/Libs/Hopac.Platform/Hopac.Platform.fsproj b/Libs/Hopac.Platform/Hopac.Platform.fsproj
@@ -28,6 +28,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <OtherFlags>--warnon:1182</OtherFlags>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Targetframework)' == 'Netstandard1.6' ">
+    <DefineConstants>CORECLR</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Init.fs" />

diff --git a/run b/run
@@ -211,22 +211,7 @@ restore() {
   echo "Restoring dependencies"
 
   if [ "$USE" = netcore ] ; then
-    local NEW_CHECKSUM
-    if has md5 ; then
-      SUM=md5
-    elif has md5sum ; then
-      SUM=md5sum
-    else
-      echo "Couldn't find command to compute MD5."
-      return 1
-    fi
-    NEW_CHECKSUM="$(find . -name 'project.json' -print0 | xargs -0 cat | $SUM)"
-    local OLD_CHECKSUM=""
-    if [ -f .dotnet ] ; then OLD_CHECKSUM="$(cat .dotnet)" ; fi
-    if [ "$NEW_CHECKSUM" != "$OLD_CHECKSUM" ] ; then
-      echo -n "$NEW_CHECKSUM" > .dotnet
-      dotnet restore --verbosity Warning
-    fi
+    dotnet restore Hopac.sln
   else
     paket --silent restore
   fi