Add Newtonsoft.Json.dll to Microsoft.Extensions.ApiDescription.Design…

… package - also remove dotnet-getdocument.runtimeconfig.dev.json file
aspnet · Oct 11, 2018 · 8c58fdb · 8c58fdb
1 parent 5cd8697
commit 8c58fdb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
@@ -8,6 +8,21 @@
         "Exclusions": {
           "BUILD_ITEMS_FRAMEWORK": {
             "*": "Package includes tool with different target frameworks."
+          },
+          "SERVICING_ATTRIBUTE": {
+            "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process"
+          },
+          "WRONG_PUBLICKEYTOKEN": {
+            "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process"
+          },
+          "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
+            "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process"
+          },
+          "ASSEMBLY_FILE_VERSION_MISMATCH": {
+            "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process"
+          },
+          "ASSEMBLY_VERSION_MISMATCH": {
+            "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process"
           }
         }
       }

diff --git a/...rosoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/...rosoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
@@ -37,7 +37,7 @@
 
   <!-- Add other signed files in a single inner build, avoiding duplications in this multi-TFM project. -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <SignedPackageFile Include="../dotnet-getdocument/bin/$(Configuration)/netcoreapp2.1/dotnet-getdocument.dll">
+    <SignedPackageFile Include="../dotnet-getdocument/bin/$(Configuration)/netcoreapp2.1/publish/dotnet-getdocument.dll">
       <Certificate>$(AssemblySigningCertName)</Certificate>
       <PackagePath>tools/dotnet-getdocument.dll</PackagePath>
       <StrongName>$(AssemblySigningStrongName)</StrongName>
@@ -57,9 +57,19 @@
       <PackagePath>tools/netcoreapp2.0/GetDocument.Insider.exe</PackagePath>
       <StrongName>$(AssemblySigningStrongName)</StrongName>
     </SignedPackageFile>
+
+    <SignedPackageFile Include="../dotnet-getdocument/bin/$(Configuration)/netcoreapp2.1/publish/Newtonsoft.Json.dll">
+      <PackagePath>tools/Newtonsoft.Json.dll"</PackagePath>
+      <Certificate>$(AssemblySigning3rdPartyCertName)"</Certificate>
+    </SignedPackageFile>
   </ItemGroup>
 
   <Target Name="PopulateNuspec">
+    <MSBuild Projects="../dotnet-getdocument/dotnet-getdocument.csproj"
+        BuildInParallel="$(BuildInParallel)"
+        RemoveProperties="RuntimeIdentifier;TargetFrameworks;TargetFramework"
+        Targets="Publish" />
+
     <PropertyGroup>
       <NuspecProperties>
         id=$(PackageId);

diff --git a/...rosoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec b/...rosoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec
@@ -22,7 +22,7 @@
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
     <file src="bin\$configuration$\net461\Microsoft.Extensions.ApiDescription.Tasks.*" target="tasks\net461" />
     <file src="bin\$configuration$\netstandard2.0\Microsoft.Extensions.ApiDescription.Tasks.*" target="tasks\netstandard2.0" />
-    <file src="..\dotnet-getdocument\bin\$configuration$\netcoreapp2.1\dotnet-getdocument.*" target="tools" />
+    <file src="..\dotnet-getdocument\bin\$configuration$\netcoreapp2.1\publish\*.*" target="tools" />
     <file src="..\GetDocumentInsider\bin\$configuration$\net461\GetDocument.Insider.*" target="tools\net461" />
     <file src="..\GetDocumentInsider\bin\x86\$configuration$\net461\GetDocument.Insider.*" target="tools\net461-x86" />
     <file src="..\GetDocumentInsider\bin\$configuration$\netcoreapp2.0\GetDocument.Insider.*" target="tools\netcoreapp2.0" />