Skip to content

Commit 4b37cd5

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '2924ca229b3d6c91b7c9eded119b31dfd7aa1fef' into internal-merge-5.0-2021-10-12-1521
2 parents b3238fb + 2924ca2 commit 4b37cd5

File tree

3 files changed

+44
-40
lines changed

3 files changed

+44
-40
lines changed

‎NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7+
<add key="darc-int-dotnet-efcore-1103fc0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1103fc01/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-efcore -->
89
<!-- Begin: Package sources from dotnet-runtime -->
10+
<add key="darc-int-dotnet-runtime-f431858" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f431858f/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-runtime -->
1012
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1113
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,8 +22,10 @@
2022
<clear />
2123
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2224
<!-- Begin: Package sources from dotnet-runtime -->
25+
<add key="darc-int-dotnet-runtime-f431858" value="true" />
2326
<!-- End: Package sources from dotnet-runtime -->
2427
<!-- Begin: Package sources from dotnet-efcore -->
28+
<add key="darc-int-dotnet-efcore-1103fc0" value="true" />
2529
<!-- End: Package sources from dotnet-efcore -->
2630
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2731
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="5.0.10">
12+
<Dependency Name="dotnet-ef" Version="5.0.11">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
14+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.10">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.11">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
18+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.11">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
22+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.11">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
26+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.11">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
30+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.11">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
34+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.10">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.11">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
38+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.11">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>4953039abb533bccee15da9ce4a1b3fee926325b</Sha>
42+
<Sha>1103fc01ad2b1d1d3e4312cc406c836e1745fb6f</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -201,9 +201,9 @@
201201
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
202202
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
203203
</Dependency>
204-
<Dependency Name="System.DirectoryServices.Protocols" Version="5.0.0">
205-
<Uri>https://github.com/dotnet/runtime</Uri>
206-
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
204+
<Dependency Name="System.DirectoryServices.Protocols" Version="5.0.1">
205+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
206+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
207207
</Dependency>
208208
<Dependency Name="System.Drawing.Common" Version="5.0.2">
209209
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -294,24 +294,24 @@
294294
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
295295
All Runtime.$rid packages should have the same version.
296296
-->
297-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.10">
297+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.11">
298298
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
299-
<Sha>5709275be7fc71fa32fa12255a34db07cecead01</Sha>
299+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
300300
</Dependency>
301-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.10-servicing.21412.14">
301+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.11-servicing.21473.8">
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303-
<Sha>5709275be7fc71fa32fa12255a34db07cecead01</Sha>
303+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.10-servicing.21412.14">
305+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.11-servicing.21473.8">
306306
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
307-
<Sha>5709275be7fc71fa32fa12255a34db07cecead01</Sha>
307+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
308308
</Dependency>
309309
</ProductDependencies>
310310
<ToolsetDependencies>
311311
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
312-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.2">
312+
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.4">
313313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
314-
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
314+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
315315
</Dependency>
316316
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21509.1">
317317
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
<PropertyGroup Label="Automated">
6060
<!-- Packages from dotnet/runtime -->
6161
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
62-
<MicrosoftNETCoreAppInternalPackageVersion>5.0.10-servicing.21412.14</MicrosoftNETCoreAppInternalPackageVersion>
62+
<MicrosoftNETCoreAppInternalPackageVersion>5.0.11-servicing.21473.8</MicrosoftNETCoreAppInternalPackageVersion>
6363
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
64-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
65-
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.10-servicing.21412.14</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
64+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
65+
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.11-servicing.21473.8</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
6666
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
6767
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
6868
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -103,7 +103,7 @@
103103
<SystemComponentModelAnnotationsPackageVersion>5.0.0</SystemComponentModelAnnotationsPackageVersion>
104104
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
105105
<SystemDiagnosticsEventLogPackageVersion>5.0.1</SystemDiagnosticsEventLogPackageVersion>
106-
<SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
106+
<SystemDirectoryServicesProtocolsPackageVersion>5.0.1</SystemDirectoryServicesProtocolsPackageVersion>
107107
<SystemDrawingCommonPackageVersion>5.0.2</SystemDrawingCommonPackageVersion>
108108
<SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
109109
<SystemNetHttpJsonPackageVersion>5.0.0</SystemNetHttpJsonPackageVersion>
@@ -125,16 +125,16 @@
125125
<SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
126126
<SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
127127
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
128-
<MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion>
128+
<MicrosoftNETCorePlatformsPackageVersion>5.0.4</MicrosoftNETCorePlatformsPackageVersion>
129129
<!-- Packages from dotnet/efcore -->
130-
<dotnetefPackageVersion>5.0.10</dotnetefPackageVersion>
131-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.10</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
132-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.10</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
133-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.10</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
134-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.10</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
135-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.10</MicrosoftEntityFrameworkCoreToolsPackageVersion>
136-
<MicrosoftEntityFrameworkCorePackageVersion>5.0.10</MicrosoftEntityFrameworkCorePackageVersion>
137-
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.10</MicrosoftEntityFrameworkCoreDesignPackageVersion>
130+
<dotnetefPackageVersion>5.0.11</dotnetefPackageVersion>
131+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.11</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
132+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.11</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
133+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.11</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
134+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.11</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
135+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.11</MicrosoftEntityFrameworkCoreToolsPackageVersion>
136+
<MicrosoftEntityFrameworkCorePackageVersion>5.0.11</MicrosoftEntityFrameworkCorePackageVersion>
137+
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.11</MicrosoftEntityFrameworkCoreDesignPackageVersion>
138138
<!-- Packages from dotnet/arcade -->
139139
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21509.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140140
</PropertyGroup>

0 commit comments

Comments
 (0)