Update NuSpec (#134)

dotnet · Jun 11, 2018 · 166c5d4 · 166c5d4
1 parent 84cdc99
commit 166c5d4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/src/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj b/src/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj
@@ -3,17 +3,21 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
     <!--
-      Pack task is not capable of generating nupkg with bakcward compatible targets.
+      Pack task is not capable of generating nupkg with backward compatible targets.
       Hence we need to use manually written nuspec with version variables substituted.
 
       See https://github.com/NuGet/Home/issues/4461 and
       https://github.com/NuGet/Home/wiki/Adding-nuget-pack-as-a-msbuild-target#packing-using-a-nuspec.
     -->
     <IsPackable>true</IsPackable>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+
+    <Description>Implementation of Microsoft DiaSymReader interfaces that reads debug information from Portable PDB format.</Description>
+    <PackageTags>DiaSymReader ISymUnmanagedReader Portable PDB COM interop debugging</PackageTags>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
@@ -24,13 +28,12 @@
     <InternalsVisibleTo Include="Microsoft.DiaSymReader.PortablePdb.UnitTests" />
   </ItemGroup>
 
-  <Target Name="_InitializeNuspecProperties" BeforeTargets="GenerateNuspec">
+  <Target Name="_InitializeNuspecProperties" 
+          BeforeTargets="GenerateNuspec"
+          DependsOnTargets="_InitializeStandardNuspecProperties">
     <PropertyGroup>
       <NuspecProperties>
-        version=$(PackageVersion);
-        licenseUrl=$(PackageLicenseUrl);
-        repoUrl=$(RepositoryUrl);
-        copyright=$(Copyright);
+        $(NuspecProperties);
         MicrosoftDiaSymReaderVersion=$(MicrosoftDiaSymReaderVersion);
         SystemCollectionsVersion=$(SystemCollectionsVersion);
         SystemCollectionsImmutableVersion=$(SystemCollectionsImmutableVersion);

diff --git a/src/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec b/src/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec
@@ -1,11 +1,18 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>Microsoft.DiaSymReader.PortablePdb</id>
-    <summary>Implementation of Microsoft DiaSymReader interfaces that reads debug information from Portable PDB format</summary>
-    <description>
-      Implementation of Microsoft DiaSymReader interfaces that reads debug information from Portable PDB format.
-    </description>
+    <id>$PackageId$</id>
+    <description>$Description$</description>
+    <version>$Version$</version>
+    <authors>$Authors$</authors>
+    <requireLicenseAcceptance>$RequireLicenseAcceptance$</requireLicenseAcceptance>
+    <licenseUrl>$PackageLicenseUrl$</licenseUrl>
+    <projectUrl>$PackageProjectUrl$</projectUrl>
+    <copyright>$Copyright$</copyright>
+    <developmentDependency>$DevelopmentDependency$</developmentDependency>
+    <tags>$PackageTags$</tags>
+    <serviceable>$Serviceable$</serviceable>
+    <repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
     <dependencies>
       <group targetFramework="portable-net45+win8">
         <dependency id="Microsoft.DiaSymReader" version="$MicrosoftDiaSymReaderVersion$" />
@@ -30,15 +37,6 @@
         <dependency id="System.Threading" version="$SystemThreadingVersion$" />
       </group>
     </dependencies>
-    <language>en-US</language>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=529443</licenseUrl>
-    <projectUrl>https://github.com/dotnet/symreader-portable</projectUrl>
-    <releaseNotes>Implementation of Microsoft DiaSymReader interfaces that reads debug information from Portable PDB format</releaseNotes>
-    <tags>DiaSymReader ISymUnmanagedReader Portable PDB COM interop debugging</tags>
-    <serviceable>true</serviceable>
   </metadata>
   <files>
     <file src="netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" target="lib\portable-net45+win8" />