Correct package description add readme to package

ChrisPulman · Feb 18, 2023 · 58f6401 · 58f6401
1 parent ecf6a0b
commit 58f6401
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 36 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,10 +3,11 @@
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Chris Pulman</Authors>
-    <Description>A Reactive Property for use in cross platform applications based on ReactiveUI</Description>
+    <Description>A Reactive Serial Port for use in cross platform applications</Description>
     <Copyright>Copyright © https://github.com/ChrisPulman $([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageReadmeFile>readme.md</PackageReadmeFile>
     <LangVersion>preview</LangVersion>
     <Configuration>$(TargetFramework)</Configuration>
     <Company>ChrisPulman</Company>
@@ -15,7 +16,7 @@
     <PackageIcon>logo.png</PackageIcon>
     <Configurations>Debug;Release;PreRelease</Configurations>
     <PackageReleaseNotes>Compatability with Net 6, Net 7 and netstandard2.0</PackageReleaseNotes>
-    <PackageTags>SerialPort;reactiveui;rx;reactive;extensions;observable;LINQ;net;netstandard</PackageTags>
+    <PackageTags>SerialPort;rx;reactive;extensions;observable;LINQ;net;netstandard</PackageTags>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
 
@@ -44,6 +45,7 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)images\logo.png" Pack="true" PackagePath="\"/>
     <None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="LICENSE" />
+    <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">

diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "nuGetPackageVersion": {
     "semVer": 2.0
   },

diff --git a/src/SerialPortRx/SerialPortRxMixins.cs b/src/SerialPortRx/SerialPortRxMixins.cs
@@ -79,10 +79,7 @@ public static IObservable<string> BufferUntil(this IObservable<char> @this, IObs
             }
         }).AddTo(dis);
 
-        if (scheduler == null)
-        {
-            scheduler = new EventLoopScheduler();
-        }
+        scheduler ??= new EventLoopScheduler();
 
         Observable.Interval(TimeSpan.FromMilliseconds(1), scheduler).Subscribe(_ =>
         {
@@ -145,10 +142,7 @@ public static IObservable<string> BufferUntil(this IObservable<char> @this, IObs
                 }
             }).AddTo(dis);
 
-            if (scheduler == null)
-            {
-                scheduler = new EventLoopScheduler();
-            }
+            scheduler ??= new EventLoopScheduler();
 
             Observable.Interval(TimeSpan.FromMilliseconds(1), scheduler).Subscribe(_ =>
             {
@@ -186,9 +180,7 @@ public static IObservable<string> BufferUntil(this IObservable<char> @this, IObs
     /// <param name="this">The this.</param>
     /// <returns>Observable value.</returns>
     public static IObservable<T> ForEach<T>(this IObservable<T[]> @this) =>
-                                        Observable.Create<T>(obs =>
-                                        {
-                                            return @this.Subscribe(
+                                        Observable.Create<T>(obs => @this.Subscribe(
                                                 list =>
                                                 {
                                                     foreach (var item in list)
@@ -200,8 +192,7 @@ public static IObservable<T> ForEach<T>(this IObservable<T[]> @this) =>
                                                     }
                                                 },
                                                 obs.OnError,
-                                                obs.OnCompleted);
-                                        });
+                                                obs.OnCompleted));
 
     /// <summary>
     /// <para>Repeats the source observable sequence until it successfully terminates.</para>
@@ -275,28 +266,25 @@ public static IObservable<TSource> OnErrorRetry<TSource, TException>(this IObser
     /// <returns>Observable value.</returns>
     public static IObservable<TSource> OnErrorRetry<TSource, TException>(
                     this IObservable<TSource> source, Action<TException> onError, int retryCount, TimeSpan delay, IScheduler delayScheduler)
-                    where TException : Exception
-    {
-        return Observable.Defer(() =>
-        {
-            var dueTime = (delay.Ticks < 0) ? TimeSpan.Zero : delay;
-            var empty = Observable.Empty<TSource>();
-            var count = 0;
+                    where TException : Exception => Observable.Defer(() =>
+                                                         {
+                                                             var dueTime = (delay.Ticks < 0) ? TimeSpan.Zero : delay;
+                                                             var empty = Observable.Empty<TSource>();
+                                                             var count = 0;
 
-            var self = default(IObservable<TSource>)!;
-            self = source.Catch((TException ex) =>
-            {
-                onError(ex);
-                return (++count < retryCount)
-                ? (dueTime == TimeSpan.Zero)
-                ? self.SubscribeOn(Scheduler.CurrentThread)
-                : empty.Delay(dueTime, delayScheduler).Concat(self).SubscribeOn(Scheduler.CurrentThread)
-                : Observable.Throw<TSource>(ex);
-            });
+                                                             var self = default(IObservable<TSource>)!;
+                                                             self = source.Catch((TException ex) =>
+                                                             {
+                                                                 onError(ex);
+                                                                 return (++count < retryCount)
+                                                                 ? (dueTime == TimeSpan.Zero)
+                                                                 ? self.SubscribeOn(Scheduler.CurrentThread)
+                                                                 : empty.Delay(dueTime, delayScheduler).Concat(self).SubscribeOn(Scheduler.CurrentThread)
+                                                                 : Observable.Throw<TSource>(ex);
+                                                             });
 
-            return self;
-        });
-    }
+                                                             return self;
+                                                         });
 
     /// <summary>
     /// Executes while port is open at the given TimeSpan.