Merge pull request #30 from emoacht/develop

Develop
emoacht · Jul 5, 2024 · 532eec4 · 532eec4
2 parents eef116d + b197cec
commit 532eec4
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Wifinian" Manufacturer="emoacht" Version="3.4.0"
+  <Product Id="*" Name="Wifinian" Manufacturer="emoacht" Version="3.5.0"
            Language="1033" Codepage="1252" UpgradeCode="{A8357D71-600C-462A-AEEE-BF1B988DD2E4}">
     <Package Id="*" InstallerVersion="500" Compressed="yes"
              InstallScope="perMachine"  InstallPrivileges="elevated"

diff --git a/Source/ReactivePropertyTest/Properties/AssemblyInfo.cs b/Source/ReactivePropertyTest/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.0.0")]
+[assembly: AssemblyVersion("3.5.0.0")]
+[assembly: AssemblyFileVersion("3.5.0.0")]
diff --git a/Source/ReactivePropertyTest/ReactivePropertyTest.csproj b/Source/ReactivePropertyTest/ReactivePropertyTest.csproj
@@ -106,25 +106,25 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
-      <Version>1.1.77</Version>
+      <Version>1.1.122</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
-      <Version>9.3.4</Version>
+      <Version>9.5.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Core">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Interfaces">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Linq">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.PlatformServices">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Windows.Threading">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
       <Version>6.0.0</Version>

diff --git a/Source/VisualStateTest/Properties/AssemblyInfo.cs b/Source/VisualStateTest/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.0.0")]
+[assembly: AssemblyVersion("3.5.0.0")]
+[assembly: AssemblyFileVersion("3.5.0.0")]
diff --git a/Source/VisualStateTest/VisualStateTest.csproj b/Source/VisualStateTest/VisualStateTest.csproj
@@ -100,7 +100,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
-      <Version>1.1.77</Version>
+      <Version>1.1.122</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Source/Wifinian/Common/DisposableBase.cs b/Source/Wifinian/Common/DisposableBase.cs
@@ -6,7 +6,7 @@ namespace Wifinian.Common;
 public abstract class DisposableBase : BindableBase, IDisposable
 {
 	protected CompositeDisposable Subscription => _subscription.Value;
-	private readonly Lazy<CompositeDisposable> _subscription = new(() => new CompositeDisposable());
+	private readonly Lazy<CompositeDisposable> _subscription = new(() => []);
 
 	#region Dispose
 

diff --git a/Source/Wifinian/Properties/AssemblyInfo.cs b/Source/Wifinian/Properties/AssemblyInfo.cs
@@ -51,8 +51,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.0.0")]
+[assembly: AssemblyVersion("3.5.0.0")]
+[assembly: AssemblyFileVersion("3.5.0.0")]
 [assembly: Guid("056ef371-bf6b-42c3-82b7-a113cafa5718")]
 [assembly: NeutralResourcesLanguage("en-US")]
 

diff --git a/Source/Wifinian/Wifinian.csproj b/Source/Wifinian/Wifinian.csproj
@@ -187,28 +187,28 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ManagedNativeWifi">
-      <Version>2.5.0</Version>
+      <Version>2.6.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
-      <Version>1.1.77</Version>
+      <Version>1.1.122</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
-      <Version>9.3.4</Version>
+      <Version>9.5.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Core">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Interfaces">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Linq">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.PlatformServices">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Windows.Threading">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
       <Version>6.0.0</Version>