Skip to content

Commit

Permalink
Single Transport Package for aspnetcore (#47684)
Browse files Browse the repository at this point in the history
* Adding non ectensions library to transport package and moving transport package to all config leg

* update servicing policy doc

* change name from Microsoft.Extensions.Internal.Transport -> Microsoft.AspNetCore.Internal.Transport

* make isAspnetCore property explicit

* csproj to proj change

* remove non used extensions assemblies from transport package

* Update Directory.Build.props
  • Loading branch information
Anipik committed Feb 8, 2021
1 parent 1fe9cbf commit a66b4e3
Show file tree
Hide file tree
Showing 53 changed files with 66 additions and 15 deletions.
11 changes: 11 additions & 0 deletions docs/project/library-servicing.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,20 @@ If this library ships both inbox on a platform and in its own library package th
```
Where the `AssemblyVersion` is set to the old version before updating. To determine if the library ships inbox you can look at for `InboxOnTargetFramework` item groups or `TreatAsOutOfBox` suppressions in the pkgproj for the library.

If the library is part of a Aspnetcore or .NET targeting pack then we cannot increment the assembly version. For Aspnetcore, You can examine the ```<IsAspNetCoreApp>true</IsAspNetCoreApp>``` property in the library`s ```Directory.Build.Props```
For .Net you can examine the list in ```NetCoreAppLibrary.Props```

If the library is part of a targeting pack and also contains an asset applicable to the .NET Framework then we will increment the assembly version for that asset.
eg.
```
<AssemblyVersion Condition="$(TargetFramework.StartsWith('net4'))">5.0.0.1</AssemblyVersion>
<SkipValidatePackage>true</SkipValidatePackage>
```

## Update the package index

If you incremented the `AssemblyVersion` in the last step, you'll also need to add an entry to [packageIndex.json](https://github.com/dotnet/runtime/blob/master/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json). Find the entry for your library in that file (again, making sure you're in the correct release branch), then find the subsection labeled `AssemblyVersionInPackageVersion`. There, add an entry that maps your new `AssemblyVersion` to your new `PackageVersion`. For an example, see [this PR](https://github.com/dotnet/runtime/commit/d0e4dcc7ebf008e7b6835cafbd03878c3a0e75f8#diff-ec9fd7a62cb0c494d86029014940382cR107), where we bumped the `PackageVersion` of `Microsoft.Diagnostics.Tracing.EventSource` from `2.0.0` to `2.0.1`, and bumped the `AssemblyVersion` from `2.0.0.0` to `2.0.1.0`. Therefore, we added an entry to `packageIndex.json` of the form `"2.0.1.0": "2.0.1"`.
The baseline version for the assembly in the package index should also be incremented so that all the other packages can use this servicing version for package dependencies.

## Add your package to libraries-packages.proj

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.5",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21101.2",
"Microsoft.Build.NoTargets": "2.0.1",
"Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<!-- These are wrapper project files for packaging.-->
<PropertyGroup>
<TargetFrameworks>netstandard1.0</TargetFrameworks>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
Commonly Used Types:
Microsoft.Extensions.Caching.Distributed.IDistributedCache
Microsoft.Extensions.Caching.Memory.IMemoryCache</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ Microsoft.Extensions.Configuration.IConfigurationBuilder
Microsoft.Extensions.Configuration.IConfigurationProvider
Microsoft.Extensions.Configuration.IConfigurationRoot
Microsoft.Extensions.Configuration.IConfigurationSection</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>INI configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>XML configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

Commonly Used Types:
Microsoft.Extensions.DependencyInjection.IServiceCollection</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ Commonly Used Types:
Microsoft.Extensions.FileProviders.IDirectoryContents
Microsoft.Extensions.FileProviders.IFileInfo
Microsoft.Extensions.FileProviders.IFileProvider</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Composite file and directory providers for Microsoft.Extensions.FileProviders.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>File provider for physical files for Microsoft.Extensions.FileProviders.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>File system globbing to find files matching a specified pattern.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Internal package for sharing Microsoft.Extensions.Hosting.HostFactoryResolver type.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Hosting and startup abstractions for applications.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Hosting and startup infrastructures for applications.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

Commonly Used Types:
System.Net.Http.IHttpClientFactory</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ 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>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Configuration support for Microsoft.Extensions.Logging.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
<PropertyGroup>
<NoWarn>$(NoWarn);PKG0001</NoWarn>
<PackageDescription>EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Logging infrastructure default implementation for Microsoft.Extensions.Logging.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Provides additional configuration specific functionality related to Options.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageDescription>Provides additional DataAnnotations specific functionality related to Options.</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ Commonly Used Types:
Microsoft.Extensions.Primitives.IChangeToken
Microsoft.Extensions.Primitives.StringValues
Microsoft.Extensions.Primitives.StringSegment</PackageDescription>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IsWindowsSpecific>true</IsWindowsSpecific>
<PackageDescription>Provides support for accessing and modifying the Windows Registry.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IsWindowsSpecific>true</IsWindowsSpecific>
<PackageDescription>Provides access to Windows system event notifications.

Expand Down
3 changes: 0 additions & 3 deletions src/libraries/NetCoreAppLibrary.props
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,4 @@
<NetCoreAppLibrary Include="$(NetCoreAppLibrary)" />
<NetCoreAppLibraryNoReference Include="$(NetCoreAppLibraryNoReference)" />
</ItemGroup>
<PropertyGroup>
<IsAspNetCoreApp Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IsWindowsSpecific>true</IsWindowsSpecific>
<PackageDescription>Provides the System.Diagnostics.EventLog class, which allows the applications to use the windows event log service.

Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Drawing.Common/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<PackageDescription>Provides access to GDI+ graphics functionality.
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.IO.Pipelines/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<PackageDescription>Single producer single consumer byte buffer management.

Commonly Used Types:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IsWindowsSpecific>true</IsWindowsSpecific>
<PackageDescription>Provides base classes that enable managing access and audit control lists on securable objects.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IsWindowsSpecific>true</IsWindowsSpecific>
<PackageDescription>Provides cryptographic algorithm implementations and key management with Windows Cryptographic Next Generation API (CNG).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<PackageDescription>Provides support for PKCS and CMS algorithms.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<PackageDescription>Provides classes to support the creation and validation of XML digital signatures. The classes in this namespace implement the World Wide Web Consortium Recommendation, "XML-Signature Syntax and Processing", described at http://www.w3.org/TR/xmldsig-core/.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<PackageDescription>Provides types supporting Code Access Security (CAS).</PackageDescription>
</PropertyGroup>
Expand Down
Loading

0 comments on commit a66b4e3

Please sign in to comment.