Skip to content

Commit 4510899

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '54e8b61777d42d2b10744d1987438ee5b8c0b24d' into internal-merge-6.0-2023-02-14-1046
2 parents 2545164 + 54e8b61 commit 4510899

File tree

3 files changed

+52
-50
lines changed

3 files changed

+52
-50
lines changed

‎NuGet.config

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +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-1af80ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1af80ba0/nuget/v3/index.json" />
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" />
88
<!-- End: Package sources from dotnet-runtime -->
99
<!-- Begin: Package sources from dotnet-efcore -->
10+
<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" />
1011
<!-- End: Package sources from dotnet-efcore -->
1112
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1213
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,9 +25,10 @@
2425
<clear />
2526
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2627
<!-- Begin: Package sources from dotnet-efcore -->
28+
<add key="darc-int-dotnet-efcore-d15fdc4" value="true" />
2729
<!-- End: Package sources from dotnet-efcore -->
2830
<!-- Begin: Package sources from dotnet-runtime -->
29-
<add key="darc-int-dotnet-runtime-1af80ba" value="true" />
31+
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
3032
<!-- End: Package sources from dotnet-runtime -->
3133
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3234
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 32 additions & 32 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.13">
12+
<Dependency Name="dotnet-ef" Version="6.0.14">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
14+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.13">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.14">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
18+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.13">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.14">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
22+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.13">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.14">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
26+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.13">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
30+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.13">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.14">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
34+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.13">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.14">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
38+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.14">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>f48dbe7321a44cd4aa3e22986beb208e559e3919</Sha>
42+
<Sha>d15fdc46d4083e2503fb980a857c62f5f4d90c3f</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.13-servicing.22580.9">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.14-servicing.23073.9">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
182+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
185185
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -217,9 +217,9 @@
217217
<Uri>https://github.com/dotnet/runtime</Uri>
218218
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.1">
220+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.2">
221221
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
222-
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
222+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
223223
</Dependency>
224224
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.1">
225225
<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.13">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.14">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
250+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.13">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.14">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
254+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.13">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.14">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
258+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</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.13">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.14">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
266+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.13">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.14">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
270+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.13-servicing.22580.9">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.14-servicing.23073.9">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
274+
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 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.13</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.13</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.13</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.13</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.13</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.13-servicing.22580.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>
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>
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.13-servicing.22580.9</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.14-servicing.23073.9</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
@@ -113,7 +113,7 @@
113113
<SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
114114
<SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>
115115
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
116-
<SystemSecurityCryptographyPkcsVersion>6.0.1</SystemSecurityCryptographyPkcsVersion>
116+
<SystemSecurityCryptographyPkcsVersion>6.0.2</SystemSecurityCryptographyPkcsVersion>
117117
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
118118
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
119119
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
@@ -122,14 +122,14 @@
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.7</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.13</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.13</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.13</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.13</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.13</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.13</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.13</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.13</MicrosoftEntityFrameworkCoreDesignVersion>
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>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23060.6</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23060.6</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)