Merge pull request #177 from mattleibow/patch-2

Add a workaround for #176
novotnyllc · Aug 13, 2019 · 8ce9859 · 8ce9859
2 parents 6a55d19 + bb2a609
commit 8ce9859
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets b/Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Xamarin.targets
@@ -34,4 +34,12 @@
     <Error Text="The Binding Project for $(_SdkTargetPlatformName) is only supported with only C#, not with $(_SdkLanguageSourceName). Please change the project to C# to use the Bindings Project.'"/>
   </Target>
 
+  <!-- A workaround for https://github.com/microsoft/msbuild/issues/4584 and resolves https://github.com/onovotny/MSBuildSdkExtras/issues/176 -->
+  <Target Name="_RemoveNativeReferencesManifest" Condition="'$(IsApplePlatform)' == 'true'" AfterTargets="BuiltProjectOutputGroup">
+    <ItemGroup>
+      <_BuiltProjectOutputGroupOutputIntermediate Remove="$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
+      <BuiltProjectOutputGroupOutput Remove="$(ProjectDir)$(OutDir)$(_DeploymentTargetApplicationManifestFileName)" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj b/Tests/ClasslibraryAsSdk/ClasslibraryAsSdk.csproj
@@ -32,6 +32,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
+    <NativeReference Include="Resource1.resx" />
+  </ItemGroup>
+
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
     <Page Include="uwp\**\*.xaml"/>
     <Compile Include="uwp\**\*.cs" />