Skip to content

Commit 44b90e0

Browse files
[main] Update dependencies from 10 repositories (#91498)
[main] Update dependencies from 10 repositories - Coherency Updates: - runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 16.0.5-alpha.1.23423.2 to 16.0.5-alpha.1.23452.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) - Make installer tests use System.Text.Json from framework only if version matches target framework version - Fix missing RID graph from the core frameworks deps.json After the breaking change in SDK https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/rid-graph we still need the RID graph in the core framework (so that if some app opts into the old behavior, it can find it there).
1 parent 088f162 commit 44b90e0

File tree

6 files changed

+242
-239
lines changed

6 files changed

+242
-239
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.23431.1",
18+
"version": "8.0.0-prerelease.23456.2",
1919
"commands": [
2020
"xharness"
2121
]

eng/Version.Details.xml

Lines changed: 158 additions & 158 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 74 additions & 74 deletions
Large diffs are not rendered by default.

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"dotnet": "8.0.100-rc.1.23415.11"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23431.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23431.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23463.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
16-
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23426.3"
16+
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23460.2"
1717
}
1818
}

src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<SymbolsArchiveName>dotnet-runtime-symbols</SymbolsArchiveName>
1313
<VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
1414
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
15+
<UseRidGraph>true</UseRidGraph>
1516
</PropertyGroup>
1617

1718
<PropertyGroup>

src/installer/tests/Directory.Build.targets

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,11 @@
121121
<Target Name="RemoveOOBPackageReference" AfterTargets="ResolvePackageAssets">
122122

123123
<!-- Tests have some dependencies that use the System.Text.Json package (HostModel, DependencyModel),
124-
but the tests should just use the framework on which they are run. Explicitly remove the item. -->
124+
but the tests should just use the framework on which they are run if possible Explicitly remove
125+
the item if the target framework version for the test matches the referenced package version. -->
125126
<ItemGroup>
126-
<RuntimeCopyLocalItems Remove="@(RuntimeCopyLocalItems)" Condition="'%(NuGetPackageId)' == 'System.Text.Json'" />
127+
<RuntimeCopyLocalItems Remove="@(RuntimeCopyLocalItems)"
128+
Condition="'%(NuGetPackageId)' == 'System.Text.Json' and $(SystemTextJsonVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))" />
127129
</ItemGroup>
128130
</Target>
129131

0 commit comments

Comments
 (0)