Update to 2.11.6

Baseflow · Jun 24, 2020 · dd07e44 · dd07e44
1 parent f6c1b87
commit dd07e44
Show file tree

Hide file tree

Showing 69 changed files with 76 additions and 35 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -1,24 +1,26 @@
 <Project>
   <PropertyGroup>
-    <Copyright>Copyright (c) Martijn van Dijk</Copyright>
+    <Copyright>Copyright (c) Baseflow</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Baseflow/ExoPlayerXamarin</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/Baseflow/ExoPlayerXamarin/develop/icon.png</PackageIconUrl>
     <!--<PackageIcon>icon.png</PackageIcon>-->
-    <Authors>Martijn van Dijk</Authors>
+    <Authors>Martijn van Dijk, Baseflow</Authors>
     <Owners>Baseflow</Owners>
     <PackageTags>xamarin, exoplayer, exo, monodroid, C#, xamarin.android, android, audio, media, player, streaming, mp3</PackageTags>
     <PackageReleaseNotes>https://github.com/Baseflow/ExoPlayerXamarin/releases</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <MinClientVersion>2.12</MinClientVersion>
+
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/Baseflow/ExoPlayerXamarin</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <NeutralLanguage>en</NeutralLanguage>
-    <Version>2.11.4</Version>
+    <Version>2.11.6</Version>
     <Platform>AnyCPU</Platform>
-
+    <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
+
     <!--<Nullable>enable</Nullable>-->
     <LangVersion>8.0</LangVersion>
     <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
@@ -31,39 +33,68 @@
 
     <DisableExtraReferences>true</DisableExtraReferences>
   </PropertyGroup>
-
+  
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
+    <IncludeSymbols>true</IncludeSymbols>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <DesignTimeBuild>false</DesignTimeBuild>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
+
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsTestProject)' != 'true' and'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Deterministic>true</Deterministic>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(OS)' == 'Windows_NT' ">
-    <!--<IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
-
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-  </PropertyGroup>
-
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
     <None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(SourceLinkEnabled)' != 'false' ">
+  <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="2.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="AsyncFixer" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <!--<PackageReference Include="IDisposableAnalyzers" Version="3.3.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>-->
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <!--<ItemGroup>
     <PackageReference Include="Xamarin.Build.Download" Version="0.8.0" PrivateAssets="All" />
   </ItemGroup>-->

diff --git a/Directory.build.targets b/Directory.build.targets
@@ -2,6 +2,9 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
     <DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
+    <DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
   </PropertyGroup>
@@ -10,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>

diff --git a/ExoPlayer.Core/ExoPlayer.Core.csproj b/ExoPlayer.Core/ExoPlayer.Core.csproj
@@ -19,6 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.1.0" />
+    <PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.1.0.1" />
   </ItemGroup>
 </Project>
