NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit123a37f

authored

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

* 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* Resolve magic* resolve magic* Minor target rework due to crosstargetting changes. Always copy fsharp.core for desktop builds

1 parent98e6821 commit123a37fCopy full SHA for 123a37f

File tree

2 files changed

-22

lines changed

src/fsharp/FSharp.Build
- Microsoft.FSharp.NetSdk.targets
- Microsoft.FSharp.targets

2 files changed

-22

lines changed

`‎src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets‎`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and`
`17`	`17`	`<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>`
`18`	`18`	`</PropertyGroup>`
`19`	`19`
`20`		`- <PropertyGroupCondition=" '$(IsCrossTargetingBuild)' == 'true'">`
	`20`	`+ <PropertyGroup>`
`21`	`21`	`<AlwaysUseNumericalSuffixInItemNames>true</AlwaysUseNumericalSuffixInItemNames>`
`22`	`22`	`<DefineCommonItemSchemasCondition=" '$(DefineCommonItemSchemas)' == ''">true</DefineCommonItemSchemas>`
`23`	`23`	`<DefineCommonReferenceSchemasCondition=" '$(DefineCommonReferenceSchemas)' == ''">true</DefineCommonReferenceSchemas>`
`@@ -30,14 +30,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and`
`30`	`30`	`<_DebugSymbolsIntermediatePathInclude="@(_DebugSymbolsIntermediatePathTemporary->'%(RootDir)%(Directory)%(Filename).pdb')"/>`
`31`	`31`	`</ItemGroup>`
`32`	`32`
`33`		`-`
`34`		`-<!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed.-->`
`35`		`-<!-- Import design time targets before the common targets, which import targets from Nuget.-->`
`36`		`- <PropertyGroup>`
`37`		`- <FSharpDesignTimeTargetsPathCondition="'$(FSharpDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.FSharp.DesignTime.targets</FSharpDesignTimeTargetsPath>`
`38`		`- </PropertyGroup>`
`39`		`- <ImportCondition=" Exists('$(FSharpDesignTimeTargetsPath)')"Project="$(FSharpDesignTimeTargetsPath)" />`
`40`		`-`
`41`	`33`	`<!-- Locate and add mscorlib, unless NoStdLib is set-->`
`42`	`34`	`<ItemGroup>`
`43`	`35`	`<_ExplicitReferenceInclude="$(FrameworkPathOverride)\mscorlib.dll"Condition=" '$(NoStdLib)' != 'true'" />`
`@@ -98,6 +90,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and`
`98`	`90`	`<!--- Add it for Desktop Apps-->`
`99`	`91`	`<ItemGroupCondition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(IsFSharpCoreReferenced)' != 'true' and '$(TargetFSharpCoreVersion)' != ''">`
`100`	`92`	`<ReferencePathInclude="$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll" />`
	`93`	`+ <ReferenceCopyLocalPathsInclude="$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll" />`
`101`	`94`	`</ItemGroup>`
`102`	`95`
`103`	`96`	`</Target>`

`‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -273,19 +273,7 @@ this file.`
`273`	`273`
`274`	`274`	`</Target>`
`275`	`275`
`276`		`- <Choose>`
`277`		`- <WhenCondition=" '$(IsCrossTargetingBuild)' == 'true'">`
`278`		`- <PropertyGroup>`
`279`		`- <FSharpCommonTargets>$(MSBuildBinPath)\Microsoft.Common.CurrentVersion.targets</FSharpCommonTargets>`
`280`		`- </PropertyGroup>`
`281`		`- </When>`
`282`		`- <Otherwise>`
`283`		`- <PropertyGroup>`
`284`		`- <FSharpCommonTargets>$(MSBuildBinPath)\Microsoft.Common.targets</FSharpCommonTargets>`
`285`		`- </PropertyGroup>`
`286`		`- </Otherwise>`
`287`		`- </Choose>`
`288`		`- <ImportProject="$(FSharpCommonTargets)" />`
	`276`	`+ <ImportProject="$(MSBuildBinPath)\Microsoft.Common.targets" />`
`289`	`277`
`290`	`278`	`<!--`
`291`	`279`	`============================================================`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit123a37f

File tree

2 files changed

2 files changed

`‎src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets‎`

`‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎`

0 commit comments