Update task assembly selection logic (#59)

Disable static analysis for XML documentation
microsoft · May 30, 2019 · 8f0ebac · 8f0ebac
1 parent 0be824e
commit 8f0ebac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/GlobalSuppressions.cs b/src/GlobalSuppressions.cs
@@ -8,7 +8,4 @@
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:FieldNamesMustNotBeginWithUnderscore", Justification = "Reviewed.")]
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:PrefixLocalCallsWithThis", Justification = "Reviewed.")]
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1118:ParameterMustNotSpanMultipleLines", Justification = "Reviewed.")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1121:UseBuiltInTypeAlias", Justification = "Reviewed.")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1611:ElementParametersMustBeDocumented", Justification = "Reviewed.")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Reviewed.")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1629:DocumentationTextMustEndWithAPeriod", Justification = "Reviewed.")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1121:UseBuiltInTypeAlias", Justification = "Reviewed.")]
diff --git a/src/SlnGen.Build.Tasks/SlnGen.Build.Tasks.csproj b/src/SlnGen.Build.Tasks/SlnGen.Build.Tasks.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>net45;net46;net472;netstandard2.0;netcoreapp2.1</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <BuildOutputTargetFolder>build\</BuildOutputTargetFolder>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);SA0001</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Label="Package properties">

diff --git a/src/SlnGen.Build.Tasks/build/Before.SlnGen.targets b/src/SlnGen.Build.Tasks/build/Before.SlnGen.targets
@@ -3,15 +3,17 @@
 
   <Import Project="$(CustomBeforeSlnGenTargets)" Condition="'$(CustomBeforeSlnGenTargets)' != '' and Exists('$(CustomBeforeSlnGenTargets)')"/>
 
-  <PropertyGroup Condition=" '$(SlnGenAssemblyFile)' == '' ">
-    <SlnGenAssemblyFile Condition=" '$(MSBuildRuntimeType)' == '' ">$(MSBuildThisFileDirectory)net45\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
-    <SlnGenAssemblyFile Condition=" '$(MSBuildRuntimeType)' == 'Full' ">$(MSBuildThisFileDirectory)net46\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
-    <SlnGenAssemblyFile Condition=" '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netstandard2.0\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+  <PropertyGroup Condition="'$(SlnGenAssemblyFile)' == ''">
+    <SlnGenAssemblyFile Condition="'$(MSBuildRuntimeType)' == ''">$(MSBuildThisFileDirectory)net45\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+    <SlnGenAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Full' And '$(MSBuildAssemblyVersion)' == '15.0'">$(MSBuildThisFileDirectory)net46\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+    <SlnGenAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Full' And '$(MSBuildAssemblyVersion)' >= '16.0'">$(MSBuildThisFileDirectory)net472\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+    <SlnGenAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core' And '$(MSBuildAssemblyVersion)' == '15.0'">$(MSBuildThisFileDirectory)netstandard2.0\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+    <SlnGenAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core' And '$(MSBuildAssemblyVersion)' >= '16.0'">$(MSBuildThisFileDirectory)netcoreapp2.1\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
   </PropertyGroup>
 
   <PropertyGroup>
-    <SlnGenGlobalProperties Condition=" '$(SlnGenGlobalProperties)' != '' ">DesignTimeBuild=true;BuildingProject=false;$(SlnGenGlobalProperties)</SlnGenGlobalProperties>
-    <SlnGenGlobalProperties Condition=" '$(SlnGenGlobalProperties)' == '' ">DesignTimeBuild=true;BuildingProject=false</SlnGenGlobalProperties>
+    <SlnGenGlobalProperties Condition="'$(SlnGenGlobalProperties)' != ''">DesignTimeBuild=true;BuildingProject=false;$(SlnGenGlobalProperties)</SlnGenGlobalProperties>
+    <SlnGenGlobalProperties Condition="'$(SlnGenGlobalProperties)' == ''">DesignTimeBuild=true;BuildingProject=false</SlnGenGlobalProperties>
   </PropertyGroup>
 
   <UsingTask TaskName="SlnGen" AssemblyFile="$(SlnGenAssemblyFile)" />