diff --git a/ExoPlayer.Core/Jars/exoplayer-core-2.11.3.aar b/ExoPlayer.Core/Jars/exoplayer-core-2.11.3.aar
diff --git a/ExoPlayer.Core/Jars/exoplayer-core-2.11.6.aar b/ExoPlayer.Core/Jars/exoplayer-core-2.11.6.aar
diff --git a/...avaDocs/exoplayer-core-2.11.3-sources.jar → ...avaDocs/exoplayer-core-2.11.6-sources.jar b/...avaDocs/exoplayer-core-2.11.3-sources.jar → ...avaDocs/exoplayer-core-2.11.6-sources.jar
diff --git a/ExoPlayer.Dash/Jars/exoplayer-dash-2.11.3.aar b/ExoPlayer.Dash/Jars/exoplayer-dash-2.11.3.aar
diff --git a/ExoPlayer.Dash/Jars/exoplayer-dash-2.11.6.aar b/ExoPlayer.Dash/Jars/exoplayer-dash-2.11.6.aar
diff --git a/ExoPlayer.Dash/JavaDocs/exoplayer-dash-2.11.3-sources.jar b/ExoPlayer.Dash/JavaDocs/exoplayer-dash-2.11.3-sources.jar
diff --git a/ExoPlayer.Dash/JavaDocs/exoplayer-dash-2.11.6-sources.jar b/ExoPlayer.Dash/JavaDocs/exoplayer-dash-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj b/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.GooglePlayServices.Cast.Framework" Version="71.1602.0" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Cast.Framework" Version="118.1.0-preview01" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExoPlayer.Ext.Cast/Jars/extension-cast-2.11.3.aar b/ExoPlayer.Ext.Cast/Jars/extension-cast-2.11.3.aar
diff --git a/ExoPlayer.Ext.Cast/Jars/extension-cast-2.11.6.aar b/ExoPlayer.Ext.Cast/Jars/extension-cast-2.11.6.aar
diff --git a/...avaDocs/extension-cast-2.11.3-sources.jar → ...avaDocs/extension-cast-2.11.6-sources.jar b/...avaDocs/extension-cast-2.11.3-sources.jar → ...avaDocs/extension-cast-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Cronet/Jars/extension-cronet-2.11.3.aar b/ExoPlayer.Ext.Cronet/Jars/extension-cronet-2.11.3.aar
diff --git a/ExoPlayer.Ext.Cronet/Jars/extension-cronet-2.11.6.aar b/ExoPlayer.Ext.Cronet/Jars/extension-cronet-2.11.6.aar
diff --git a/ExoPlayer.Ext.Cronet/JavaDocs/extension-cronet-2.11.3-sources.jar b/ExoPlayer.Ext.Cronet/JavaDocs/extension-cronet-2.11.3-sources.jar
diff --git a/ExoPlayer.Ext.Cronet/JavaDocs/extension-cronet-2.11.6-sources.jar b/ExoPlayer.Ext.Cronet/JavaDocs/extension-cronet-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Gvr/Jars/extension-gvr-2.11.3.aar b/ExoPlayer.Ext.Gvr/Jars/extension-gvr-2.11.3.aar
diff --git a/ExoPlayer.Ext.Gvr/Jars/extension-gvr-2.11.6.aar b/ExoPlayer.Ext.Gvr/Jars/extension-gvr-2.11.6.aar
diff --git a/...JavaDocs/extension-gvr-2.11.3-sources.jar → ...JavaDocs/extension-gvr-2.11.6-sources.jar b/...JavaDocs/extension-gvr-2.11.3-sources.jar → ...JavaDocs/extension-gvr-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj b/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xam.Plugins.Android.Interactivemedia.Ads" Version="3.11.3" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Ads.Identifier" Version="71.1600.0" />
+    <PackageReference Include="Xam.Plugins.Android.Interactivemedia.Ads" Version="3.19.2" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Ads.Identifier" Version="117.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExoPlayer.Ext.Ima/Jars/extension-ima-2.11.3.aar b/ExoPlayer.Ext.Ima/Jars/extension-ima-2.11.3.aar
diff --git a/ExoPlayer.Ext.Ima/Jars/extension-ima-2.11.6.aar b/ExoPlayer.Ext.Ima/Jars/extension-ima-2.11.6.aar
diff --git a/ExoPlayer.Ext.Ima/JavaDocs/extension-ima-2.11.3-sources.jar b/ExoPlayer.Ext.Ima/JavaDocs/extension-ima-2.11.3-sources.jar
diff --git a/ExoPlayer.Ext.Ima/JavaDocs/extension-ima-2.11.6-sources.jar b/ExoPlayer.Ext.Ima/JavaDocs/extension-ima-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Jobdispatcher/Jars/extension-jobdispatcher-2.11.3.aar b/ExoPlayer.Ext.Jobdispatcher/Jars/extension-jobdispatcher-2.11.3.aar
diff --git a/ExoPlayer.Ext.Jobdispatcher/Jars/extension-jobdispatcher-2.11.6.aar b/ExoPlayer.Ext.Jobdispatcher/Jars/extension-jobdispatcher-2.11.6.aar
diff --git a/...xtension-jobdispatcher-2.11.3-sources.jar → ...xtension-jobdispatcher-2.11.6-sources.jar b/...xtension-jobdispatcher-2.11.3-sources.jar → ...xtension-jobdispatcher-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Leanback/ExoPlayer.Ext.Leanback.csproj b/ExoPlayer.Ext.Leanback/ExoPlayer.Ext.Leanback.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Leanback" Version="1.0.0" />
+    <PackageReference Include="Xamarin.AndroidX.Leanback" Version="1.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...anback/Jars/extension-leanback-2.11.3.aar → ...anback/Jars/extension-leanback-2.11.6.aar b/...anback/Jars/extension-leanback-2.11.3.aar → ...anback/Jars/extension-leanback-2.11.6.aar
diff --git a/...ocs/extension-leanback-2.11.3-sources.jar → ...ocs/extension-leanback-2.11.6-sources.jar b/...ocs/extension-leanback-2.11.3-sources.jar → ...ocs/extension-leanback-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj b/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Media" Version="1.1.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media" Version="1.1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-2.11.3.aar b/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-2.11.3.aar
diff --git a/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-2.11.6.aar b/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-2.11.6.aar
diff --git a/ExoPlayer.Ext.MediaSession/JavaDocs/extension-mediasession-2.11.3-sources.jar b/ExoPlayer.Ext.MediaSession/JavaDocs/extension-mediasession-2.11.3-sources.jar
diff --git a/ExoPlayer.Ext.MediaSession/JavaDocs/extension-mediasession-2.11.6-sources.jar b/ExoPlayer.Ext.MediaSession/JavaDocs/extension-mediasession-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj b/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Square.OkHttp3" Version="3.12.3" />
+    <PackageReference Include="Square.OkHttp3" Version="3.12.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-2.11.3.aar b/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-2.11.3.aar
diff --git a/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-2.11.6.aar b/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-2.11.6.aar
diff --git a/ExoPlayer.Ext.OkHttp/JavaDocs/extension-okhttp-2.11.3-sources.jar b/ExoPlayer.Ext.OkHttp/JavaDocs/extension-okhttp-2.11.3-sources.jar
diff --git a/ExoPlayer.Ext.OkHttp/JavaDocs/extension-okhttp-2.11.6-sources.jar b/ExoPlayer.Ext.OkHttp/JavaDocs/extension-okhttp-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Rtmp/Jars/extension-rtmp-2.11.3.aar b/ExoPlayer.Ext.Rtmp/Jars/extension-rtmp-2.11.3.aar
diff --git a/ExoPlayer.Ext.Rtmp/Jars/extension-rtmp-2.11.6.aar b/ExoPlayer.Ext.Rtmp/Jars/extension-rtmp-2.11.6.aar
diff --git a/...avaDocs/extension-rtmp-2.11.3-sources.jar → ...avaDocs/extension-rtmp-2.11.6-sources.jar b/...avaDocs/extension-rtmp-2.11.3-sources.jar → ...avaDocs/extension-rtmp-2.11.6-sources.jar
diff --git a/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj b/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj
@@ -23,6 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.2.0" />
+    <PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.3.4.3" />
   </ItemGroup>
 </Project>
diff --git a/ExoPlayer.Ext.Workmanager/Jars/extension-workmanager-2.11.3.aar b/ExoPlayer.Ext.Workmanager/Jars/extension-workmanager-2.11.3.aar
diff --git a/ExoPlayer.Ext.Workmanager/Jars/extension-workmanager-2.11.6.aar b/ExoPlayer.Ext.Workmanager/Jars/extension-workmanager-2.11.6.aar
diff --git a/.../extension-workmanager-2.11.3-sources.jar → .../extension-workmanager-2.11.6-sources.jar b/.../extension-workmanager-2.11.3-sources.jar → .../extension-workmanager-2.11.6-sources.jar
diff --git a/ExoPlayer.Hls/Jars/exoplayer-hls-2.11.3.aar b/ExoPlayer.Hls/Jars/exoplayer-hls-2.11.3.aar
diff --git a/ExoPlayer.Hls/Jars/exoplayer-hls-2.11.6.aar b/ExoPlayer.Hls/Jars/exoplayer-hls-2.11.6.aar
diff --git a/...JavaDocs/exoplayer-hls-2.11.3-sources.jar → ...JavaDocs/exoplayer-hls-2.11.6-sources.jar b/...JavaDocs/exoplayer-hls-2.11.3-sources.jar → ...JavaDocs/exoplayer-hls-2.11.6-sources.jar
diff --git a/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-2.11.3.aar b/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-2.11.3.aar
diff --git a/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-2.11.6.aar b/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-2.11.6.aar
diff --git a/...player-smoothstreaming-2.11.3-sources.jar → ...player-smoothstreaming-2.11.6-sources.jar b/...player-smoothstreaming-2.11.3-sources.jar → ...player-smoothstreaming-2.11.6-sources.jar
diff --git a/ExoPlayer.Testutils/Jars/exoplayer-testutils-2.11.3.aar b/ExoPlayer.Testutils/Jars/exoplayer-testutils-2.11.3.aar
diff --git a/ExoPlayer.Testutils/Jars/exoplayer-testutils-2.11.6.aar b/ExoPlayer.Testutils/Jars/exoplayer-testutils-2.11.6.aar
diff --git a/...cs/exoplayer-testutils-2.11.3-sources.jar → ...cs/exoplayer-testutils-2.11.6-sources.jar b/...cs/exoplayer-testutils-2.11.3-sources.jar → ...cs/exoplayer-testutils-2.11.6-sources.jar
diff --git a/ExoPlayer.UI/ExoPlayer.UI.csproj b/ExoPlayer.UI/ExoPlayer.UI.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
    <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Media" Version="1.1.0" />
