Use dotnet pack for other Microsoft.extensions* projects (#52084)

* remove pkgprojs from other extensions projects

* make resolver non shipping

* add comments

* move packageDescripition to src project

* Fix linker tests

* revert ectensions change because of the new generator

* set is packable to false for logging abstactions.

* remove pkgproj for the extensions.logging as we moved the gen out of it

* add isSrcProject condition

* Update Directory.Build.props

* Update Directory.Build.props

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 724c8c1..2f7da34 100644 (file)
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -98,7 +98,9 @@
     <!-- Default any assembly not specifying a key to use the Open Key -->
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- Microsoft.Extensions projects have a separate StrongNameKeyId -->
+    <!-- TODO: Remove condition when all libraries migrated from pkgprojs to NuGet's Pack Task. -->
     <StrongNameKeyId Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">MicrosoftAspNetCore</StrongNameKeyId>
+    <IsPackable Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.')) and '$(IsSourceProject)' == 'true'">true</IsPackable>
   </PropertyGroup>
 
   <!-- Disable some standard properties for building our projects -->

diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props
index 45a5c4b..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props
@@ -1,11 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Caching abstractions for in-memory cache and distributed cache.
-
-Commonly Used Types:
-Microsoft.Extensions.Caching.Distributed.IDistributedCache
-Microsoft.Extensions.Caching.Memory.IMemoryCache</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/pkg/Microsoft.Extensions.Caching.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/pkg/Microsoft.Extensions.Caching.Abstractions.pkgproj
deleted file mode 100644 (file)
index 1b13b47..0000000
--- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/pkg/Microsoft.Extensions.Caching.Abstractions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Caching.Abstractions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj
index 6e49dfd..b5279da 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj
@@ -3,6 +3,11 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Caching abstractions for in-memory cache and distributed cache.
+
+Commonly Used Types:
+Microsoft.Extensions.Caching.Distributed.IDistributedCache
+Microsoft.Extensions.Caching.Memory.IMemoryCache</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/Directory.Build.props b/src/libraries/Microsoft.Extensions.Caching.Memory/Directory.Build.props
index a900083..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/pkg/Microsoft.Extensions.Caching.Memory.pkgproj b/src/libraries/Microsoft.Extensions.Caching.Memory/pkg/Microsoft.Extensions.Caching.Memory.pkgproj
deleted file mode 100644 (file)
index 1260737..0000000
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/pkg/Microsoft.Extensions.Caching.Memory.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Caching.Memory.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
index 3992cb1..495c645 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Directory.Build.props
index c71d7a8..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Directory.Build.props
@@ -1,14 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Abstractions of key-value pair based configuration.
-
-Commonly Used Types:
-Microsoft.Extensions.Configuration.IConfiguration
-Microsoft.Extensions.Configuration.IConfigurationBuilder
-Microsoft.Extensions.Configuration.IConfigurationProvider
-Microsoft.Extensions.Configuration.IConfigurationRoot
-Microsoft.Extensions.Configuration.IConfigurationSection</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/pkg/Microsoft.Extensions.Configuration.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/pkg/Microsoft.Extensions.Configuration.Abstractions.pkgproj
deleted file mode 100644 (file)
index b33b496..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/pkg/Microsoft.Extensions.Configuration.Abstractions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Abstractions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj
index c8f4913..24cbc93 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj
@@ -3,6 +3,14 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Abstractions of key-value pair based configuration.
+
+Commonly Used Types:
+Microsoft.Extensions.Configuration.IConfiguration
+Microsoft.Extensions.Configuration.IConfigurationBuilder
+Microsoft.Extensions.Configuration.IConfigurationProvider
+Microsoft.Extensions.Configuration.IConfigurationRoot
+Microsoft.Extensions.Configuration.IConfigurationSection</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.Binder/Directory.Build.props
index f387923..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/pkg/Microsoft.Extensions.Configuration.Binder.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/pkg/Microsoft.Extensions.Configuration.Binder.pkgproj
deleted file mode 100644 (file)
index efc73b1..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/pkg/Microsoft.Extensions.Configuration.Binder.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Binder.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj
index 0295775..680611d 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Directory.Build.props
index dca6d25..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/pkg/Microsoft.Extensions.Configuration.CommandLine.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/pkg/Microsoft.Extensions.Configuration.CommandLine.pkgproj
deleted file mode 100644 (file)
index 6bb2413..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/pkg/Microsoft.Extensions.Configuration.CommandLine.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.CommandLine.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj
index 0c2ba3f..e86f2b3 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
index e7696df..c12fa85 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-    <IsPackable>true</IsPackable>
     <EnableDefaultItems>true</EnableDefaultItems>
     <PackageDescription>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Directory.Build.props
index 1a7f6fc..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/pkg/Microsoft.Extensions.Configuration.FileExtensions.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/pkg/Microsoft.Extensions.Configuration.FileExtensions.pkgproj
deleted file mode 100644 (file)
index 29cbf60..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/pkg/Microsoft.Extensions.Configuration.FileExtensions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.FileExtensions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj
index 4eb56f8..0c6a948 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.Ini/Directory.Build.props
index c19dd20..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>INI configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/pkg/Microsoft.Extensions.Configuration.Ini.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/pkg/Microsoft.Extensions.Configuration.Ini.pkgproj
deleted file mode 100644 (file)
index a6f6f4b..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/pkg/Microsoft.Extensions.Configuration.Ini.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Ini.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj
index f30343e..045743e 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>INI configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.Json/Directory.Build.props
index 8ff3524..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj
deleted file mode 100644 (file)
index b3f239f..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj
index aa7b6ae..ba9b999 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Directory.Build.props
index 66354d6..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/pkg/Microsoft.Extensions.Configuration.UserSecrets.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/pkg/Microsoft.Extensions.Configuration.UserSecrets.pkgproj
deleted file mode 100644 (file)
index 24fd2cb..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/pkg/Microsoft.Extensions.Configuration.UserSecrets.pkgproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.UserSecrets.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <File Include="..\src\build\netstandard2.0\*" TargetPath="build\netstandard2.0" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
index d4378be..d488eec 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration.Xml/Directory.Build.props
index 184da16..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>XML configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/pkg/Microsoft.Extensions.Configuration.Xml.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/pkg/Microsoft.Extensions.Configuration.Xml.pkgproj
deleted file mode 100644 (file)
index f1b66ef..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/pkg/Microsoft.Extensions.Configuration.Xml.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Xml.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj
index e1dad4a..c9c66f5 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>XML configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Configuration/Directory.Build.props b/src/libraries/Microsoft.Extensions.Configuration/Directory.Build.props
index c8065ef..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Configuration/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration/pkg/Microsoft.Extensions.Configuration.pkgproj b/src/libraries/Microsoft.Extensions.Configuration/pkg/Microsoft.Extensions.Configuration.pkgproj
deleted file mode 100644 (file)
index c11ff1e..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration/pkg/Microsoft.Extensions.Configuration.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
index a017ce7..62243f8 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Directory.Build.props
index ee377c8..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Directory.Build.props
@@ -1,10 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Abstractions for dependency injection.
-
-Commonly Used Types:
-Microsoft.Extensions.DependencyInjection.IServiceCollection</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/pkg/Microsoft.Extensions.DependencyInjection.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/pkg/Microsoft.Extensions.DependencyInjection.Abstractions.pkgproj
deleted file mode 100644 (file)
index dc757ca..0000000
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/pkg/Microsoft.Extensions.DependencyInjection.Abstractions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
index c7ac4d7..c6eff6e 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
@@ -4,6 +4,10 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
     <Nullable>enable</Nullable>
+    <PackageDescription>Abstractions for dependency injection.
+
+Commonly Used Types:
+Microsoft.Extensions.DependencyInjection.IServiceCollection</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
index 8446761..2364f7b 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
@@ -4,7 +4,6 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
     <CLSCompliant>false</CLSCompliant>
-    <IsPackable>true</IsPackable>
     <IsRuntimeAssembly>false</IsRuntimeAssembly>
     <PackageDescription>Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection.</PackageDescription>
   </PropertyGroup>

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/Directory.Build.props b/src/libraries/Microsoft.Extensions.DependencyInjection/Directory.Build.props
index b7c391a..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/pkg/Microsoft.Extensions.DependencyInjection.pkgproj b/src/libraries/Microsoft.Extensions.DependencyInjection/pkg/Microsoft.Extensions.DependencyInjection.pkgproj
deleted file mode 100644 (file)
index becfee5..0000000
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/pkg/Microsoft.Extensions.DependencyInjection.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.DependencyInjection.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
index b303f19..59a2999 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
@@ -5,6 +5,7 @@
     <!-- Debug IL generation -->
     <ILEmitBackendSaveAssemblies>False</ILEmitBackendSaveAssemblies>
     <Nullable>Annotations</Nullable>
+    <PackageDescription>Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection.</PackageDescription>
   </PropertyGroup>
   
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->

diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Directory.Build.props b/src/libraries/Microsoft.Extensions.DependencyModel/Directory.Build.props
index bae6f46..ad247e4 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyModel/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/Directory.Build.props
@@ -1,9 +1,3 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
-  <PropertyGroup>
-    <PackageDescription>Abstractions for reading `.deps` files.
-
-Commonly Used Types:
-Microsoft.Extensions.DependencyModel.DependencyContext</PackageDescription>
-  </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/pkg/Microsoft.Extensions.DependencyModel.pkgproj b/src/libraries/Microsoft.Extensions.DependencyModel/pkg/Microsoft.Extensions.DependencyModel.pkgproj
deleted file mode 100644 (file)
index ba0c445..0000000
--- a/src/libraries/Microsoft.Extensions.DependencyModel/pkg/Microsoft.Extensions.DependencyModel.pkgproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.DependencyModel.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
-    <ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net451;net46" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj
index 500f16e..7d21c76 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj
@@ -2,6 +2,10 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Abstractions for reading `.deps` files.
+
+Commonly Used Types:
+Microsoft.Extensions.DependencyModel.DependencyContext</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Directory.Build.props
index 7028d43..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Directory.Build.props
@@ -1,12 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Abstractions of files and directories.
-
-Commonly Used Types:
-Microsoft.Extensions.FileProviders.IDirectoryContents
-Microsoft.Extensions.FileProviders.IFileInfo
-Microsoft.Extensions.FileProviders.IFileProvider</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj
deleted file mode 100644 (file)
index 8428031..0000000
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/pkg/Microsoft.Extensions.FileProviders.Abstractions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Abstractions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj
index 232bd1f..43164c7 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj
@@ -4,6 +4,12 @@
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Abstractions of files and directories.
+
+Commonly Used Types:
+Microsoft.Extensions.FileProviders.IDirectoryContents
+Microsoft.Extensions.FileProviders.IFileInfo
+Microsoft.Extensions.FileProviders.IFileProvider</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/Directory.Build.props b/src/libraries/Microsoft.Extensions.FileProviders.Composite/Directory.Build.props
index e291547..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Composite file and directory providers for Microsoft.Extensions.FileProviders.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj
deleted file mode 100644 (file)
index ed4160e..0000000
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/pkg/Microsoft.Extensions.FileProviders.Composite.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Composite.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj
index 80db265..f692dd3 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj
@@ -4,6 +4,7 @@
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Composite file and directory providers for Microsoft.Extensions.FileProviders.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props
index 6e40318..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>File provider for physical files for Microsoft.Extensions.FileProviders.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj
deleted file mode 100644 (file)
index 6a3148e..0000000
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/pkg/Microsoft.Extensions.FileProviders.Physical.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Physical.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
index 376c721..9801bac 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>File provider for physical files for Microsoft.Extensions.FileProviders.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Directory.Build.props b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Directory.Build.props
index dc4cbeb..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>File system globbing to find files matching a specified pattern.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj
deleted file mode 100644 (file)
index d67bac3..0000000
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/pkg/Microsoft.Extensions.FileSystemGlobbing.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.FileSystemGlobbing.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
index 5e06423..3b3239f 100644 (file)
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>File system globbing to find files matching a specified pattern.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/Directory.Build.props b/src/libraries/Microsoft.Extensions.HostFactoryResolver/Directory.Build.props
index 9bf8f65..a957bcc 100644 (file)
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Internal package for sharing Microsoft.Extensions.Hosting.HostFactoryResolver type.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/pkg/Microsoft.Extensions.HostFactoryResolver.Sources.pkgproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/pkg/Microsoft.Extensions.HostFactoryResolver.Sources.pkgproj
deleted file mode 100644 (file)
index 2954849..0000000
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/pkg/Microsoft.Extensions.HostFactoryResolver.Sources.pkgproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <PropertyGroup>
-    <IsShipping>false</IsShipping>
-    <IsSourcePackage>true</IsSourcePackage>
-  </PropertyGroup>
-  <ItemGroup>
-    <SourcePackageFiles Include="..\src\*.cs" PackagePath="contentFiles/cs/netstandard1.0/%(FileName)%(Extension)"  />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj
index 31def25..e2ad07d 100644 (file)
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj
@@ -1,8 +1,14 @@
 <Project Sdk="Microsoft.Build.NoTargets">
-  <!-- These are wrapper project files for packaging.-->
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <!-- Avoid trying to binplace non existent documentation file.-->
     <EnableBinPlacing>false</EnableBinPlacing>
+    <IsShipping>false</IsShipping>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <PackageDescription>Internal package for sharing Microsoft.Extensions.Hosting.HostFactoryResolver type.</PackageDescription>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="*.cs" PackagePath="contentFiles/cs/netstandard1.0/%(FileName)%(Extension)" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Directory.Build.props
index 20b4463..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Hosting and startup abstractions for applications.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/pkg/Microsoft.Extensions.Hosting.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/pkg/Microsoft.Extensions.Hosting.Abstractions.pkgproj
deleted file mode 100644 (file)
index 1333327..0000000
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/pkg/Microsoft.Extensions.Hosting.Abstractions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Hosting.Abstractions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj
index e8315bf..c1d22e3 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <RootNamespace>Microsoft.Extensions.Hosting</RootNamespace>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Hosting and startup abstractions for applications.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Directory.Build.props
index ea749ce..3d31843 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>.NET hosting infrastructure for Systemd Services.</PackageDescription>
     <PackageTags>hosting</PackageTags>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/pkg/Microsoft.Extensions.Hosting.Systemd.pkgproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/pkg/Microsoft.Extensions.Hosting.Systemd.pkgproj
deleted file mode 100644 (file)
index ff80c97..0000000
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/pkg/Microsoft.Extensions.Hosting.Systemd.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Hosting.Systemd.csproj">
-      <SupportedFramework>netcoreapp3.0;net5.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj
index bcafdd8..b3d03b2 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>.NET hosting infrastructure for Systemd Services.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props
index c5f4d2e..3d31843 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>.NET hosting infrastructure for Windows Services.</PackageDescription>
     <PackageTags>hosting</PackageTags>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/pkg/Microsoft.Extensions.Hosting.WindowsServices.pkgproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/pkg/Microsoft.Extensions.Hosting.WindowsServices.pkgproj
deleted file mode 100644 (file)
index 52335c4..0000000
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/pkg/Microsoft.Extensions.Hosting.WindowsServices.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Hosting.WindowsServices.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj
index d5a959a..243e794 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>.NET hosting infrastructure for Windows Services.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">

diff --git a/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props b/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
index decaece..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Hosting and startup infrastructures for applications.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting/pkg/Microsoft.Extensions.Hosting.pkgproj b/src/libraries/Microsoft.Extensions.Hosting/pkg/Microsoft.Extensions.Hosting.pkgproj
deleted file mode 100644 (file)
index 622f44a..0000000
--- a/src/libraries/Microsoft.Extensions.Hosting/pkg/Microsoft.Extensions.Hosting.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Hosting.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
index 2998929..2d31eae 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Hosting and startup infrastructures for applications.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Http/Directory.Build.props b/src/libraries/Microsoft.Extensions.Http/Directory.Build.props
index a9800ce..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Http/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Http/Directory.Build.props
@@ -1,10 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. The HttpClient factory provides extensibility to plug in DelegatingHandlers that address cross-cutting concerns such as service location, load balancing, and reliability. The default HttpClient factory provides built-in diagnostics and logging and manages the lifetimes of connections in a performant way.
-
-Commonly Used Types:
-System.Net.Http.IHttpClientFactory</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Http/pkg/Microsoft.Extensions.Http.pkgproj b/src/libraries/Microsoft.Extensions.Http/pkg/Microsoft.Extensions.Http.pkgproj
deleted file mode 100644 (file)
index f476c3e..0000000
--- a/src/libraries/Microsoft.Extensions.Http/pkg/Microsoft.Extensions.Http.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Http.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj
index f838278..a5ce152 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj
+++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj
@@ -4,6 +4,10 @@
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
     <Nullable>Annotations</Nullable>
+    <PackageDescription>The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. The HttpClient factory provides extensibility to plug in DelegatingHandlers that address cross-cutting concerns such as service location, load balancing, and reliability. The default HttpClient factory provides built-in diagnostics and logging and manages the lifetimes of connections in a performant way.
+
+Commonly Used Types:
+System.Net.Http.IHttpClientFactory</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Directory.Build.props
index 1376033..5788bac 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Directory.Build.props
@@ -1,7 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Logging abstractions for Microsoft.Extensions.Logging.
+    <IsAspNetCoreApp>true</IsAspNetCoreApp>
+      <PackageDescription>Logging abstractions for Microsoft.Extensions.Logging.
 
 Commonly Used Types:
 Microsoft.Extensions.Logging.ILogger
@@ -11,6 +12,5 @@ Microsoft.Extensions.Logging.LogLevel
 Microsoft.Extensions.Logging.Logger&lt;T&gt;
 Microsoft.Extensions.Logging.LoggerMessage
 Microsoft.Extensions.Logging.Abstractions.NullLogger</PackageDescription>
-    <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
index f110d08..10623a7 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -8,6 +8,7 @@
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
     <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.Configuration/Directory.Build.props
index 0ece16b..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Configuration support for Microsoft.Extensions.Logging.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/pkg/Microsoft.Extensions.Logging.Configuration.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/pkg/Microsoft.Extensions.Logging.Configuration.pkgproj
deleted file mode 100644 (file)
index 5bd1b25..0000000
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/pkg/Microsoft.Extensions.Logging.Configuration.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.Configuration.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
index d12a37a..e936b26 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Configuration support for Microsoft.Extensions.Logging.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.Console/Directory.Build.props
index 0ef4127..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Console/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/pkg/Microsoft.Extensions.Logging.Console.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Console/pkg/Microsoft.Extensions.Logging.Console.pkgproj
deleted file mode 100644 (file)
index 4c3cdc6..0000000
--- a/src/libraries/Microsoft.Extensions.Logging.Console/pkg/Microsoft.Extensions.Logging.Console.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.Console.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
index ef573cd..ac10446 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
@@ -9,6 +9,7 @@
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
+    <PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.Debug/Directory.Build.props
index 4e30f69..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.Debug/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine().</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/pkg/Microsoft.Extensions.Logging.Debug.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Debug/pkg/Microsoft.Extensions.Logging.Debug.pkgproj
deleted file mode 100644 (file)
index d89a7e9..0000000
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/pkg/Microsoft.Extensions.Logging.Debug.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.Debug.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj
index a025ca9..2c17605 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine().</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.EventLog/Directory.Build.props
index 5d32f3c..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/pkg/Microsoft.Extensions.Logging.EventLog.pkgproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/pkg/Microsoft.Extensions.Logging.EventLog.pkgproj
deleted file mode 100644 (file)
index b6dff5a..0000000
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/pkg/Microsoft.Extensions.Logging.EventLog.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.EventLog.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj
index 5e290a0..04daa2e 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
+    <PackageDescription>Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props
index 527597f..0530813 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <NoWarn>$(NoWarn);PKG0001</NoWarn>
-    <PackageDescription>EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/pkg/Microsoft.Extensions.Logging.EventSource.pkgproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/pkg/Microsoft.Extensions.Logging.EventSource.pkgproj
deleted file mode 100644 (file)
index 0360fe3..0000000
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/pkg/Microsoft.Extensions.Logging.EventSource.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.EventSource.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
index 1916836..f3ef40b 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
@@ -7,6 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
+    <PackageDescription>EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Directory.Build.props
index caf305e..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent().</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/pkg/Microsoft.Extensions.Logging.TraceSource.pkgproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/pkg/Microsoft.Extensions.Logging.TraceSource.pkgproj
deleted file mode 100644 (file)
index 88eeed2..0000000
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/pkg/Microsoft.Extensions.Logging.TraceSource.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.TraceSource.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj
index 89bb3fe..7a0010c 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent().</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props
index 229dc59..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Logging infrastructure default implementation for Microsoft.Extensions.Logging.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj b/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj
deleted file mode 100644 (file)
index b1aeb27..0000000
--- a/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Logging.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
index 49781fe..f065276 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
@@ -5,6 +5,7 @@
     <EnableDefaultItems>true</EnableDefaultItems>
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
+    <PackageDescription>Logging infrastructure default implementation for Microsoft.Extensions.Logging.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Directory.Build.props
index d345f94..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Provides additional configuration specific functionality related to Options.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/pkg/Microsoft.Extensions.Options.ConfigurationExtensions.pkgproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/pkg/Microsoft.Extensions.Options.ConfigurationExtensions.pkgproj
deleted file mode 100644 (file)
index a0b57f2..0000000
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/pkg/Microsoft.Extensions.Options.ConfigurationExtensions.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj
index 5a43205..822d470 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj
+++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Provides additional configuration specific functionality related to Options.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Directory.Build.props b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Directory.Build.props
index 4172e15..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Provides additional DataAnnotations specific functionality related to Options.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/pkg/Microsoft.Extensions.Options.DataAnnotations.pkgproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/pkg/Microsoft.Extensions.Options.DataAnnotations.pkgproj
deleted file mode 100644 (file)
index de95035..0000000
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/pkg/Microsoft.Extensions.Options.DataAnnotations.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Options.DataAnnotations.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj
index 56e09a3..c7a02b8 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj
+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Provides additional DataAnnotations specific functionality related to Options.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Options/Directory.Build.props b/src/libraries/Microsoft.Extensions.Options/Directory.Build.props
index 1950bd9..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Options/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Options/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Provides a strongly typed way of specifying and accessing settings using dependency injection.</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Options/pkg/Microsoft.Extensions.Options.pkgproj b/src/libraries/Microsoft.Extensions.Options/pkg/Microsoft.Extensions.Options.pkgproj
deleted file mode 100644 (file)
index f50e78b..0000000
--- a/src/libraries/Microsoft.Extensions.Options/pkg/Microsoft.Extensions.Options.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Options.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project> 
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj
index 1e00f8b..5ccbc14 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj
+++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <PackageDescription>Provides a strongly typed way of specifying and accessing settings using dependency injection.</PackageDescription>
   </PropertyGroup>
 
   <!-- These types weren't available before net5.0 and need to be compiled into the assembly. -->

diff --git a/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props b/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props
index c1135c9..668e395 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props
@@ -1,12 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageDescription>Primitives shared by framework extensions. Commonly used types include:
-
-Commonly Used Types:
-Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.Primitives.StringValues
-Microsoft.Extensions.Primitives.StringSegment</PackageDescription>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Primitives/pkg/Microsoft.Extensions.Primitives.pkgproj b/src/libraries/Microsoft.Extensions.Primitives/pkg/Microsoft.Extensions.Primitives.pkgproj
deleted file mode 100644 (file)
index 07273ae..0000000
--- a/src/libraries/Microsoft.Extensions.Primitives/pkg/Microsoft.Extensions.Primitives.pkgproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.Primitives.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
index 94cf266..5895ee3 100644 (file)
--- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
+++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
@@ -6,6 +6,12 @@
     <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
+    <PackageDescription>Primitives shared by framework extensions. Commonly used types include:
+
+Commonly Used Types:
+Microsoft.Extensions.Primitives.IChangeToken
+Microsoft.Extensions.Primitives.StringValues
+Microsoft.Extensions.Primitives.StringSegment</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>