[Nuget] Publish v6.0.0-preview.4

Respawnsive · May 24, 2024 · 57137bf · 57137bf
1 parent 8d5c3ed
commit 57137bf
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -348,3 +348,4 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+/Apizr/.idea/.idea.Apizr/.idea
diff --git a/Apizr/Samples/Apizr.Sample.MAUI/Apizr - Backup.Sample.MAUI.csproj b/Apizr/Samples/Apizr.Sample.MAUI/Apizr - Backup.Sample.MAUI.csproj
diff --git a/Apizr/Samples/Apizr.Sample.MAUI/Apizr.Sample.MAUI.csproj b/Apizr/Samples/Apizr.Sample.MAUI/Apizr.Sample.MAUI.csproj
@@ -26,6 +26,9 @@
     <CodesignKey>Apple Development: Created via API (Z887M6WDP6)</CodesignKey>
     <CodesignProvision>VS: WildCard Development</CodesignProvision>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
+    <MtouchLink>SdkOnly</MtouchLink>
+  </PropertyGroup>
   <ItemGroup>
     <!-- App Icon -->
     <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
@@ -53,7 +56,7 @@
     <PackageReference Include="CommunityToolkit.Maui" Version="9.0.0" />
     <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="8.0.0-preview-02" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageReference Include="Prism.DryIoc.Maui" Version="9.0.271-pre" />
+    <PackageReference Include="Prism.DryIoc.Maui" Version="9.0.401-pre" />
     <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageReference Include="Refit.Newtonsoft.Json" Version="7.0.0" />
     <PackageReference Include="Shiny.Framework" Version="4.1.0" />

diff --git a/Apizr/Samples/Apizr.Sample.MAUI/Infrastructure/TestRequestHandler.cs b/Apizr/Samples/Apizr.Sample.MAUI/Infrastructure/TestRequestHandler.cs
@@ -0,0 +1,24 @@
+namespace Apizr.Sample.MAUI.Infrastructure
+{
+    public class TestRequestHandler : DelegatingHandler
+    {
+        private readonly ISecureStorage _secureStorage;
+
+        public TestRequestHandler(ISecureStorage secureStorage)
+        {
+            _secureStorage = secureStorage;
+        }
+
+        /// <inheritdoc />
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var identityKey = await _secureStorage.GetAsync("IdentityKey");
+            if (!string.IsNullOrWhiteSpace(identityKey))
+            {
+                request.Headers.Add("X-Identity-Key", identityKey);
+            }
+
+            return await base.SendAsync(request, cancellationToken);
+        }
+    }
+}
diff --git a/Apizr/Samples/Apizr.Sample.MAUI/MauiProgram.cs b/Apizr/Samples/Apizr.Sample.MAUI/MauiProgram.cs
@@ -48,6 +48,9 @@ public static MauiApp CreateMauiApp()
             // Navigation
             services.RegisterForNavigation<MainPage, MainPageViewModel>();
 
