Android: Workaround MSBuild bug with ProjectReference

This works around a macOS-only error in Android sample projects which involves a javac error. This workaround is only needed when using ProjectReference, not PackageReference, so users should not be affected. dotnet/msbuild#3232
videolan · Dec 21, 2020 · a0163c1 · a0163c1
1 parent 2399ee8
commit a0163c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/...rp.Forms.Sample.MediaElement.Android/LibVLCSharp.Forms.Sample.MediaElement.Android.csproj b/...rp.Forms.Sample.MediaElement.Android/LibVLCSharp.Forms.Sample.MediaElement.Android.csproj
@@ -114,6 +114,10 @@
       <Project>{537a70a3-6565-41e2-8c65-5198e0f4eb45}</Project>
       <Name>LibVLCSharp.Forms.Sample.MediaElement</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\src\LibVLCSharp.Android.AWindow\LibVLCSharp.Android.AWindow.csproj">
+      <Project>{239A82A5-19A1-4382-8F9B-4A9705648017}</Project>
+      <Name>LibVLCSharp.Android.AWindow</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/samples/Forms/LibVLCSharp.Forms.Sample.Android/LibVLCSharp.Forms.Sample.Android.csproj b/samples/Forms/LibVLCSharp.Forms.Sample.Android/LibVLCSharp.Forms.Sample.Android.csproj
@@ -103,6 +103,10 @@
       <Project>{A7F1B21F-CA82-4FC7-871F-2BE5B9D6DA70}</Project>
       <Name>LibVLCSharp.Forms.Sample</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\src\LibVLCSharp.Android.AWindow\LibVLCSharp.Android.AWindow.csproj">
+      <Project>{239A82A5-19A1-4382-8F9B-4A9705648017}</Project>
+      <Name>LibVLCSharp.Android.AWindow</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/samples/LibVLCSharp.Android.Sample/LibVLCSharp.Android.Sample.csproj b/samples/LibVLCSharp.Android.Sample/LibVLCSharp.Android.Sample.csproj
@@ -95,6 +95,10 @@
       <Project>{d1c3b7c4-713b-46b2-b33a-e9298c819921}</Project>
       <Name>LibVLCSharp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\LibVLCSharp.Android.AWindow\LibVLCSharp.Android.AWindow.csproj">
+      <Project>{239A82A5-19A1-4382-8F9B-4A9705648017}</Project>
+      <Name>LibVLCSharp.Android.AWindow</Name>
+    </ProjectReference>
     <PackageReference Include="VideoLAN.LibVLC.Android" Version="3.1.2" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />