Revert "[automated] Merge branch 'release/9.0' => 'release/9.0-staging' (dotnet#116514)"

jozkee · jozkee · commit 2536cdc617c1 · 2025-06-17T14:39:39.000-05:00
This reverts commit c9dfa92.
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -75,6 +75,14 @@ jobs:
         # Limiting interp runs as we don't need as much coverage.
         - (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64
 
+    # Linux s390x
+    - ${{ if eq(parameters.platform, 'linux_s390x') }}:
+        - Ubuntu.2004.S390X.Experimental.Open
+
+    # Linux PPC64le
+    - ${{ if eq(parameters.platform, 'linux_ppc64le') }}:
+        - Ubuntu.2204.PPC64le.Experimental.Open
+
     # OSX arm64
     - ${{ if eq(parameters.platform, 'osx_arm64') }}:
       - OSX.1200.ARM64.Open
diff --git a/eng/pipelines/runtime-community.yml b/eng/pipelines/runtime-community.yml
@@ -71,6 +71,17 @@ extends:
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
                 eq(variables['isRollingBuild'], true))
+            # extra steps, run tests
+            postBuildSteps:
+              - template: /eng/pipelines/libraries/helix.yml
+                parameters:
+                  creator: dotnet-bot
+                  testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+                  condition: >-
+                    or(
+                    eq(variables['librariesContainsChange'], true),
+                    eq(variables['monoContainsChange'], true),
+                    eq(variables['isRollingBuild'], true))
 
       #
       # Build the whole product using Mono
diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/Comhost.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/Comhost.cs
@@ -111,35 +111,6 @@ public void ActivateClass_IgnoreAppLocalHostFxr()
             }
         }
 
-        [Fact]
-        public void ActivateClass_IgnoreWorkingDirectory()
-        {
-            using (TestArtifact cwd = TestArtifact.Create("cwd"))
-            {
-                // Validate that hosting components in the working directory will not be used
-                File.Copy(Binaries.CoreClr.MockPath, Path.Combine(cwd.Location, Binaries.CoreClr.FileName));
-                File.Copy(Binaries.HostFxr.MockPath_5_0, Path.Combine(cwd.Location, Binaries.HostFxr.FileName));
-                File.Copy(Binaries.HostPolicy.MockPath, Path.Combine(cwd.Location, Binaries.HostPolicy.FileName));
-
-                string[] args = {
-                    "comhost",
-                    "synchronous",
-                    "1",
-                    sharedState.ComHostPath,
-                    sharedState.ClsidString
-                };
-                sharedState.CreateNativeHostCommand(args, TestContext.BuiltDotNet.BinPath)
-                    .WorkingDirectory(cwd.Location)
-                    .Execute()
-                    .Should().Pass()
-                    .And.HaveStdOutContaining("New instance of Server created")
-                    .And.HaveStdOutContaining($"Activation of {sharedState.ClsidString} succeeded.")
-                    .And.ResolveHostFxr(TestContext.BuiltDotNet)
-                    .And.ResolveHostPolicy(TestContext.BuiltDotNet)
-                    .And.ResolveCoreClr(TestContext.BuiltDotNet);
-            }
-        }
-
         [Fact]
         public void ActivateClass_ValidateIErrorInfoResult()
         {
diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/FunctionPointerResultExtensions.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/FunctionPointerResultExtensions.cs
@@ -2,11 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.IO;
 
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeHosting
 {
-    internal static class NativeHostingResultExtensions
+    internal static class FunctionPointerResultExtensions
     {
         public static FluentAssertions.AndConstraint<CommandResultAssertions> ExecuteFunctionPointer(this CommandResultAssertions assertion, string methodName, int callCount, int returnValue)
         {
@@ -48,21 +47,5 @@ public static FluentAssertions.AndConstraint<CommandResultAssertions> ExecuteWit
         {
             return assertion.HaveStdOutContaining($"{assemblyName}: Location = '{location}'");
         }
-
-        public static FluentAssertions.AndConstraint<CommandResultAssertions> ResolveHostFxr(this CommandResultAssertions assertion, Microsoft.DotNet.Cli.Build.DotNetCli dotnet)
-        {
-            return assertion.HaveStdErrContaining($"Resolved fxr [{dotnet.GreatestVersionHostFxrFilePath}]");
-        }
-
-        public static FluentAssertions.AndConstraint<CommandResultAssertions> ResolveHostPolicy(this CommandResultAssertions assertion, Microsoft.DotNet.Cli.Build.DotNetCli dotnet)
-        {
-            return assertion.HaveStdErrContaining($"{Binaries.HostPolicy.FileName} directory is [{dotnet.GreatestVersionSharedFxPath}]");
-        }
-
-        public static FluentAssertions.AndConstraint<CommandResultAssertions> ResolveCoreClr(this CommandResultAssertions assertion, Microsoft.DotNet.Cli.Build.DotNetCli dotnet)
-        {
-            return assertion.HaveStdErrContaining($"CoreCLR path = '{Path.Combine(dotnet.GreatestVersionSharedFxPath, Binaries.CoreClr.FileName)}'")
-                .And.HaveStdErrContaining($"CoreCLR dir = '{dotnet.GreatestVersionSharedFxPath}{Path.DirectorySeparatorChar}'");
-        }
     }
 }
diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs
@@ -89,32 +89,6 @@ public void LoadLibrary_ContextConfig(bool load_isolated)
             }
         }
 
-        [Fact]
-        public void LoadLibrary_IgnoreWorkingDirectory()
-        {
-            using (TestArtifact cwd = TestArtifact.Create("cwd"))
-            {
-                // Validate that hosting components in the working directory will not be used
-                File.Copy(Binaries.CoreClr.MockPath, Path.Combine(cwd.Location, Binaries.CoreClr.FileName));
-                File.Copy(Binaries.HostFxr.MockPath_5_0, Path.Combine(cwd.Location, Binaries.HostFxr.FileName));
-                File.Copy(Binaries.HostPolicy.MockPath, Path.Combine(cwd.Location, Binaries.HostPolicy.FileName));
-
-                string [] args = {
-                    "ijwhost",
-                    sharedState.IjwApp.AppDll,
-                    "NativeEntryPoint"
-                };
-                sharedState.CreateNativeHostCommand(args, TestContext.BuiltDotNet.BinPath)
-                    .WorkingDirectory(cwd.Location)
-                    .Execute()
-                    .Should().Pass()
-                    .And.HaveStdOutContaining("[C++/CLI] NativeEntryPoint: calling managed class")
-                    .And.HaveStdOutContaining("[C++/CLI] ManagedClass: AssemblyLoadContext = \"Default\" System.Runtime.Loader.DefaultAssemblyLoadContext")
-                    .And.ResolveHostFxr(TestContext.BuiltDotNet)
-                    .And.ResolveHostPolicy(TestContext.BuiltDotNet)
-                    .And.ResolveCoreClr(TestContext.BuiltDotNet);
-            }
-        }
 
         [Fact]
         public void LoadLibraryWithoutRuntimeConfigButActiveRuntime()
diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/LoadAssemblyAndGetFunctionPointer.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/LoadAssemblyAndGetFunctionPointer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 
 using Microsoft.DotNet.Cli.Build.Framework;
@@ -232,37 +231,6 @@ public void CallDelegateOnComponentContext_UnhandledException()
                 .And.ExecuteFunctionPointerWithException(entryPoint, 1);
         }
 
