Skip to content

Commit 2bf8208

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d' into internal-merge-7.0-2023-06-13-1019
2 parents 38dd4e7 + 3dfc6fd commit 2bf8208

File tree

3 files changed

+74
-78
lines changed

3 files changed

+74
-78
lines changed

‎NuGet.config

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +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-5c6be24" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5c6be245/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-efcore-5c6be24-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5c6be245-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-efcore-5c6be24-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5c6be245-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-efcore-81a09d5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-81a09d5f/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-efcore-81a09d5-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-81a09d5f-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-efcore-81a09d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-81a09d5f-1/nuget/v3/index.json" />
1010
<!-- End: Package sources from dotnet-efcore -->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12-
<add key="darc-int-dotnet-runtime-8042d61" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-8042d61-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b-2/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-runtime-8042d61-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b-1/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/nuget/v3/index.json" />
1513
<!-- End: Package sources from dotnet-runtime -->
1614
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1715
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -30,14 +28,12 @@
3028
<clear />
3129
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3230
<!-- Begin: Package sources from dotnet-efcore -->
33-
<add key="darc-int-dotnet-efcore-5c6be24-1" value="true" />
34-
<add key="darc-int-dotnet-efcore-5c6be24-2" value="true" />
35-
<add key="darc-int-dotnet-efcore-5c6be24" value="true" />
31+
<add key="darc-int-dotnet-efcore-81a09d5-1" value="true" />
32+
<add key="darc-int-dotnet-efcore-81a09d5-2" value="true" />
33+
<add key="darc-int-dotnet-efcore-81a09d5" value="true" />
3634
<!-- End: Package sources from dotnet-efcore -->
3735
<!-- Begin: Package sources from dotnet-runtime -->
38-
<add key="darc-int-dotnet-runtime-8042d61-1" value="true" />
39-
<add key="darc-int-dotnet-runtime-8042d61-2" value="true" />
40-
<add key="darc-int-dotnet-runtime-8042d61" value="true" />
36+
<add key="darc-int-dotnet-runtime-5b20af4" value="true" />
4137
<!-- End: Package sources from dotnet-runtime -->
4238
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4339
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 44 additions & 44 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.5">
12+
<Dependency Name="dotnet-ef" Version="7.0.7">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
14+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.7">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
18+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
22+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.7">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
26+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.7">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
30+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.7">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
34+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.5">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.7">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
38+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.7">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>5c6be2458d7d7d2ec22d1555bf829ed19adacb2a</Sha>
42+
<Sha>81a09d5f0ca45f744ec8a4b8938f38780bb15a4c</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>
@@ -129,9 +129,9 @@
129129
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
130130
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0">
132+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1">
133133
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
134-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
134+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
135135
</Dependency>
136136
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="7.0.0">
137137
<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.5-servicing.23174.5">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.7-servicing.23274.4">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
182+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</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>
@@ -198,9 +198,9 @@
198198
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
199199
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
200200
</Dependency>
201-
<Dependency Name="System.DirectoryServices.Protocols" Version="7.0.0">
201+
<Dependency Name="System.DirectoryServices.Protocols" Version="7.0.1">
202202
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
203-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
203+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
204204
</Dependency>
205205
<Dependency Name="System.IO.Pipelines" Version="7.0.0">
206206
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -214,17 +214,17 @@
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.1">
217+
<Dependency Name="System.Reflection.Metadata" Version="7.0.2">
218218
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
219-
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
219+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</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>
223223
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
224224
</Dependency>
225-
<Dependency Name="System.Security.Cryptography.Pkcs" Version="7.0.1">
225+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="7.0.2">
226226
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
227-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
227+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
228228
</Dependency>
229229
<Dependency Name="System.Security.Cryptography.Xml" Version="7.0.1">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -234,17 +234,17 @@
234234
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
235235
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
236236
</Dependency>
237-
<Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0">
237+
<Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.1">
238238
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
239-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
239+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
240240
</Dependency>
241241
<Dependency Name="System.Text.Encodings.Web" Version="7.0.0">
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.2">
245+
<Dependency Name="System.Text.Json" Version="7.0.3">
246246
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
247-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
247+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
248248
</Dependency>
249249
<Dependency Name="System.Threading.AccessControl" Version="7.0.1">
250250
<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.5">
265+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.7">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
267-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
267+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
268268
</Dependency>
269-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.5">
269+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.7">
270270
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
271-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
271+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
272272
</Dependency>
273-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.5">
273+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.7">
274274
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
275-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
275+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</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.5">
281+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.7">
282282
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
283-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
283+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
284284
</Dependency>
285-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.5">
285+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.7">
286286
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
287-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
287+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
288288
</Dependency>
289-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.5-servicing.23174.5">
289+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.7-servicing.23274.4">
290290
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
291-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
291+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</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.2">
301+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.3">
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
303+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
304304
</Dependency>
305305
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
306306
<Uri>https://github.com/dotnet/arcade</Uri>

0 commit comments

Comments
 (0)