diff --git a/Directory.Build.props b/Directory.Build.props
index 9364a8b..070613e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -79,20 +79,12 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Project Assets">
-    <ProjectIcon Condition="Exists('$(MSBuildThisFileDirectory)\icon.png')">
-      $(MSBuildThisFileDirectory)icon.png
-    </ProjectIcon>
-    <ProjectIcon Condition="Exists('$(MSBuildProjectDirectory)\icon.png')">
-      $(MSBuildProjectDirectory)icon.png
-    </ProjectIcon>
+    <ProjectIcon Condition="Exists('$(MSBuildThisFileDirectory)icon.png')">$(MSBuildThisFileDirectory)icon.png</ProjectIcon>
+    <ProjectIcon Condition="Exists('$(MSBuildProjectDirectory)\icon.png')">$(MSBuildProjectDirectory)\icon.png</ProjectIcon>
     <ProjectIconExists Condition="$(ProjectIcon) != ''">true</ProjectIconExists>
 
-    <ProjectReadMe Condition="Exists('$(MSBuildThisFileDirectory)\README.md')">
-      $(MSBuildThisFileDirectory)README.md
-    </ProjectReadMe>
-    <ProjectReadMe Condition="Exists('$(MSBuildProjectDirectory)\README.md')">
-      $(MSBuildProjectDirectory)README.md
-    </ProjectReadMe>
+    <ProjectReadMe Condition="Exists('$(MSBuildThisFileDirectory)README.md')">$(MSBuildThisFileDirectory)README.md</ProjectReadMe>
+    <ProjectReadMe Condition="Exists('$(MSBuildProjectDirectory)\README.md')">$(MSBuildProjectDirectory)\README.md</ProjectReadMe>
     <ProjectReadMeExists Condition="$(ProjectReadMe) != ''">true</ProjectReadMeExists>
   </PropertyGroup>
 
@@ -127,11 +119,6 @@
     <EFOptimizeContext>true</EFOptimizeContext>
   </PropertyGroup>
 
-  <!-- Mark assemblies as CLS compliant so the compiler warns on non compliant usage -->
-  <PropertyGroup Condition="$(IsPackable) == 'true'">
-    <ClsCompliant>true</ClsCompliant>
-    <GenerateSBOM>true</GenerateSBOM>
-  </PropertyGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.CLSCompliant">
       <_Parameter1>$(ClsCompliant)</_Parameter1>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 697b16b..047c3da 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -9,6 +9,12 @@
     <None Update="packages.lock.json" Visible="false" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <ClsCompliant Condition="'$(SkipClsCompliant)' != 'true' AND '$(IsPackable)' != 'false' AND '$(IsTestProject)' != 'true'">true</ClsCompliant>
+    <ClsCompliant Condition="'$(ClsCompliant)' == ''">false</ClsCompliant>
+    <GenerateSBOM Condition="'$(IsPackable)' != 'false' AND '$(IsTestProject)' != 'true'">true</GenerateSBOM>
+  </PropertyGroup>
+
   <ItemGroup
     Condition="'$(UsingMicrosoftNETSdkWeb)' == 'True' AND @(PackageReference->WithMetadataValue('Identity','Microsoft.AspNetCore.OpenApi')->Count()) &gt; 0">
     <PackageReference Include="Microsoft.Extensions.ApiDescription.Server">