Skip to content

Commit 7669e2b

Browse files
Nirmal4GNirmal4G
committed
Refactor remaining Project and Build files
- Simplify project files - Add and Update comments - Remove unnecessary lines - Rearrange and Order code blocks - Include build root folder - Rename NuGet Icon to `Icon.png` - Normalize casing for `ReadMe.md` - Rename solution file to `CommunityToolkit.sln`
1 parent 16e21b6 commit 7669e2b

File tree

21 files changed

+145
-129
lines changed

21 files changed

+145
-129
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
[Rr]eleases/
1919
x64/
2020
x86/
21-
build/
2221
bld/
2322
[Bb]in/
2423
[Oo]bj/

‎CommunityToolkit.Common/CommunityToolkit.Common.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
<PackageTags>Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers</PackageTags>
1515
</PropertyGroup>
1616

17-
<!-- .NET Standard 2.1 and .NET 6 already have [NotNullIfNotNull] and [NotNullWhen].
18-
Additionally, also enable trimming support on .NET 6. -->
17+
<!--
18+
NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1 and .NET 6
19+
Those targets already have [NotNullIfNotNull] and [NotNullWhen].
20+
Additionally, also enable trimming support on .NET 6.
21+
-->
1922
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
2023
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
2124
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>

‎CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj

+13-6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
</When>
2525

2626
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
27+
28+
<!-- NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1 and .NET 6 -->
2729
<PropertyGroup>
2830
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
2931
</PropertyGroup>
@@ -34,7 +36,10 @@
3436
</ItemGroup>
3537
</When>
3638

37-
<!-- Enable trimming support on .NET 6 -->
39+
<!--
40+
NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1 and .NET 6.
41+
Additionally, also enable trimming support on .NET 6.
42+
-->
3843
<When Condition="'$(TargetFramework)' == 'net6.0'">
3944
<PropertyGroup>
4045
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
@@ -44,6 +49,12 @@
4449
</When>
4550
</Choose>
4651

52+
<!-- T4 service used by the Guard APIs -->
53+
<ItemGroup>
54+
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
55+
</ItemGroup>
56+
57+
<!-- Text Templates to generate sources -->
4758
<ItemGroup>
4859
<None Update="Generated\Guard.Comparable.Numeric.tt">
4960
<Generator>TextTemplatingFileGenerator</Generator>
@@ -63,11 +74,7 @@
6374
</None>
6475
</ItemGroup>
6576

66-
<!-- T4 service used by the Guard APIs -->
67-
<ItemGroup>
68-
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
69-
</ItemGroup>
70-
77+
<!-- Sources generated based on the above text templates -->
7178
<ItemGroup>
7279
<Compile Update="Generated\Guard.Comparable.Numeric.g.cs">
7380
<DesignTime>True</DesignTime>

‎CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj

+21-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- Box&lt;T&gt;: a type mapping boxed value types and exposing some utility and high performance methods.
2222
- Ref&lt;T&gt;: a stack-only struct that can store a reference to a value of a specified type.
2323
- NullableRef&lt;T&gt;: a stack-only struct similar to Ref&lt;T&gt;, which also supports nullable references.
24-
</Description>
24+
</Description>
2525
<PackageTags>Parallel;Performance;Unsafe;Span;Memory;String;StringPool;Array;Stream;Buffer;Extensions;Helpers</PackageTags>
2626
</PropertyGroup>
2727

@@ -39,33 +39,42 @@
3939

4040
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
4141

42+
<!-- NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1, .NET Core 3.1 and .NET 6 -->
43+
<PropertyGroup>
44+
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
45+
</PropertyGroup>
46+
4247
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
4348
<ItemGroup>
4449
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
4550
</ItemGroup>
4651
</When>
4752

48-
<When Condition="'$(TargetFramework)' == 'net6.0'">
53+
<When Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
4954

50-
<!-- NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1, .NET Core 3.1 and .NET 6.
51-
Additionally, also enable trimming support on .NET 6. -->
55+
<!-- NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1, .NET Core 3.1 and .NET 6 -->
5256
<PropertyGroup>
5357
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
54-
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
55-
<IsTrimmable>true</IsTrimmable>
5658
</PropertyGroup>
57-
</When>
5859

