Precursor for switch from travis to .github actions

fsprojects · Oct 2, 2019 · f6325c8 · f6325c8
1 parent 98cd475
commit f6325c8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Directory.build.props b/Directory.build.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <WithoutCrossCompile Condition="'$(GITHUB_ACTION)' != '' OR '$(LGTM_SRC)' != ''">True</WithoutCrossCompile>
+    </PropertyGroup>
+</Project>
diff --git a/FSharp.Interop.Dynamic/FSharp.Interop.Dynamic.fsproj b/FSharp.Interop.Dynamic/FSharp.Interop.Dynamic.fsproj
@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard1.6;netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netstandard2.0</TargetFrameworks>
     <Description>dynamic operator using the DLR</Description>
     <Company>Ekon Benefits</Company>
     <Authors>Jay Tuley</Authors>
@@ -20,7 +21,7 @@
   <Import Project="../monofx.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.6.0" />
     <PackageReference Include="FSharp.Core" Version="4.2.*" />
     <PackageReference Include="Dynamitey" Version="2.0.*" />
   </ItemGroup>

diff --git a/Tests/Tests.fsproj b/Tests/Tests.fsproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net46</TargetFrameworks>
+    <TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <Import Project="../monofx.props" />