Skip to content

Commit

Permalink
Apparently the unit test dll's don't use fsharptest.directory.props (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinRansom authored Jul 3, 2019
1 parent 92e4a52 commit 1b6cf9f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 4 additions & 0 deletions FSharpBuild.Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Unix'">
<DefineConstants>$(DefineConstants);TESTING_ON_LINUX</DefineConstants>
</PropertyGroup>

<!-- SDK targets override -->
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
<FSharpTargetsPath>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets</FSharpTargetsPath>
Expand Down
4 changes: 0 additions & 4 deletions FSharpTests.Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
<DotnetFsiCompilerPath></DotnetFsiCompilerPath>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Unix'">
<DefineConstants>($(DefineConstants);TESTING_ON_LINUX</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>

Expand Down

0 comments on commit 1b6cf9f

Please sign in to comment.