Merge pull request #20 from emoacht/develop

Develop
emoacht · Dec 3, 2021 · 4c709dd · 4c709dd
2 parents edeb54b + 48cbf80
commit 4c709dd
Show file tree

Hide file tree

Showing 10 changed files with 419 additions and 306 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.0.1"
+  <Product Id="*" Name="Wifinian" Manufacturer="emoacht" Version="3.1.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("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
diff --git a/Source/ReactivePropertyTest/ReactivePropertyTest.csproj b/Source/ReactivePropertyTest/ReactivePropertyTest.csproj
@@ -106,10 +106,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
-      <Version>1.1.31</Version>
+      <Version>1.1.39</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
-      <Version>7.12.0</Version>
+      <Version>8.0.2</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Core">
       <Version>5.0.0</Version>

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.31</Version>
+      <Version>1.1.39</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Source/Wifinian/AppController.cs b/Source/Wifinian/AppController.cs
@@ -221,7 +221,7 @@ private void OnMenuWindowShowRequested(object sender, Point e)
 		private void ShowMainWindow()
 		{
 			var window = (MainWindow)_current.MainWindow;
-			if (window is { CanBeShown: false } or { Visibility: Visibility.Visible, IsForeground: true })
+			if (window is null or { CanBeShown: false } or { Visibility: Visibility.Visible, IsForeground: true })
 				return;
 
 			window.Show();

diff --git a/Source/Wifinian/Library/ScreenFrame.dll b/Source/Wifinian/Library/ScreenFrame.dll
diff --git a/Source/Wifinian/Library/ScreenFrame.xml b/Source/Wifinian/Library/ScreenFrame.xml
diff --git a/Source/Wifinian/Library/StartupAgency.dll b/Source/Wifinian/Library/StartupAgency.dll
diff --git a/Source/Wifinian/Properties/AssemblyInfo.cs b/Source/Wifinian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
 [assembly: Guid("056ef371-bf6b-42c3-82b7-a113cafa5718")]
 [assembly: NeutralResourcesLanguage("en-US")]