Skip to content

Commit dd07e44

Browse files
martijn00martijn00
committed
Update to 2.11.6
1 parent f6c1b87 commit dd07e44

File tree

69 files changed

+76
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+76
-35
lines changed

‎Directory.build.props‎

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<Project>
22
<PropertyGroup>
3-
<Copyright>Copyright (c) Martijn van Dijk</Copyright>
3+
<Copyright>Copyright (c) Baseflow</Copyright>
44
<PackageLicenseExpression>MIT</PackageLicenseExpression>
55
<PackageProjectUrl>https://github.com/Baseflow/ExoPlayerXamarin</PackageProjectUrl>
66
<PackageIconUrl>https://raw.githubusercontent.com/Baseflow/ExoPlayerXamarin/develop/icon.png</PackageIconUrl>
77
<!--<PackageIcon>icon.png</PackageIcon>-->
8-
<Authors>Martijn van Dijk</Authors>
8+
<Authors>Martijn van Dijk, Baseflow</Authors>
99
<Owners>Baseflow</Owners>
1010
<PackageTags>xamarin, exoplayer, exo, monodroid, C#, xamarin.android, android, audio, media, player, streaming, mp3</PackageTags>
1111
<PackageReleaseNotes>https://github.com/Baseflow/ExoPlayerXamarin/releases</PackageReleaseNotes>
1212
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
13-
13+
<NeutralLanguage>en-US</NeutralLanguage>
14+
<MinClientVersion>2.12</MinClientVersion>
15+
1416
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1517
<RepositoryUrl>https://github.com/Baseflow/ExoPlayerXamarin</RepositoryUrl>
1618
<RepositoryType>git</RepositoryType>
1719
<Product>$(AssemblyName) ($(TargetFramework))</Product>
18-
<NeutralLanguage>en</NeutralLanguage>
19-
<Version>2.11.4</Version>
20+
<Version>2.11.6</Version>
2021
<Platform>AnyCPU</Platform>
21-
22+
<!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
23+
2224
<!--<Nullable>enable</Nullable>-->
2325
<LangVersion>8.0</LangVersion>
2426
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
@@ -31,39 +33,68 @@
3133

3234
<DisableExtraReferences>true</DisableExtraReferences>
3335
</PropertyGroup>
34-
36+
3537
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
38+
<!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
39+
<IncludeSymbols>true</IncludeSymbols>
40+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
41+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
42+
3643
<DesignTimeBuild>false</DesignTimeBuild>
37-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
38-
<GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
3944
<DebugType>portable</DebugType>
4045
<DebugSymbols>true</DebugSymbols>
46+
47+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
48+
<GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
49+
</PropertyGroup>
50+
51+
<PropertyGroup Condition="'$(IsTestProject)' != 'true' and'$(TF_BUILD)' == 'true'">
52+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
53+
<Deterministic>true</Deterministic>
4154
</PropertyGroup>
4255

4356
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
4457
<DebugType>full</DebugType>
4558
<DebugSymbols>true</DebugSymbols>
4659
</PropertyGroup>
4760

48-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(OS)' == 'Windows_NT' ">
49-
<!--<IncludeSymbols>true</IncludeSymbols>
50-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
51-
52-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
53-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
54-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
55-
</PropertyGroup>
56-
57-
<ItemGroup>
61+
<ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
5862
<None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="\" />
5963
<None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
6064
</ItemGroup>
6165

62-
<ItemGroup Condition=" '$(SourceLinkEnabled)' != 'false' ">
66+
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
6367
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
6468
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6569
</ItemGroup>
6670

71+
<PropertyGroup>
72+
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
73+
</PropertyGroup>
74+
75+
<ItemGroup>
76+
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
77+
</ItemGroup>
78+
79+
<ItemGroup>
80+
<PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
81+
<PrivateAssets>all</PrivateAssets>
82+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
83+
</PackageReference>
84+
<PackageReference Include="AsyncFixer" Version="1.3.0">
85+
<PrivateAssets>all</PrivateAssets>
86+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
87+
</PackageReference>
88+
<!--<PackageReference Include="IDisposableAnalyzers" Version="3.3.1">
89+
<PrivateAssets>all</PrivateAssets>
90+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
91+
</PackageReference>-->
92+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
93+
<PrivateAssets>all</PrivateAssets>
94+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
95+
</PackageReference>
96+
</ItemGroup>
97+
6798
<!--<ItemGroup>
6899
<PackageReference Include="Xamarin.Build.Download" Version="0.8.0" PrivateAssets="All" />
69100
</ItemGroup>-->

‎Directory.build.targets‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
33
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
44
</PropertyGroup>
5+
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
6+
<DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
7+
</PropertyGroup>
58
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
69
<DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
710
</PropertyGroup>
@@ -10,8 +13,8 @@
1013
</PropertyGroup>
1114
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
1215
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
13-
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
14-
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
16+
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
17+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1518
</PropertyGroup>
1619
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
1720
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>

‎ExoPlayer.Core/ExoPlayer.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.1.0" />
22+
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.1.0.1" />
2323
</ItemGroup>
2424
</Project>

‎ExoPlayer.Core/Jars/exoplayer-core-2.11.3.aar‎

-1.59 MB
Binary file not shown.

‎ExoPlayer.Core/Jars/exoplayer-core-2.11.6.aar‎

1.6 MB
Binary file not shown.

ExoPlayer.Core/JavaDocs/exoplayer-core-2.11.3-sources.jar renamed to ExoPlayer.Core/JavaDocs/exoplayer-core-2.11.6-sources.jar

1.35 MB
Binary file not shown.

‎ExoPlayer.Dash/Jars/exoplayer-dash-2.11.3.aar‎

-110 KB
Binary file not shown.

‎ExoPlayer.Dash/Jars/exoplayer-dash-2.11.6.aar‎

111 KB
Binary file not shown.

‎ExoPlayer.Dash/JavaDocs/exoplayer-dash-2.11.3-sources.jar‎

-75.4 KB
Binary file not shown.

‎ExoPlayer.Dash/JavaDocs/exoplayer-dash-2.11.6-sources.jar‎

76.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)