+    <PackageReference Include="Xamarin.AndroidX.Media" Version="1.1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExoPlayer.UI/Jars/exoplayer-ui-2.11.3.aar b/ExoPlayer.UI/Jars/exoplayer-ui-2.11.3.aar
diff --git a/ExoPlayer.UI/Jars/exoplayer-ui-2.11.6.aar b/ExoPlayer.UI/Jars/exoplayer-ui-2.11.6.aar
diff --git a/ExoPlayer.UI/JavaDocs/exoplayer-ui-2.11.3-sources.jar b/ExoPlayer.UI/JavaDocs/exoplayer-ui-2.11.3-sources.jar
diff --git a/ExoPlayer.UI/JavaDocs/exoplayer-ui-2.11.6-sources.jar b/ExoPlayer.UI/JavaDocs/exoplayer-ui-2.11.6-sources.jar
diff --git a/ExoPlayer/Jars/exoplayer-2.11.3.aar b/ExoPlayer/Jars/exoplayer-2.11.3.aar
diff --git a/ExoPlayer/Jars/exoplayer-2.11.6.aar b/ExoPlayer/Jars/exoplayer-2.11.6.aar
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Martijn van Dijk
+Copyright (c) 2020 Baseflow
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Samples/Cast/ExoPlayer.CastDemo.csproj b/Samples/Cast/ExoPlayer.CastDemo.csproj
@@ -58,6 +58,10 @@
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <PropertyGroup>
     <AndroidErrorOnCustomJavaObject>false</AndroidErrorOnCustomJavaObject>

diff --git a/Samples/Directory.build.props b/Samples/Directory.build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Copyright>Copyright (c) Martijn van Dijk</Copyright>
+    <Copyright>Copyright (c) Baseflow</Copyright>
     <Authors>Martijn van Dijk</Authors>
     <Owners>martijn00</Owners>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>

diff --git a/Samples/Directory.build.targets b/Samples/Directory.build.targets
@@ -2,6 +2,9 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
     <DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
+    <DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
   </PropertyGroup>
@@ -10,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>