Skip to content

Commit

Permalink
Update Props (#3027)
Browse files Browse the repository at this point in the history
* Remove comment ifdefs

* Add Microsoft.NET.Sdk.FSharp.props

* Make TargetFrameworks work

* restore {BuildSuffix}

* rename sdk targets and props, refactor project logic into our repo

* wrong name

* Add automagic FSharp.Core reference for coreclr

* Set <DefaultProjectTypeGuid to F# project system guid

* Fix setup

* Update sdk props
  • Loading branch information
KevinRansom authored May 11, 2017
1 parent 123a37f commit 50980ff
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,27 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<WarningLevel Condition=" '$(WarningLevel)' == '' ">3</WarningLevel>
</PropertyGroup>

<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <!--- Do not glob F# source files -->
<EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">false</EnableDefaultCompileItems> <!--- Do not glob F# source files -->
<DefaultProjectTypeGuid Condition=" '$(DefaultProjectTypeGuid)' == '' ">{F2A71F9B-5D33-465A-A702-920D77279786}</DefaultProjectTypeGuid> <!-- F# project type -->
</PropertyGroup>

<PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'core' ">
<FscToolPath Condition="'$(FscToolPath)' == ''">$(MSBuildThisFileDirectory)</FscToolPath>
<FscToolExe Condition="'$(OS)' != 'Unix' and '$(FscToolExe)' == ''">RunFsc.cmd</FscToolExe>
<FscToolExe Condition="'$(OS)' == 'Unix' and '$(FscToolExe)' == ''">RunFsc.sh</FscToolExe>
<PropertyGroup Condition=" '$(OS)' != 'Unix' and Exists('$(MSBuildThisFileDirectory)\RunFsc.cmd')" >
<FscToolPath Condition=" '$(FscToolPath)' == '' ">$(MSBuildThisFileDirectory)</FscToolPath>
<FscToolExe Condition=" '$(FscToolExe)' == ''">RunFsc.cmd</FscToolExe>
</PropertyGroup>

<PropertyGroup Condition=" '$(OS)' == 'Unix' and Exists('$(MSBuildThisFileDirectory)\RunFsc.sh')" >
<FscToolPath Condition=" '$(FscToolPath)' == '' ">$(MSBuildThisFileDirectory)</FscToolPath>
<FscToolExe Condition="'$(OS)' == 'Unix' and '$(FscToolExe)' == ''">RunFsc.sh</FscToolExe>
</PropertyGroup>
</Project>

0 comments on commit 50980ff

Please sign in to comment.