Merge pull request #321 from CommunityToolkit/dev/fix-targets-conflicts

Add unique prefixes to all .targets properties and items
CommunityToolkit · Jun 22, 2022 · 90f1db2 · 90f1db2
2 parents a2c9313 + 86aaa99
commit 90f1db2
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets b/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets
@@ -1,55 +1,55 @@
 <Project>
 
   <!-- Get the analyzer from the CommunityToolkit.Mvvm NuGet package -->
-  <Target Name="_MVVMToolkitGatherAnalyzers">
+  <Target Name="MVVMToolkitGatherAnalyzers">
     <ItemGroup>
-      <_MVVMToolkitAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)' == 'CommunityToolkit.Mvvm'" />
+      <MVVMToolkitAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)' == 'CommunityToolkit.Mvvm'" />
     </ItemGroup>
   </Target>
 
   <!-- Remove the analyzer if using Roslyn 3.x (incremental generators require Roslyn 4.x) -->
-  <Target Name="_MVVMToolkitRemoveAnalyzersForRoslyn3"
+  <Target Name="MVVMToolkitRemoveAnalyzersForRoslyn3"
           Condition="'$(CSharpCoreTargetsPath)' != ''"
           AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
-          DependsOnTargets="_MVVMToolkitGatherAnalyzers">
+          DependsOnTargets="MVVMToolkitGatherAnalyzers">
 
     <!-- Use the CSharpCoreTargetsPath property to find the version of the compiler we are using. This is the same mechanism
          MSBuild uses to find the compiler. We could check the assembly version for any compiler assembly (since they all have
          the same version) but Microsoft.Build.Tasks.CodeAnalysis.dll is where MSBuild loads the compiler tasks from so if
          someone is getting creative with msbuild tasks/targets this is the "most correct" assembly to check. -->
     <GetAssemblyIdentity AssemblyFiles="$([System.IO.Path]::Combine(`$([System.IO.Path]::GetDirectoryName($(CSharpCoreTargetsPath)))`,`Microsoft.Build.Tasks.CodeAnalysis.dll`))">
-      <Output TaskParameter="Assemblies" ItemName="CurrentCompilerAssemblyIdentity"/>
+      <Output TaskParameter="Assemblies" ItemName="MVVMToolkitCurrentCompilerAssemblyIdentity"/>
     </GetAssemblyIdentity>
 
     <PropertyGroup>
 
       <!-- Transform the resulting item from GetAssemblyIdentity into a property representing its assembly version -->
-      <CurrentCompilerVersion>@(CurrentCompilerAssemblyIdentity->'%(Version)')</CurrentCompilerVersion>
+      <MVVMToolkitCurrentCompilerVersion>@(MVVMToolkitCurrentCompilerAssemblyIdentity->'%(Version)')</MVVMToolkitCurrentCompilerVersion>
 
       <!-- The CurrentCompilerVersionIsNotNewEnough property can now be defined based on the Roslyn assembly version -->
-      <CurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(CurrentCompilerVersion), 4.0))">true</CurrentCompilerVersionIsNotNewEnough>
+      <MVVMToolkitCurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(MVVMToolkitCurrentCompilerVersion), 4.0))">true</MVVMToolkitCurrentCompilerVersionIsNotNewEnough>
     </PropertyGroup>
 
     <!-- If the Roslyn version is < 4.0, disable the source generators -->
-    <ItemGroup Condition ="'$(CurrentCompilerVersionIsNotNewEnough)' == 'true'">
-      <Analyzer Remove="@(_MVVMToolkitAnalyzer)"/>
+    <ItemGroup Condition ="'$(MVVMToolkitCurrentCompilerVersionIsNotNewEnough)' == 'true'">
+      <Analyzer Remove="@(MVVMToolkitAnalyzer)"/>
     </ItemGroup>
 
     <!-- If the source generators are disabled, also emit a warning. This would've been produced by MSBuild itself as well, but
          emitting this manually lets us customize the message to inform developers as to why exactly the generators have been
          disabled, and that the rest of the MVVM Toolkit will still keep working as intended, just without additional features. -->
-    <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."/>
+    <Warning Condition ="'$(MVVMToolkitCurrentCompilerVersionIsNotNewEnough)' == '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."/>
   </Target>
 
   <!-- Remove the analyzer if Roslyn is missing -->
-  <Target Name="_MVVMToolkitRemoveAnalyzersForRosynNotFound"
+  <Target Name="MVVMToolkitRemoveAnalyzersForRosynNotFound"
           Condition="'$(CSharpCoreTargetsPath)' == ''"
           AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
-          DependsOnTargets="_MVVMToolkitGatherAnalyzers">
+          DependsOnTargets="MVVMToolkitGatherAnalyzers">
 
     <!-- If no Roslyn assembly could be found, just remove the analyzer without emitting a warning -->
     <ItemGroup>
-      <Analyzer Remove="@(_MVVMToolkitAnalyzer)"/>
+      <Analyzer Remove="@(MVVMToolkitAnalyzer)"/>
     </ItemGroup>
   </Target>