From 4f9ea37bbbf21e049658382ef7e3adf575db5f00 Mon Sep 17 00:00:00 2001
From: Martijn van Dijk <mhvdijk@gmail.com>
Date: Fri, 2 Sep 2022 13:33:40 +0200
Subject: [PATCH] Fixes

---
 Directory.Build.props                           | 17 -----------------
 ExoPlayer.Common/ExoPlayer.Common.csproj        | 13 ++-----------
 ExoPlayer.Common/Transforms/Metadata.xml        |  4 +++-
 ExoPlayer.Core/ExoPlayer.Core.csproj            | 10 ----------
 ExoPlayer.Core/Transforms/Metadata.xml          |  9 +++++++++
 ExoPlayer.Dash/ExoPlayer.Dash.csproj            | 10 ----------
 .../ExoPlayer.DataSource.csproj                 | 10 ----------
 ExoPlayer.Database/ExoPlayer.Database.csproj    | 10 ----------
 ExoPlayer.Decoder/ExoPlayer.Decoder.csproj      | 12 +-----------
 ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj    | 10 ----------
 .../ExoPlayer.Ext.Cronet.csproj                 | 10 ----------
 ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj      | 10 ----------
 .../ExoPlayer.Ext.Leanback.csproj               | 10 ----------
 .../ExoPlayer.Ext.Media2.csproj                 | 10 ----------
 .../ExoPlayer.Ext.MediaSession.csproj           | 10 ----------
 .../ExoPlayer.Ext.OkHttp.csproj                 | 10 ----------
 ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj    | 10 ----------
 .../ExoPlayer.Ext.Workmanager.csproj            | 10 ----------
 ExoPlayer.Extractor/ExoPlayer.Extractor.csproj  | 10 ----------
 ExoPlayer.Hls/ExoPlayer.Hls.csproj              | 10 ----------
 .../ExoPlayer.Robolectricutils.csproj           | 10 ----------
 ExoPlayer.Rtsp/ExoPlayer.Rtsp.csproj            | 10 ----------
 .../ExoPlayer.SmoothStreaming.csproj            | 10 ----------
 ExoPlayer.Testutils/ExoPlayer.Testutils.csproj  | 14 --------------
 .../ExoPlayer.Transformer.csproj                | 12 +-----------
 ExoPlayer.UI/ExoPlayer.UI.csproj                | 14 --------------
 ExoPlayer/ExoPlayer.csproj                      | 10 ----------
 27 files changed, 16 insertions(+), 269 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3e0d9d8d..95240f62 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -56,19 +56,6 @@
     <None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
       <PrivateAssets>all</PrivateAssets>
@@ -80,8 +67,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <!--<ItemGroup>
-    <PackageReference Include="Xamarin.Build.Download" Version="0.8.0" PrivateAssets="All" />
-  </ItemGroup>-->
-
 </Project>
diff --git a/ExoPlayer.Common/ExoPlayer.Common.csproj b/ExoPlayer.Common/ExoPlayer.Common.csproj
index 66fd5bfb..ce337310 100644
--- a/ExoPlayer.Common/ExoPlayer.Common.csproj
+++ b/ExoPlayer.Common/ExoPlayer.Common.csproj
@@ -5,20 +5,11 @@
     <RootNamespace>ExoPlayer.Common</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Common</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.3.0.4" />
     <PackageReference Include="Xamarin.Google.Guava" Version="31.1.0.3" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/ExoPlayer.Common/Transforms/Metadata.xml b/ExoPlayer.Common/Transforms/Metadata.xml
index 2f27fcd2..93246739 100644
--- a/ExoPlayer.Common/Transforms/Metadata.xml
+++ b/ExoPlayer.Common/Transforms/Metadata.xml
@@ -247,5 +247,7 @@
     <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='getCurrentCues' and count(parameter)=0]"/>
 
     <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.upstream']/class[@name='HttpDataSource.BaseFactory']/method[@name='createDataSourceInternal' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.upstream.HttpDataSource.RequestProperties']]">Com.Google.Android.Exoplayer2.Upstream.IDataSource</attr>
-    
+
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player.Listener']/method[@name='onPositionDiscontinuity' and count(parameter)=3 and parameter[1][@type='com.google.android.exoplayer2.Player.PositionInfo'] and parameter[2][@type='com.google.android.exoplayer2.Player.PositionInfo'] and parameter[3][@type='int']]" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player.Listener']/method[@name='onCues' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.text.Cue&gt;']]" />
 </metadata>
\ No newline at end of file
diff --git a/ExoPlayer.Core/ExoPlayer.Core.csproj b/ExoPlayer.Core/ExoPlayer.Core.csproj
index 56e20d72..dff44988 100644
--- a/ExoPlayer.Core/ExoPlayer.Core.csproj
+++ b/ExoPlayer.Core/ExoPlayer.Core.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Core</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Core</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.7.0.2" />
   </ItemGroup>
diff --git a/ExoPlayer.Core/Transforms/Metadata.xml b/ExoPlayer.Core/Transforms/Metadata.xml
index 01414c1b..bfa8a3ca 100644
--- a/ExoPlayer.Core/Transforms/Metadata.xml
+++ b/ExoPlayer.Core/Transforms/Metadata.xml
@@ -265,4 +265,13 @@
 
     <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.drm']/class[@name='FrameworkMediaDrm']/method[@name='createCryptoConfig' and count(parameter)=1 and parameter[1][@type='byte[]']]">Com.Google.Android.Exoplayer2.Decoder.ICryptoConfig</attr>
 
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.audio']/interface[@name='DefaultAudioSink.AudioTrackBufferSizeProvider']/field[@name='DEFAULT']" />
+
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='DefaultMediaSourceFactory']/method[@name='setDrmSessionManagerProvider' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.drm.DrmSessionManagerProvider']]">Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='ProgressiveMediaSource.Factory']/method[@name='setLoadErrorHandlingPolicy' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy']]">Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='DefaultMediaSourceFactory']/method[@name='setLoadErrorHandlingPolicy' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy']]">Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='ProgressiveMediaSource.Factory']/method[@name='setDrmSessionManagerProvider' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.drm.DrmSessionManagerProvider']]">Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory</attr>
+
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onCues' and count(parameter)=2 and parameter[1][@type='com.google.android.exoplayer2.analytics.AnalyticsListener.EventTime'] and parameter[2][@type='java.util.List&lt;com.google.android.exoplayer2.text.Cue&gt;']]" />
+
 </metadata>
diff --git a/ExoPlayer.Dash/ExoPlayer.Dash.csproj b/ExoPlayer.Dash/ExoPlayer.Dash.csproj
index f0e7bab5..0fd8a00d 100644
--- a/ExoPlayer.Dash/ExoPlayer.Dash.csproj
+++ b/ExoPlayer.Dash/ExoPlayer.Dash.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Dash</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Dash</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
   </ItemGroup>
diff --git a/ExoPlayer.DataSource/ExoPlayer.DataSource.csproj b/ExoPlayer.DataSource/ExoPlayer.DataSource.csproj
index e43567ae..a4d3fa7d 100644
--- a/ExoPlayer.DataSource/ExoPlayer.DataSource.csproj
+++ b/ExoPlayer.DataSource/ExoPlayer.DataSource.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.DataSource</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.DataSource</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />
     <ProjectReference Include="..\ExoPlayer.Database\ExoPlayer.Database.csproj" />
diff --git a/ExoPlayer.Database/ExoPlayer.Database.csproj b/ExoPlayer.Database/ExoPlayer.Database.csproj
index d9c4fd19..8bf84236 100644
--- a/ExoPlayer.Database/ExoPlayer.Database.csproj
+++ b/ExoPlayer.Database/ExoPlayer.Database.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Database</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Database</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />
   </ItemGroup>
diff --git a/ExoPlayer.Decoder/ExoPlayer.Decoder.csproj b/ExoPlayer.Decoder/ExoPlayer.Decoder.csproj
index ba4bd27e..bf3f071d 100644
--- a/ExoPlayer.Decoder/ExoPlayer.Decoder.csproj
+++ b/ExoPlayer.Decoder/ExoPlayer.Decoder.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Decoder</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Decoder</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />
   </ItemGroup>
diff --git a/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj b/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj
index 77a08092..84da3074 100644
--- a/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj
+++ b/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Ext.Cast</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Cast</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Xamarin.GooglePlayServices.Cast.Framework" Version="120.0.0.5" />
   </ItemGroup>
diff --git a/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj b/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj
index 865d6c56..c9be5fe2 100644
--- a/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj
+++ b/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Ext.Cronet</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Cronet</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Xamarin.GooglePlayServices.CroNet" Version="117.0.1.5" />
   </ItemGroup>
diff --git a/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj b/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj
index a662f17a..42b7a37a 100644
--- a/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj
+++ b/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj
@@ -5,17 +5,7 @@
     <RootNamespace>ExoPlayer.Ext.Ima</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Ima</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Xam.Plugins.Android.Interactivemedia.Ads" Version="3.19.2" />
diff --git a/ExoPlayer.Ext.Leanback/ExoPlayer.Ext.Leanback.csproj b/ExoPlayer.Ext.Leanback/ExoPlayer.Ext.Leanback.csproj
index ce7740a9..13173813 100644
--- a/ExoPlayer.Ext.Leanback/ExoPlayer.Ext.Leanback.csproj
+++ b/ExoPlayer.Ext.Leanback/ExoPlayer.Ext.Leanback.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Ext.Leanback</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Leanback</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Leanback" Version="1.0.0.16" />
   </ItemGroup>
diff --git a/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj b/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj
index bbff91c2..6ae9e7e0 100644
--- a/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj
+++ b/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Ext.Media2</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Media2</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove="Additions\SessionPlayerConnector.cs" />
   </ItemGroup>
diff --git a/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj b/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj
index c0208bd9..dff622ea 100644
--- a/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj
+++ b/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Ext.MediaSession</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.MediaSession</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Media" Version="1.4.3.2" />
   </ItemGroup>
diff --git a/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj b/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj
index 3c99876a..d47a4211 100644
--- a/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj
+++ b/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj
@@ -5,17 +5,7 @@
     <RootNamespace>ExoPlayer.Ext.OkHttp</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.OkHttp</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Square.OkHttp3" Version="4.9.2.3" />
diff --git a/ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj b/ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj
index 1921db69..bbdc1c0c 100644
--- a/ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj
+++ b/ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Ext.Rtmp</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Rtmp</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />
     <ProjectReference Include="..\ExoPlayer.DataSource\ExoPlayer.DataSource.csproj" />
diff --git a/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj b/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj
index 3189aeae..1e8e6570 100644
--- a/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj
+++ b/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj
@@ -5,17 +5,7 @@
     <RootNamespace>ExoPlayer.Ext.Workmanager</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Workmanager</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
diff --git a/ExoPlayer.Extractor/ExoPlayer.Extractor.csproj b/ExoPlayer.Extractor/ExoPlayer.Extractor.csproj
index 02d03f22..1c8f45e1 100644
--- a/ExoPlayer.Extractor/ExoPlayer.Extractor.csproj
+++ b/ExoPlayer.Extractor/ExoPlayer.Extractor.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Extractor</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Extractor</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />
     <ProjectReference Include="..\ExoPlayer.Decoder\ExoPlayer.Decoder.csproj" />
diff --git a/ExoPlayer.Hls/ExoPlayer.Hls.csproj b/ExoPlayer.Hls/ExoPlayer.Hls.csproj
index 2e780e9c..80fcf83b 100644
--- a/ExoPlayer.Hls/ExoPlayer.Hls.csproj
+++ b/ExoPlayer.Hls/ExoPlayer.Hls.csproj
@@ -5,17 +5,7 @@
     <RootNamespace>ExoPlayer.Hls</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Hls</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
diff --git a/ExoPlayer.Robolectricutils/ExoPlayer.Robolectricutils.csproj b/ExoPlayer.Robolectricutils/ExoPlayer.Robolectricutils.csproj
index 609d1808..3b46b7eb 100644
--- a/ExoPlayer.Robolectricutils/ExoPlayer.Robolectricutils.csproj
+++ b/ExoPlayer.Robolectricutils/ExoPlayer.Robolectricutils.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Robolectricutils</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Robolectricutils</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
     <ProjectReference Include="..\ExoPlayer.Testutils\ExoPlayer.Testutils.csproj" />
diff --git a/ExoPlayer.Rtsp/ExoPlayer.Rtsp.csproj b/ExoPlayer.Rtsp/ExoPlayer.Rtsp.csproj
index 9cde7704..ea1ca6b6 100644
--- a/ExoPlayer.Rtsp/ExoPlayer.Rtsp.csproj
+++ b/ExoPlayer.Rtsp/ExoPlayer.Rtsp.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Rtsp</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Rtsp</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
   </ItemGroup>
diff --git a/ExoPlayer.SmoothStreaming/ExoPlayer.SmoothStreaming.csproj b/ExoPlayer.SmoothStreaming/ExoPlayer.SmoothStreaming.csproj
index 7e8ee530..a4234407 100644
--- a/ExoPlayer.SmoothStreaming/ExoPlayer.SmoothStreaming.csproj
+++ b/ExoPlayer.SmoothStreaming/ExoPlayer.SmoothStreaming.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.SmoothStreaming</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.SmoothStreaming</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
   </ItemGroup>
diff --git a/ExoPlayer.Testutils/ExoPlayer.Testutils.csproj b/ExoPlayer.Testutils/ExoPlayer.Testutils.csproj
index 78050470..9c47610e 100644
--- a/ExoPlayer.Testutils/ExoPlayer.Testutils.csproj
+++ b/ExoPlayer.Testutils/ExoPlayer.Testutils.csproj
@@ -5,24 +5,10 @@
     <RootNamespace>ExoPlayer.Testutils</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Testutils</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="JavaDocs\" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/ExoPlayer.Transformer/ExoPlayer.Transformer.csproj b/ExoPlayer.Transformer/ExoPlayer.Transformer.csproj
index 7df7c8e3..f337c31c 100644
--- a/ExoPlayer.Transformer/ExoPlayer.Transformer.csproj
+++ b/ExoPlayer.Transformer/ExoPlayer.Transformer.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.Transformer</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.Transformer</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-	  <LibraryProjectZip Include="Jars\*.aar" />
-	  <TransformFile Include="Transforms\*.xml" />
-	  <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
   </ItemGroup>
diff --git a/ExoPlayer.UI/ExoPlayer.UI.csproj b/ExoPlayer.UI/ExoPlayer.UI.csproj
index fc73181b..a3b62a14 100644
--- a/ExoPlayer.UI/ExoPlayer.UI.csproj
+++ b/ExoPlayer.UI/ExoPlayer.UI.csproj
@@ -5,18 +5,8 @@
     <RootNamespace>ExoPlayer.UI</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer.UI</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
-
    <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Media" Version="1.4.3.2" />
     <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
@@ -25,8 +15,4 @@
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="JavaDocs\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ExoPlayer/ExoPlayer.csproj b/ExoPlayer/ExoPlayer.csproj
index abc3364c..4e4d6968 100644
--- a/ExoPlayer/ExoPlayer.csproj
+++ b/ExoPlayer/ExoPlayer.csproj
@@ -5,17 +5,7 @@
     <RootNamespace>ExoPlayer</RootNamespace>
     <Description>Xamarin bindings for ExoPlayer</Description>
     <PackageId>Xam.Plugins.Android.ExoPlayer</PackageId>
-    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Additions\*;Jars\*;Transforms\*;JavaDocs\**" />
-    <LibraryProjectZip Include="Jars\*.aar" />
-    <TransformFile Include="Transforms\*.xml" />
-    <Compile Include="Additions\*.cs" />
-    <None Include="..\readme.txt" pack="true" PackagePath="." />
-    <JavaSourceJar Include="JavaDocs\*.jar" />
-  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />