diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
index b2551a1c7251..0b96f304229e 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
@@ -132,6 +132,18 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!-- Determine PlatformTarget (if not already set) from runtime identifier. -->
   <Choose>
+    <!-- For all targets other than .NETFramework, set $(PlatformTarget) to AnyCPU.
+
+         Outside .NET Framework, PlatformTarget does not have a real purpose since the process architecture is
+         determined by the host used to launch the application. Defaulting to AnyCPU naturally works on all platforms
+         where modern .NET is supported and makes it unnecessary to recognize these platforms as PlatformTargets.
+    -->
+    <When Condition="'$(PlatformTarget)' == '' and '$(TargetFrameworkIdentifier)' != '.NETFramework' and '$(UseNativeCode)' != 'true'">
+      <PropertyGroup>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+      </PropertyGroup>
+    </When>
+
     <When Condition="'$(PlatformTarget)' != '' or '$(RuntimeIdentifier)' == ''" />
 
     <When Condition="$(RuntimeIdentifier.EndsWith('-x86')) or $(RuntimeIdentifier.Contains('-x86-'))">
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
index ccb497097cd2..581655a9fb70 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
@@ -57,6 +57,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!--
     NOTE:
 
+    • For all targets other than .NETFramework, set $(PlatformTarget) to AnyCPU.
+
      * We cannot compare against $(Platform) directly as that will give VS cause to instantiate extra
        configurations, for each combination, which leads to performance problems and clutter in the sln
        in the common AnyCPU-only case.
@@ -67,6 +69,7 @@ Copyright (c) .NET Foundation. All rights reserved.
        outside the 1:1 defaults below.
   -->
   <PropertyGroup>
+    <PlatformTarget Condition=" '$(PlatformTarget)' == '' and '$(TargetFrameworkIdentifier)' != '.NETFramework' and '$(UseNativeCode)' != 'true' ">AnyCPU</PlatformTarget>
     <_PlatformWithoutConfigurationInference>$(Platform)</_PlatformWithoutConfigurationInference>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(_PlatformWithoutConfigurationInference)' == 'x64' ">
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs
index 1b4b5eaabcab..9314ebfbf9de 100644
--- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs
+++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs
@@ -103,7 +103,7 @@ public void It_publishes_the_project_with_a_refs_folder_and_correct_deps_file(st
 
                 dependencyContext.CompilationOptions.Defines.Should().Contain(expectedDefines);
                 dependencyContext.CompilationOptions.LanguageVersion.Should().Be(langVersion);
-                dependencyContext.CompilationOptions.Platform.Should().Be("x86");
+                dependencyContext.CompilationOptions.Platform.Should().Be(appTargetFramework == "net46" ? "x86" : "AnyCPU");
                 dependencyContext.CompilationOptions.Optimize.Should().Be(false);
                 dependencyContext.CompilationOptions.KeyFile.Should().Be("");
                 dependencyContext.CompilationOptions.EmitEntryPoint.Should().Be(true);