Skip to content

Commit cedb91f

Browse files
wtgodbewtgodbe
authored
Merge pull request #51265 from vseanreesermsft/internal-merge-6.0-2023-10-10-1028
Merging internal commits for release/6.0
2 parents 20f37ce + 97956e1 commit cedb91f

File tree

12 files changed

+560
-399
lines changed

12 files changed

+560
-399
lines changed

‎NuGet.config

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
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" />
7+
<add key="darc-int-dotnet-runtime-e0f0de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-runtime -->
99
<!-- 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" />
10+
<add key="darc-int-dotnet-efcore-50a6896" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-50a6896c/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-efcore-50a6896-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-50a6896c-2/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-efcore-50a6896-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-50a6896c-1/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-efcore -->
1314
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1415
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,11 +27,12 @@
2627
<clear />
2728
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2829
<!-- 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" />
30+
<add key="darc-int-dotnet-efcore-50a6896-1" value="true" />
31+
<add key="darc-int-dotnet-efcore-50a6896-2" value="true" />
32+
<add key="darc-int-dotnet-efcore-50a6896" value="true" />
3133
<!-- End: Package sources from dotnet-efcore -->
3234
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-4bb6dc1" value="true" />
35+
<add key="darc-int-dotnet-runtime-e0f0de8" value="true" />
3436
<!-- End: Package sources from dotnet-runtime -->
3537
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3638
</disabledPackageSources>

‎eng/Baseline.Designer.props

Lines changed: 222 additions & 222 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 107 additions & 107 deletions
Large diffs are not rendered by default.

‎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.22">
13-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
12+
<Dependency Name="dotnet-ef" Version="6.0.23">
13+
<Uri>https://github.com/dotnet/efcore</Uri>
14+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.22">
17-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.23">
17+
<Uri>https://github.com/dotnet/efcore</Uri>
18+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.22">
21-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.23">
21+
<Uri>https://github.com/dotnet/efcore</Uri>
22+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.22">
25-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.23">
25+
<Uri>https://github.com/dotnet/efcore</Uri>
26+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.22">
29-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.23">
29+
<Uri>https://github.com/dotnet/efcore</Uri>
30+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
33-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.23">
33+
<Uri>https://github.com/dotnet/efcore</Uri>
34+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.22">
37-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.23">
37+
<Uri>https://github.com/dotnet/efcore</Uri>
38+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.22">
41-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.23">
41+
<Uri>https://github.com/dotnet/efcore</Uri>
42+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</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.22-servicing.23424.25">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.23-servicing.23480.2">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
182+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</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.22">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.23">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
250+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.22">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.23">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
254+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.22">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.23">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
258+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</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.22">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.23">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
266+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.22">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.23">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
270+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.22-servicing.23424.25">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.23-servicing.23480.2">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
274+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>24</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -63,12 +63,12 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
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>
66+
<MicrosoftNETCoreAppRefVersion>6.0.23</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.23</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.23</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.23</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.23</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.23-servicing.23480.2</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.22-servicing.23424.25</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.23-servicing.23480.2</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.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>
125+
<dotnetefVersion>6.0.23</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.23</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.23</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.23</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.23</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.23</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.23</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.23</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksTemplatingVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.122"
3+
"version": "6.0.123"
44
},
55
"tools": {
6-
"dotnet": "6.0.122",
6+
"dotnet": "6.0.123",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",

0 commit comments

Comments
 (0)