From 4c679978be1e11b9b7b230977f82c4d6ee5118de Mon Sep 17 00:00:00 2001 From: MarcinZiabek Date: Sun, 14 May 2023 23:50:18 +0200 Subject: [PATCH] Fixes --- QuestPDF.ReportSample/Tests.cs | 2 +- QuestPDF/Previewer/ApiRequests.cs | 2 +- QuestPDF/Previewer/PreviewerService.cs | 7 ++++--- SimpleApp/SimpleApp.csproj | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/QuestPDF.ReportSample/Tests.cs b/QuestPDF.ReportSample/Tests.cs index e4b9bcd..8ee5432 100644 --- a/QuestPDF.ReportSample/Tests.cs +++ b/QuestPDF.ReportSample/Tests.cs @@ -25,7 +25,7 @@ namespace QuestPDF.ReportSample [Test] public void GenerateAndShowPdf() { - Report.ShowInPreviewer(5000); + Report.ShowInPreviewer(); //ImagePlaceholder.Solid = true; // diff --git a/QuestPDF/Previewer/ApiRequests.cs b/QuestPDF/Previewer/ApiRequests.cs index acbc040..3dda91c 100644 --- a/QuestPDF/Previewer/ApiRequests.cs +++ b/QuestPDF/Previewer/ApiRequests.cs @@ -11,7 +11,7 @@ internal sealed class IncompatibleVersionApiRequest internal sealed class NotifyPresenceApiRequest { - public string Id { get; set; } + public string ClientId { get; set; } public string LibraryVersion { get; set; } public bool IsDotnet6OrBeyond { get; set; } public bool IsDotnet3OrBeyond { get; set; } diff --git a/QuestPDF/Previewer/PreviewerService.cs b/QuestPDF/Previewer/PreviewerService.cs index 130f018..ceb5385 100644 --- a/QuestPDF/Previewer/PreviewerService.cs +++ b/QuestPDF/Previewer/PreviewerService.cs @@ -128,11 +128,12 @@ namespace QuestPDF.Previewer #endregion #region Checking compatibility - + private async Task GetPreviewerVersion() { using var result = await HttpClient.GetAsync("/version"); - return await result.Content.ReadFromJsonAsync(); + var response = await result.Content.ReadFromJsonAsync(); + return Version.Parse(response); } private async Task CheckVersionCompatibility(Version version) @@ -173,7 +174,7 @@ namespace QuestPDF.Previewer { var payload = new NotifyPresenceApiRequest { - Id = ClientId, + ClientId = ClientId, LibraryVersion = LibraryVersion, IsDotnet6OrBeyond = RuntimeDetector.IsNet6OrGreater, IsDotnet3OrBeyond = RuntimeDetector.IsNet3OrGreater, diff --git a/SimpleApp/SimpleApp.csproj b/SimpleApp/SimpleApp.csproj index 388d62d..616bcc7 100644 --- a/SimpleApp/SimpleApp.csproj +++ b/SimpleApp/SimpleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net5.0 enable enable 10