dotnet · steveisok · Jun 22, 2023 · Jun 13, 2023 · Jun 14, 2023 · Jun 14, 2023
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.23312.1",
+      "version": "8.0.0-prerelease.23321.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/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
@@ -54,6 +54,10 @@ cpuname=$(uname -m)
 case $cpuname in
   arm64|aarch64)
     buildarch=arm64
+    if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+        # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+        buildarch=arm
+    fi
     ;;
   loongarch64)
     buildarch=loongarch64

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -379,7 +379,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   }
 
   # Minimum VS version to require.
-  $vsMinVersionReqdStr = '16.8'
+  $vsMinVersionReqdStr = '17.6'
   $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
 
   # If the version of msbuild is going to be xcopied,

diff --git a/global.json b/global.json
@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.4.23260.5",
+    "version": "8.0.100-preview.5.23303.2",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "8.0.100-preview.4.23260.5"
+    "dotnet": "8.0.100-preview.5.23303.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23309.8",
-    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23309.8",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23320.3",
+    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23320.3",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.NET.Sdk.IL": "8.0.0-preview.6.23309.7"
+    "Microsoft.NET.Sdk.IL": "8.0.0-preview.6.23319.2"
   }
 }
diff --git a/...taller/tests/Assets/TestProjects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj b/...taller/tests/Assets/TestProjects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/TestProjects/AppWithSubDirs/AppWithSubDirs.csproj b/src/installer/tests/Assets/TestProjects/AppWithSubDirs/AppWithSubDirs.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <Target Name="CopyFiles" AfterTargets="Publish">

diff --git a/src/installer/tests/Assets/TestProjects/AppWithWait/AppWithWait.csproj b/src/installer/tests/Assets/TestProjects/AppWithWait/AppWithWait.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/TestProjects/BundleProbeTester/BundleProbeTester.csproj b/src/installer/tests/Assets/TestProjects/BundleProbeTester/BundleProbeTester.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/installer/tests/Assets/TestProjects/HammerServiceApp/HammerServiceApp.csproj b/src/installer/tests/Assets/TestProjects/HammerServiceApp/HammerServiceApp.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
 <ItemGroup>

diff --git a/src/installer/tests/Assets/TestProjects/LocalizedApp/LocalizedApp.csproj b/src/installer/tests/Assets/TestProjects/LocalizedApp/LocalizedApp.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/installer/tests/Assets/TestProjects/ManagedHost/ManagedHost.csproj b/src/installer/tests/Assets/TestProjects/ManagedHost/ManagedHost.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
 
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest Condition="'$(RegFreeCom)' == 'true'">App.manifest</ApplicationManifest>

diff --git a/src/installer/tests/Assets/TestProjects/SingleFileApiTests/SingleFileApiTests.csproj b/src/installer/tests/Assets/TestProjects/SingleFileApiTests/SingleFileApiTests.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj
@@ -6,6 +6,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj
@@ -6,6 +6,7 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp3x/StandaloneApp3x.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp3x/StandaloneApp3x.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <!--

diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp6x/StandaloneApp6x.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp6x/StandaloneApp6x.csproj
@@ -4,5 +4,6 @@
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 </Project>
diff --git a/src/installer/tests/Assets/TestProjects/TestWindowsOsShimsApp/TestWindowsOsShimsApp.csproj b/src/installer/tests/Assets/TestProjects/TestWindowsOsShimsApp/TestWindowsOsShimsApp.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
     <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS;$(DefineConstants)</DefineConstants>

diff --git a/src/installer/tests/HostActivation.Tests/HostVersionCompatibility.cs b/src/installer/tests/HostActivation.Tests/HostVersionCompatibility.cs
@@ -153,7 +153,7 @@ public SharedTestState()
                 var fixtureLatest = new TestProjectFixture("StandaloneApp", RepoDirectories);
                 fixtureLatest
                     .EnsureRestoredForRid(fixtureLatest.CurrentRid)
-                    .PublishProject(runtime: fixtureLatest.CurrentRid);
+                    .PublishProject(runtime: fixtureLatest.CurrentRid, selfContained: true);
 
                 FixtureLatest = fixtureLatest;
             }
