[Pkg-cli-apps-commits] [fsharp] 36/60: Small corrections to targets file (changeset 1312249)
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Sun Sep 14 08:13:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository fsharp.
commit 6cd2878c2a882f9293f54a64c671026f50fbc318
Author: latkin <latkin at microsoft.com>
Date: Tue Aug 5 17:38:01 2014 -0700
Small corrections to targets file (changeset 1312249)
---
src/FSharpSource.targets | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index f16e8d5..3c1017a 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -7,7 +7,7 @@
<When Condition="'$(ProjectLanguage)' == 'FSharp'">
<Choose>
<When Condition="'$(AssemblyName)' == 'FSharp.Core'">
- <PropertyGroup Condition="'$(TargetFramework)' == 'Portable7' or '$(TargetFramework)' == 'Portable78' or '$(TargetFramework)' == 'Portable259'">
+ <PropertyGroup Condition="'$(TargetFramework)' == 'portable47' or '$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259'">
<IsPortableProfile>true</IsPortableProfile>
</PropertyGroup>
<PropertyGroup>
@@ -222,7 +222,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
- <!-- Target Portable -->
+ <!-- Target Portable Profile 78 -->
<PropertyGroup Condition="'$(TargetFramework)'=='portable78'">
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE78</DefineConstants>
@@ -257,6 +257,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
+ <!-- Target Portable Profile 259 -->
<PropertyGroup Condition="'$(TargetFramework)'=='portable259'">
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE259</DefineConstants>
@@ -621,16 +622,11 @@
</PropertyGroup>
<Choose>
- <When Condition="'$(TargetFramework)'=='portable47' OR '$(TargetFramework)'=='portable7'">
+ <When Condition="'$(TargetFramework)'=='portable47' OR '$(TargetFramework)'=='portable7' OR '$(TargetFramework)'=='portable78' OR '$(TargetFramework)'=='portable259'">
<PropertyGroup>
<FSharpTargetsPath>..\Proto\$(protoCLIDir)\bin\Microsoft.Portable.FSharp-proto.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
- <When Condition="'$(TargetFramework)'=='portable78' or '$(TargetFramework)'=='portable259'">
- <PropertyGroup>
- <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets</FSharpTargetsPath>
- </PropertyGroup>
- </When>
<When Condition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'">
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets</FSharpTargetsPath>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list