Skip to content

Commit

Permalink
Target net8.0 and update nuget packages
Browse files Browse the repository at this point in the history
  • Loading branch information
tmk907 committed Jan 5, 2024
1 parent 1e1afad commit 65d5ea0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions AndroidYouTubeDownloader/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.tmk907.androidyoutubedownloader" android:versionCode="13" android:versionName="1.3.8">
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.AndroidYouTubeDownloader"></application>
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/Theme.AndroidYouTubeDownloader"></application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="31" />
</manifest>
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34" />
</manifest>
24 changes: 12 additions & 12 deletions AndroidYouTubeDownloader/AndroidYouTubeDownloader.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-android</TargetFramework>
<TargetFramework>net8.0-android</TargetFramework>
<SupportedOSPlatformVersion>26</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<Nullable>disable</Nullable>
Expand Down Expand Up @@ -28,17 +28,17 @@
<ItemGroup>
<PackageReference Include="FFmpegKitSlim" Version="0.1.0" />
<PackageReference Include="Plugin.CurrentActivity" Version="2.1.0.4" />
<PackageReference Include="Square.OkHttp" Version="2.7.5.9" />
<PackageReference Include="Square.OkIO" Version="3.3.0.2" />
<PackageReference Include="Xamarin.Android.Glide" Version="4.15.1.2" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.1" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
<PackageReference Include="YouTubeStreamsExtractor" Version="1.0.3" />
<PackageReference Include="YouTubeStreamsExtractor.JsEngine.AndroidWebView" Version="1.0.1" />
<PackageReference Include="z440.atl.core" Version="5.6.0" />
<PackageReference Include="Square.OkHttp" Version="2.7.5.11" />
<PackageReference Include="Square.OkIO" Version="3.6.0.1" />
<PackageReference Include="Xamarin.Android.Glide" Version="4.16.0.2" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.5.1" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.2" />
<PackageReference Include="YouTubeStreamsExtractor" Version="1.0.4" />
<PackageReference Include="YouTubeStreamsExtractor.JsEngine.AndroidWebView" Version="1.0.2" />
<PackageReference Include="z440.atl.core" Version="5.14.0" />
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
Expand Down
2 changes: 1 addition & 1 deletion CreateApk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Function Build {
$signingKeyPass
)

dotnet publish -f:net6.0-android -c:Release /p:AndroidSigningKeyPass=$signingKeyPass /p:AndroidSigningStorePass=$signingKeyPass
dotnet publish -f:net8.0-android -c:Release /p:AndroidSigningKeyPass=$signingKeyPass /p:AndroidSigningStorePass=$signingKeyPass
}

Function CopyToLocalAppStore {
Expand Down
4 changes: 2 additions & 2 deletions build/Build.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="3.1.0" />
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/PublishTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public override void Run(BuildContext context)

context.Log.Information($"Deleted artifacts folder {context.ArtifactsDirectory}");

DirectoryPath publishDirectory = context.RootDirectory.Combine(@".\AndroidYouTubeDownloader\bin\Release\net7.0-android\publish");
DirectoryPath publishDirectory = context.RootDirectory.Combine(@".\AndroidYouTubeDownloader\bin\Release\net8.0-android\publish");
var appName = "AndroidYouTubeDownloader";
var package = context.GetApplicationId();
var architectures = new[] { "arm64-v8a", "armeabi-v7a", "x86_64" };
Expand Down

0 comments on commit 65d5ea0

Please sign in to comment.