Skip to content

Commit a4e680c

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit 'e56abc45c4f8adc518abfc11a59849d616431e2c' into internal-merge-7.0-2023-03-14-1019
2 parents 254fce0 + e56abc4 commit a4e680c

File tree

4 files changed

+68
-71
lines changed

4 files changed

+68
-71
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-efcore -->
7-
<add key="darc-int-dotnet-efcore-01a74cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-01a74ccf/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-efcore-01a74cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-01a74ccf-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-efcore-01a74cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-01a74ccf-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-efcore-e2a4877" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-e2a4877d/nuget/v3/index.json" />
108
<!-- End: Package sources from dotnet-efcore -->
119
<!-- Begin: Package sources from dotnet-runtime -->
12-
<add key="darc-int-dotnet-runtime-0a2bda1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10-3/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" />
1411
<!-- End: Package sources from dotnet-runtime -->
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" />
@@ -29,13 +26,10 @@
2926
<clear />
3027
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3128
<!-- Begin: Package sources from dotnet-efcore -->
32-
<add key="darc-int-dotnet-efcore-01a74cc-1" value="true" />
33-
<add key="darc-int-dotnet-efcore-01a74cc-2" value="true" />
34-
<add key="darc-int-dotnet-efcore-01a74cc" value="true" />
29+
<add key="darc-int-dotnet-efcore-e2a4877" value="true" />
3530
<!-- End: Package sources from dotnet-efcore -->
3631
<!-- Begin: Package sources from dotnet-runtime -->
37-
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="true" />
38-
<add key="darc-int-dotnet-runtime-0a2bda1" value="true" />
32+
<add key="darc-int-dotnet-runtime-0a396ac" value="true" />
3933
<!-- End: Package sources from dotnet-runtime -->
4034
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4135
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 40 additions & 40 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.3">
12+
<Dependency Name="dotnet-ef" Version="7.0.4">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
14+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.3">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.4">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
18+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.3">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
22+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
26+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
30+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
34+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.3">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.4">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
38+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>01a74ccf9db71c23785f6a6ace038fed2ee7ae41</Sha>
42+
<Sha>e2a4877d7a05d5cf6e6c790913a9aa73d4e89494</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.3">
56+
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="7.0.4">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
58+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</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.3-servicing.23069.10">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.4-servicing.23115.8">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
182+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</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>
@@ -190,9 +190,9 @@
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
191191
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
192192
</Dependency>
193-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.1">
193+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.2">
194194
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
195-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
195+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
196196
</Dependency>
197197
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0">
198198
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -206,17 +206,17 @@
206206
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
207207
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
208208
</Dependency>
209-
<Dependency Name="System.Net.Http.Json" Version="7.0.0">
209+
<Dependency Name="System.Net.Http.Json" Version="7.0.1">
210210
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
211-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
211+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
212212
</Dependency>
213213
<Dependency Name="System.Net.Http.WinHttpHandler" Version="7.0.0">
214214
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
215215
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
216216
</Dependency>
217-
<Dependency Name="System.Reflection.Metadata" Version="7.0.0">
217+
<Dependency Name="System.Reflection.Metadata" Version="7.0.1">
218218
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
219-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
219+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
220220
</Dependency>
221221
<Dependency Name="System.Resources.Extensions" Version="7.0.0">
222222
<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.3">
265+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.4">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
267-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
267+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
268268
</Dependency>
269-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.3">
269+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.4">
270270
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
271-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
271+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
272272
</Dependency>
273-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.3">
273+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.4">
274274
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
275-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
275+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</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.3">
281+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.4">
282282
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
283-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
283+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
284284
</Dependency>
285-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.3">
285+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.4">
286286
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
287-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
287+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
288288
</Dependency>
289-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.3-servicing.23069.10">
289+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.4-servicing.23115.8">
290290
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
291-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
291+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
292292
</Dependency>
293293
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
294294
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -298,9 +298,9 @@
298298
</ProductDependencies>
299299
<ToolsetDependencies>
300300
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
301-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0">
301+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.1">
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
303+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
304304
</Dependency>
305305
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
306306
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props

