huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit 'dc5e11abdb05b322f4b74b3afbcfb352fe984b2e' into dougbu/v5.0.6.II

This commit is contained in:
Doug Bunting 2021-05-11 11:55:57 -07:00
parent b124d508b8 dc5e11abdb
commit b76c48333c
No known key found for this signature in database
GPG Key ID: EE41520987982C03
3 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NuGet.config
View File

@ -4,10 +4,12 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-pub-dotnet-efcore-5420351" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-54203510/nuget/v3/index.json" /> <add key="darc-int-dotnet-efcore-42e8143" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-478b2f8-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@ -22,9 +24,12 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2f740ad" value="true" /> <add key="darc-int-dotnet-runtime-478b2f8" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8-1" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8-2" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-42e8143" value="true" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources> </disabledPackageSources>

44
eng/Version.Details.xml
View File

@ -9,37 +9,37 @@
--> -->
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="dotnet-ef" Version="5.0.5"> <Dependency Name="dotnet-ef" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.5"> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.6">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>54203510db732a088a3e7e58d49b98ada7c14227</Sha> <Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0"> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
@ -294,17 +294,17 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. 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. All Runtime.$rid packages should have the same version.
--> -->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.5"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha> <Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.5-servicing.21166.9"> <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.6-servicing.21220.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha> <Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.5-servicing.21166.9"> <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.6-servicing.21220.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha> <Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>

22
eng/Versions.props
View File

@ -59,10 +59,10 @@
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime --> <!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.5-servicing.21166.9</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppInternalPackageVersion>5.0.6-servicing.21220.11</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.5-servicing.21166.9</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion> <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.6-servicing.21220.11</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion> <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion> <MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion> <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@ -127,14 +127,14 @@
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/efcore --> <!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.5</dotnetefPackageVersion> <dotnetefPackageVersion>5.0.6</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.5</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.5</MicrosoftEntityFrameworkCoreRelationalPackageVersion> <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.5</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.6</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.5</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.5</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.5</MicrosoftEntityFrameworkCorePackageVersion> <MicrosoftEntityFrameworkCorePackageVersion>5.0.6</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.5</MicrosoftEntityFrameworkCoreDesignPackageVersion> <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21160.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21160.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>