59-
<When Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
60-
<PropertyGroup>
61-
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
62-
</PropertyGroup>
63-
6460
<!-- .NET Core 3.1 has the Unsafe type, but the version it ships with lacks Unsafe.IsNullRef<T> -->
6561
<ItemGroup>
6662
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
6763
</ItemGroup>
6864
</When>
65+
66+
<When Condition="'$(TargetFramework)' == 'net6.0'">
67+
68+
<!--
69+
NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1, .NET Core 3.1 and .NET 6.
70+
Additionally, also enable trimming support on .NET 6.
71+
-->
72+
<PropertyGroup>
73+
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
74+
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
75+
<IsTrimmable>true</IsTrimmable>
76+
</PropertyGroup>
77+
</When>
6978
</Choose>
7079

7180
</Project>

‎CommunityToolkit.Mvvm.SourceGenerators/CommunityToolkit.Mvvm.SourceGenerators.csproj

+12-26
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
54
<IsPackable>false</IsPackable>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
</PropertyGroup>
77

8+
<!-- Sources that are used by Generator logic in the target projects -->
89
<ItemGroup>
9-
<Compile Remove="EmbeddedResources\INotifyPropertyChanged.cs" />
10-
<Compile Remove="EmbeddedResources\NotNullAttribute.cs" />
11-
<Compile Remove="EmbeddedResources\NotNullIfNotNullAttribute.cs" />
12-
<Compile Remove="EmbeddedResources\ObservableObject.cs" />
13-
<Compile Remove="EmbeddedResources\ObservableRecipient.cs" />
14-
</ItemGroup>
15-
16-
<ItemGroup>
17-
<EmbeddedResource Include="EmbeddedResources\INotifyPropertyChanged.cs">
18-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19-
</EmbeddedResource>
20-
<EmbeddedResource Include="EmbeddedResources\NotNullAttribute.cs">
21-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22-
</EmbeddedResource>
23-
<EmbeddedResource Include="EmbeddedResources\NotNullIfNotNullAttribute.cs">
24-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25-
</EmbeddedResource>
26-
<EmbeddedResource Include="EmbeddedResources\ObservableObject.cs">
27-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
28-
</EmbeddedResource>
29-
<EmbeddedResource Include="EmbeddedResources\ObservableRecipient.cs">
10+
<Compile Remove="EmbeddedResources\*.cs" />
11+
<EmbeddedResource Include="EmbeddedResources\*.cs">
3012
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3113
</EmbeddedResource>
3214
</ItemGroup>
3315

16+
<!--
17+
These files enables tracking Analyzer releases for the rules that ship from this project.
18+
See <https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md>
19+
-->
3420
<ItemGroup>
35-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" Pack="false" />
21+
<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
22+
<AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
3623
</ItemGroup>
3724

3825
<ItemGroup>
39-
<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
40-
<AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" Pack="false" />
4127
</ItemGroup>
4228

43-
</Project>
29+
</Project>

‎CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj

+22-17
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@
2020
<PackageTags>MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;Observable;IOC;DI;Dependency Injection;Object Messaging;Extensions;Helpers</PackageTags>
2121
</PropertyGroup>
2222

23+
<!-- Enable trimming support on .NET 6 -->
24+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
25+
<IsTrimmable>true</IsTrimmable>
26+
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
27+
</PropertyGroup>
28+
29+
<!-- Include the custom .targets file to check the source generator (.NET 6+ is not needed as it guarantees Roslyn 4.x) -->
30+
<ItemGroup Label="Package">
31+
<None Include="CommunityToolkit.Mvvm.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0" />
32+
<None Include="CommunityToolkit.Mvvm.targets" Pack="true" PackagePath="buildTransitive\netstandard2.1" />
33+
<None Include="CommunityToolkit.Mvvm.targets" Pack="true" PackagePath="build\netstandard2.0" />
34+
<None Include="CommunityToolkit.Mvvm.targets" Pack="true" PackagePath="build\netstandard2.1" />
35+
</ItemGroup>
36+
2337
<!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
2438
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2539
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
@@ -34,30 +48,21 @@
3448
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
3549
</ItemGroup>
3650

37-
<!-- Enable trimming support on .NET 6 -->
38-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
39-
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
40-
<IsTrimmable>true</IsTrimmable>
41-
</PropertyGroup>
42-
4351
<!-- Source generator project reference for packing -->
4452
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
45-
<ProjectReference Include="..\CommunityToolkit.Mvvm.SourceGenerators\CommunityToolkit.Mvvm.SourceGenerators.csproj" ReferenceOutputAssembly="false" />
53+
<ProjectReference Include="..\CommunityToolkit.Mvvm.SourceGenerators\CommunityToolkit.Mvvm.SourceGenerators.csproj"
54+
ReferenceOutputAssembly="false" />
4655
</ItemGroup>
4756

