Only none-include if default compile items are off

novotnyllc · Sep 1, 2018 · 9099675 · 9099675
1 parent 4d63077
commit 9099675
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets
@@ -32,7 +32,7 @@
     <_SdkMinVersionWithNoneIssue>2.1.300</_SdkMinVersionWithNoneIssue>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$([System.Version]::Parse($(_SdkNETCoreSdkVersion)))' >= '$([System.Version]::Parse($(_SdkMinVersionWithNoneIssue)))'">
+  <ItemGroup Condition="'$(EnableDefaultCompileItems)' == 'false' and '$([System.Version]::Parse($(_SdkNETCoreSdkVersion)).CompareTo($([System.Version]::Parse($(_SdkMinVersionWithNoneIssue)))))' &gt;= '0'" >
     <None Include="**\*$(DefaultLanguageSourceExtension)" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
 

diff --git a/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj b/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj
@@ -29,7 +29,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'xamarin.mac20'">
     <Reference Include="System.Xml" />
-  </ItemGroup>  
+  </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\Source\MSBuild.Sdk.Extras\Sdk\Sdk.targets" />
 	<Import Project="..\Test.targets" />