Skip to content

Commit 8ed1caa

Browse files
Nirmal4GNirmal4G
committed
Refactor Test project files
Remove redundant MSBuild logic Consolidate common MSBuild logic Reorder code-blocks for better readability Fix-up comments and new-lines across project files Improve support for Visual Studio 2022: Since VS IDE 2022 (17.0) is 64-bit only, replace all 32-bit specific MSBuild properties with generic ones.
1 parent 3ad9062 commit 8ed1caa

File tree

16 files changed

+137
-161
lines changed

16 files changed

+137
-161
lines changed

‎SmokeTests/SmokeTest.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@
123123
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
124124
<Target Name="BeforeBuild">
125125
<ItemGroup Condition="$(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'">
126-
<ToolkitNuGets Include="$(MSBuildThisFileDirectory)..\bin\nupkg\$(CurrentProject).*.nupkg" />
127-
<ToolkitNuGet Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', `$(CurrentProject).([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?.nupkg`))" Include="@(ToolkitNuGets)" />
126+
<NuGetPackage Include="$(RepositoryDirectory)bin\nupkg\$(CurrentProject).*.nupkg" />
127+
<NuGetPackageFiltered Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', `$(CurrentProject).([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?.nupkg`))" Include="@(NuGetPackage)" />
128128
</ItemGroup>
129-
<Error Condition="'@(ToolkitNuGet)' == '' and $(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'" Text="NuGet '$(CurrentProject).[SEMVER].nupkg' doesn't exist!" />
129+
<Error Condition="'@(NuGetPackageFiltered)' == '' and $(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'" Text="NuGet '$(CurrentProject).[SEMVER].nupkg' doesn't exist!" />
130130
<Error Condition="'$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' == 'To Fill In With Local Version Number'" Text="Please set 'NuGetPackageVersion' at the top of 'SmokeTest.csproj' with the version to smoke test locally." />
131131
</Target>
132132
<!-- No-op to avoid build error when packing solution from commandline -->

‎SmokeTests/SmokeTests.proj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
Microsoft.Toolkit.Uwp.UI;
1919
Microsoft.Toolkit.Uwp.UI.Animations;
2020
Microsoft.Toolkit.Uwp.UI.Behaviors;
21+
Microsoft.Toolkit.Uwp.UI.Media;
2122
Microsoft.Toolkit.Uwp.UI.Controls;
2223
Microsoft.Toolkit.Uwp.UI.Controls.Core;
2324
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
@@ -26,7 +27,6 @@
2627
Microsoft.Toolkit.Uwp.UI.Controls.Markdown;
2728
Microsoft.Toolkit.Uwp.UI.Controls.Media;
2829
Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
29-
Microsoft.Toolkit.Uwp.UI.Media;
3030
</ToolkitPackages>
3131
</PropertyGroup>
3232

@@ -52,7 +52,7 @@
5252
Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" />
5353
</Target>
5454

55-
<Target Name="ChooseProjectsToBuild" DependsOnTargets="CheckNuGets">
55+
<Target Name="ChooseProjectsToBuild" DependsOnTargets="CheckNuGetPackages">
5656
<ItemGroup>
5757
<BuildPlatform Include="$(BuildPlatforms)" />
5858
<BuildConfiguration Include="$(BuildConfigurations)" />
@@ -80,14 +80,14 @@
8080
</ItemGroup>
8181
</Target>
8282

83-
<Target Name="CheckNuGets">
83+
<Target Name="CheckNuGetPackages">
8484
<PropertyGroup>
85-
<ToolkitNuGets>$(MSBuildThisFileDirectory)..\bin\nupkg\*.nupkg</ToolkitNuGets>
85+
<NuGetOutputPath>$(MSBuildThisFileDirectory)..\bin\nupkg</NuGetOutputPath>
8686
</PropertyGroup>
8787
<ItemGroup>
88-
<ToolkitNuGets Include="$(ToolkitNuGets)" />
88+
<NuGetPackage Include="$(NuGetOutputPath)\*.nupkg" />
8989
</ItemGroup>
90-
<Error Condition="'@(ToolkitNuGets)' == ''" Text="Directory '$(ToolkitNuGets)' is empty" />
90+
<Error Condition="'@(NuGetPackage)' == ''" Text="Directory '$(NuGetOutputPath)' is empty" />
9191
</Target>
9292

