Merge pull request #77 from AArnott/fix76

Add support for newer ('dotnet') PCL project types
AArnott · Jun 6, 2016 · 906341a · 906341a
2 parents fa7ff5c + 007b7cc
commit 906341a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 6 deletions.
diff --git a/src/ImmutableObjectGraph.Core.NuGet/ImmutableObjectGraph.Core.NuGet.nuproj b/src/ImmutableObjectGraph.Core.NuGet/ImmutableObjectGraph.Core.NuGet.nuproj
@@ -42,4 +42,12 @@
     <None Include="ImmutableObjectGraph.nuspec" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" />
+  <Target Name="CopyAssemblyToLibDotNetFolder" DependsOnTargets="ConvertItems" AfterTargets="ConvertItems">
+    <ItemGroup>
+      <File Include="@(File)"
+            Condition=" '%(File.TargetFrameworkMoniker)' == '.NETPortable,Version=v4.5,Profile=Profile259' ">
+        <TargetPath>lib\dotnet\%(FileName)%(Extension)</TargetPath>
+      </File>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/ImmutableObjectGraph.Core.NuGet/ImmutableObjectGraph.nuspec b/src/ImmutableObjectGraph.Core.NuGet/ImmutableObjectGraph.nuspec
@@ -11,10 +11,20 @@
     <copyright></copyright>
     <tags></tags>
     <dependencies>
-      <group targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10">
+      <group targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10">
         <dependency id="System.Collections.Immutable" version="1.1.37" />
         <dependency id="Validation" version="2.2.8" />
       </group>
+      <group targetFramework="dotnet">
+        <dependency id="System.Collections" version="4.0.0" />
+        <dependency id="System.Collections.Immutable" version="1.1.37" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.0" />
+        <dependency id="System.IO" version="4.0.0" />
+        <dependency id="System.Linq" version="4.0.0" />
+        <dependency id="System.Runtime" version="4.0.0" />
+        <dependency id="System.Runtime.Extensions" version="4.0.0" />
+        <dependency id="Validation" version="2.2.8" />
+      </group>
     </dependencies>
   </metadata>
 </package>
diff --git a/src/ImmutableObjectGraph.Generation.NuGet/ImmutableObjectGraph.Generation.NuGet.nuproj b/src/ImmutableObjectGraph.Generation.NuGet/ImmutableObjectGraph.Generation.NuGet.nuproj
@@ -44,12 +44,20 @@
     <ProjectReference Include="..\ImmutableObjectGraph.Core.NuGet\ImmutableObjectGraph.Core.NuGet.nuproj" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="build\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\ImmutableObjectGraph.Generation.targets" />
+    <Content Include="build\ImmutableObjectGraph.Generation.targets" />
     <Content Include="Readme.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ImmutableObjectGraph.Generation.nuspec" />
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" />
+  <Target Name="CopyAssemblyToLibDotNetFolder" DependsOnTargets="ConvertItems" AfterTargets="ConvertItems">
+    <ItemGroup>
+      <File Include="@(File)"
+            Condition=" '%(File.TargetFrameworkMoniker)' == '.NETPortable,Version=v4.5,Profile=Profile259' ">
+        <TargetPath>lib\dotnet\%(FileName)%(Extension)</TargetPath>
+      </File>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/ImmutableObjectGraph.Generation.NuGet/ImmutableObjectGraph.Generation.nuspec b/src/ImmutableObjectGraph.Generation.NuGet/ImmutableObjectGraph.Generation.nuspec
@@ -11,7 +11,7 @@
     <copyright></copyright>
     <tags></tags>
     <dependencies>
-      <group targetFramework=".NETPortable0.0-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10">
+      <group targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10">
         <dependency id="CodeGeneration.Roslyn.BuildTime" version="0.1.57" />
       </group>
     </dependencies>

diff --git a/...0/ImmutableObjectGraph.Generation.targets → ...d/ImmutableObjectGraph.Generation.targets b/...0/ImmutableObjectGraph.Generation.targets → ...d/ImmutableObjectGraph.Generation.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <GeneratorAssemblySearchPaths Include="$(MSBuildThisFileDirectory)..\..\tools" />
+    <GeneratorAssemblySearchPaths Include="$(MSBuildThisFileDirectory)..\tools" />
   </ItemGroup>
 </Project>
diff --git a/src/ImmutableObjectGraph/ImmutableObjectGraph.csproj b/src/ImmutableObjectGraph/ImmutableObjectGraph.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>ImmutableObjectGraph</RootNamespace>
     <AssemblyName>ImmutableObjectGraph</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
     <RestorePackages>true</RestorePackages>

diff --git a/src/ImmutableObjectGraph/project.json b/src/ImmutableObjectGraph/project.json
@@ -12,6 +12,7 @@
       "version": "0.10.48-beta-gea4a31bbc5",
       "suppressParent": "none"
     },
+    "NuSpec.ReferenceGenerator": "1.4.2",
     "ReadOnlySourceTree": {
       "version": "0.1.37-beta",
       "suppressParent": "none"
@@ -20,7 +21,7 @@
     "Validation": "2.2.8"
   },
   "frameworks": {
-    ".NETPortable,Version=v4.5,Profile=Profile78": { }
+    ".NETPortable,Version=v4.5,Profile=Profile259": { }
   },
   "runtimes": {
     "win": { }