Update SDK to 6.0 Preview 5

eng/testing/linker/trimmingTests.targets

@@ -42,6 +42,7 @@
       <TestConsoleApps Include="@(TestConsoleAppSourceFiles->'%(ProjectFile)')" Condition="!$([System.String]::Copy('%(TestConsoleAppSourceFiles.SkipOnTestRuntimes)').Contains('$(PackageRID)'))">
         <ProjectCompileItems>%(Identity)</ProjectCompileItems>
       </TestConsoleApps>
+      <TestConsoleApps AdditionalProperties="MSBuildEnableWorkloadResolver=$(MSBuildEnableWorkloadResolver)" Condition="'$(MSBuildEnableWorkloadResolver)' != ''" />
     </ItemGroup>
   </Target>
 

global.json

@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.4.21255.9",
+    "version": "6.0.100-preview.5.21302.13",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.4.21255.9"
+    "dotnet": "6.0.100-preview.5.21302.13"
   },
   "native-tools": {
     "cmake": "3.16.4",

src/installer/tests/Assets/TestProjects/LightupClient/LightupClient.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
   </PropertyGroup>
 
 </Project>

src/installer/tests/HostActivation.Tests/PortableAppActivation.cs

@@ -162,7 +162,15 @@ public void Muxer_Exec_activation_of_Build_Output_Portable_DLL_with_DepsJson_Rem
             var fixture = sharedTestState.PortableAppFixture_Built
                 .Copy();
 
+            // Move the .deps.json to a subdirectory, note that in this case we have to move all of the app's dependencies
+            // along with it - in this case Newtonsoft.Json.dll
+            // For framework dependent apps (dotnet build produces those) the probing directories are:
+            // - The directory where the .deps.json is
+            // - Any framework directory
             var depsJson = MoveDepsJsonToSubdirectory(fixture);
+            File.Move(
+                Path.Combine(Path.GetDirectoryName(fixture.TestProject.AppDll), "Newtonsoft.Json.dll"),
+                Path.Combine(Path.GetDirectoryName(depsJson), "Newtonsoft.Json.dll"));
 
             var dotnet = fixture.BuiltDotnet;
             var appDll = fixture.TestProject.AppDll;

src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs

@@ -400,7 +400,7 @@ static CoreFxFileStatusProvider()
                     try
                     {
                         s_fileSystem_fileStatusField = typeof(FileSystemInfo).GetField("_fileStatus", BindingFlags.NonPublic | BindingFlags.Instance);
-                        s_fileStatus_fileStatusField = s_fileSystem_fileStatusField.FieldType.GetField("_fileStatus", BindingFlags.NonPublic | BindingFlags.Instance);
+                        s_fileStatus_fileStatusField = s_fileSystem_fileStatusField.FieldType.GetField("_fileCache", BindingFlags.NonPublic | BindingFlags.Instance);
                         s_fileStatusModeField = s_fileStatus_fileStatusField.FieldType.GetField("Mode", BindingFlags.NonPublic | BindingFlags.Instance);
                     }
                     catch (Exception ex)

src/mono/wasm/build/WasmApp.LocalBuild.props

@@ -23,6 +23,7 @@
 
   <PropertyGroup>
     <_NetCoreAppToolCurrent>net6.0</_NetCoreAppToolCurrent>
+    <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeSrcDir)' != '' and '$(WasmBuildSupportDir)' == ''">

src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs

@@ -95,6 +95,9 @@ public BuildEnvironment()
                     DefaultBuildArgs = $" /p:RuntimeSrcDir={solutionRoot.FullName} /p:RuntimeConfig={s_runtimeConfig} /p:EMSDK_PATH={emsdkPath} ";
                 }
 
+                // for EMSDK runs, we don't want to get the dependencies from workloads
+                DefaultBuildArgs += " /p:MSBuildEnableWorkloadResolver=false";
+
                 IsWorkload = false;
                 DotNet = "dotnet";
                 EnvVars = new Dictionary<string, string>()

src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props

@@ -1,5 +1,8 @@
 <Project>
   <PropertyGroup>
+    <!-- disable workloads for this emsdk build -->
+    <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
+
     <_WasmTargetsDir Condition="'$(RuntimeSrcDir)' != ''">$(RuntimeSrcDir)\src\mono\wasm\build\</_WasmTargetsDir>
     <_WasmTargetsDir Condition="'$(WasmBuildSupportDir)' != ''">$(WasmBuildSupportDir)\wasm\</_WasmTargetsDir>
     <EMSDK_PATH Condition="'$(WasmBuildSupportDir)' != ''">$(WasmBuildSupportDir)\emsdk\</EMSDK_PATH>

src/tests/Common/CLRTest.Execute.Bash.targets

@@ -275,7 +275,7 @@ else
   __Command+=" dotnet"
 fi
 
-$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` || exit $?
+$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` $(CLRTestMSBuildArgs) || exit $?
 
    ]]>
       </BashCLRTestPreCommands>

src/tests/Directory.Build.props

@@ -149,4 +149,8 @@
          as we do with many of the package versions above -->
     <BaselineMicrosoftNetCoreAppPackageVersion>2.1.0-preview3-26416-01</BaselineMicrosoftNetCoreAppPackageVersion>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
+    <CLRTestMSBuildArgs>/p:MSBuildEnableWorkloadResolver=false</CLRTestMSBuildArgs>
+  </PropertyGroup>
 </Project>