Another attempt to fix the build

MonacsLib · Apr 10, 2018 · 084c9d0 · 084c9d0
1 parent a2c39c9
commit 084c9d0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ dist: trusty
 env: FrameworkPathOverride=/usr/lib/mono/4.5/
 script:
  - dotnet build -c Release
-# - dotnet test -c Release --no-build Monacs.UnitTests/Monacs.UnitTests.fsproj
+ - dotnet test -c Release --no-build Monacs.UnitTests/Monacs.UnitTests.fsproj
 deploy:
   provider: script
   skip_cleanup: true

diff --git a/Monacs.Core/Monacs.Core.csproj b/Monacs.Core/Monacs.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard1.3;net461</TargetFrameworks>
     <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
     <LangVersion>latest</LangVersion>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -11,4 +11,7 @@
   <ItemGroup Condition = "'$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
+  <ItemGroup Condition = "'$(TargetFramework)' == 'net461' AND '$(OS)' == 'Windows_NT'">
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+  </ItemGroup>
 </Project>
diff --git a/Monacs.sln b/Monacs.sln
@@ -4,6 +4,8 @@ VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monacs.Core", "Monacs.Core/Monacs.Core.csproj", "{AC132BCD-1473-4365-8A14-6C2A0EB41EBF}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Monacs.UnitTests", "Monacs.UnitTests/Monacs.UnitTests.fsproj", "{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,6 +28,18 @@ Global
 		{AC132BCD-1473-4365-8A14-6C2A0EB41EBF}.Release|x64.Build.0 = Release|Any CPU
 		{AC132BCD-1473-4365-8A14-6C2A0EB41EBF}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC132BCD-1473-4365-8A14-6C2A0EB41EBF}.Release|x86.Build.0 = Release|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Debug|x64.Build.0 = Debug|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Debug|x86.Build.0 = Debug|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Release|x64.ActiveCfg = Release|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Release|x64.Build.0 = Release|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Release|x86.ActiveCfg = Release|Any CPU
+		{355D8F6F-F9C8-49BC-9416-4FEA3C2F8EAF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE