Skip to content

Commit d9c9550

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '564969bca155b40432d101ec35f24a0e81e6afa0' into internal-merge-6.0-2023-09-12-1025
2 parents 529ed6b + 564969b commit d9c9550

File tree

3 files changed

+51
-45
lines changed

3 files changed

+51
-45
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-4bb6dc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4bb6dc19/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!-- Begin: Package sources from dotnet-efcore -->
10+
<add key="darc-int-dotnet-efcore-687fc8f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-687fc8f9/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-efcore-687fc8f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-687fc8f9-1/nuget/v3/index.json" />
912
<!-- End: Package sources from dotnet-efcore -->
1013
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1114
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,8 +26,11 @@
2326
<clear />
2427
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2528
<!-- Begin: Package sources from dotnet-efcore -->
29+
<add key="darc-int-dotnet-efcore-687fc8f-1" value="true" />
30+
<add key="darc-int-dotnet-efcore-687fc8f" value="true" />
2631
<!-- End: Package sources from dotnet-efcore -->
2732
<!-- Begin: Package sources from dotnet-runtime -->
33+
<add key="darc-int-dotnet-runtime-4bb6dc1" value="true" />
2834
<!-- End: Package sources from dotnet-runtime -->
2935
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3036
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.21">
12+
<Dependency Name="dotnet-ef" Version="6.0.22">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
14+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.21">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.22">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
18+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.21">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.22">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
22+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.21">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.22">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
26+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.21">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.22">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
30+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.21">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
34+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.21">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.22">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
38+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.21">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.22">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>fa741b8bad8eebb503bba99e078538f97aff3f5d</Sha>
42+
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.21-servicing.23363.11">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.22-servicing.23424.25">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
182+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -245,33 +245,33 @@
245245
<Uri>https://github.com/dotnet/runtime</Uri>
246246
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.21">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.22">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
250+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.21">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.22">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
254+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.21">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.22">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
258+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
259259
</Dependency>
260260
<!--
261261
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
262262
All Runtime.$rid packages should have the same version.
263263
-->
264-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.21">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.22">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
266+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.21">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.22">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
270+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.21-servicing.23363.11">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.22-servicing.23424.25">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
274+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>6.0.21</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.21</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.21</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.21</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.21</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.21-servicing.23363.11</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.22</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.22</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.22</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.22</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.22</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.22-servicing.23424.25</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.21-servicing.23363.11</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.22-servicing.23424.25</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -122,14 +122,14 @@
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.21</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.21</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.21</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.21</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.21</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.21</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.21</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.21</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.22</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.22</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.22</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.22</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.22</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.22</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.22</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.22</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)