Merge pull request #1 from 7sharp9/profile78

Corrected .NETCore path and reference assemblies for Profile78
7sharp9 · May 23, 2014 · 581e7c3 · 581e7c3
2 parents 08b1f0f + 6be2157
commit 581e7c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config.make.in b/config.make.in
@@ -69,7 +69,7 @@ endif
 ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable-net45+wp80+win8-)
 VERSION = 4.5.8.0
 TARGET = portable-net45+wp80+win8
-PCLPATH = .NETPortable
+PCLPATH = .NETCore
 endif
 
 
@@ -98,7 +98,7 @@ endif
 ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable-net45+wp80+win8-3.0)
 VERSION = 4.5.8.3
 TARGET = portable-net45+wp80+win8
-PCLPATH = .NETPortable
+PCLPATH = .NETCore
 outsuffix = fsharp30/$(TargetFramework)
 endif
 

diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
@@ -210,7 +210,7 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
     <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='portable-windows8+net45'">
+  <ItemGroup Condition="'$(TargetFramework)'=='portable-windows8+net45' OR '$(TargetFramework)'=='portable-net45+wp80+win8'">
     <Reference Include="Microsoft.CSharp.dll" />
     <Reference Include="Microsoft.VisualBasic.dll" />
     <Reference Include="mscorlib.dll" />