Add workaround for dotnet/sdk#2337 into the Extras

novotnyllc · Aug 17, 2018 · bc948cc · bc948cc
1 parent bcc5cee
commit bc948cc
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets b/Source/MSBuild.Sdk.Extras/DefaultItems/Platforms/Common.targets
@@ -25,4 +25,15 @@
     <_SdkEmbeddedResourceCodeGeneratorTool Condition="'$(ExtrasEmbeddedResourceGeneratedCodeIsPublic)' == 'true'">PublicVbMyResourcesResXFileCodeGenerator</_SdkEmbeddedResourceCodeGeneratorTool>
   </PropertyGroup>
 
+
+  <!-- Workaround for https://github.com/dotnet/sdk/issues/2337 -->
+  <!-- Fix will be in https://github.com/dotnet/project-system/issues/935 -->
+  <PropertyGroup>
+    <_SdkMinVersionWithNoneIssue>2.1.300</_SdkMinVersionWithNoneIssue>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$([System.Version]::Parse($(_SdkNETCoreSdkVersion)))' >= '$([System.Version]::Parse($(_SdkMinVersionWithNoneIssue)))'">
+    <None Include="**\*$(DefaultLanguageSourceExtension)" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+
 </Project>
diff --git a/Tests/ClasslibraryAsSdk/Class.monoandroid.cs b/Tests/ClasslibraryAsSdk/Class.monoandroid.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MSBuild.Sdk.Extras.Tests
+{
+	public class ClassMono
+	{
+	    int SomeMethod(int a, int b) => a + b;
+    }
+}
diff --git a/Tests/ClasslibraryAsSdk/Class.cs → Tests/ClasslibraryAsSdk/Class.shared.cs b/Tests/ClasslibraryAsSdk/Class.cs → Tests/ClasslibraryAsSdk/Class.shared.cs
diff --git a/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj b/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj
@@ -10,16 +10,26 @@
     <ExtrasBuildEachRuntimeIdentifier Condition="'$(TargetFramework)' == 'netstandard2.0'">true</ExtrasBuildEachRuntimeIdentifier>
 	  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 	</PropertyGroup>
 
 
   <ItemGroup>
     <ReferenceAssemblyProjectReference Include="..\ClasslibraryAsSdk.Ref\ClasslibraryAsSdk.Ref.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="*.shared.cs" />
+    <Compile Include="*.Designer.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
+    <Compile Include="*.monoandroid.cs" />
+  </ItemGroup>
+
   <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" />