Skip to content

Commit e03ccfe

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '6a6d775f49623bbd742c02f89d373630668547bb' into internal-merge-6.0-2023-03-14-1015
2 parents 73447ee + 6a6d775 commit e03ccfe

File tree

3 files changed

+60
-66
lines changed

3 files changed

+60
-66
lines changed

‎NuGet.config

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +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-runtime -->
7-
<add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-2a90daa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!-- Begin: Package sources from dotnet-efcore -->
11-
<add key="darc-int-dotnet-efcore-d15fdc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d15fdc46/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-efcore-d15fdc4-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d15fdc46-2/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-efcore-d15fdc4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d15fdc46-1/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-efcore-7e23173" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-7e231732/nuget/v3/index.json" />
1411
<!-- End: Package sources from dotnet-efcore -->
1512
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1613
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,13 +25,10 @@
2825
<clear />
2926
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3027
<!-- Begin: Package sources from dotnet-efcore -->
31-
<add key="darc-int-dotnet-efcore-d15fdc4-1" value="true" />
32-
<add key="darc-int-dotnet-efcore-d15fdc4-2" value="true" />
33-
<add key="darc-int-dotnet-efcore-d15fdc4" value="true" />
28+
<add key="darc-int-dotnet-efcore-7e23173" value="true" />
3429
<!-- End: Package sources from dotnet-efcore -->
3530
<!-- Begin: Package sources from dotnet-runtime -->
36-
<add key="darc-int-dotnet-runtime-2a90daa-1" value="true" />
37-
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
31+
<add key="darc-int-dotnet-runtime-5edef4b" value="true" />
3832
<!-- End: Package sources from dotnet-runtime -->
3933
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4034
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 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.14">
12+
<Dependency Name="dotnet-ef" Version="6.0.15">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
14+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.14">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.15">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
18+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.14">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.15">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
22+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.14">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.15">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
26+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.15">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
30+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.14">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.15">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
34+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.14">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.15">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
38+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.14">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.15">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
42+
<Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,13 +177,13 @@
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.14-servicing.23073.9">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.15-servicing.23115.7">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
182+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
183183
</Dependency>
184-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
185-
<Uri>https://github.com/dotnet/runtime</Uri>
186-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
184+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
186+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
187187
</Dependency>
188188
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0">
189189
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -197,9 +197,9 @@
197197
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
198198
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Net.Http.Json" Version="6.0.0">
201-
<Uri>https://github.com/dotnet/runtime</Uri>
202-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
200+
<Dependency Name="System.Net.Http.Json" Version="6.0.1">
201+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
202+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
203203
</Dependency>
204204
<Dependency Name="System.Net.Http.WinHttpHandler" Version="6.0.1">
205205
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -245,40 +245,40 @@
245245
<Uri>https://github.com/dotnet/runtime</Uri>
246246
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.14">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.15">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
250+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.14">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.15">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
254+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.14">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.15">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
258+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</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.14">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.15">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
266+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.14">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.15">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
270+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.14-servicing.23073.9">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.15-servicing.23115.7">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
274+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>
278278
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
279-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.7">
279+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.8">
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281-
<Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha>
281+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
282282
</Dependency>
283283
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23114.5">
284284
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props

Lines changed: 18 additions & 18 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.14</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.14</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.14</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.14</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.14-servicing.23073.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.15</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.15</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.15</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.15</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.15-servicing.23115.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,12 +103,12 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.14-servicing.23073.9</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107-
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.15-servicing.23115.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107+
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
110110
<SystemIOPipelinesVersion>6.0.3</SystemIOPipelinesVersion>
111-
<SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion>
111+
<SystemNetHttpJsonVersion>6.0.1</SystemNetHttpJsonVersion>
112112
<SystemNetHttpWinHttpHandlerVersion>6.0.1</SystemNetHttpWinHttpHandlerVersion>
113113
<SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
114114
<SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>
@@ -120,16 +120,16 @@
120120
<SystemTextJsonVersion>6.0.7</SystemTextJsonVersion>
121121
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123-
<MicrosoftNETCorePlatformsVersion>6.0.7</MicrosoftNETCorePlatformsVersion>
123+
<MicrosoftNETCorePlatformsVersion>6.0.8</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.14</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.14</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.14</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.14</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.14</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.14</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.14</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.14</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.15</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.15</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.15</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.15</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.15</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.15</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.15</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.15</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)