[main] Update dependencies from 10 repositories (dotnet#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).
kotlarmilos · Sep 14, 2023 · 44b90e0 · 44b90e0
1 parent 088f162
commit 44b90e0
Show file tree

Hide file tree

Showing 6 changed files with 242 additions and 239 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23431.1",
+      "version": "8.0.0-prerelease.23456.2",
       "commands": [
         "xharness"
       ]

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/global.json b/global.json
@@ -8,11 +8,11 @@
     "dotnet": "8.0.100-rc.1.23415.11"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23431.2",
-    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23431.2",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1",
+    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23463.1",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23426.3"
+    "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23460.2"
   }
 }
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
@@ -12,6 +12,7 @@
     <SymbolsArchiveName>dotnet-runtime-symbols</SymbolsArchiveName>
     <VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
     <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
+    <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets
@@ -121,9 +121,11 @@
   <Target Name="RemoveOOBPackageReference" AfterTargets="ResolvePackageAssets">
 
     <!-- Tests have some dependencies that use the System.Text.Json package (HostModel, DependencyModel),
-         but the tests should just use the framework on which they are run. Explicitly remove the item. -->
+         but the tests should just use the framework on which they are run if possible Explicitly remove
+         the item if the target framework version for the test matches the referenced package version. -->
     <ItemGroup>
-      <RuntimeCopyLocalItems Remove="@(RuntimeCopyLocalItems)" Condition="'%(NuGetPackageId)' == 'System.Text.Json'" />
+      <RuntimeCopyLocalItems Remove="@(RuntimeCopyLocalItems)"
+                             Condition="'%(NuGetPackageId)' == 'System.Text.Json' and $(SystemTextJsonVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))" />
     </ItemGroup>
   </Target>