57+
<!--
58+
Pack the source generator to the right package folder.
59+
TODO: Find a way to get the analyzer project's build output path,
60+
and include using NuGet Pack's extensibility target points.
61+
-->
4862
<ItemGroup Label="Package">
49-
50-
<!-- Include the custom .targets file to check the source generator (.NET 6 is not needed as it guarantees Roslyn 4.x) -->
51-
<None Include="CommunityToolkit.Mvvm.targets" PackagePath="buildTransitive\netstandard2.0" Pack="true" />
52-
<None Include="CommunityToolkit.Mvvm.targets" PackagePath="buildTransitive\netstandard2.1" Pack="true" />
53-
<None Include="CommunityToolkit.Mvvm.targets" PackagePath="build\netstandard2.0" Pack="true" />
54-
<None Include="CommunityToolkit.Mvvm.targets" PackagePath="build\netstandard2.1" Pack="true" />
55-
56-
<!-- Pack the source generator to the right package folder -->
5763
<None Include="..\CommunityToolkit.Mvvm.SourceGenerators\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Mvvm.SourceGenerators.dll"
5864
PackagePath="analyzers\dotnet\roslyn4.0\cs"
59-
Pack="true"
60-
Visible="false" />
65+
Pack="true" Visible="false" />
6166
</ItemGroup>
6267

6368
</Project>

‎CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets

+16-14
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
1414
DependsOnTargets="_MVVMToolkitGatherAnalyzers">
1515

16-
<!-- Use the CSharpCoreTargetsPath property to find the version of the compiler we are using. This is the same mechanism
17-
MSBuild uses to find the compiler. We could check the assembly version for any compiler assembly (since they all have
18-
the same version) but Microsoft.Build.Tasks.CodeAnalysis.dll is where MSBuild loads the compiler tasks from so if
19-
someone is getting creative with msbuild tasks/targets this is the "most correct" assembly to check. -->
20-
<GetAssemblyIdentity AssemblyFiles="$([System.IO.Path]::Combine(`$([System.IO.Path]::GetDirectoryName($(CSharpCoreTargetsPath)))`,`Microsoft.Build.Tasks.CodeAnalysis.dll`))">
16+
<!--
17+
Use the 'CSharpCoreTargetsPath' property to find the version of the compiler we are using. This is the same mechanism
18+
MSBuild uses to find the compiler. We could check the assembly version for any compiler assembly (since they all have
19+
the same version) but 'Microsoft.Build.Tasks.CodeAnalysis.dll' is where MSBuild loads the compiler tasks from so if
20+
someone is getting creative with msbuild tasks/targets this is the "most correct" assembly to check.
21+
-->
22+
<GetAssemblyIdentity AssemblyFiles="$([System.IO.Path]::Combine('$([System.IO.Path]::GetDirectoryName($(CSharpCoreTargetsPath))'), 'Microsoft.Build.Tasks.CodeAnalysis.dll'))">
2123
<Output TaskParameter="Assemblies" ItemName="CurrentCompilerAssemblyIdentity"/>
2224
</GetAssemblyIdentity>
2325

2426
<PropertyGroup>
25-
2627
<!-- Transform the resulting item from GetAssemblyIdentity into a property representing its assembly version -->
2728
<CurrentCompilerVersion>@(CurrentCompilerAssemblyIdentity->'%(Version)')</CurrentCompilerVersion>
28-
29-
<!-- The CurrentCompilerVersionIsNotNewEnough property can now be defined based on the Roslyn assembly version -->
29+
<!-- The 'CurrentCompilerVersionIsNotNewEnough' property can now be defined based on the Roslyn assembly version -->
3030
<CurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(CurrentCompilerVersion), 4.0))">true</CurrentCompilerVersionIsNotNewEnough>
3131
</PropertyGroup>
3232

@@ -35,12 +35,14 @@
3535
<Analyzer Remove="@(_MVVMToolkitAnalyzer)"/>
3636
</ItemGroup>
3737

