From 8a04881e25f59da3e0663d7a18d001d9511112d4 Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:17:53 -0800
Subject: [PATCH 1/6] Remove dependency on MAUI from Airship.Net package
---
src/Airship.Net/Airship.Net.csproj | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/Airship.Net/Airship.Net.csproj b/src/Airship.Net/Airship.Net.csproj
index 06d41b1..cd6c80f 100644
--- a/src/Airship.Net/Airship.Net.csproj
+++ b/src/Airship.Net/Airship.Net.csproj
@@ -2,7 +2,6 @@
net8.0;net8.0-android;net8.0-ios
- true
true
enable
latest
@@ -34,17 +33,13 @@
-
-
-
-
-
+
From 2b8fb78c1402ed77b76a80484b028d42e0e79cec Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:27:57 -0800
Subject: [PATCH 2/6] Update dev readme
---
DEV_README.md | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/DEV_README.md b/DEV_README.md
index 8a58dfb..929b949 100644
--- a/DEV_README.md
+++ b/DEV_README.md
@@ -4,14 +4,14 @@
### Requirements
-* Visual Studio for Mac ([stable](https://visualstudio.microsoft.com/vs/mac/) or [preview](https://visualstudio.microsoft.com/vs/mac/preview/))
-* A supported Xcode version (at the time of writing, VS 2022 recommends Xcode 15.1+)
-* OpenJDK 11
- * Using [Homebrew](https://brew.sh/): `brew install openjdk@11`
- * Or [SDKMAN!](https://sdkman.io/): `sdk install java 11.0.18-zulu`
-* Android SDK: API 31+ platform, emulator, build tools, command line tools, etc.
-* .NET8 SDK (install via VS)
-* .NET Workloads (install via VS): maui, android, ios
+* VSCode and the [.NET MAUI](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-maui) plugin, or another .NET IDE such as Rider
+* A [supported](https://github.com/dotnet/maui/wiki/Release-Versions) Xcode version
+* OpenJDK 17
+ * Using [Homebrew](https://brew.sh/): `brew install openjdk@17`
+ * Or [SDKMAN!](https://sdkman.io/): `sdk install java 17.0.10-zulu`
+* Android SDK: API 34+ platform, emulator, build tools, command line tools, etc.
+* .NET8 SDK (installed via VSCode extension)
+* .NET Workloads (install via dotnet cli): maui, android, ios
* Doxygen & Graphviz (`brew install doxygen graphviz`)
* Carthage (`brew install carthage`)
From 7fe8f6fa63f21644904fb501c752b7a3d0712ff4 Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:28:09 -0800
Subject: [PATCH 3/6] Release 19.4.1
---
CHANGELOG.md | 6 ++++++
Directory.Build.props | 8 ++++----
airship.properties | 6 +++---
src/SharedAssemblyInfo.Common.cs | 2 +-
src/SharedAssemblyInfo.CrossPlatform.cs | 2 +-
src/SharedAssemblyInfo.iOS.cs | 2 +-
6 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7f92d..0cc2167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Airship DotNet Changelog
+## Version 19.4.1 - Dec 6, 2024
+Minor release that updates the Airship.Net package to no longer depend on MAUI.
+
+### Changes
+- Removed unnecessary MAUI dependency from Airship.Net
+
## Version 19.4.0 - July 29, 2024
Minor release that updates the Airship SDK to iOS 17.10.1 and Android 17.8.1.
diff --git a/Directory.Build.props b/Directory.Build.props
index bdefdaf..ffee4e5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,14 +6,14 @@
17.8.1
- 17.8.1
+ 17.8.1.1
17.10.1
- 17.10.1
+ 17.10.1.1
- 19.4.0
- 19.4.0
+ 19.4.1
+ 19.4.1
diff --git a/airship.properties b/airship.properties
index 3eb764d..562e0d0 100644
--- a/airship.properties
+++ b/airship.properties
@@ -3,7 +3,7 @@ iosVersion = 17.10.1
androidVersion = 17.8.1
# Airship.Net cross-platform version
-crossPlatformVersion = 19.4.0
+crossPlatformVersion = 19.4.1
# Filename of the iOS SDK zip file
iosFrameworkZip = Airship-Xcode15.zip
@@ -12,7 +12,7 @@ iosFrameworkZip = Airship-Xcode15.zip
# If > 0, the revision number will be added to the versions
# defined above as a 4th segment (i.e., MAJOR.MINOR.PATCH.REVISION).
# If = 0, NuGet packages will be versioned using standard 3-segment semver.
-androidRevision = 0
-iosRevision = 0
+androidRevision = 1
+iosRevision = 1
crossPlatformRevision = 0
diff --git a/src/SharedAssemblyInfo.Common.cs b/src/SharedAssemblyInfo.Common.cs
index fd25fbd..3b09aca 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.4.0")]
+[assembly: UACrossPlatformVersion ("19.4.1")]
diff --git a/src/SharedAssemblyInfo.CrossPlatform.cs b/src/SharedAssemblyInfo.CrossPlatform.cs
index f91216a..8f46f2b 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.4.0")]
+[assembly: AssemblyVersion ("19.4.1")]
diff --git a/src/SharedAssemblyInfo.iOS.cs b/src/SharedAssemblyInfo.iOS.cs
index 3929fae..df8aa93 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.4.0")]
+[assembly: AssemblyVersion ("19.4.1")]
From 90427f0a77ce4faf2b41341a0c53f137cbe31d3b Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:19:07 -0800
Subject: [PATCH 4/6] Workaround 'SingleProject' not being available without
'UseMaui'
---
binderator/source/AndroidProject.cshtml | 3 ++-
src/Airship.Net/Airship.Net.csproj | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/binderator/source/AndroidProject.cshtml b/binderator/source/AndroidProject.cshtml
index d4cbfad..0ecfbff 100644
--- a/binderator/source/AndroidProject.cshtml
+++ b/binderator/source/AndroidProject.cshtml
@@ -79,8 +79,9 @@
Performance hit for builds
- BG8A04: matched no nodes.
- BG8A00: matched no nodes.
+ - XAOBS001: Restricted APIs (we're only using our own)
-->
- 08A04;BG8A00;CS0109;CS0108;CS0114
+ 08A04;BG8A00;CS0109;CS0108;CS0114;XAOBS001
From 3aafd429bf5c962c3e75c17f7f15fc09db627bf3 Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:48:54 -0800
Subject: [PATCH 5/6] Update actions in ci and release workflows
---
.github/workflows/ci.yaml | 11 +++++++----
.github/workflows/release.yaml | 8 ++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 253666f..46f9084 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,16 +13,16 @@ jobs:
ci:
runs-on: macOS-13
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Set up JDK 11
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
- name: Set up .NET
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
@@ -73,7 +73,10 @@ jobs:
- name: Build
run: ./gradlew build pack buildSample
- - uses: actions/upload-artifact@v2
+ - name: Upload build dir artifact
+ uses: actions/upload-artifact@v4
with:
name: build
path: build
+ retention-days: 7 # For debugging, so we don't need to keep them for very long
+ compression-level: 0 # Nupkgs are just .zip files, so no need to compress them
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 949a222..039bc20 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
contents: write
runs-on: macOS-13
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Get Version
id: get_version
@@ -56,13 +56,13 @@ jobs:
# uses: google-github-actions/setup-gcloud@v1
- name: Set up JDK 11
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
- name: Set up .NET
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
@@ -83,7 +83,7 @@ jobs:
- name: Create Github Release
id: create_release
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.get_version.outputs.VERSION }}
release_name: ${{ steps.get_version.outputs.VERSION }}
From a627963cc3f69a8c0d51178d12d12c2ad35f6704 Mon Sep 17 00:00:00 2001
From: Josh Yaganeh <319444+jyaganeh@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:20:14 -0800
Subject: [PATCH 6/6] Update changelog
---
CHANGELOG.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cc2167..78cf83b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
# Airship DotNet Changelog
-## Version 19.4.1 - Dec 6, 2024
-Minor release that updates the Airship.Net package to no longer depend on MAUI.
+## Version 19.4.1 - Dec 12, 2024
+Minor release that updates the Airship.Net package to no longer depend on MAUI and adds methods to fetch channel and contact subscription lists to the cross-platform library.
### Changes
- Removed unnecessary MAUI dependency from Airship.Net
+- Added `FetchChannelSubscriptionLists` and `FetchContactSubscriptionLists` methods to Airship.Net
## Version 19.4.0 - July 29, 2024
Minor release that updates the Airship SDK to iOS 17.10.1 and Android 17.8.1.