Skip to content

Commit 38af0fc

Browse files
Merge commit '7c810658463f35c39c54d5fb8a8dbbfd463bf747' into internal-merge-7.0-2023-01-10-1112
2 parents ce5d73c + 7c81065 commit 38af0fc

File tree

3 files changed

+65
-57
lines changed

3 files changed

+65
-57
lines changed

NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +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-efcore -->
7+
<add key="darc-int-dotnet-efcore-0c8605d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-0c8605d8/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-efcore-0c8605d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-0c8605d8-1/nuget/v3/index.json" />
79
<!-- End: Package sources from dotnet-efcore -->
810
<!-- Begin: Package sources from dotnet-runtime -->
11+
<add key="darc-int-dotnet-runtime-d037e07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d037e070/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-97203d3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97203d38/nuget/v3/index.json" />
913
<!-- End: Package sources from dotnet-runtime -->
1014
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1115
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,8 +28,12 @@
2428
<clear />
2529
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2630
<!-- Begin: Package sources from dotnet-efcore -->
31+
<add key="darc-int-dotnet-efcore-0c8605d-1" value="true" />
32+
<add key="darc-int-dotnet-efcore-0c8605d" value="true" />
2733
<!-- End: Package sources from dotnet-efcore -->
2834
<!-- Begin: Package sources from dotnet-runtime -->
35+
<add key="darc-int-dotnet-runtime-97203d3" value="true" />
36+
<add key="darc-int-dotnet-runtime-d037e07" value="true" />
2937
<!-- End: Package sources from dotnet-runtime -->
3038
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3139
</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="7.0.0">
12+
<Dependency Name="dotnet-ef" Version="7.0.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
14+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
18+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.2">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
22+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
26+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
30+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
34+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.0">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
38+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</Sha>
42+
<Sha>0c8605d87b88157c773efd70ed2b8546ef18d5a1</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -53,9 +53,9 @@
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5454
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="7.0.0">
56+
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="7.0.2">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
58+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
5959
</Dependency>
6060
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
178178
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-rtm.22518.5">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.2-servicing.22606.5">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
182+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
183183
</Dependency>
184184
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22505.1">
185185
<Uri>https://github.com/dotnet/source-build-externals</Uri>
@@ -226,9 +226,9 @@
226226
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
227227
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
228228
</Dependency>
229-
<Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0">
229+
<Dependency Name="System.Security.Cryptography.Xml" Version="7.0.1">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
231-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
231+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
232232
</Dependency>
233233
<Dependency Name="System.Security.Permissions" Version="7.0.0">
234234
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -242,13 +242,13 @@
242242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
243243
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
244244
</Dependency>
245-
<Dependency Name="System.Text.Json" Version="7.0.0">
245+
<Dependency Name="System.Text.Json" Version="7.0.1">
246246
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
247-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
247+
<Sha>97203d38ba734d76d39984c5206f2747f792fa89</Sha>
248248
</Dependency>
249-
<Dependency Name="System.Threading.AccessControl" Version="7.0.0">
249+
<Dependency Name="System.Threading.AccessControl" Version="7.0.1">
250250
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
251-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
251+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
252252
</Dependency>
253253
<Dependency Name="System.Threading.Channels" Version="7.0.0">
254254
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -262,33 +262,33 @@
262262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
263263
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
264264
</Dependency>
265-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0">
265+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.2">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
267-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
267+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
268268
</Dependency>
269-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.0">
269+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.2">
270270
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
271-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
271+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
272272
</Dependency>
273-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.0">
273+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.2">
274274
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
275-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
275+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
276276
</Dependency>
277277
<!--
278278
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
279279
All Runtime.$rid packages should have the same version.
280280
-->
281-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0">
281+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.2">
282282
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
283-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
283+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
284284
</Dependency>
285-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.0">
285+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.2">
286286
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
287-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
287+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
288288
</Dependency>
289-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.0-rtm.22518.5">
289+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.2-servicing.22606.5">
290290
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
291-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
291+
<Sha>d037e070ebe5c83838443f869d5800752b0fcb13</Sha>
292292
</Dependency>
293293
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
294294
<Uri>https://github.com/dotnet/xdt</Uri>

eng/Versions.props

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>7.0.0</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rtm.22518.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>7.0.2</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.2-servicing.22606.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
75-
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0</MicrosoftExtensionsConfigurationBinderVersion>
75+
<MicrosoftExtensionsConfigurationBinderVersion>7.0.2</MicrosoftExtensionsConfigurationBinderVersion>
7676
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
7777
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
7878
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0</MicrosoftExtensionsConfigurationFileExtensionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>7.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rtm.22518.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.2-servicing.22606.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
108108
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0</SystemDiagnosticsDiagnosticSourceVersion>
109109
<SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
@@ -114,25 +114,25 @@
114114
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
115115
<SystemResourcesExtensionsVersion>7.0.0</SystemResourcesExtensionsVersion>
116116
<SystemSecurityCryptographyPkcsVersion>7.0.0</SystemSecurityCryptographyPkcsVersion>
117-
<SystemSecurityCryptographyXmlVersion>7.0.0</SystemSecurityCryptographyXmlVersion>
117+
<SystemSecurityCryptographyXmlVersion>7.0.1</SystemSecurityCryptographyXmlVersion>
118118
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
119119
<SystemServiceProcessServiceControllerVersion>7.0.0</SystemServiceProcessServiceControllerVersion>
120120
<SystemTextEncodingsWebVersion>7.0.0</SystemTextEncodingsWebVersion>
121-
<SystemTextJsonVersion>7.0.0</SystemTextJsonVersion>
122-
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
121+
<SystemTextJsonVersion>7.0.1</SystemTextJsonVersion>
122+
<SystemThreadingAccessControlVersion>7.0.1</SystemThreadingAccessControlVersion>
123123
<SystemThreadingChannelsVersion>7.0.0</SystemThreadingChannelsVersion>
124124
<SystemThreadingRateLimitingVersion>7.0.0</SystemThreadingRateLimitingVersion>
125125
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
126126
<MicrosoftNETCorePlatformsVersion>7.0.0</MicrosoftNETCorePlatformsVersion>
127127
<!-- Packages from dotnet/efcore -->
128-
<dotnetefVersion>7.0.0</dotnetefVersion>
129-
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0</MicrosoftEntityFrameworkCoreInMemoryVersion>
130-
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0</MicrosoftEntityFrameworkCoreRelationalVersion>
131-
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0</MicrosoftEntityFrameworkCoreSqliteVersion>
132-
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0</MicrosoftEntityFrameworkCoreSqlServerVersion>
133-
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.0</MicrosoftEntityFrameworkCoreToolsVersion>
134-
<MicrosoftEntityFrameworkCoreVersion>7.0.0</MicrosoftEntityFrameworkCoreVersion>
135-
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0</MicrosoftEntityFrameworkCoreDesignVersion>
128+
<dotnetefVersion>7.0.2</dotnetefVersion>
129+
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.2</MicrosoftEntityFrameworkCoreInMemoryVersion>
130+
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.2</MicrosoftEntityFrameworkCoreRelationalVersion>
131+
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.2</MicrosoftEntityFrameworkCoreSqliteVersion>
132+
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.2</MicrosoftEntityFrameworkCoreSqlServerVersion>
133+
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.2</MicrosoftEntityFrameworkCoreToolsVersion>
134+
<MicrosoftEntityFrameworkCoreVersion>7.0.2</MicrosoftEntityFrameworkCoreVersion>
135+
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.2</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137137
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksInstallersVersion>
138138
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)