Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Props #3029

Merged
merged 15 commits into from
May 11, 2017
Merged

Props #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fc76474
Remove comment ifdefs
KevinRansom Mar 3, 2017
75a38f6
merge
KevinRansom Mar 31, 2017
7246971
Merge https://github.com/Microsoft/visualfsharp
KevinRansom May 3, 2017
638a51a
Add Microsoft.NET.Sdk.FSharp.props
KevinRansom May 3, 2017
e47f4a9
Make TargetFrameworks work
KevinRansom May 5, 2017
bb199c3
restore {BuildSuffix}
KevinRansom May 5, 2017
62b8692
rename sdk targets and props, refactor project logic into our repo
KevinRansom May 6, 2017
f253a7f
wrong name
KevinRansom May 6, 2017
e52daea
Add automagic FSharp.Core reference for coreclr
KevinRansom May 6, 2017
2ceacac
Set <DefaultProjectTypeGuid to F# project system guid
KevinRansom May 6, 2017
b04861d
Fix setup
KevinRansom May 6, 2017
1a5c122
Merge https://github.com/Microsoft/visualfsharp
KevinRansom May 7, 2017
37fce1a
Merge https://github.com/Microsoft/visualfsharp
KevinRansom May 11, 2017
3608889
Update sdk props
KevinRansom May 11, 2017
956086a
Typo for net461
KevinRansom May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props
View file
Open in desktop
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>
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

<PropertyGroup Condition=" '$(DisableAutoValueTupleReference)' != 'true' ">
<FrameworkNeedsValueTupleReference Condition=" $(TargetFramework.StartsWith(netcoreapp1.)) or $(TargetFramework.StartsWith(netstandard1.)) ">true</FrameworkNeedsValueTupleReference>
<FrameworkNeedsValueTupleReference Condition=" '$(TargetFramework)' == 'net40' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net61' or '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net47' ">true</FrameworkNeedsValueTupleReference>
<FrameworkNeedsValueTupleReference Condition=" '$(TargetFramework)' == 'net40' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net47' ">true</FrameworkNeedsValueTupleReference>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' != '' ">
Expand Down