Fixes

Baseflow · Sep 2, 2022 · 4f9ea37 · 4f9ea37
1 parent 83987d3
commit 4f9ea37
Show file tree

Hide file tree

Showing 27 changed files with 16 additions and 269 deletions.
diff --git 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
@@ -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>
diff --git 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>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" />