Merge pull request #91 from CommunityToolkit/dev/targets-update

Update .targets for MVVM Toolkit to fix .wapproj issues

Author: Sergio0694

CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets

@@ -9,6 +9,7 @@
 
   <!-- Remove the analyzer if using Roslyn 3.x (incremental generators require Roslyn 4.x) -->
   <Target Name="_MVVMToolkitRemoveAnalyzersForRoslyn3"
+          Condition="'$(CSharpCoreTargetsPath)' != ''"
           AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
           DependsOnTargets="_MVVMToolkitGatherAnalyzers">
 
@@ -19,26 +20,37 @@
     <GetAssemblyIdentity AssemblyFiles="$([System.IO.Path]::Combine(`$([System.IO.Path]::GetDirectoryName($(CSharpCoreTargetsPath)))`,`Microsoft.Build.Tasks.CodeAnalysis.dll`))">
       <Output TaskParameter="Assemblies" ItemName="CurrentCompilerAssemblyIdentity"/>
     </GetAssemblyIdentity>
-    
+
     <PropertyGroup>
 
       <!-- Transform the resulting item from GetAssemblyIdentity into a property representing its assembly version -->
       <CurrentCompilerVersion>@(CurrentCompilerAssemblyIdentity->'%(Version)')</CurrentCompilerVersion>
-      
+
       <!-- The CurrentCompilerVersionIsNotNewEnough property can now be defined based on the Roslyn assembly version -->
       <CurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(CurrentCompilerVersion), 4.0))">true</CurrentCompilerVersionIsNotNewEnough>
-      <CurrentCompilerVersionIsNotNewEnough Condition="$(CurrentCompilerVersionIsNotNewEnough) == ''">false</CurrentCompilerVersionIsNotNewEnough>
     </PropertyGroup>
-    
+
     <!-- If the Roslyn version is < 4.0, disable the source generators -->
-    <ItemGroup Condition ="$(CurrentCompilerVersionIsNotNewEnough) == 'true'">
+    <ItemGroup Condition ="'$(CurrentCompilerVersionIsNotNewEnough)' == '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 ="'$(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."/>  
+  </Target>
+  
+  <!-- Remove the analyzer if Roslyn is missing -->
+  <Target Name="_MVVMToolkitRemoveAnalyzersForRosynNotFound"
+          Condition="'$(CSharpCoreTargetsPath)' == ''"
+          AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
+          DependsOnTargets="_MVVMToolkitGatherAnalyzers">
+
+    <!-- If no Roslyn assembly could be found, just remove the analyzer without emitting a warning -->
+    <ItemGroup>
+      <Analyzer Remove="@(_MVVMToolkitAnalyzer)"/>
+    </ItemGroup>
   </Target>
 
 </Project>