9393
</Project>

‎UITests/UITests.App/UITests.App.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
2828
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
2929
<IsTestHost>true</IsTestHost>
30-
<LangVersion>9.0</LangVersion>
3130
</PropertyGroup>
3231
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
3332
<DebugSymbols>true</DebugSymbols>

‎UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
1-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
7-
<TargetFrameworkVersion>v3.1</TargetFrameworkVersion>
8-
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
9-
<LangVersion>9.0</LangVersion>
10-
11-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12-
<PlatformTarget>x86</PlatformTarget>
134
<OutputType>Exe</OutputType>
14-
<IsPackable>false</IsPackable>
5+
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
6+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
7+
</PropertyGroup>
158

9+
<PropertyGroup>
1610
<IsTestHarness>true</IsTestHarness>
11+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1712
</PropertyGroup>
1813

1914
<ItemGroup>
20-
<PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.1'"
21-
Include="Microsoft.Windows.SDK.Contracts"
22-
Version="10.0.19041.0" />
23-
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
25-
<PackageReference Include="MUXTestInfra.MSTest" Version="0.0.4" />
15+
<!-- MSTest -->
2616
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
2717
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
28-
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
19+
<!-- Microsoft.UI.Xaml MSTest Extension -->
20+
<PackageReference Include="MUXTestInfra.MSTest" Version="0.0.4" />
21+
<!-- System packages -->
22+
<PackageReference Include="System.Text.Json" Version="5.0.2" />
2923
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
24+
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
3025
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
26+
<!-- Windows SDK packages -->
3227
<PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
33-
<PackageReference Include="System.Text.Json" Version="5.0.2" />
28+
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.0" />
3429
</ItemGroup>
3530

3631
<Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
32+
3733
</Project>

‎UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
55
</PropertyGroup>
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
7-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
8-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
7+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
8+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
99
<PropertyGroup />
1010
<Import Project="UITests.Tests.Shared.projitems" Label="Shared" />
11-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
11+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
1212
</Project>

‎UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj‎

Lines changed: 33 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,38 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
7-
<TargetFrameworkVersion>v3.1</TargetFrameworkVersion>
8-
<LangVersion>9.0</LangVersion>
9-
10-
<TaefRootDirectory>$(PkgTAEF_Redist_Wlk)\build\Binaries\x86\CoreClr\</TaefRootDirectory>
11-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12-
<PlatformTarget>x86</PlatformTarget>
13-
<DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
144
<OutputType>Exe</OutputType>
5+
<PlatformTarget>x86</PlatformTarget>
156
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
16-
<IsPackable>false</IsPackable>
17-
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
7+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
8+
</PropertyGroup>
189

10+
<PropertyGroup>
1911
<IsTestHarness>true</IsTestHarness>
12+
<EnableDefaultItems>false</EnableDefaultItems>
13+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
14+
<DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
15+
<TaefRootDirectory>$(PkgTAEF_Redist_Wlk)\build\Binaries\$(PlatformTarget)\CoreClr\</TaefRootDirectory>
2016
</PropertyGroup>
2117

18+
<ItemGroup>
19+
<Compile Include="MainClass.cs" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
24+
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\Dependencies\$(PlatformTarget)\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
25+
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
26+
<None Include="$(PkgMUXCustomBuildTasks)\tools\$(PlatformTarget)\WttLog.dll" CopyToOutputDirectory="PreserveNewest" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<None Include="UITests.App.dependencies.$(Configuration).txt">
31+
<Link>UITests.App.dependencies.txt</Link>
32+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33+
</None>
34+
</ItemGroup>
35+
2236
<ItemGroup>
2337
<Reference Include="TE.Managed">
2438
<HintPath>$(TaefRootDirectory)TE.Managed.dll</HintPath>
@@ -39,38 +53,16 @@
3953
</ItemGroup>
4054