+            // Plugins
+            services.AddSingleton(_ => SecureStorage.Default);
+
             // Polly
             services.AddResiliencePipeline<string, HttpResponseMessage>("TransientHttpError",
                 pipelineBuilder => pipelineBuilder.AddRetry(
@@ -73,6 +76,7 @@ public static MauiApp CreateMauiApp()
                     .AddCrudManagerFor(typeof(User).Assembly),
 
                 config => config
+                    .WithDelegatingHandler(serviceProvider => new TestRequestHandler(serviceProvider.GetRequiredService<ISecureStorage>()))
                     .WithAkavacheCacheHandler()
                     .WithLogging()
                     //.WithConnectivityHandler<IConnectivity>(connectivity => connectivity.NetworkAccess == NetworkAccess.Internet)

diff --git a/Apizr/Samples/Apizr.Sample.MAUI/ViewModels/MainPageViewModel.cs b/Apizr/Samples/Apizr.Sample.MAUI/ViewModels/MainPageViewModel.cs
@@ -72,6 +72,8 @@ private async Task GetUsersAsync()
             IList<User>? users = null;
             try
             {
+                await SecureStorage.SetAsync("IdentityKey", "123456789");
+
                 // This is a manually defined web api call into IReqResService (classic actually)
                 var userList = await _reqResManager.ExecuteAsync(api => api.GetUsersAsync());
                 users = userList?.Data;

diff --git a/Apizr/Tools/Apizr.Tools.NSwag/Apizr.Tools.NSwag.csproj b/Apizr/Tools/Apizr.Tools.NSwag/Apizr.Tools.NSwag.csproj
@@ -8,7 +8,7 @@
     <ToolCommandName>apizr</ToolCommandName>
     <!-- NuGet package metadata -->
     <PackageId>Apizr.Tools.NSwag</PackageId>
-    <PackageVersion>6.0.0-preview.3</PackageVersion>
+    <PackageVersion>6.0.0-preview.4</PackageVersion>
     <Description>An Apizr .NET Tool to generate models, interfaces and registration methods from a swagger url</Description>
     <Authors>Respawnsive</Authors>
     <PackageTags>Refit Web Api Generator CLI</PackageTags>

diff --git a/nuget/Apizr.Extensions.Microsoft.Caching.nuspec b/nuget/Apizr.Extensions.Microsoft.Caching.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Extensions.Microsoft.Caching</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Extensions.Microsoft.Caching</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Cache Web Api Extensions</tags>
     <dependencies>
       <dependency id="Microsoft.Extensions.Caching.Abstractions" version="8.0.0" />
-      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="6.0.0-preview.3" />
+      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Extensions.Microsoft.DependencyInjection.nuspec b/nuget/Apizr.Extensions.Microsoft.DependencyInjection.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Extensions.Microsoft.DependencyInjection</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Extensions.Microsoft.DependencyInjection</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Polly Fusillade HttpTracer Web Api Extensions</tags>
     <dependencies>
       <dependency id="Refit.HttpClientFactory" version="7.0.0" />
-      <dependency id="Apizr" version="6.0.0-preview.3" />
+      <dependency id="Apizr" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Extensions.Microsoft.FileTransfer.nuspec b/nuget/Apizr.Extensions.Microsoft.FileTransfer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Extensions.Microsoft.FileTransfer</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Extensions.Microsoft.FileTransfer</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http File Transfer Download Upload</tags>
     <dependencies>
-      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="6.0.0-preview.3" />
-      <dependency id="Apizr.Integrations.FileTransfer" version="6.0.0-preview.3" />
+      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="6.0.0-preview.4" />
+      <dependency id="Apizr.Integrations.FileTransfer" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Integrations.Akavache.nuspec b/nuget/Apizr.Integrations.Akavache.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.Akavache</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Integrations.Akavache</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Polly Fusillade HttpTracer Web Api Akavache</tags>
     <dependencies>
       <dependency id="akavache" version="9.1.20" />
-      <dependency id="Apizr" version="6.0.0-preview.3" />
+      <dependency id="Apizr" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Integrations.AutoMapper.nuspec b/nuget/Apizr.Integrations.AutoMapper.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.AutoMapper</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Integrations.AutoMapper</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -17,19 +17,19 @@
     <dependencies>
       <group targetFramework="net6.0">
         <dependency id="AutoMapper" version="13.0.1" />
-        <dependency id="Apizr" version="6.0.0-preview.3" />
+        <dependency id="Apizr" version="6.0.0-preview.4" />
       </group>
       <group targetFramework="net7.0">
         <dependency id="AutoMapper" version="13.0.1" />
-        <dependency id="Apizr" version="6.0.0-preview.3" />
+        <dependency id="Apizr" version="6.0.0-preview.4" />
       </group>
       <group targetFramework="net8.0">
         <dependency id="AutoMapper" version="13.0.1" />
-        <dependency id="Apizr" version="6.0.0-preview.3" />
+        <dependency id="Apizr" version="6.0.0-preview.4" />
       </group>
       <group targetFramework=".NETStandard2.1">
         <dependency id="AutoMapper" version="12.0.1" />
-        <dependency id="Apizr" version="6.0.0-preview.3" />
+        <dependency id="Apizr" version="6.0.0-preview.4" />
       </group>
     </dependencies>
   </metadata>

diff --git a/nuget/Apizr.Integrations.FileTransfer.MediatR.nuspec b/nuget/Apizr.Integrations.FileTransfer.MediatR.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.FileTransfer.MediatR</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Integrations.FileTransfer.MediatR</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http Transfer</tags>
     <dependencies>
-      <dependency id="Apizr.Integrations.MediatR" version="6.0.0-preview.3" />
-      <dependency id="Apizr.Extensions.Microsoft.FileTransfer" version="6.0.0-preview.3" />
+      <dependency id="Apizr.Integrations.MediatR" version="6.0.0-preview.4" />
+      <dependency id="Apizr.Extensions.Microsoft.FileTransfer" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Integrations.FileTransfer.Optiona.nuspec b/nuget/Apizr.Integrations.FileTransfer.Optiona.nuspec
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
+  <metadata>
+    <id>Apizr.Integrations.FileTransfer.Optional</id>
+    <version>6.0.0-preview.4</version>
+    <title>Apizr.Integrations.FileTransfer.Optional</title>
+    <authors>Respawnsive</authors>
+    <owners>Respawnsive</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://raw.githubusercontent.com/Respawnsive/Apizr/master/LICENSE</licenseUrl>
+    <readme>README.md</readme>
+    <projectUrl>https://www.apizr.net/</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/Respawnsive/Apizr/master/logo.png</iconUrl>
+    <description>Refit based web api client management, but resilient (retry, connectivity, cache, auth, log, priority...)</description>
+    <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
+    <tags>Refit Web Api Http Transfer</tags>
+    <dependencies>
+      <dependency id="Apizr.Integrations.Optional" version="6.0.0-preview.4" />
+      <dependency id="Apizr.Integrations.FileTransfer.MediatR" version="6.0.0-preview.4" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="lib\netstandard2.0\Apizr.Integrations.FileTransfer.Optional.dll" target="lib\netstandard2.0\Apizr.Integrations.FileTransfer.Optional.dll" />
+    <file src="lib\netstandard2.0\Apizr.Integrations.FileTransfer.Optional.pdb" target="lib\netstandard2.0\Apizr.Integrations.FileTransfer.Optional.pdb" />
+    <file src="lib\netstandard2.0\Apizr.Integrations.FileTransfer.Optional.xml" target="lib\netstandard2.0\Apizr.Integrations.FileTransfer.Optional.xml" />
+    <file src="lib\netstandard2.1\Apizr.Integrations.FileTransfer.Optional.dll" target="lib\netstandard2.1\Apizr.Integrations.FileTransfer.Optional.dll" />
+    <file src="lib\netstandard2.1\Apizr.Integrations.FileTransfer.Optional.pdb" target="lib\netstandard2.1\Apizr.Integrations.FileTransfer.Optional.pdb" />
+    <file src="lib\netstandard2.1\Apizr.Integrations.FileTransfer.Optional.xml" target="lib\netstandard2.1\Apizr.Integrations.FileTransfer.Optional.xml" />
+    <file src="README.md" target="README.md" />
+  </files>
+</package>
diff --git a/nuget/Apizr.Integrations.FileTransfer.Optional.nuspec b/nuget/Apizr.Integrations.FileTransfer.Optional.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.FileTransfer.Optional</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Integrations.FileTransfer.Optional</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http Transfer</tags>
     <dependencies>
-      <dependency id="Apizr.Integrations.Optional" version="6.0.0-preview.3" />
-      <dependency id="Apizr.Integrations.FileTransfer.MediatR" version="6.0.0-preview.3" />
+      <dependency id="Apizr.Integrations.Optional" version="6.0.0-preview.4" />
+      <dependency id="Apizr.Integrations.FileTransfer.MediatR" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Integrations.FileTransfer.nuspec b/nuget/Apizr.Integrations.FileTransfer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.FileTransfer</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Integrations.FileTransfer</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,7 +15,7 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http Transfer</tags>
     <dependencies>
-      <dependency id="Apizr" version="6.0.0-preview.3" />
+      <dependency id="Apizr" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nuget/Apizr.Integrations.Fusillade.nuspec b/nuget/Apizr.Integrations.Fusillade.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.Fusillade</id>
-    <version>6.0.0-preview.3</version>
+    <version>6.0.0-preview.4</version>
     <title>Apizr.Integrations.Fusillade</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Fusillade Web Api Akavache</tags>
     <dependencies>
       <dependency id="fusillade" version="2.6.1" />
-      <dependency id="Apizr" version="6.0.0-preview.3" />
+      <dependency id="Apizr" version="6.0.0-preview.4" />
     </dependencies>
   </metadata>
   <files>