Skip to content

Commit 2e83b92

Browse files
authored
Merge pull request #18639 from dsplaisted/workload-default-runtimeidentifier
Import RuntimeIdentifierInference targets after workloads
2 parents cd8654a + 0b91db3 commit 2e83b92

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ Copyright (c) .NET Foundation. All rights reserved.
5959
<_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
6060
</PropertyGroup>
6161

62-
<!--
63-
Use RuntimeIdentifier to determine PlatformTarget.
64-
Also, enforce that RuntimeIdentifier is always specified for .NETFramework executables.
65-
-->
66-
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.RuntimeIdentifierInference.targets" />
67-
6862
<!--
6963
Import targets from RazorSDK if referenced
7064
Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.BeforeCommon.targets
@@ -75,6 +69,12 @@ Copyright (c) .NET Foundation. All rights reserved.
7569
<!-- Import workload targets -->
7670
<Import Project="Microsoft.NET.Sdk.ImportWorkloads.targets" Condition="'$(MSBuildEnableWorkloadResolver)' == 'true'" />
7771

72+
<!--
73+
Use RuntimeIdentifier to determine PlatformTarget.
74+
Also, enforce that RuntimeIdentifier is always specified for .NETFramework executables.
75+
-->
76+
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.RuntimeIdentifierInference.targets" />
77+
7878
<!-- Checks for EOL frameworks -->
7979
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.EolTargetFrameworks.targets" />
8080

0 commit comments

Comments
 (0)