Media3

.gitattributes

@@ -1,15 +1,23 @@
-# This file is understood by git 1.7.2+.
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto eol=lf
+
+# Check out the following as ln always for osx/linux/cygwin
+*.sh text eol=lf
 
 # Windows specific files should always be crlf on checkout
 *.bat text eol=crlf
 *.cmd text eol=crlf
 *.ps1 text eol=crlf
 
-# Check out the following as ln always for osx/linux/cygwin
-*.sh text eol=lf
-
-# Opt in the following types to always normalize line endings
-# on checkin and always use native endings on checkout.
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
 *.config  text
 *.cs      text diff=csharp
 *.csproj  text
@@ -24,14 +32,55 @@
 *.xaml    text
 *.xml     text
 
-# Binary files
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
 *.bmp     binary
 *.jpeg    binary
 *.jpg     binary
 *.nupkg   binary
 *.png     binary
 *.sdf     binary
 
-*.html linguist-language=csharp
-*.css linguist-language=csharp
-*.js linguist-language=csharp
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily

.github/workflows/dotnet.yml

@@ -2,14 +2,14 @@ name: Dotnet build & publish
 
 on:
   push:
-    branches: [ develop, main, xamarin ]
+    branches: [ media3 ]
   pull_request:
-    branches: [ develop, xamarin ]
+    branches: [ media3 ]
 jobs:
   build:
 
     env:
-      SOLUTION: 'ExoPlayer.sln'
+      SOLUTION: 'Media3.sln'
 
     runs-on: windows-latest
 
@@ -21,10 +21,16 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
+
+    - name: Install MAUI Workloads
+      run: |
+          dotnet workload install android --ignore-failed-sources
+          dotnet workload install maui --ignore-failed-sources
+
     - name: Install dependencies
       run: dotnet restore $SOLUTION
     - name: Build
-      run: msbuild $SOLUTION -p:Configuration=Release -p:RestorePackages=false -verbosity:minimal
+      run: dotnet build --configuration Release
     - name: Publish
       if: startsWith(github.ref, 'refs/heads/main')
       run: dotnet nuget push artifacts\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{secrets.PUBLISH_TO_NUGET_ORG}} --skip-duplicate

Directory.Build.props

@@ -10,33 +10,30 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <MinClientVersion>2.14</MinClientVersion>
-
+
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/Baseflow/ExoPlayerXamarin</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>2.18.11</Version>
+    <Version>1.1.1</Version>
     <Platform>AnyCPU</Platform>
-    <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
 
-    <TargetFrameworks>net6.0-android32.0;net6.0-android33.0;net7.0-android33.0</TargetFrameworks>
-    
+    <TargetFrameworks>net7.0-android</TargetFrameworks>
+
     <Nullable>enable</Nullable>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
+    <WarningsAsErrors>$(WarningsAsErrors);BG8A00;BG8A01;BG8A04</WarningsAsErrors>
 
   </PropertyGroup>
-  
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
-    <!--<IncludeSymbols>true</IncludeSymbols>-->
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <IncludeSymbols>true</IncludeSymbols>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
     <DesignTimeBuild>false</DesignTimeBuild>
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
 
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -47,8 +44,6 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
@@ -58,4 +53,8 @@
     <None Include="$(MSBuildThisFileDirectory)\readme.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>

Directory.Build.targets

@@ -14,6 +14,9 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <DefineConstants>$(DefineConstants);NET;NET7</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <DefineConstants>$(DefineConstants);NET;NET7</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" >
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
   </PropertyGroup>