Skip to content

Commit 8358007

Browse files
Merge pull request #351 from CommunityToolkit/llama/multi-target-fix
Fix issued with MultiTarget.props being ignored in Experiments
2 parents 7b778c3 + ac3a49a commit 8358007

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

common/MultiTarget/MultiTarget.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
<MultiTargetIsSampleProject Condition="$(MSBuildProjectName.EndsWith('.Samples')) == 'true'">true</MultiTargetIsSampleProject>
44
</PropertyGroup>
55

6-
<Import Project="$(MSBuildThisFileDirectory)\Defaults.props" Condition="'$(MultiTarget)' == ''" />
76
<Import Project="$(MSBuildProjectDirectory)\MultiTarget.props" Condition="Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND '$(MultiTarget)' == ''" />
87

98
<!-- If in a sample project, pull the MultiTarget settings from the source project. -->
109
<!-- This behavior is also implemented in GeneratedAllProjectReferences.ps1 for <ProjectReference> generation. -->
11-
<Import Project="../../src/MultiTarget.props" Condition="$(MultiTargetIsSampleProject) == 'true' AND !Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND Exists('../../src/MultiTarget.props')" />
10+
<Import Project="../../src/MultiTarget.props" Condition="$(MultiTargetIsSampleProject) == 'true' AND !Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND Exists('../../src/MultiTarget.props') AND '$(MultiTarget)' == ''" />
11+
12+
<Import Project="$(MSBuildThisFileDirectory)\Defaults.props" Condition="'$(MultiTarget)' == ''" />
1213

1314
<PropertyGroup>
1415
<!--
@@ -78,4 +79,4 @@
7879
<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>
7980
</Reference>
8081
</ItemGroup>
81-
</Project>
82+
</Project>

0 commit comments

Comments
 (0)