Merge pull request CommunityToolkit#351 from CommunityToolkit/llama/m…

…ulti-target-fix Fix issued with MultiTarget.props being ignored in Experiments
Martin1994 · Jan 11, 2023 · 3efe3f3 · 3efe3f3
2 parents f08c089 + f84cd48
commit 3efe3f3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/MultiTarget/MultiTarget.props b/MultiTarget/MultiTarget.props
@@ -3,12 +3,13 @@
     <MultiTargetIsSampleProject Condition="$(MSBuildProjectName.EndsWith('.Samples')) == 'true'">true</MultiTargetIsSampleProject>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Defaults.props" Condition="'$(MultiTarget)' == ''" />
   <Import Project="$(MSBuildProjectDirectory)\MultiTarget.props" Condition="Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND '$(MultiTarget)' == ''" />
 
   <!-- If in a sample project, pull the MultiTarget settings from the source project. -->
   <!-- This behavior is also implemented in GeneratedAllProjectReferences.ps1 for <ProjectReference> generation. -->
-  <Import Project="../../src/MultiTarget.props" Condition="$(MultiTargetIsSampleProject) == 'true' AND !Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND Exists('../../src/MultiTarget.props')" />
+  <Import Project="../../src/MultiTarget.props" Condition="$(MultiTargetIsSampleProject) == 'true' AND !Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND Exists('../../src/MultiTarget.props') AND '$(MultiTarget)' == ''" />
+
+  <Import Project="$(MSBuildThisFileDirectory)\Defaults.props" Condition="'$(MultiTarget)' == ''" />
 
   <PropertyGroup>
     <!--
@@ -78,4 +79,4 @@
       <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
     </Reference>
   </ItemGroup>
-</Project>
+</Project>