From a3d3e88a5fa8e701e93e3b43f638e5633f2e35a5 Mon Sep 17 00:00:00 2001 From: khmMouna Date: Tue, 18 Jun 2024 17:04:01 +0200 Subject: [PATCH 1/9] Update to latest 17.X SDKs --- Cartfile | 2 +- Directory.Build.props | 12 ++++----- airship.properties | 6 ++--- binderator/config.json | 36 ++++++++++++------------- src/SharedAssemblyInfo.Common.cs | 2 +- src/SharedAssemblyInfo.CrossPlatform.cs | 2 +- src/SharedAssemblyInfo.iOS.cs | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cartfile b/Cartfile index e538a23..f30abf3 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "urbanairship/ios-library" == 17.10.0 +github "urbanairship/ios-library" == 17.10.1 diff --git a/Directory.Build.props b/Directory.Build.props index d859c43..bdefdaf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,15 +5,15 @@ - 17.7.4 - 17.7.4 + 17.8.1 + 17.8.1 - 17.10.0 - 17.10.0 + 17.10.1 + 17.10.1 - 19.3.0 - 19.3.0 + 19.4.0 + 19.4.0 diff --git a/airship.properties b/airship.properties index 2fa0e90..ab69170 100644 --- a/airship.properties +++ b/airship.properties @@ -1,9 +1,9 @@ # Airship native SDK versions -iosVersion = 17.10.0 -androidVersion = 17.7.4 +iosVersion = 17.10.1 +androidVersion = 17.8.1 # Airship.Net cross-platform version -crossPlatformVersion = 19.3.0 +crossPlatformVersion = 19.4.0 # Filename of the iOS SDK zip file iosFrameworkZip = Airship.zip diff --git a/binderator/config.json b/binderator/config.json index 335a9ec..0baf5c3 100644 --- a/binderator/config.json +++ b/binderator/config.json @@ -17,72 +17,72 @@ { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-adm", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.Adm", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-automation", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.Automation", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-core", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.Core", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-fcm", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.Fcm", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-feature-flag", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.FeatureFlag", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-layout", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.Layout", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-live-update", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.LiveUpdate", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-message-center", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.MessageCenter", "dependencyOnly": false }, { "groupId": "com.urbanairship.android", "artifactId": "urbanairship-preference-center", - "version": "17.7.4", - "nugetVersion": "17.7.4", + "version": "17.8.1", + "nugetVersion": "17.8.1", "nugetId": "Airship.Net.Android.PreferenceCenter", "dependencyOnly": false }, diff --git a/src/SharedAssemblyInfo.Common.cs b/src/SharedAssemblyInfo.Common.cs index 976b709..fd25fbd 100644 --- a/src/SharedAssemblyInfo.Common.cs +++ b/src/SharedAssemblyInfo.Common.cs @@ -6,4 +6,4 @@ // Change them to the values specific to your project. // Cross-platform version of the plugin -[assembly: UACrossPlatformVersion ("19.3.0")] +[assembly: UACrossPlatformVersion ("19.4.0")] diff --git a/src/SharedAssemblyInfo.CrossPlatform.cs b/src/SharedAssemblyInfo.CrossPlatform.cs index 15412e1..f91216a 100644 --- a/src/SharedAssemblyInfo.CrossPlatform.cs +++ b/src/SharedAssemblyInfo.CrossPlatform.cs @@ -12,5 +12,5 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("19.3.0")] +[assembly: AssemblyVersion ("19.4.0")] diff --git a/src/SharedAssemblyInfo.iOS.cs b/src/SharedAssemblyInfo.iOS.cs index b2759d9..3929fae 100644 --- a/src/SharedAssemblyInfo.iOS.cs +++ b/src/SharedAssemblyInfo.iOS.cs @@ -17,4 +17,4 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("19.3.0")] +[assembly: AssemblyVersion ("19.4.0")] From 1420a3b3ecbab6f2f7a7a95b7b9dd4dc70ed9dd1 Mon Sep 17 00:00:00 2001 From: khmMouna Date: Tue, 18 Jun 2024 17:10:20 +0200 Subject: [PATCH 2/9] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa5b31a..251ce17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Airship DotNet Changelog +## Version 19.4.0 - June 19, 2024 +Minor release that updates the Airship SDK to iOS 17.10.1 and Android 17.8.1, + +### Changes +- Updated iOS SDK to 17.10.1 +- Updated Android SDK to 17.8.1 + ## Version 19.3.0 - Apr 8, 2024 Minor release that updates the Airship SDK to iOS 17.10.0 and Android 17.7.4, From 9762964a817709dbd371d1d58cef8a7c2a8de10f Mon Sep 17 00:00:00 2001 From: khmMouna Date: Tue, 18 Jun 2024 17:26:27 +0200 Subject: [PATCH 3/9] Update Maui controls version --- global.json | 2 +- src/Airship.Net.MessageCenter/Airship.Net.MessageCenter.csproj | 2 +- src/Airship.Net/Airship.Net.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 322b6fa..bdf7665 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.204", "rollForward": "patch" }, "msbuild-sdks": diff --git a/src/Airship.Net.MessageCenter/Airship.Net.MessageCenter.csproj b/src/Airship.Net.MessageCenter/Airship.Net.MessageCenter.csproj index 43b82df..f1c9941 100644 --- a/src/Airship.Net.MessageCenter/Airship.Net.MessageCenter.csproj +++ b/src/Airship.Net.MessageCenter/Airship.Net.MessageCenter.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/Airship.Net/Airship.Net.csproj b/src/Airship.Net/Airship.Net.csproj index 06d41b1..a7606ac 100644 --- a/src/Airship.Net/Airship.Net.csproj +++ b/src/Airship.Net/Airship.Net.csproj @@ -36,7 +36,7 @@ - + From a468b3a27c21f069e52273366664349f8487ce7c Mon Sep 17 00:00:00 2001 From: khmMouna Date: Thu, 20 Jun 2024 10:26:46 +0200 Subject: [PATCH 4/9] Update macOS and xcode versions on CI job --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 253666f..91622a2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: [pull_request] env: - DEVELOPER_DIR: /Applications/Xcode_15.1.app + DEVELOPER_DIR: /Applications/Xcode_15.4.app DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 @@ -11,7 +11,7 @@ env: jobs: ci: - runs-on: macOS-13 + runs-on: macos-14-xlarge steps: - uses: actions/checkout@v2 From 70bd4dfc4a62c84f9d6a2642457231d1a4c646bd Mon Sep 17 00:00:00 2001 From: khmMouna Date: Thu, 20 Jun 2024 10:52:10 +0200 Subject: [PATCH 5/9] Update setup dotnet --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 91622a2..ea94b2b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: java-version: '11' - name: Set up .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: global-json-file: global.json From 30641ff090fba5b3f7d374506bc490ccd8557126 Mon Sep 17 00:00:00 2001 From: khmMouna Date: Thu, 20 Jun 2024 11:19:34 +0200 Subject: [PATCH 6/9] Revert --- .github/workflows/ci.yaml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ea94b2b..0cb5388 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: [pull_request] env: - DEVELOPER_DIR: /Applications/Xcode_15.4.app + DEVELOPER_DIR: /Applications/Xcode_15.1.app DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 @@ -11,7 +11,7 @@ env: jobs: ci: - runs-on: macos-14-xlarge + runs-on: macOS-13 steps: - uses: actions/checkout@v2 diff --git a/global.json b/global.json index bdf7665..322b6fa 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.204", + "version": "8.0.100", "rollForward": "patch" }, "msbuild-sdks": From 33af4065f1d7a55f2231fa00c8c8e8229e361c64 Mon Sep 17 00:00:00 2001 From: khmMouna Date: Thu, 20 Jun 2024 11:30:32 +0200 Subject: [PATCH 7/9] Revert --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0cb5388..253666f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: java-version: '11' - name: Set up .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v3 with: global-json-file: global.json From 7bd1bb3e10b42ba84e5ce19a4e1c65002add9a39 Mon Sep 17 00:00:00 2001 From: khmMouna Date: Thu, 20 Jun 2024 11:31:17 +0200 Subject: [PATCH 8/9] test --- MauiSample/MauiSample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MauiSample/MauiSample.csproj b/MauiSample/MauiSample.csproj index c9ce111..9ee2ccd 100644 --- a/MauiSample/MauiSample.csproj +++ b/MauiSample/MauiSample.csproj @@ -64,7 +64,7 @@ - + From 262bed6c6025974b92b6da4b9fa13926641c22ff Mon Sep 17 00:00:00 2001 From: khmMouna Date: Thu, 20 Jun 2024 15:13:05 +0200 Subject: [PATCH 9/9] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 253666f..a673c8c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ jobs: - name: Restore workloads run: | - dotnet workload install android ios maui-android maui-ios maui-maccatalyst + dotnet workload install android ios maccatalyst maui-android maui-ios maui-maccatalyst - name: Build run: ./gradlew build pack buildSample