Use NuSpec refgen to put correct dotnet targets

dgodd · Dec 4, 2015 · 2be1baf · 2be1baf
1 parent e2be367
commit 2be1baf
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ TestResults
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 [Dd]ebug/
@@ -109,4 +110,8 @@ UpgradeLog*.XML
 
 artifacts
 build
-tools
+tools
+
+*.lock.json
+*.nuget.targets
+*.nuget.props
diff --git a/src/Polly.Pcl/Polly.Pcl.csproj b/src/Polly.Pcl/Polly.Pcl.csproj
@@ -37,6 +37,11 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\Polly.Net45\Polly.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <ItemGroup>
+    <NuSpecFile Include="$(SolutionDir)Polly.nuspec">
+      <Visible>False</Visible>
+    </NuSpecFile>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
@@ -51,7 +56,9 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Import Project="..\Polly.Shared\Polly.Shared.projitems" Label="Shared" />
   <Import Project="..\packages\GitVersionTask.3.1.2\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.1.2\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/src/Polly.Pcl/project.json b/src/Polly.Pcl/project.json
@@ -0,0 +1,12 @@
+{
+    "dependencies": {
+        "NuSpec.ReferenceGenerator": {
+            "version": "1.4.0",
+            "type": "build"
+        }
+    },
+    "frameworks": {
+        ".NETPortable,Version=v4.5,Profile=Profile259": { }
+    },
+    "supports": {}
+}
diff --git a/src/Polly.nuspec b/src/Polly.nuspec
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package>
- <metadata>
-   <owners>App vNext</owners>
-   <authors>Michael Wolfenden, App vNext</authors>
-   <description>
+  <metadata>
+    <owners>App vNext</owners>
+    <authors>Michael Wolfenden, App vNext</authors>
+    <description>
      Polly is a .NET 3.5 / 4.0 / 4.5 / PCL library (Profile 259) that allows developers to express transient exception handling policies such as Retry, Retry Forever, Wait and Retry or Circuit Breaker in a fluent manner.
    </description>
-   <language>en-AU</language>
-   <licenseUrl>https://raw.github.com/App-vNext/Polly/master/LICENSE.txt</licenseUrl>
-   <iconUrl>https://raw.github.com/App-vNext/Polly/master/Polly.png</iconUrl>
-   <projectUrl>https://github.com/App-vNext/Polly</projectUrl>
-   <tags>Exception Handling Policy Retry Wait Circuit Breaker</tags>
-   <copyright>Copyright © 2015, App vNext</copyright>
-   <releaseNotes>
+    <language>en-AU</language>
+    <licenseUrl>https://raw.github.com/App-vNext/Polly/master/LICENSE.txt</licenseUrl>
+    <iconUrl>https://raw.github.com/App-vNext/Polly/master/Polly.png</iconUrl>
+    <projectUrl>https://github.com/App-vNext/Polly</projectUrl>
+    <tags>Exception Handling Policy Retry Wait Circuit Breaker</tags>
+    <copyright>Copyright © 2015, App vNext</copyright>
+    <releaseNotes>
      2.2.4
      ---------------------
      - Add .NET Core support
@@ -33,7 +33,7 @@
      2.2.0
      ---------------------
      - Added Async Support (PCL)
-     - PCL Profile updated from Profile78 ->  Profile 259
+     - PCL Profile updated from Profile78 -&gt;  Profile 259
      - Added missing WaitAndRetryAsync overload
 
      2.1.0
@@ -51,17 +51,25 @@
      - Allow arbitrary data to be passed to policy execution
    </releaseNotes>
     <dependencies>
-        <group targetFramework="net" />
-        <group targetFramework="win" />
-        <group targetFramework="wp" />
-        <group targetFramework="wpa" />
-        <group targetFramework="MonoAndroid" />
-        <group targetFramework="MonoTouch" />
-        <group targetFramework="Xamarin.iOS" />
-        <group targetFramework="portable-net45+win8+wpa81+wp8" />
+      <group targetFramework="net" />
+      <group targetFramework="win" />
+      <group targetFramework="wp" />
+      <group targetFramework="wpa" />
+      <group targetFramework="MonoAndroid" />
+      <group targetFramework="MonoTouch" />
+      <group targetFramework="Xamarin.iOS" />
+      <group targetFramework="portable-net45+win8+wpa81+wp8" />
+      <group targetFramework="dotnet">
+        <dependency id="System.Collections" version="4.0.0" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.0" />
+        <dependency id="System.Linq" version="4.0.0" />
+        <dependency id="System.Runtime" version="4.0.0" />
+        <dependency id="System.Threading" version="4.0.0" />
+        <dependency id="System.Threading.Tasks" version="4.0.0" />
+      </group>
     </dependencies>
- </metadata>
- <files>
-   <file src="lib\**\*.*" target="lib" exclude="**\*.unsigned"/>
- </files>
-</package>
+  </metadata>
+  <files>
+    <file src="lib\**\*.*" target="lib" exclude="**\*.unsigned" />
+  </files>
+</package>