Skip to content

Commit 4b84a2a

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit 'd0ca5a8d20ac50a33d5451e998a5d411a810c8d7' into internal-merge-7.0-2024-03-12-1056
2 parents 5a5ee6a + d0ca5a8 commit 4b84a2a

File tree

3 files changed

+61
-45
lines changed

3 files changed

+61
-45
lines changed

‎NuGet.config

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
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-c9d1c2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-c9d1c2d2/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-efcore-819a61e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-efcore-819a61e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-efcore-819a61e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6-1/nuget/v3/index.json" />
711
<!-- End: Package sources from dotnet-efcore -->
812
<!-- Begin: Package sources from dotnet-runtime -->
13+
<add key="darc-int-dotnet-runtime-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-runtime-567edaf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-2/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-runtime-567edaf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-1/nuget/v3/index.json" />
917
<!-- End: Package sources from dotnet-runtime -->
1018
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1119
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,8 +32,16 @@
2432
<clear />
2533
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2634
<!-- Begin: Package sources from dotnet-efcore -->
35+
<add key="darc-int-dotnet-efcore-c9d1c2d" value="true" />
36+
<add key="darc-int-dotnet-efcore-819a61e-1" value="true" />
37+
<add key="darc-int-dotnet-efcore-819a61e-2" value="true" />
38+
<add key="darc-int-dotnet-efcore-819a61e" value="true" />
2739
<!-- End: Package sources from dotnet-efcore -->
2840
<!-- Begin: Package sources from dotnet-runtime -->
41+
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
42+
<add key="darc-int-dotnet-runtime-567edaf-1" value="true" />
43+
<add key="darc-int-dotnet-runtime-567edaf-2" value="true" />
44+
<add key="darc-int-dotnet-runtime-567edaf" value="true" />
2945
<!-- End: Package sources from dotnet-runtime -->
3046
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3147
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 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.16">
12+
<Dependency Name="dotnet-ef" Version="7.0.17">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
14+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.16">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.17">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
18+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.17">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
22+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.16">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.17">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
26+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.16">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
30+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
34+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.16">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.17">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
38+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.16">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.17">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
42+
<Sha>c9d1c2d28f509244ffe9ad61a46d1d81f89ddd2f</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>
@@ -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.16-servicing.24066.29">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.17-servicing.24115.8">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
182+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
183183
</Dependency>
184184
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24158.4">
185185
<Uri>https://github.com/dotnet/source-build-externals</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.16">
265+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.17">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
267-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
267+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
268268
</Dependency>
269-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.16">
269+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.17">
270270
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
271-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
271+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
272272
</Dependency>
273-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.16">
273+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.17">
274274
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
275-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
275+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</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.16">
281+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.17">
282282
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
283-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
283+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
284284
</Dependency>
285-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.16">
285+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.17">
286286
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
287-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
287+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
288288
</Dependency>
289-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.16-servicing.24066.29">
289+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.17-servicing.24115.8">
290290
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
291-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
291+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>7.0.16</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.16</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.16</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.16</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.16-servicing.24066.29</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>7.0.17</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.17</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.17</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.17</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.17</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.17-servicing.24115.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>7.0.1</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.16-servicing.24066.29</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.17-servicing.24115.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
108108
<SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
109109
<SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
@@ -125,14 +125,14 @@
125125
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
126126
<MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
127127
<!-- Packages from dotnet/efcore -->
128-
<dotnetefVersion>7.0.16</dotnetefVersion>
129-
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.16</MicrosoftEntityFrameworkCoreInMemoryVersion>
130-
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.16</MicrosoftEntityFrameworkCoreRelationalVersion>
131-
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.16</MicrosoftEntityFrameworkCoreSqliteVersion>
132-
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.16</MicrosoftEntityFrameworkCoreSqlServerVersion>
133-
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.16</MicrosoftEntityFrameworkCoreToolsVersion>
134-
<MicrosoftEntityFrameworkCoreVersion>7.0.16</MicrosoftEntityFrameworkCoreVersion>
135-
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.16</MicrosoftEntityFrameworkCoreDesignVersion>
128+
<dotnetefVersion>7.0.17</dotnetefVersion>
129+
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.17</MicrosoftEntityFrameworkCoreInMemoryVersion>
130+
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.17</MicrosoftEntityFrameworkCoreRelationalVersion>
131+
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.17</MicrosoftEntityFrameworkCoreSqliteVersion>
132+
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.17</MicrosoftEntityFrameworkCoreSqlServerVersion>
133+
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.17</MicrosoftEntityFrameworkCoreToolsVersion>
134+
<MicrosoftEntityFrameworkCoreVersion>7.0.17</MicrosoftEntityFrameworkCoreVersion>
135+
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.17</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137137
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksInstallersVersion>
138138
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)