From 3ec1676ac6c88f4ce43bf2e143889e6167fc3883 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 6 Apr 2020 01:06:22 -0700 Subject: [PATCH] Ingest updated packages from dotnet/runtime (#20300) --- eng/Dependencies.props | 2 +- eng/SharedFramework.External.props | 5 +- eng/Version.Details.xml | 212 +++++++++--------- eng/Versions.props | 73 +++--- eng/targets/ResolveReferences.targets | 12 +- .../ref/Microsoft.AspNetCore.App.Ref.csproj | 16 +- ...Extensions.Diagnostics.HealthChecks.csproj | 2 + ...Extensions.Diagnostics.HealthChecks.csproj | 1 + .../Microsoft.Extensions.Identity.Core.csproj | 1 + .../Microsoft.Extensions.Identity.Core.csproj | 3 +- .../Session/samples/SessionSample.csproj | 2 - src/Middleware/Session/samples/Startup.cs | 6 +- .../InProcessNewShimWebSite.csproj | 1 + .../Shared.Tests/HostFactoryResolverTests.cs | 6 +- .../Microsoft.AspNetCore.Shared.Tests.csproj | 2 +- 15 files changed, 170 insertions(+), 174 deletions(-) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 6013eeca3d..695c2d85f9 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -123,7 +123,7 @@ and are generated based on the last package release. - + diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index 9812152edd..59987b0a2c 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -18,9 +18,8 @@ $(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0 - - + @@ -54,8 +53,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ab63a957a..fce2392a69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,153 +61,145 @@ https://github.com/dotnet/extensions 03c40031d618f923aa88da125cb078aabde9ebb1 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 - - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 - - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 https://github.com/dotnet/extensions 03c40031d618f923aa88da125cb078aabde9ebb1 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 - - https://github.com/dotnet/extensions - 03c40031d618f923aa88da125cb078aabde9ebb1 + + https://github.com/dotnet/runtime + e1fa5d7648d46f067e265211fc2c695d409fe788 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 737b0be4fb..1ebf3b484d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,14 +65,47 @@ 5.0.0-beta.20180.5 3.6.0-3.20201.6 - + 5.0.0-preview.4-runtime.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 + 5.0.0-preview.4-runtime.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 @@ -98,43 +131,7 @@ 5.0.0-preview.4.20201.2 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 - 5.0.0-preview.4.20201.2 5.0.0-preview.4.20203.1 5.0.0-preview.4.20203.1 diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 37a17b7140..8cc5c717ec 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -216,16 +216,16 @@ Condition=" '$(CompileUsingReferenceAssemblies)' != false AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">true - + IncludeAssets="Compile" + PrivateAssets="All" + GeneratePathProperty="true" /> diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index f695e4d3ee..4f60448f35 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -53,6 +53,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 $(ReferencePackSharedFxVersion)-$(VersionSuffix) + + + $(PkgMicrosoft_Extensions_Internal_Transport)\ref\$(TargetFramework)\ + @@ -109,14 +113,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant BeforeTargets="_GetPackageFiles" DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences"> - <_AvailableExtensionsRefAssemblies Include="$(MicrosoftInternalExtensionsRefsPath)\*.dll" /> + <_AvailableExtensionsRefAssemblies Include="$(RuntimeExtensionsReferenceDirectory)*.dll" /> - + @@ -131,7 +135,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + <_ReferencedExtensionsRefAssembliesToExclude Include="@(_ReferencedExtensionsRefAssemblies)" Exclude="@(_DuplicatedExtensionsRefAssemblies)" /> @@ -147,10 +151,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant @(ReferencePathWithRefAssemblies->WithMetadataValue('ReferenceGrouping', 'Microsoft.NETCore.App'));" /> + Include="@(_SelectedExtensionsRefAssemblies->'$(RuntimeExtensionsReferenceDirectory)%(FileName)%(Extension)')" /> - + @@ -165,7 +169,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Outputs="$(TargetDir)$(PackageConflictManifestFileName)"> - <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Internal.Extensions.Refs' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " /> + <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(RuntimeExtensionsReferenceDirectory)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Extensions.Internal.Transport' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " /> <_AspNetCoreAppPackageOverrides Include="@(_SelectedExtensionsRefAssemblies->'%(FileName)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" /> diff --git a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index d6b79361e7..4f83bbda83 100644 --- a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -9,6 +9,7 @@ + @@ -16,6 +17,7 @@ + diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index a737e01d45..44e1d8d95f 100644 --- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -28,6 +28,7 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder + diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj index 1ddecfe522..846f73feee 100644 --- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj index 7555dda1fe..5f6681e261 100644 --- a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj @@ -13,7 +13,8 @@ - + + diff --git a/src/Middleware/Session/samples/SessionSample.csproj b/src/Middleware/Session/samples/SessionSample.csproj index c1d8559a47..3beef6fa7b 100644 --- a/src/Middleware/Session/samples/SessionSample.csproj +++ b/src/Middleware/Session/samples/SessionSample.csproj @@ -9,8 +9,6 @@ - - diff --git a/src/Middleware/Session/samples/Startup.cs b/src/Middleware/Session/samples/Startup.cs index c776d8e2ff..9bc4265daf 100644 --- a/src/Middleware/Session/samples/Startup.cs +++ b/src/Middleware/Session/samples/Startup.cs @@ -21,7 +21,8 @@ namespace SessionSample // Uncomment the following line to use the in-memory implementation of IDistributedCache services.AddDistributedMemoryCache(); - // Uncomment the following line to use the Microsoft SQL Server implementation of IDistributedCache. + // Uncomment the following line to use the Microsoft SQL Server implementation of IDistributedCache + // and add a PackageReference to Microsoft.Extensions.Caching.SqlServer in the .csrpoj. // Note that this would require setting up the session state database. //services.AddDistributedSqlServerCache(o => //{ @@ -30,7 +31,8 @@ namespace SessionSample // o.TableName = "Sessions"; //}); - // Uncomment the following line to use the Redis implementation of IDistributedCache. + // Uncomment the following line to use the Redis implementation of IDistributedCache + // and add a PackageReference to Microsoft.Extensions.Caching.StackExchangeRedis in the .csrpoj. // This will override any previously registered IDistributedCache service. //services.AddStackExchangeRedisCache(o => //{ diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index fabcb2938a..7e319b26df 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -7,6 +7,7 @@ InProcessWebSite InProcessNewShimWebSite FORWARDCOMPAT + false diff --git a/src/Shared/test/Shared.Tests/HostFactoryResolverTests.cs b/src/Shared/test/Shared.Tests/HostFactoryResolverTests.cs index a26fb7b133..3301687ee4 100644 --- a/src/Shared/test/Shared.Tests/HostFactoryResolverTests.cs +++ b/src/Shared/test/Shared.Tests/HostFactoryResolverTests.cs @@ -82,10 +82,10 @@ namespace Microsoft.Extensions.Hosting.Tests [Fact] public void CreateHostBuilderPattern_CanFindHostBuilder() { - var factory = HostFactoryResolver.ResolveHostBuilderFactory(typeof(CreateHostBuilderPatternTestSite.Program).Assembly); + var factory = HostFactoryResolver.ResolveHostBuilderFactory(typeof(CreateHostBuilderPatternTestSite.Program).Assembly); Assert.NotNull(factory); - Assert.IsAssignableFrom(factory(Array.Empty())); + Assert.IsAssignableFrom(factory(Array.Empty())); } [Fact] @@ -100,7 +100,7 @@ namespace Microsoft.Extensions.Hosting.Tests [Fact] public void CreateHostBuilderPattern__Invalid_CantFindHostBuilder() { - var factory = HostFactoryResolver.ResolveHostBuilderFactory(typeof(CreateHostBuilderInvalidSignature.Program).Assembly); + var factory = HostFactoryResolver.ResolveHostBuilderFactory(typeof(CreateHostBuilderInvalidSignature.Program).Assembly); Assert.Null(factory); } diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj index bc6eb225c1..c1db74970e 100644 --- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj +++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj @@ -1,4 +1,4 @@ - + $(DefaultNetCoreTargetFramework)