Skip to content

Commit 41f3416

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit 'ae2eabad0e49302d0632a7dde917fdc68d960dc4' into internal-merge-5.0-2021-07-13-1001
2 parents 299d1f0 + ae2eaba commit 41f3416

File tree

3 files changed

+49
-45
lines changed

3 files changed

+49
-45
lines changed

‎NuGet.config

+4
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-1af30fd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1af30fd9/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-35964c9" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92/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-35964c9" value="true" />
2326
<!-- End: Package sources from dotnet-runtime -->
2427
<!-- Begin: Package sources from dotnet-efcore -->
28+
<add key="darc-int-dotnet-efcore-1af30fd" 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

+33-33
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.7">
13-
<Uri>https://github.com/dotnet/efcore</Uri>
14-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
12+
<Dependency Name="dotnet-ef" Version="5.0.8">
13+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.7">
17-
<Uri>https://github.com/dotnet/efcore</Uri>
18-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.8">
17+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7">
21-
<Uri>https://github.com/dotnet/efcore</Uri>
22-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.8">
21+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.7">
25-
<Uri>https://github.com/dotnet/efcore</Uri>
26-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.8">
25+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7">
29-
<Uri>https://github.com/dotnet/efcore</Uri>
30-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.8">
29+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
33-
<Uri>https://github.com/dotnet/efcore</Uri>
34-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.8">
33+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.7">
37-
<Uri>https://github.com/dotnet/efcore</Uri>
38-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.8">
37+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
41-
<Uri>https://github.com/dotnet/efcore</Uri>
42-
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.8">
41+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42+
<Sha>1af30fd9b4752ab36eff63d9bc75888d41c85657</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -93,9 +93,9 @@
9393
<Uri>https://github.com/dotnet/runtime</Uri>
9494
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.1">
97-
<Uri>https://github.com/dotnet/runtime</Uri>
98-
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
96+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.2">
97+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
98+
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
9999
</Dependency>
100100
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0">
101101
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -294,17 +294,17 @@
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.7">
297+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.8">
298298
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
299-
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
299+
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
300300
</Dependency>
301-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.7-servicing.21255.8">
301+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.8-servicing.21315.4">
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303-
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
303+
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.7-servicing.21255.8">
305+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.8-servicing.21315.4">
306306
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
307-
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
307+
<Sha>35964c9215613d66a687ebcb2d7fcd9496390ee7</Sha>
308308
</Dependency>
309309
</ProductDependencies>
310310
<ToolsetDependencies>

‎eng/Versions.props

+12-12
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.7-servicing.21255.8</MicrosoftNETCoreAppInternalPackageVersion>
62+
<MicrosoftNETCoreAppInternalPackageVersion>5.0.8-servicing.21315.4</MicrosoftNETCoreAppInternalPackageVersion>
6363
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
64-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
65-
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.7-servicing.21255.8</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
64+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
65+
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.8-servicing.21315.4</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
6666
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
6767
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
6868
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -78,7 +78,7 @@
7878
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
7979
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0</MicrosoftExtensionsConfigurationXmlPackageVersion>
8080
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
81-
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
81+
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
8282
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
8383
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0</MicrosoftExtensionsFileProvidersCompositePackageVersion>
8484
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
@@ -127,14 +127,14 @@
127127
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
128128
<MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion>
129129
<!-- Packages from dotnet/efcore -->
130-
<dotnetefPackageVersion>5.0.7</dotnetefPackageVersion>
131-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
132-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
133-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.7</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
134-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
135-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreToolsPackageVersion>
136-
<MicrosoftEntityFrameworkCorePackageVersion>5.0.7</MicrosoftEntityFrameworkCorePackageVersion>
137-
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreDesignPackageVersion>
130+
<dotnetefPackageVersion>5.0.8</dotnetefPackageVersion>
131+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
132+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
133+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.8</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
134+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
135+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreToolsPackageVersion>
136+
<MicrosoftEntityFrameworkCorePackageVersion>5.0.8</MicrosoftEntityFrameworkCorePackageVersion>
137+
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreDesignPackageVersion>
138138
<!-- Packages from dotnet/arcade -->
139139
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140140
</PropertyGroup>

0 commit comments

Comments
 (0)