Skip to content

Commit d5b20ec

Browse files
dougbudougbu
authored
Merge pull request #43952 from vseanreesermsft/internal-merge-6.0-2022-09-13-1004
Merging internal commits for release/6.0
2 parents ae98ae8 + fc1b7e9 commit d5b20ec

File tree

12 files changed

+721
-420
lines changed

12 files changed

+721
-420
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-runtime -->
7+
<add key="darc-int-dotnet-runtime-163a635" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-163a6359/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-33e3c95" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-33e3c950/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-efcore -->
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" />
@@ -25,8 +27,10 @@
2527
<clear />
2628
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2729
<!-- Begin: Package sources from dotnet-efcore -->
30+
<add key="darc-int-dotnet-efcore-33e3c95" value="true" />
2831
<!-- End: Package sources from dotnet-efcore -->
2932
<!-- Begin: Package sources from dotnet-runtime -->
33+
<add key="darc-int-dotnet-runtime-163a635" value="true" />
3034
<!-- End: Package sources from dotnet-runtime -->
3135
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3236
</disabledPackageSources>

‎eng/Baseline.Designer.props

Lines changed: 247 additions & 247 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: 34 additions & 34 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.8">
12+
<Dependency Name="dotnet-ef" Version="6.0.9">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
14+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.8">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
18+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.8">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
22+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.8">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
26+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.8">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
30+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.8">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.9">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
34+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.8">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.9">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
38+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>62e1b2f494af376a4588bf3d365f7be5443d4a5d</Sha>
42+
<Sha>33e3c950af2eb996c0b3c48e30eb4471138da675</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -129,9 +129,9 @@
129129
<Uri>https://github.com/dotnet/runtime</Uri>
130130
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1">
132+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2">
133133
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
134-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
134+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
135135
</Dependency>
136136
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="6.0.0">
137137
<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.8-servicing.22363.6">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.9-servicing.22419.5">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
182+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
185185
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -233,9 +233,9 @@
233233
<Uri>https://github.com/dotnet/runtime</Uri>
234234
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
235235
</Dependency>
236-
<Dependency Name="System.Text.Json" Version="6.0.5">
236+
<Dependency Name="System.Text.Json" Version="6.0.6">
237237
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
238-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
238+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
239239
</Dependency>
240240
<Dependency Name="System.Threading.Channels" Version="6.0.0">
241241
<Uri>https://github.com/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.8">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.9">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
250+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.8">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.9">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
254+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.8">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.9">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
258+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</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.8">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.9">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
266+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.8">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.9">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
270+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.8-servicing.22363.6">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.9-servicing.22419.5">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>55fb7ef977e7d120dc12f0960edcff0739d7ee0e</Sha>
274+
<Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>10</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.8</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.8</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.8</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.8</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.8</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.8-servicing.22363.6</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.9</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.9</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.9</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.9</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.9-servicing.22419.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -91,7 +91,7 @@
9191
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
9292
<MicrosoftExtensionsHostingVersion>6.0.1</MicrosoftExtensionsHostingVersion>
9393
<MicrosoftExtensionsHttpVersion>6.0.0</MicrosoftExtensionsHttpVersion>
94-
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.1</MicrosoftExtensionsLoggingAbstractionsVersion>
94+
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
9595
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0</MicrosoftExtensionsLoggingConfigurationVersion>
9696
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
9797
<MicrosoftExtensionsLoggingDebugVersion>6.0.0</MicrosoftExtensionsLoggingDebugVersion>
@@ -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.8-servicing.22363.6</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.9-servicing.22419.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
@@ -117,19 +117,19 @@
117117
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
118118
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
119119
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
120-
<SystemTextJsonVersion>6.0.5</SystemTextJsonVersion>
120+
<SystemTextJsonVersion>6.0.6</SystemTextJsonVersion>
121121
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.5</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.8</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.8</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.8</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.8</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.8</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.8</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.8</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.8</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.9</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.9</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.9</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.9</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.9</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.9</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.9</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.9</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksTemplatingVersion>
@@ -214,7 +214,7 @@
214214
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
215215
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
216216
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
217-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.28-servicing-22364-2</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
217+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.29-servicing-22418-8</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
218218
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
219219
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
220220
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>

‎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.108"
3+
"version": "6.0.109"
44
},
55
"tools": {
6-
"dotnet": "6.0.108",
6+
"dotnet": "6.0.109",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",

0 commit comments

Comments
 (0)