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

Netstandard2 -- minor target changes for dotnet.exe #3023

Merged
merged 16 commits into from
May 11, 2017
Merged

Netstandard2 -- minor target changes for dotnet.exe #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 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
fdc7564
Resolve magic
KevinRansom May 9, 2017
2f03f76
resolve magic
KevinRansom May 9, 2017
24cf853
Merge https://github.com/Microsoft/visualfsharp into netstandard2
KevinRansom May 10, 2017
01aa660
Minor target rework due to crosstargetting changes. Always copy fsha…
KevinRansom May 10, 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
11 changes: 2 additions & 9 deletions 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 @@ -17,7 +17,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<PropertyGroup Condition=" '$(IsCrossTargetingBuild)' == 'true' ">
<PropertyGroup>
<AlwaysUseNumericalSuffixInItemNames>true</AlwaysUseNumericalSuffixInItemNames>
<DefineCommonItemSchemas Condition=" '$(DefineCommonItemSchemas)' == '' ">true</DefineCommonItemSchemas>
<DefineCommonReferenceSchemas Condition=" '$(DefineCommonReferenceSchemas)' == '' ">true</DefineCommonReferenceSchemas>
Expand All @@ -30,14 +30,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<_DebugSymbolsIntermediatePath Include="@(_DebugSymbolsIntermediatePathTemporary->'%(RootDir)%(Directory)%(Filename).pdb')"/>
</ItemGroup>


<!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed. -->
<!-- Import design time targets before the common targets, which import targets from Nuget. -->
<PropertyGroup>
<FSharpDesignTimeTargetsPath Condition="'$(FSharpDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.FSharp.DesignTime.targets</FSharpDesignTimeTargetsPath>
</PropertyGroup>
<Import Condition=" Exists('$(FSharpDesignTimeTargetsPath)')" Project="$(FSharpDesignTimeTargetsPath) " />

<!-- Locate and add mscorlib, unless NoStdLib is set -->
<ItemGroup>
<_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" Condition=" '$(NoStdLib)' != 'true' " />
Expand Down Expand Up @@ -98,6 +90,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<!--- Add it for Desktop Apps -->
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(IsFSharpCoreReferenced)' != 'true' and '$(TargetFSharpCoreVersion)' != ''">
<ReferencePath Include="$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll" />
<ReferenceCopyLocalPaths Include="$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll" />
</ItemGroup>

</Target>
Expand Down
14 changes: 1 addition & 13 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,19 +273,7 @@ this file.

</Target>

<Choose>
<When Condition=" '$(IsCrossTargetingBuild)' == 'true' ">
<PropertyGroup>
<FSharpCommonTargets>$(MSBuildBinPath)\Microsoft.Common.CurrentVersion.targets</FSharpCommonTargets>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<FSharpCommonTargets>$(MSBuildBinPath)\Microsoft.Common.targets</FSharpCommonTargets>
</PropertyGroup>
</Otherwise>
</Choose>
<Import Project="$(FSharpCommonTargets)" />
<Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />

<!--
============================================================
Expand Down