[Guava] Add escape hatches for jar includes. (#1365)

xamarin · Apr 19, 2022 · 895182c · 895182c
1 parent e804797
commit 895182c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Android/Guava/Directory.Build.props b/Android/Guava/Directory.Build.props
@@ -3,9 +3,9 @@
  <!-- Uncomment if a $(PackageVersionSuffix) is ever needed -->
  <!-- <PackageVersionSuffix>-net6preview04</PackageVersionSuffix> -->
  <!-- <PackageVersionSuffix Condition=" '$(BUILD_BUILDID)' != '' ">$(PackageVersionSuffix).$(BUILD_BUILDID)</PackageVersionSuffix> -->
- <GuavaNuGetVersion>31.1.0$(PackageVersionSuffix)</GuavaNuGetVersion>
+ <GuavaNuGetVersion>31.1.0.1$(PackageVersionSuffix)</GuavaNuGetVersion>
  <GuavaFailureAccessNuGetVersion>1.0.1.6$(PackageVersionSuffix)</GuavaFailureAccessNuGetVersion>
- <GuavaListenableFutureNuGetVersion>1.0.0.6$(PackageVersionSuffix)</GuavaListenableFutureNuGetVersion>
+ <GuavaListenableFutureNuGetVersion>1.0.0.7$(PackageVersionSuffix)</GuavaListenableFutureNuGetVersion>
 
  <!-- Opt out of C#8 features to maintain compatibility with legacy -->
  <AndroidBoundInterfacesContainConstants>false</AndroidBoundInterfacesContainConstants>

diff --git a/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.targets b/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Condition=" '$(AndroidApplication)' == 'true' ">
+ <ItemGroup Condition=" '$(AndroidApplication)' == 'true' And '$(XamarinGoogleGuavaListenableFutureOptOut)' != 'true' ">
  <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
  </ItemGroup>
 </Project>
diff --git a/Android/Guava/source/Guava/Guava.targets b/Android/Guava/source/Guava/Guava.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <EmbeddedReferenceJar Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
+ <ItemGroup Condition=" '$(AndroidApplication)' == 'true' And '$(XamarinGoogleGuavaOptOut)' != 'true' ">
+ <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
  </ItemGroup>
 </Project>