From e483d1215532fdb5e4b90c583365b020839db9ed Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 13:22:02 +0200 Subject: [PATCH 1/9] dotnet format --- src/Raygun.Samples.Blazor.Maui/MauiProgram.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs b/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs index 7bb9fac..03d9f83 100644 --- a/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs +++ b/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs @@ -29,8 +29,8 @@ public static MauiApp CreateMauiApp() builder.Services.AddMauiBlazorWebView(); #if DEBUG - builder.Services.AddBlazorWebViewDeveloperTools(); - builder.Logging.AddDebug(); + builder.Services.AddBlazorWebViewDeveloperTools(); + builder.Logging.AddDebug(); #endif return builder.Build(); From 705098ee011e76a09cd69a8d9d14dd7cd9c76260 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 13:23:35 +0200 Subject: [PATCH 2/9] add --no-restore option to avoid dotnet errors --- .github/workflows/dotnet-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index 4958aa6..2271787 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -17,5 +17,5 @@ jobs: - name: Format working-directory: ./src - run: dotnet format --verify-no-changes + run: dotnet format --verify-no-changes --no-restore \ No newline at end of file From c127f2294c308a59fb362f4df25073d6f5dcc823 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 13:28:03 +0200 Subject: [PATCH 3/9] restore workloads --- .github/workflows/dotnet.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 35a6c10..fb24356 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -20,6 +20,9 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: 8.0.x + - name: Restore workloads + working-directory: ./src + run: dotnet workload restore - name: Restore dependencies working-directory: ./src run: dotnet restore From 52c759725c28cfc43e1244c6600cab0db05b858c Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 13:37:48 +0200 Subject: [PATCH 4/9] change CI to macos --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index fb24356..6078d9d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - uses: actions/checkout@v4 From dfe145270b2776b5bdaf7e20c1ef8768ea62d053 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 13:48:35 +0200 Subject: [PATCH 5/9] make os platform target depend on OS --- .github/workflows/dotnet.yml | 2 +- src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj | 6 ++++-- .../Raygun.Samples.Blazor.Maui.csproj | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6078d9d..fb24356 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: macos-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj b/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj index 864df6a..8ccc39c 100644 --- a/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj +++ b/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj @@ -1,9 +1,11 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst + net8.0-android - $(TargetFrameworks);net8.0-windows10.0.19041.0 + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0 + + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst diff --git a/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj b/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj index df5e0fd..7efaf6b 100644 --- a/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj +++ b/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj @@ -1,8 +1,11 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net8.0-android + + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0 + + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst From 7b3cf5ed4f3d960889c33cb21fbf6b167cf3a40b Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 14:12:08 +0200 Subject: [PATCH 6/9] setup Android for MAUI build --- .github/workflows/dotnet.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index fb24356..cc97d39 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -20,6 +20,13 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: 8.0.x + - name: Setup JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '17' + - name: Setup Android SDK + uses: android-actions/setup-android@v3 - name: Restore workloads working-directory: ./src run: dotnet workload restore From fa44cd804a388d3098722c2207f2c95d0bcb1caa Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 1 Oct 2024 14:15:46 +0200 Subject: [PATCH 7/9] try windows --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index cc97d39..00d5659 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -23,7 +23,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'microsoft' java-version: '17' - name: Setup Android SDK uses: android-actions/setup-android@v3 From 674044a7005a1244ce8e977f7ea85149c1797c84 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Wed, 2 Oct 2024 10:34:14 +0200 Subject: [PATCH 8/9] add class summary --- .../Offline/SendStrategy/TimerBasedSendStrategy.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs b/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs index 69d86cc..f4a0ec8 100644 --- a/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs +++ b/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs @@ -35,6 +35,9 @@ public TimerBasedSendStrategy(TimeSpan? interval = null) Start(); } + /// + /// Class destructor. Disposes the timer. + /// ~TimerBasedSendStrategy() { Dispose(); From 23459a4eb0a23bea6bb7ce59c3dc7f3f7b9aa5ec Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Wed, 2 Oct 2024 10:50:46 +0200 Subject: [PATCH 9/9] fix nullability requirement --- src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs b/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs index a3d27e1..434bb10 100644 --- a/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs +++ b/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs @@ -18,13 +18,13 @@ public class RaygunErrorBoundary : ErrorBoundary /// /// [Inject] - internal RaygunBlazorClient RaygunClient { get; set; } + required public RaygunBlazorClient RaygunClient { get; set; } /// /// /// [Inject] - internal IOptions RaygunSettings { get; set; } + required public IOptions RaygunSettings { get; set; } #endregion