Lines changed: 20 additions & 20 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.3</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.3</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.3</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.3</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.3-servicing.23069.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>7.0.4</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.4</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.4</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.4</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.4-servicing.23115.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
75-
<MicrosoftExtensionsConfigurationBinderVersion>7.0.3</MicrosoftExtensionsConfigurationBinderVersion>
75+
<MicrosoftExtensionsConfigurationBinderVersion>7.0.4</MicrosoftExtensionsConfigurationBinderVersion>
7676
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
7777
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
7878
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0</MicrosoftExtensionsConfigurationFileExtensionsVersion>
@@ -103,15 +103,15 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>7.0.1</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.3-servicing.23069.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.4-servicing.23115.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
108-
<SystemDiagnosticsDiagnosticSourceVersion>7.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108+
<SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
109109
<SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
110110
<SystemDirectoryServicesProtocolsVersion>7.0.0</SystemDirectoryServicesProtocolsVersion>
111111
<SystemIOPipelinesVersion>7.0.0</SystemIOPipelinesVersion>
112-
<SystemNetHttpJsonVersion>7.0.0</SystemNetHttpJsonVersion>
112+
<SystemNetHttpJsonVersion>7.0.1</SystemNetHttpJsonVersion>
113113
<SystemNetHttpWinHttpHandlerVersion>7.0.0</SystemNetHttpWinHttpHandlerVersion>
114-
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
114+
<SystemReflectionMetadataVersion>7.0.1</SystemReflectionMetadataVersion>
115115
<SystemResourcesExtensionsVersion>7.0.0</SystemResourcesExtensionsVersion>
116116
<SystemSecurityCryptographyPkcsVersion>7.0.1</SystemSecurityCryptographyPkcsVersion>
117117
<SystemSecurityCryptographyXmlVersion>7.0.1</SystemSecurityCryptographyXmlVersion>
@@ -123,16 +123,16 @@
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 -->
126-
<MicrosoftNETCorePlatformsVersion>7.0.0</MicrosoftNETCorePlatformsVersion>
126+
<MicrosoftNETCorePlatformsVersion>7.0.1</MicrosoftNETCorePlatformsVersion>
127127
<!-- Packages from dotnet/efcore -->
128-
<dotnetefVersion>7.0.3</dotnetefVersion>
129-
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.3</MicrosoftEntityFrameworkCoreInMemoryVersion>
130-
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.3</MicrosoftEntityFrameworkCoreRelationalVersion>
131-
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.3</MicrosoftEntityFrameworkCoreSqliteVersion>
132-
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.3</MicrosoftEntityFrameworkCoreSqlServerVersion>
133-
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.3</MicrosoftEntityFrameworkCoreToolsVersion>
134-
<MicrosoftEntityFrameworkCoreVersion>7.0.3</MicrosoftEntityFrameworkCoreVersion>
135-
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.3</MicrosoftEntityFrameworkCoreDesignVersion>
128+
<dotnetefVersion>7.0.4</dotnetefVersion>
129+
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.4</MicrosoftEntityFrameworkCoreInMemoryVersion>
130+
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.4</MicrosoftEntityFrameworkCoreRelationalVersion>
131+
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.4</MicrosoftEntityFrameworkCoreSqliteVersion>
132+
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.4</MicrosoftEntityFrameworkCoreSqlServerVersion>
133+
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.4</MicrosoftEntityFrameworkCoreToolsVersion>
134+
<MicrosoftEntityFrameworkCoreVersion>7.0.4</MicrosoftEntityFrameworkCoreVersion>
135+
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.4</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137137
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersVersion>
138138
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTemplatingVersion>

‎src/Framework/test/TargetingPackTests.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,10 @@ public void AssembliesAreReferenceAssemblies()
199199

200200
Assert.True(hasRefAssemblyAttribute, $"{path} should have {nameof(ReferenceAssemblyAttribute)}");
201201
#pragma warning disable SYSLIB0037 // AssemblyName.ProcessorArchitecture is obsolete
202-
Assert.Equal(ProcessorArchitecture.None, assemblyName.ProcessorArchitecture);
202+
// MSIL and None represent platform neutral assemblies such that reference assemblies can always be loaded.
203+
Assert.True(assemblyName.ProcessorArchitecture == ProcessorArchitecture.MSIL ||
204+
assemblyName.ProcessorArchitecture == ProcessorArchitecture.None
205+
);
203206
#pragma warning restore SYSLIB0037
204207
});
205208
}

0 commit comments

Comments
 (0)