@@ -176,7 +176,7 @@ private static TestProjectFixture CreateTestFixture(string testName, string netC
                 {
                     publishFixture
                         .EnsureRestoredForRid(publishFixture.CurrentRid)
-                        .PublishProject(runtime: publishFixture.CurrentRid);
+                        .PublishProject(runtime: publishFixture.CurrentRid, selfContained: true);
                 }
 
                 return publishFixture;

diff --git a/src/installer/tests/HostActivation.Tests/StandaloneAppActivation.cs b/src/installer/tests/HostActivation.Tests/StandaloneAppActivation.cs
@@ -321,7 +321,7 @@ public SharedTestState()
                 var publishFixture = new TestProjectFixture("StandaloneApp", RepoDirectories);
                 publishFixture
                     .EnsureRestoredForRid(publishFixture.CurrentRid)
-                    .PublishProject(runtime: publishFixture.CurrentRid);
+                    .PublishProject(runtime: publishFixture.CurrentRid, selfContained: true);
 
                 ReplaceTestProjectOutputHostInTestProjectFixture(buildFixture);
 

diff --git a/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundleTestBase.cs b/src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundleTestBase.cs
@@ -77,6 +77,7 @@ public TestProjectFixture PreparePublishedSelfContainedTestProject(string projec
                 testFixture
                     .EnsureRestoredForRid(testFixture.CurrentRid)
                     .PublishProject(runtime: testFixture.CurrentRid,
+                                    selfContained: true,
                                     outputDirectory: BundleHelper.GetPublishPath(testFixture),
                                     extraArgs: extraArgs);
 

diff --git a/...staller/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundledAppWithSubDirs.cs b/...staller/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/BundledAppWithSubDirs.cs
@@ -244,6 +244,7 @@ public SharedTestState()
                 TestSelfContainedFixture
                     .EnsureRestoredForRid(TestSelfContainedFixture.CurrentRid)
                     .PublishProject(runtime: TestSelfContainedFixture.CurrentRid,
+                                    selfContained: true,
                                     outputDirectory: BundleHelper.GetPublishPath(TestSelfContainedFixture));
 
                 TestAppWithEmptyFileFixture = new TestProjectFixture("AppWithSubDirs", RepoDirectories);
@@ -252,6 +253,7 @@ public SharedTestState()
                 TestAppWithEmptyFileFixture
                     .EnsureRestoredForRid(TestAppWithEmptyFileFixture.CurrentRid)
                     .PublishProject(runtime: TestAppWithEmptyFileFixture.CurrentRid,
+                                    selfContained: true,
                                     outputDirectory: BundleHelper.GetPublishPath(TestAppWithEmptyFileFixture));
 
                 TestSelfContainedFixtureComposite = new TestProjectFixture("AppWithSubDirs", RepoDirectories);
@@ -261,6 +263,7 @@ public SharedTestState()
                     .PublishProject(runtime: TestSelfContainedFixtureComposite.CurrentRid,
                                     // ACTIVE ISSUE: https://github.com/dotnet/runtime/issues/54234
                                     //               uncomment extraArgs when fixed.
+                                    selfContained: true,
                                     outputDirectory: BundleHelper.GetPublishPath(TestSelfContainedFixtureComposite) /*,
                                     extraArgs: new string[] {
                                        "/p:PublishReadyToRun=true",

diff --git a/...NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUsedWithSymbolicLinks.cs b/...NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUsedWithSymbolicLinks.cs
@@ -235,12 +235,12 @@ public SharedTestState()
                 var localizedFixture = new TestProjectFixture("LocalizedApp", RepoDirectories);
                 localizedFixture
                     .EnsureRestoredForRid(localizedFixture.CurrentRid)
-                    .PublishProject(runtime: localizedFixture.CurrentRid);
+                    .PublishProject(runtime: localizedFixture.CurrentRid, selfContained: true);
 
                 var publishFixture = new TestProjectFixture("StandaloneApp", RepoDirectories);
                 publishFixture
                     .EnsureRestoredForRid(publishFixture.CurrentRid)
-                    .PublishProject(runtime: publishFixture.CurrentRid);
+                    .PublishProject(runtime: publishFixture.CurrentRid, selfContained: true);
 
                 var fwPublishedFixture = new TestProjectFixture("PortableApp", RepoDirectories);
                 fwPublishedFixture

diff --git a/.../tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundleAndRun.cs b/.../tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundleAndRun.cs
@@ -135,6 +135,7 @@ public SharedTestState()
                 TestFixture
                     .EnsureRestoredForRid(TestFixture.CurrentRid)
                     .PublishProject(runtime: TestFixture.CurrentRid,
+                                    selfContained: true,
                                     outputDirectory: BundleHelper.GetPublishPath(TestFixture));
             }
 

diff --git a/.../tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundleLegacy.cs b/.../tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundleLegacy.cs
@@ -44,7 +44,7 @@ private static TestProjectFixture CreatePublishedFixture(string netCoreAppFramew
             var repoDirectories = new RepoDirectoriesProvider(microsoftNETCoreAppVersion: mnaVersion);
             var fixture = new TestProjectFixture("StandaloneApp3x", repoDirectories, framework: netCoreAppFramework, assemblyName: "StandaloneApp");
 
-            fixture.PublishProject(runtime: fixture.CurrentRid, outputDirectory: BundleHelper.GetPublishPath(fixture), restore: true);
+            fixture.PublishProject(runtime: fixture.CurrentRid, selfContained: true, outputDirectory: BundleHelper.GetPublishPath(fixture), restore: true);
 
             return fixture;
         }

diff --git a/...osoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundlerConsistencyTests.cs b/...osoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundlerConsistencyTests.cs
@@ -374,6 +374,7 @@ public SharedTestState()
                 TestFixture
                     .EnsureRestoredForRid(TestFixture.CurrentRid)
                     .PublishProject(runtime: TestFixture.CurrentRid,
+                                    selfContained: true,
                                     outputDirectory: BundleHelper.GetPublishPath(TestFixture));
             }
 

diff --git a/src/installer/tests/TestUtils/TestProjectFixture.cs b/src/installer/tests/TestUtils/TestProjectFixture.cs
@@ -285,6 +285,13 @@ public TestProjectFixture PublishProject(
             {
                 publishArgs.Add("--runtime");
                 publishArgs.Add(runtime);
+
+                if (selfContained == null)
+                {
+                    // This is to prevent bugs caused by SDK defaulting self-contained differently for various configurations.
+                    // We still want to allow selfContained to remain unspecified for simple cases, for example for building libraries.
+                    throw new ArgumentException("If runtime is specified, then the caller also has to specify selfContained value.");
+                }
             }
 
             if (framework != null)

diff --git a/...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
@@ -4,16 +4,6 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-freebsd;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-solaris;$(NetCoreAppCurrent)-linux;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetFrameworkCurrent)</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup>
-    <!--
-      We're testing the BinaryFormatter enablement / disablement switch, so we need to suppress any inherited behavior.
-      The specific combination below accomplishes this. Normal apps should *NOT* set this combination of switches and
-      should instead set the switches documented at:
-      https://learn.microsoft.com/dotnet/core/compatibility/core-libraries/7.0/binaryformatter-apis-produce-errors#recommended-action
-    -->
-    <_ProjectTypeRequiresBinaryFormatter>true</_ProjectTypeRequiresBinaryFormatter>
-    <EnableUnsafeBinaryFormatterSerialization><!-- intentionally left blank --></EnableUnsafeBinaryFormatterSerialization>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinaryFormatterTestData.cs" />
     <Compile Include="BinaryFormatterTests.cs" />
@@ -72,4 +62,16 @@
     <Reference Include="System.Transactions" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
+
+  <!--
+      We're testing the BinaryFormatter enablement / disablement switch, so we need to suppress any inherited behavior.
+      See https://github.com/dotnet/runtime/issues/87811 for more details.
+      This is a temporary solution and should be reverted back to the original once the necessary changes are made in
+      shared frameworks and SDK.
+    -->
+  <Target Name="RemoveSerializationRuntimeOption" BeforeTargets="GenerateBuildRuntimeConfigurationFiles">
+    <ItemGroup>
+      <RuntimeHostConfigurationOption Remove="System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization" />
+    </ItemGroup>
+  </Target>
 </Project>
@@ -3,6 +3,7 @@
 
   <Import Project="$(MSBuildThisFileDirectory)WasmApp.props" />
   <PropertyGroup>
+    <SelfContained>true</SelfContained>
     <Platform>AnyCPU</Platform>
     <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>

@@ -24,6 +24,7 @@
   <PropertyGroup>
     <_TargetFrameworkForNETCoreTasks>net8.0</_TargetFrameworkForNETCoreTasks>
     <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeSrcDir)' != '' and '$(WasmBuildSupportDir)' == ''">

@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+     <LibrariesConfiguration>$(RuntimeConfiguration)</LibrariesConfiguration>
+  </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\build\WasmApp.InTree.props" />
   <PropertyGroup>

diff --git a/src/tests/JIT/jit64/jit64_3.csproj b/src/tests/JIT/jit64/jit64_3.csproj
@@ -1,7 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <MergedWrapperProjectReference Include="opt/**/*.??proj" />
+    <!-- Issue: https://github.com/dotnet/runtime/issues/87879 -->
+    <ProjectsToSkip Include="opt/rngchk/RngchkStress2_o.csproj" />
+    <ProjectsToSkip Include="opt/cse/hugeSimpleExpr1.csproj" />
+
+    <MergedWrapperProjectReference Include="opt/**/*.??proj" Exclude="@(ProjectsToSkip)" />
   </ItemGroup>
 
   <Import Project="$(TestSourceDir)MergedTestRunner.targets" />
-</Project>
+</Project>