4155
<ItemGroup>
42-
<PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.1'"
43-
Include="Microsoft.Windows.SDK.Contracts"
44-
Version="10.0.19041.0" />
45-
46-
<PackageReference Include="MUXTestInfra.TAEF" Version="0.0.4" />
47-
56+
<!-- System packages -->
4857
<PackageReference Include="System.Text.Json" Version="5.0.2" />
49-
<PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
58+
<!-- Microsoft.UI.Xaml TAEF Extensions -->
59+
<PackageReference Include="MUXTestInfra.TAEF" Version="0.0.4" />
5060
<PackageReference Include="MUXCustomBuildTasks" Version="1.0.67" GeneratePathProperty="true" />
51-
</ItemGroup>
52-
53-
<ItemGroup>
54-
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
55-
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\Dependencies\$(PlatformTarget)\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
56-
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
57-
<None Include="$(PkgMUXCustomBuildTasks)\tools\x86\WttLog.dll" CopyToOutputDirectory="PreserveNewest" />
58-
</ItemGroup>
59-
60-
<ItemGroup>
61-
<Compile Include="MainClass.cs" />
62-
</ItemGroup>
63-
64-
<ItemGroup>
65-
<None Include="UITests.App.dependencies.Debug.txt" Condition="'$(Configuration)' == 'Debug'">
66-
<Link>UITests.App.dependencies.txt</Link>
67-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
68-
</None>
69-
<None Include="UITests.App.dependencies.Release.txt" Condition="'$(Configuration)' == 'Release'">
70-
<Link>UITests.App.dependencies.txt</Link>
71-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72-
</None>
61+
<PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
62+
<!-- Windows SDK package -->
63+
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.0" />
7364
</ItemGroup>
7465

7566
<Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
67+
7668
</Project>

‎UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
5-
<LangVersion>8.0</LangVersion>
64
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<IsPackable>false</IsPackable>
5+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
86
</PropertyGroup>
97

10-
<!-- .NET Core 2.1 doesn't have the Unsafe type -->
11-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
12-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
8+
<ItemGroup>
9+
<ProjectReference Include="..\..\Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj" />
1310
</ItemGroup>
1411

1512
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
1713
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
1814
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1916
</ItemGroup>
2017

21-
<ItemGroup>
22-
<ProjectReference Include="..\..\Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj" />
18+
<!-- .NET Core 2.1 doesn't have the Unsafe type -->
19+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
20+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
2321
</ItemGroup>
2422

2523
<Import Project="..\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems" Label="Shared" />

‎UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
55
</PropertyGroup>
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
7-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
8-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
7+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
8+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
99
<PropertyGroup />
1010
<Import Project="UnitTests.HighPerformance.Shared.projitems" Label="Shared" />
11-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
11+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
1212
</Project>

‎UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
1919
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
2020
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
21-
<LangVersion>8.0</LangVersion>
2221
</PropertyGroup>
2322
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2423
<DebugSymbols>true</DebugSymbols>

‎UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
5-
<IsPackable>false</IsPackable>
6-
<LangVersion>8.0</LangVersion>
75
</PropertyGroup>
86

7+
<ItemGroup>
8+
<ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
9+
<ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
10+
<ProjectReference Include="..\..\Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj" />
11+
</ItemGroup>
12+
913
<ItemGroup>
1014
<PackageReference Include="FluentAssertions" Version="5.10.3" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1215
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
1316
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1418
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
1519
</ItemGroup>
1620

@@ -19,12 +23,6 @@
1923
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
2024
</ItemGroup>
2125

22-
<ItemGroup>
23-
<ProjectReference Include="..\..\Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj" />
24-
<ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
25-
<ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
26-
</ItemGroup>
27-
2826
<Import Project="..\UnitTests.Shared\UnitTests.Shared.projitems" Label="Shared" />
2927

3028
</Project>

0 commit comments

Comments
 (0)