Skip to content

Commit 4692773

Browse files
committed
Fixed compile issues from merge error
1 parent 1bdf731 commit 4692773

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

ProjectHeads/Tests.Head.Uwp.props

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,6 @@
1111
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
1212
</PropertyGroup>
1313

14-
<Choose>
15-
<When Condition="'$(ToolkitExtensionSourceProject)' == ''">
16-
<ItemGroup>
17-
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.0-beta.1"/>
18-
</ItemGroup>
19-
</When>
20-
<Otherwise>
21-
<ItemGroup>
22-
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
23-
</ItemGroup>
24-
</Otherwise>
25-
</Choose>
26-
2714
<ItemGroup>
2815
<SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
2916
</ItemGroup>

ProjectHeads/Tests.Head.props

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@
1818
<ProjectReference Include="$(ToolingDirectory)\CommunityToolkit.Tooling.TestGen\CommunityToolkit.Tooling.TestGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="True" />
1919
</ItemGroup>
2020

21+
<Choose>
22+
<When Condition="'$(ToolkitExtensionSourceProject)' == ''">
23+
<ItemGroup>
24+
<PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.0-beta.1"/>
25+
</ItemGroup>
26+
</When>
27+
<Otherwise>
28+
<ItemGroup>
29+
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
30+
</ItemGroup>
31+
</Otherwise>
32+
</Choose>
33+
2134
<!-- Global Usings -->
2235
<ItemGroup>
2336
<Compile Include="$(ToolingDirectory)\GlobalUsings_Tests.cs" />

0 commit comments

Comments
 (0)