Merge commit 'd827c653b787c07de908240b7746ce34d3e6271e' into dougbu/branding/5.0.4

This commit is contained in:
Doug Bunting 2021-02-09 14:47:58 -08:00
commit eaa99dc6e3
No known key found for this signature in database
GPG Key ID: EE41520987982C03
7 changed files with 84 additions and 52 deletions

View File

@ -2,20 +2,43 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-efc2924" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-efc2924e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-c636bbd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-c636bbdc/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<!-- Used for the SiteExtension 3.1 bits that are included in the 5.0 build -->
<add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-1ee6b62" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-cb5f173" value="true" />
<add key="darc-int-dotnet-efcore-8c89ec4" value="true" />
<add key="darc-int-dotnet-efcore-9322ea3" value="true" />
<add key="darc-int-dotnet-efcore-d5943e6" value="true" />
<add key="darc-int-dotnet-efcore-8741b87" value="true" />
<add key="darc-int-dotnet-efcore-ff5f100" value="true" />
<add key="darc-int-dotnet-runtime-f37e9a0" value="true" />
<add key="darc-int-dotnet-runtime-d070c3f" value="true" />
<add key="darc-int-dotnet-runtime-c37365f" value="true" />
<add key="darc-int-dotnet-runtime-75b9165" value="true" />
<add key="darc-int-dotnet-runtime-8552839" value="true" />
<add key="darc-int-dotnet-runtime-44db96a" value="true" />
<add key="darc-int-dotnet-runtime-fe8a2d0" value="true" />
<add key="darc-int-dotnet-runtime-eae88cc" value="true" />
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-c636bbd" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-efc2924" value="true" />
<!-- End: Package sources from dotnet-efcore -->
</disabledPackageSources>
</configuration>

View File

@ -9,37 +9,37 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="5.0.2">
<Dependency Name="dotnet-ef" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -197,17 +197,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices.Protocols" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
<Dependency Name="System.Drawing.Common" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="5.0.1">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -294,24 +294,24 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.2">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.2-servicing.20611.20">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.3-servicing.21072.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.2-servicing.20611.20">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.3-servicing.21072.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21063.3">
<Uri>https://github.com/dotnet/arcade</Uri>

View File

@ -58,10 +58,10 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.2-servicing.20611.20</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.3-servicing.21072.12</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.2-servicing.20611.20</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.3-servicing.21072.12</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@ -101,9 +101,9 @@
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rtm.20519.4</MicrosoftExtensionsInternalTransportPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>5.0.0</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.1</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.0</SystemDrawingCommonPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.1</SystemDrawingCommonPackageVersion>
<SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
<SystemNetHttpJsonPackageVersion>5.0.0</SystemNetHttpJsonPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0</SystemNetHttpWinHttpHandlerPackageVersion>
@ -124,16 +124,16 @@
<SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>5.0.1</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.2</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.2</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<dotnetefPackageVersion>5.0.3</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.3</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21063.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>

View File

@ -7,6 +7,6 @@
<add key="entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
</packageSources>
</configuration>

View File

@ -12,7 +12,15 @@
<!-- Ignore aspnetcorev2_inprocess because tests expect only managed assemblies in this item group. -->
<_SharedFrameworkBinariesFromRepo Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)" />
<_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
<!--
Special-case System.Diagnostics.EventLog.Messages.dll because that assembly name does _not_ match a
package. Can't mention it in @(ExternalAspNetCoreAppReference) or underlying
@(_TransitiveExternalAspNetCoreAppReference) without thoroughly confusing eng/targets/ResolveReferences.targets.
-->
<_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);
@(ExternalAspNetCoreAppReference);
@(_TransitiveExternalAspNetCoreAppReference);
System.Diagnostics.EventLog.Messages" />
<_ExpectedSharedFrameworkBinaries Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'" Include="aspnetcorev2_inprocess" />
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">

View File

@ -143,6 +143,7 @@ namespace Microsoft.AspNetCore
"Microsoft.Net.Http.Headers",
"Microsoft.Win32.SystemEvents",
"System.Diagnostics.EventLog",
"System.Diagnostics.EventLog.Messages",
"System.Drawing.Common",
"System.IO.Pipelines",
"System.Security.Cryptography.Pkcs",

View File

@ -7,6 +7,6 @@
<add key="entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
</packageSources>
</configuration>