Skip to content

Commit e18aefd

Browse files
dotnet-botdotnet-bot
committed
[internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-efcore
 - explicitly reference system.text.json to avoid pre-build - Revert "Add source build metadata to System.Text.Json" - Add source build metadata to System.Text.Json
1 parent 48e1ed9 commit e18aefd

File tree

4 files changed

+45
-42
lines changed

4 files changed

+45
-42
lines changed

‎NuGet.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<!-- Begin: Package sources from dotnet-extensions -->
77
<!-- End: Package sources from dotnet-extensions -->
88
<!-- Begin: Package sources from dotnet-efcore -->
9-
<add key="darc-int-dotnet-efcore-a7a3adc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a7a3adcc/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-efcore-04c2fa5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-04c2fa5b/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-72e5ae9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-72e5ae97/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-d682195" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d6821954/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-runtime -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -30,10 +30,10 @@
3030
<clear />
3131
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3232
<!-- Begin: Package sources from dotnet-efcore -->
33-
<add key="darc-int-dotnet-efcore-a7a3adc" value="true" />
33+
<add key="darc-int-dotnet-efcore-04c2fa5" value="true" />
3434
<!-- End: Package sources from dotnet-efcore -->
3535
<!-- Begin: Package sources from dotnet-runtime -->
36-
<add key="darc-int-dotnet-runtime-72e5ae9" value="true" />
36+
<add key="darc-int-dotnet-runtime-d682195" value="true" />
3737
<!-- End: Package sources from dotnet-runtime -->
3838
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3939
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@
1111
<ProductDependencies>
1212
<Dependency Name="dotnet-ef" Version="8.0.1">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
14+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
18+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
22+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
26+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
2727
</Dependency>
2828
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
30+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
34+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.EntityFrameworkCore" Version="8.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
38+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>a7a3adcc7922f093b9104f6153128df8fd1715ee</Sha>
42+
<Sha>04c2fa5bc221b49971c57706c37957465be552df</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -55,7 +55,7 @@
5555
</Dependency>
5656
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.1">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
58+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
5959
</Dependency>
6060
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -121,9 +121,9 @@
121121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
122122
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.0-rtm.23531.3">
124+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.1-servicing.23572.22">
125125
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
126-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
126+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
127127
</Dependency>
128128
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0">
129129
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -177,17 +177,17 @@
177177
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
178178
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Extensions.Options" Version="8.0.1">
180+
<Dependency Name="Microsoft.Extensions.Options" Version="8.0.2">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
182+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
183183
</Dependency>
184184
<Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
186186
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
187187
</Dependency>
188-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="8.0.1-servicing.23572.10">
188+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="8.0.1-servicing.23572.22">
189189
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
190-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
190+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
191191
</Dependency>
192192
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23570.1">
193193
<Uri>https://github.com/dotnet/source-build-externals</Uri>
@@ -255,9 +255,9 @@
255255
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
256256
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
257257
</Dependency>
258-
<Dependency Name="System.Text.Json" Version="8.0.0">
258+
<Dependency Name="System.Text.Json" Version="8.0.1">
259259
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
260-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
260+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
261261
</Dependency>
262262
<Dependency Name="System.Threading.AccessControl" Version="8.0.0">
263263
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -277,24 +277,24 @@
277277
</Dependency>
278278
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.1">
279279
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
280-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
280+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
281281
</Dependency>
282282
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="8.0.1">
283283
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
284-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
284+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
285285
</Dependency>
286286
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="8.0.1">
287287
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
288-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
288+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
289289
</Dependency>
290290
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0">
291291
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
292292
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
293293
</Dependency>
294294
<!-- Transitive package to provide coherency in dotnet/extensions -->
295-
<Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0">
295+
<Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.1">
296296
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
297-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
297+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
298298
</Dependency>
299299
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
300300
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -318,20 +318,20 @@
318318
-->
319319
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.1">
320320
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
321-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
321+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="8.0.1-servicing.23572.10">
323+
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="8.0.1-servicing.23572.22">
324324
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
325-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
325+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
326326
<SourceBuild RepoName="runtime" ManagedOnly="false" />
327327
</Dependency>
328328
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="8.0.1">
329329
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
330-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
330+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.1-servicing.23572.10">
332+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.1-servicing.23572.22">
333333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
334-
<Sha>72e5ae975785990e904372573c93dd661279f662</Sha>
334+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
335335
</Dependency>
336336
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
337337
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -368,9 +368,9 @@
368368
</ProductDependencies>
369369
<ToolsetDependencies>
370370
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
371-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rtm.23531.3">
371+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.1-servicing.23572.22">
372372
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
373-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
373+
<Sha>d682195447d43c6840bf1e360a2e60a0afa60c41</Sha>
374374
</Dependency>
375375
<Dependency Name="System.Drawing.Common" Version="8.0.0-rtm.23520.14">
376376
<Uri>https://github.com/dotnet/winforms</Uri>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
7272
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
7373
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.1-servicing.23572.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
74+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.1-servicing.23572.22</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7575
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7676
<MicrosoftExtensionsCachingMemoryVersion>8.0.0</MicrosoftExtensionsCachingMemoryVersion>
7777
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -92,7 +92,7 @@
9292
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0</MicrosoftExtensionsFileProvidersCompositeVersion>
9393
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0</MicrosoftExtensionsFileProvidersPhysicalVersion>
9494
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
95-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-rtm.23531.3</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
95+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.1-servicing.23572.22</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
9696
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
9797
<MicrosoftExtensionsHostingVersion>8.0.0</MicrosoftExtensionsHostingVersion>
9898
<MicrosoftExtensionsHttpVersion>8.0.0</MicrosoftExtensionsHttpVersion>
@@ -106,9 +106,9 @@
106106
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0</MicrosoftExtensionsLoggingTraceSourceVersion>
107107
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
108108
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
109-
<MicrosoftExtensionsOptionsVersion>8.0.1</MicrosoftExtensionsOptionsVersion>
109+
<MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
110110
<MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
111-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.1-servicing.23572.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
111+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.1-servicing.23572.22</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
112112
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
113113
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
114114
<SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
@@ -124,16 +124,16 @@
124124
<SystemSecurityPermissionsVersion>8.0.0</SystemSecurityPermissionsVersion>
125125
<SystemServiceProcessServiceControllerVersion>8.0.0</SystemServiceProcessServiceControllerVersion>
126126
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
127-
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
127+
<SystemTextJsonVersion>8.0.1</SystemTextJsonVersion>
128128
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
129129
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
130130
<SystemThreadingRateLimitingVersion>8.0.0</SystemThreadingRateLimitingVersion>
131-
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>8.0.1-servicing.23572.10</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
131+
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>8.0.1-servicing.23572.22</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
132132
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
133-
<MicrosoftNETCorePlatformsVersion>8.0.0-rtm.23531.3</MicrosoftNETCorePlatformsVersion>
133+
<MicrosoftNETCorePlatformsVersion>8.0.1-servicing.23572.22</MicrosoftNETCorePlatformsVersion>
134134
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
135135
<!-- Transitive package to provide coherency in dotnet/extensions -->
136-
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
136+
<MicrosoftBclTimeProviderVersion>8.0.1</MicrosoftBclTimeProviderVersion>
137137
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
138138
<SystemDiagnosticsPerformanceCounterVersion>8.0.0</SystemDiagnosticsPerformanceCounterVersion>
139139
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
from the dependency on NuGet.Packaging which would cause a source-built prebuilt. -->
2020
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
2121
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
22+
<!-- Explicitly reference the desired version of System.Text.Json to avoid getting an older version
23+
from the dependency on Microsoft.Extensions.DependencyModel which would cause a source-built prebuilt. -->
24+
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2225
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
2326
</ItemGroup>
2427

0 commit comments

Comments
 (0)