-        [Fact]
-        public void CallDelegateOnComponentContext_IgnoreWorkingDirectory()
-        {
-            using (TestArtifact cwd = TestArtifact.Create("cwd"))
-            {
-                // Validate that hosting components in the working directory will not be used
-                File.Copy(Binaries.CoreClr.MockPath, Path.Combine(cwd.Location, Binaries.CoreClr.FileName));
-                File.Copy(Binaries.HostPolicy.MockPath, Path.Combine(cwd.Location, Binaries.HostPolicy.FileName));
-
-                var component = sharedState.Component;
-                string[] args =
-                {
-                    ComponentLoadAssemblyAndGetFunctionPointerArg,
-                    sharedState.HostFxrPath,
-                    component.RuntimeConfigJson,
-                    component.AppDll,
-                    sharedState.ComponentTypeName,
-                    sharedState.ComponentEntryPoint1,
-                };
-
-                sharedState.CreateNativeHostCommand(args, sharedState.DotNetRoot)
-                    .WorkingDirectory(cwd.Location)
-                    .Execute()
-                    .Should().Pass()
-                    .And.InitializeContextForConfig(component.RuntimeConfigJson)
-                    .And.ExecuteFunctionPointer(sharedState.ComponentEntryPoint1, 1, 1)
-                    .And.ResolveHostPolicy(TestContext.BuiltDotNet)
-                    .And.ResolveCoreClr(TestContext.BuiltDotNet);
-            }
-        }
-
         public class SharedTestState : SharedTestStateBase
         {
             public string HostFxrPath { get; }
diff --git a/src/native/corehost/apphost/standalone/hostfxr_resolver.cpp b/src/native/corehost/apphost/standalone/hostfxr_resolver.cpp
@@ -118,11 +118,6 @@ hostfxr_resolver_t::hostfxr_resolver_t(const pal::string_t& app_root)
     {
         m_status_code = StatusCode::CoreHostLibMissingFailure;
     }
-    else if (!pal::is_path_rooted(m_fxr_path))
-    {
-        // We should always be loading hostfxr from an absolute path
-        m_status_code = StatusCode::CoreHostLibMissingFailure;
-    }
     else if (pal::load_library(&m_fxr_path, &m_hostfxr_dll))
     {
         m_status_code = StatusCode::Success;
diff --git a/src/native/corehost/fxr/standalone/hostpolicy_resolver.cpp b/src/native/corehost/fxr/standalone/hostpolicy_resolver.cpp
@@ -180,10 +180,6 @@ int hostpolicy_resolver::load(
             return StatusCode::CoreHostLibMissingFailure;
         }
 
-        // We should always be loading hostpolicy from an absolute path
-        if (!pal::is_path_rooted(host_path))
-            return StatusCode::CoreHostLibMissingFailure;
-
         // Load library
         // We expect to leak hostpolicy - just as we do not unload coreclr, we do not unload hostpolicy
         if (!pal::load_library(&host_path, &g_hostpolicy))
diff --git a/src/native/corehost/fxr_resolver.h b/src/native/corehost/fxr_resolver.h
@@ -55,10 +55,6 @@ int load_fxr_and_get_delegate(hostfxr_delegate_type type, THostPathToConfigCallb
             return StatusCode::CoreHostLibMissingFailure;
         }
 
-        // We should always be loading hostfxr from an absolute path
-        if (!pal::is_path_rooted(fxr_path))
-            return StatusCode::CoreHostLibMissingFailure;
-
         // Load library
         if (!pal::load_library(&fxr_path, &fxr))
         {
diff --git a/src/native/corehost/hostpolicy/deps_resolver.cpp b/src/native/corehost/hostpolicy/deps_resolver.cpp
@@ -830,21 +830,15 @@ bool deps_resolver_t::resolve_probe_dirs(
         }
     }
 
-    // If the deps file is missing for the app, add known locations.
-    // For libhost scenarios, there is no app or app path
-    if (m_host_mode != host_mode_t::libhost && !get_app_deps().exists())
+    // If the deps file is missing add known locations.
+    if (!get_app_deps().exists())
     {
-        assert(!m_app_dir.empty());
-
         // App local path
         add_unique_path(asset_type, m_app_dir, &items, output, &non_serviced, core_servicing);
 
-        if (m_coreclr_path.empty())
-        {
-            // deps_resolver treats being able to get the coreclr path as optional, so we ignore the return value here.
-            // The caller is responsible for checking whether coreclr path is set and handling as appropriate.
-            (void) file_exists_in_dir(m_app_dir, LIBCORECLR_NAME, &m_coreclr_path);
-        }
+        // deps_resolver treats being able to get the coreclr path as optional, so we ignore the return value here.
+        // The caller is responsible for checking whether coreclr path is set and handling as appropriate.
+        (void) file_exists_in_dir(m_app_dir, LIBCORECLR_NAME, &m_coreclr_path);
     }
 
     // Handle any additional deps.json that were specified.
diff --git a/src/native/corehost/hostpolicy/standalone/coreclr_resolver.cpp b/src/native/corehost/hostpolicy/standalone/coreclr_resolver.cpp
@@ -13,10 +13,6 @@ bool coreclr_resolver_t::resolve_coreclr(const pal::string_t& libcoreclr_path, c
     pal::string_t coreclr_dll_path(libcoreclr_path);
     append_path(&coreclr_dll_path, LIBCORECLR_NAME);
 
-    // We should always be loading coreclr from an absolute path
-    if (!pal::is_path_rooted(coreclr_dll_path))
-        return false;
-
     if (!pal::load_library(&coreclr_dll_path, &coreclr_resolver_contract.coreclr))
     {
         return false;

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using System.IO;`
`6`	`5`
`7`	`6`	`namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.NativeHosting`
`8`	`7`	`{`
`9`		`- internal static class NativeHostingResultExtensions`
	`8`	`+ internal static class FunctionPointerResultExtensions`
`10`	`9`	`{`
`11`	`10`	`public static FluentAssertions.AndConstraint<CommandResultAssertions> ExecuteFunctionPointer(this CommandResultAssertions assertion, string methodName, int callCount, int returnValue)`
`12`	`11`	`{`
`@@ -48,21 +47,5 @@ public static FluentAssertions.AndConstraint<CommandResultAssertions> ExecuteWit`
`48`	`47`	`{`
`49`	`48`	`return assertion.HaveStdOutContaining($"{assemblyName}: Location = '{location}'");`
`50`	`49`	`}`
`51`		`-`
`52`		`- public static FluentAssertions.AndConstraint<CommandResultAssertions> ResolveHostFxr(this CommandResultAssertions assertion, Microsoft.DotNet.Cli.Build.DotNetCli dotnet)`
`53`		`- {`
`54`		`- return assertion.HaveStdErrContaining($"Resolved fxr [{dotnet.GreatestVersionHostFxrFilePath}]");`
`55`		`- }`
`56`		`-`
`57`		`- public static FluentAssertions.AndConstraint<CommandResultAssertions> ResolveHostPolicy(this CommandResultAssertions assertion, Microsoft.DotNet.Cli.Build.DotNetCli dotnet)`
`58`		`- {`
`59`		`- return assertion.HaveStdErrContaining($"{Binaries.HostPolicy.FileName} directory is [{dotnet.GreatestVersionSharedFxPath}]");`
`60`		`- }`
`61`		`-`
`62`		`- public static FluentAssertions.AndConstraint<CommandResultAssertions> ResolveCoreClr(this CommandResultAssertions assertion, Microsoft.DotNet.Cli.Build.DotNetCli dotnet)`
`63`		`- {`
`64`		`- return assertion.HaveStdErrContaining($"CoreCLR path = '{Path.Combine(dotnet.GreatestVersionSharedFxPath, Binaries.CoreClr.FileName)}'")`
`65`		`- .And.HaveStdErrContaining($"CoreCLR dir = '{dotnet.GreatestVersionSharedFxPath}{Path.DirectorySeparatorChar}'");`
`66`		`- }`
`67`	`50`	`}`
`68`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,11 +118,6 @@ hostfxr_resolver_t::hostfxr_resolver_t(const pal::string_t& app_root)`
`118`	`118`	`{`
`119`	`119`	`m_status_code = StatusCode::CoreHostLibMissingFailure;`
`120`	`120`	`}`
`121`		`- else if (!pal::is_path_rooted(m_fxr_path))`
`122`		`- {`
`123`		`- // We should always be loading hostfxr from an absolute path`
`124`		`- m_status_code = StatusCode::CoreHostLibMissingFailure;`
`125`		`- }`
`126`	`121`	`else if (pal::load_library(&m_fxr_path, &m_hostfxr_dll))`
`127`	`122`	`{`
`128`	`123`	`m_status_code = StatusCode::Success;`
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,6 @@ int load_fxr_and_get_delegate(hostfxr_delegate_type type, THostPathToConfigCallb`
`55`	`55`	`return StatusCode::CoreHostLibMissingFailure;`
`56`	`56`	`}`
`57`	`57`
`58`		`- // We should always be loading hostfxr from an absolute path`
`59`		`- if (!pal::is_path_rooted(fxr_path))`
`60`		`- return StatusCode::CoreHostLibMissingFailure;`
`61`		`-`
`62`	`58`	`// Load library`
`63`	`59`	`if (!pal::load_library(&fxr_path, &fxr))`
`64`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -830,21 +830,15 @@ bool deps_resolver_t::resolve_probe_dirs(`
`830`	`830`	`}`
`831`	`831`	`}`
`832`	`832`
`833`		`- // If the deps file is missing for the app, add known locations.`
`834`		`- // For libhost scenarios, there is no app or app path`
`835`		`- if (m_host_mode != host_mode_t::libhost && !get_app_deps().exists())`
	`833`	`+ // If the deps file is missing add known locations.`
	`834`	`+ if (!get_app_deps().exists())`
`836`	`835`	`{`
`837`		`- assert(!m_app_dir.empty());`
`838`		`-`
`839`	`836`	`// App local path`
`840`	`837`	`add_unique_path(asset_type, m_app_dir, &items, output, &non_serviced, core_servicing);`
`841`	`838`
`842`		`- if (m_coreclr_path.empty())`
`843`		`- {`
`844`		`- // deps_resolver treats being able to get the coreclr path as optional, so we ignore the return value here.`
`845`		`- // The caller is responsible for checking whether coreclr path is set and handling as appropriate.`
`846`		`- (void) file_exists_in_dir(m_app_dir, LIBCORECLR_NAME, &m_coreclr_path);`
`847`		`- }`
	`839`	`+ // deps_resolver treats being able to get the coreclr path as optional, so we ignore the return value here.`
	`840`	`+ // The caller is responsible for checking whether coreclr path is set and handling as appropriate.`
	`841`	`+ (void) file_exists_in_dir(m_app_dir, LIBCORECLR_NAME, &m_coreclr_path);`
`848`	`842`	`}`
`849`	`843`
`850`	`844`	`// Handle any additional deps.json that were specified.`