Skip to content

Commit 6c99752

Browse files
Merge commit '827b96040e62e5aa47d829bfa61c000d315d4f2e' into internal-merge-6.0-2024-10-08-1029
2 parents 723b0ab + 827b960 commit 6c99752

File tree

4 files changed

+60
-71
lines changed

4 files changed

+60
-71
lines changed

NuGet.config

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +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-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/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-73adbdc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-efcore-73adbdc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3-6/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-efcore-73adbdc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3-5/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-efcore-73adbdc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3-4/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-efcore-73adbdc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3-3/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-efcore-73adbdc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3-2/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-efcore-73adbdc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3-1/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-efcore-2903f6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-2903f6b1/nuget/v3/index.json" />
1711
<!-- End: Package sources from dotnet-efcore -->
1812
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1913
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -31,16 +25,10 @@
3125
<clear />
3226
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3327
<!-- Begin: Package sources from dotnet-efcore -->
34-
<add key="darc-int-dotnet-efcore-73adbdc-1" value="true" />
35-
<add key="darc-int-dotnet-efcore-73adbdc-2" value="true" />
36-
<add key="darc-int-dotnet-efcore-73adbdc-3" value="true" />
37-
<add key="darc-int-dotnet-efcore-73adbdc-4" value="true" />
38-
<add key="darc-int-dotnet-efcore-73adbdc-5" value="true" />
39-
<add key="darc-int-dotnet-efcore-73adbdc-6" value="true" />
40-
<add key="darc-int-dotnet-efcore-73adbdc" value="true" />
28+
<add key="darc-int-dotnet-efcore-2903f6b" value="true" />
4129
<!-- End: Package sources from dotnet-efcore -->
4230
<!-- Begin: Package sources from dotnet-runtime -->
43-
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
31+
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
4432
<!-- End: Package sources from dotnet-runtime -->
4533
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4634
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,45 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.33">
12+
<Dependency Name="dotnet-ef" Version="6.0.35">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
14+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.33">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.35">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
18+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.33">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.35">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
22+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.33">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.35">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
26+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.33">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.35">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
30+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.33">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.35">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
34+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.33">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.35">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
38+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.33">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.35">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
42+
<Sha>2903f6b1b808dc685547bfa6146abd90ca5bd8ac</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
4646
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.1">
48+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.2">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
50+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0">
5353
<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.33-servicing.24366.10">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.35-servicing.24459.18">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
182+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -233,45 +233,45 @@
233233
<Uri>https://github.com/dotnet/runtime</Uri>
234234
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
235235
</Dependency>
236-
<Dependency Name="System.Text.Json" Version="6.0.9">
236+
<Dependency Name="System.Text.Json" Version="6.0.10">
237237
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
238-
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
238+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
239239
</Dependency>
240240
<Dependency Name="System.Threading.Channels" Version="6.0.0">
241241
<Uri>https://github.com/dotnet/runtime</Uri>
242242
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
243243
</Dependency>
244-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0">
245-
<Uri>https://github.com/dotnet/runtime</Uri>
246-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
244+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.1">
245+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
246+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.33">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.35">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
250+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.33">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.35">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
254+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.33">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.35">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
258+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</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.33">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.35">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
266+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.33">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.35">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
270+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.33-servicing.24366.10">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.35-servicing.24459.18">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
274+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

eng/Versions.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
65-
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>6.0.33</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.33</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.33</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.33</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.33</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.33-servicing.24366.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
65+
<MicrosoftExtensionsDependencyModelVersion>6.0.1</MicrosoftExtensionsDependencyModelVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.35</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.35</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.35</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.35</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.35</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
73-
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
73+
<MicrosoftExtensionsCachingMemoryVersion>6.0.2</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
7575
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0</MicrosoftExtensionsConfigurationBinderVersion>
7676
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
@@ -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.33-servicing.24366.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.35-servicing.24459.18</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -117,19 +117,19 @@
117117
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
118118
<SystemServiceProcessServiceControllerVersion>6.0.1</SystemServiceProcessServiceControllerVersion>
119119
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
120-
<SystemTextJsonVersion>6.0.9</SystemTextJsonVersion>
120+
<SystemTextJsonVersion>6.0.10</SystemTextJsonVersion>
121121
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.33</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.33</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.33</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.33</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.33</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.33</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.33</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.33</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.35</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.35</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.35</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.35</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.35</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.35</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.35</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.35</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksTemplatingVersion>

src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
<ItemGroup>
2323
<Reference Include="Newtonsoft.Json" />
24+
<Reference Include="System.Text.Json" />
2425
<Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
2526
</ItemGroup>
2627

0 commit comments

Comments
 (0)