Fix App Info Version to give correct version number (#164)

* Fix App Info Version to give correct version number

* Update version.json

---------

Co-authored-by: Glenn <[email protected]>

src/Directory.Build.props

@@ -5,13 +5,14 @@
     <Platform>AnyCPU</Platform>
     <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
     <DebugType>embedded</DebugType>
-    <Authors>Glenn Watson</Authors>
-    <Copyright>Copyright (c) 2021 ReactiveUI Association Inc</Copyright>
+    <Authors>Glenn Watson,Chris Pulman</Authors>
+    <Copyright>Copyright (c) $([System.DateTime]::Now.ToString(yyyy)) ReactiveUI Association Inc</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/reactivemarbles/CacheDatabase</PackageProjectUrl>
     <PackageDescription>Allows users to cache values in a local sqlite database.</PackageDescription>
     <PackageIcon>logo.png</PackageIcon>
-    <Owners>glennawatson</Owners>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <Owners>glennawatson;chrispulman</Owners>
     <PackageTags>system.reactive;propertychanged;inpc;reactive;functional;akavache;cache;database</PackageTags>
     <PackageReleaseNotes>https://github.com/reactivemarbles/CacheDatabase/releases</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/reactivemarbles/CacheDatabase</RepositoryUrl>
@@ -44,6 +45,7 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
     <None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\"/>
+    <None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>

src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
 </Project>

src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

src/ReactiveMarbles.CacheDatabase.Settings/Core/AppInfo.cs

@@ -13,6 +13,7 @@
 using ReactiveMarbles.CacheDatabase.Sqlite3;
 #endif
 
+using System.Diagnostics;
 using System.Reflection;
 
 #if ENCRYPTED
@@ -34,7 +35,8 @@ static AppInfo()
             ExecutingAssemblyName = ExecutingAssembly.FullName!.Split(',')[0];
             ApplicationRootPath = Path.Combine(Path.GetDirectoryName(ExecutingAssembly.Location)!, "..");
             SettingsCachePath = Path.Combine(ApplicationRootPath, "SettingsCache");
-            Version = ExecutingAssembly.GetName().Version;
+            var fileVersionInfo = FileVersionInfo.GetVersionInfo(ExecutingAssembly.Location);
+            Version = new(fileVersionInfo.ProductMajorPart, fileVersionInfo.ProductMinorPart, fileVersionInfo.ProductBuildPart, fileVersionInfo.ProductPrivatePart);
         }
 
         /// <summary>

src/ReactiveMarbles.CacheDatabase.Tests/BlobCacheTestsBase.cs

@@ -182,9 +182,9 @@ public async Task ArraysShouldBeRoundtrippable()
                 }
             }
 
-            Assert.Equal(input.First().Blog, result.First().Blog);
-            Assert.Equal(input.First().Bio, result.First().Bio);
-            Assert.Equal(input.First().Name, result.First().Name);
+            Assert.Equal(input[0].Blog, result[0].Blog);
+            Assert.Equal(input[0].Bio, result[0].Bio);
+            Assert.Equal(input[0].Name, result[0].Name);
             Assert.Equal(input.Last().Blog, result.Last().Blog);
             Assert.Equal(input.Last().Bio, result.Last().Bio);
             Assert.Equal(input.Last().Name, result.Last().Name);
@@ -247,8 +247,8 @@ public async Task ArraysShouldBeRoundtrippableUsingObjectFactory(Type serializer
                 }
             }
 
-            Assert.Equal(input.First().Age, result.First().Age);
-            Assert.Equal(input.First().Name, result.First().Name);
+            Assert.Equal(input[0].Age, result[0].Age);
+            Assert.Equal(input[0].Name, result[0].Name);
             Assert.Equal(input.Last().Age, result.Last().Age);
             Assert.Equal(input.Last().Name, result.Last().Name);
         }
@@ -297,8 +297,7 @@ public async Task FetchFunctionShouldBeCalledOnceForGetOrFetchObject()
         /// Makes sure the fetch function debounces current requests.
         /// </summary>
         [Fact(Skip = "TestScheduler tests aren't gonna work with new SQLite")]
-        public void FetchFunctionShouldDebounceConcurrentRequests()
-        {
+        public void FetchFunctionShouldDebounceConcurrentRequests() =>
             new TestScheduler().With(sched =>
             {
                 using (Utility.WithEmptyDirectory(out var path))
@@ -383,7 +382,6 @@ public void FetchFunctionShouldDebounceConcurrentRequests()
                     }
                 }
             });
-        }
 
         /// <summary>
         /// Makes sure that the fetch function propogates thrown exceptions.
@@ -392,10 +390,7 @@ public void FetchFunctionShouldDebounceConcurrentRequests()
         [Fact]
         public async Task FetchFunctionShouldPropagateThrownExceptionAsObservableException()
         {
-            var fetcher = new Func<IObservable<Tuple<string, string>>>(() =>
-            {
-                throw new InvalidOperationException();
-            });
+            var fetcher = new Func<IObservable<Tuple<string, string>>>(() => throw new InvalidOperationException());
 
             using (Utility.WithEmptyDirectory(out var path))
             await using (var fixture = CreateBlobCache(path))
@@ -517,12 +512,12 @@ public async Task GetAndFetchLatestCallsFetchPredicate()
         {
             var fetchPredicateCalled = false;
 
-            Func<DateTimeOffset, bool> fetchPredicate = d =>
+            bool FetchPredicate(DateTimeOffset d)
             {
                 fetchPredicateCalled = true;
 
                 return true;
-            };
+            }
 
             var fetcher = new Func<IObservable<string>>(() => Observable.Return("baz"));
 
@@ -534,7 +529,7 @@ public async Task GetAndFetchLatestCallsFetchPredicate()
                 {
                     await fixture.InsertObject("foo", "bar").FirstAsync();
 
-                    await fixture.GetAndFetchLatest("foo", fetcher, fetchPredicate).LastAsync();
+                    await fixture.GetAndFetchLatest("foo", fetcher, FetchPredicate).LastAsync();
 
                     Assert.True(fetchPredicateCalled);
                 }

src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2",
+  "version": "1.3",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
     "^refs/heads/main$"