38-
<!-- If the source generators are disabled, also emit a warning. This would've been produced by MSBuild itself as well, but
39-
emitting this manually lets us customize the message to inform developers as to why exactly the generators have been
40-
disabled, and that the rest of the MVVM Toolkit will still keep working as intended, just without additional features. -->
41-
<Warning Condition ="'$(CurrentCompilerVersionIsNotNewEnough)' == 'true'" Text="The MVVM Toolkit source generators have been disabled on the current configuration, as they need Roslyn 4.x in order to work. The MVVM Toolkit will work just fine, but features relying on the source generators will not be available."/>
38+
<!--
39+
If the source generators are disabled, also emit a warning. This would've been produced by MSBuild itself as well, but
40+
emitting this manually lets us customize the message to inform developers as to why exactly the generators have been
41+
disabled, and that the rest of the MVVM Toolkit will still keep working as intended, just without additional features.
42+
-->
43+
<Warning Condition ="'$(CurrentCompilerVersionIsNotNewEnough)' == 'true'" Text="The MVVM Toolkit source generators have been disabled on the current configuration, as they need Roslyn 4.x in order to work. The MVVM Toolkit will work just fine, but features relying on the source generators will not be available."/>
4244
</Target>
43-
45+
4446
<!-- Remove the analyzer if Roslyn is missing -->
4547
<Target Name="_MVVMToolkitRemoveAnalyzersForRosynNotFound"
4648
Condition="'$(CSharpCoreTargetsPath)' == ''"
@@ -53,4 +55,4 @@
5355
</ItemGroup>
5456
</Target>
5557

56-
</Project>
58+
</Project>

‎dotnet Community Toolkit.sln renamed to ‎CommunityToolkit.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
3030
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
3131
Contributing.md = Contributing.md
3232
License.md = License.md
33-
README.md = README.md
33+
ReadMe.md = ReadMe.md
3434
ThirdPartyNotices.txt = ThirdPartyNotices.txt
3535
EndProjectSection
3636
EndProject

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<!-- Embed source files that are not tracked by the source control manager to the PDB -->
3737
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3838
<!-- Include PDB in the built .nupkg -->
39-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
39+
<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

‎README.md renamed to ‎ReadMe.md

File renamed without changes.

‎build/Community.Toolkit.Common.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
<Company>.NET Foundation</Company>
55
<Authors>Microsoft.Toolkit</Authors>
66
<Product>.NET Community Toolkit</Product>
7-
<CommonTags>dotnet;Community;Toolkit</CommonTags>
7+
<CommonTags>.NET;Community;Toolkit;dotnet</CommonTags>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1010
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
1111
<PackageProjectUrl>https://github.com/CommunityToolkit/dotnet</PackageProjectUrl>
1212
<PackageReleaseNotes>https://github.com/CommunityToolkit/dotnet/releases</PackageReleaseNotes>
1313
<PackageIcon>Icon.png</PackageIcon>
14-
<PackageIconUrl>https://raw.githubusercontent.com/CommunityToolkit/dotnet/main/build/nuget.png</PackageIconUrl>
1514
</PropertyGroup>
1615

1716
<PropertyGroup>
18-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
17+
<Features>Strict</Features>
18+
<Nullable>Enable</Nullable>
1919
<LangVersion>10.0</LangVersion>
20-
<Nullable>enable</Nullable>
20+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2121
</PropertyGroup>
2222

2323
<PropertyGroup>
24-
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
24+
<IsTestProject>$(MSBuildProjectName.EndsWith('Tests'))</IsTestProject>
2525
<IsCoreProject Condition="$(IsTestProject)">False</IsCoreProject>
2626
<IsCoreProject Condition="'$(IsCoreProject)' == ''">True</IsCoreProject>
2727
</PropertyGroup>
@@ -32,4 +32,4 @@
3232
<ContinuousIntegrationBuild>$(TF_BUILD)</ContinuousIntegrationBuild>
3333
</PropertyGroup>
3434

35-
</Project>
35+
</Project>

‎build/Community.Toolkit.Common.targets

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup Condition="$(IsPackable)">
15-
<None Include="$(BuildToolsDirectory)nuget.png" Pack="true" PackagePath="\Icon.png" Visible="False" />
16-
<None Include="$(RepositoryDirectory)License.md" Pack="true" PackagePath="\" Visible="False" />
17-
<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" Visible="False" />
15+
<None Pack="true" PackagePath="\" Visible="False" Include="$(BuildToolsDirectory)Icon.png" />
16+
<None Pack="true" PackagePath="\" Visible="False" Include="$(RepositoryDirectory)License.md" />
17+
<None Pack="true" PackagePath="\" Visible="False" Include="$(RepositoryDirectory)ThirdPartyNotices.txt" />
1818
</ItemGroup>
1919

2020
</Project>

‎build/nuget.png renamed to ‎build/Icon.png

File renamed without changes.

‎tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
9-
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
8+
<ProjectReference Include="..\..\CommunityToolkit.Common\CommunityToolkit.Common.csproj" />
119
</ItemGroup>
1210

1311
<ItemGroup>
14-
<ProjectReference Include="..\..\CommunityToolkit.Common\CommunityToolkit.Common.csproj" />
12+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
13+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1515
</ItemGroup>
1616

17-
</Project>
17+
</Project>

0 commit comments

Comments
 (0)