Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/on_push_workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Setup .NET 8
- name: Setup .NET 9
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Install .NET MAUI
run: dotnet workload install maui
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
p12-file-base64: ${{ secrets.IOS_P12_BASE64 }}
p12-password: ${{ secrets.IOS_P12_PASSWORD }}

- name: Setup .NET 8
- name: Setup .NET 9
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'
source-url: https://nuget.pkg.github.com/emartech/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android</TargetFrameworks>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
6 changes: 3 additions & 3 deletions common/Internal/Emarsys.Binding.Internal.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks>net9.0;net9.0-android;net9.0-ios</TargetFrameworks>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.0</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
Expand All @@ -24,7 +24,7 @@

<!-- Reference the Android binding dependencies -->
<PropertyGroup Condition="$(TargetFramework.Contains('android'))">
<DependenciesPath>..\..\android\native\emarsys\bin\Release\net8.0-android\outputs\deps</DependenciesPath>
<DependenciesPath>..\..\android\native\emarsys\bin\Release\net9.0-android\outputs\deps</DependenciesPath>
<EmarsysSDKVersion>3.10.2</EmarsysSDKVersion>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.Contains('android'))">
Expand Down Expand Up @@ -55,7 +55,7 @@
<Compile Remove="**\Android.cs" />
<Compile Remove="**\Dotnet.cs" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
<ItemGroup Condition="$(TargetFramework) == 'net9.0'">
<Compile Remove="**\Android.cs" />
<Compile Remove="**\iOS.cs" />
<Compile Remove="PlatformAPI\**" />
Expand Down
2 changes: 1 addition & 1 deletion common/Public/Emarsys.Binding.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.0</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
Expand Down
8 changes: 4 additions & 4 deletions common/Public/Emarsys.Binding.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
<group>
<dependency id="Microsoft.Maui.Controls" version="8.0.3" />
</group>
<group targetFramework="net8.0-android24.0">
<group targetFramework="net9.0-android24.0">
<dependency id="Xamarin.AndroidX.Fragment.Ktx" version="1.8.4" />
<dependency id="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" version="2.8.6" />
<dependency id="Xamarin.Firebase.Messaging" version="124.0.2" />
</group>
<group targetFramework="net8.0-ios14.0">
<group targetFramework="net9.0-ios14.0">
</group>
</dependencies>
</metadata>
<files>
<file src="bin\Release\net8.0-android\**" target="lib\net8.0-android24.0" />
<file src="bin\Release\net8.0-ios\**" target="lib\net8.0-ios14.0" />
<file src="bin\Release\net9.0-android\**" target="lib\net9.0-android24.0" />
<file src="bin\Release\net9.0-ios\**" target="lib\net9.0-ios14.0" />
</files>
</package>
2 changes: 1 addition & 1 deletion ios/Emarsys.iOS.Binding/Emarsys.iOS.Binding.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-ios</TargetFrameworks>
<TargetFrameworks>net9.0-ios</TargetFrameworks>
<SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-ios</TargetFrameworks>
<TargetFrameworks>net9.0-ios</TargetFrameworks>

<OutputType>Library</OutputType>
<RootNamespace>Sample.NotificationService</RootNamespace>
Expand Down
10 changes: 6 additions & 4 deletions sample/Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>

<OutputType>Exe</OutputType>
<RootNamespace>Sample</RootNamespace>
Expand Down Expand Up @@ -51,9 +51,11 @@

<ItemGroup Condition="$(TargetFramework.Contains('android'))">
<GoogleServicesJson Include="google-services.json" />
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.4" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.8.6" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.8.6" />
<PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.8.6.1" />
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.6.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.8.7.3" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.8.7.3" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.8.7.3" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.Contains('ios'))">
Expand Down
2 changes: 1 addition & 1 deletion test/Test.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>

<IsPackable>false</IsPackable>
<RootNamespace>Test</RootNamespace>
Expand Down