Clean up nuspec properties

dotnet · Dec 20, 2018 · b21e2ce · b21e2ce
1 parent d812a28
commit b21e2ce
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -10,6 +10,7 @@
   <!-- Properties which should be set after the project has been evaluated -->
   <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
     <PackageId Condition=" '$(PackageId)' == '' ">$(AssemblyName)</PackageId>
+    <Description Condition=" '$(Description)' == ''">$(PackageId)</Description>
     <IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsUnitTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' ) ">false</IsPackable>
     <IsPackable Condition="'$(IsPackable)' == '' ">true</IsPackable>
   </PropertyGroup>

diff --git a/src/Shared/src/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj b/src/Shared/src/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj
@@ -2,6 +2,13 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)..\ParameterDefaultValue\ParameterDefaultValue.cs">
+      <Pack>true</Pack>
+      <PackagePath>$(ContentTargetFolders)\cs\netstandard1.0\</PackagePath>
+    </Compile>
+  </ItemGroup>
+
   <Target Name="Compile" />
   <Target Name="CopyFilesToOutputDirectory" />
 </Project>
diff --git a/src/Shared/src/BenchmarkRunner/Directory.Build.props b/src/Shared/src/BenchmarkRunner/Directory.Build.props
diff --git a/...Extensions.BenchmarkRunner.Sources.csproj → ...AspNetCore.BenchmarkRunner.Sources.csproj b/...Extensions.BenchmarkRunner.Sources.csproj → ...AspNetCore.BenchmarkRunner.Sources.csproj
diff --git a/src/Shared/src/Directory.Build.props b/src/Shared/src/Directory.Build.props
@@ -9,7 +9,6 @@
     <NoBuild>true</NoBuild>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <Description>$(PackageId)</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
     <ContentTargetFolders>contentFiles</ContentTargetFolders>