Merge pull request #37 from emoacht/develop

Develop
emoacht · Feb 12, 2025 · f745601 · f745601
2 parents 70b1cc3 + d75e121
commit f745601
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/Source/Installer/Installer.wixproj b/Source/Installer/Installer.wixproj
@@ -30,4 +30,6 @@
     <Content Include="Resources\banner.png" />
     <Content Include="Resources\dialog.png" />
   </ItemGroup>
+
+  <Target Name="CollectSuggestedVisualStudioComponentIds" />
 </Project>
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package Name="Wifinian" Manufacturer="emoacht" Version="3.7.0"
+  <Package Name="Wifinian" Manufacturer="emoacht" Version="3.7.1"
            Language="1033" Codepage="1252" UpgradeCode="{A8357D71-600C-462A-AEEE-BF1B988DD2E4}">
     <SummaryInformation Description="Installer for Wifinian"/>
 

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.5.0.0")]
-[assembly: AssemblyFileVersion("3.5.0.0")]
+[assembly: AssemblyVersion("3.7.1.0")]
+[assembly: AssemblyFileVersion("3.7.1.0")]
diff --git a/Source/ReactivePropertyTest/ReactivePropertyTest.csproj b/Source/ReactivePropertyTest/ReactivePropertyTest.csproj
@@ -109,7 +109,7 @@
       <Version>1.1.135</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
-      <Version>9.6.0</Version>
+      <Version>9.7.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Core">
       <Version>6.0.1</Version>

diff --git a/Source/Wifinian.Test/Properties/AssemblyInfo.cs b/Source/Wifinian.Test/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -16,5 +16,5 @@
 [assembly: Guid("98c08e30-5716-4bca-99f6-80413d56867b")]
 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.7.0.0")]
-[assembly: AssemblyFileVersion("3.7.0.0")]
+[assembly: AssemblyVersion("3.7.1.0")]
+[assembly: AssemblyFileVersion("3.7.1.0")]
diff --git a/Source/Wifinian.Test/Wifinian.Test.csproj b/Source/Wifinian.Test/Wifinian.Test.csproj
@@ -59,7 +59,7 @@
       <Version>2.2.10</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
-      <Version>9.6.0</Version>
+      <Version>9.7.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />

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.7.0.0")]
-[assembly: AssemblyFileVersion("3.7.0.0")]
+[assembly: AssemblyVersion("3.7.1.0")]
+[assembly: AssemblyFileVersion("3.7.1.0")]
 [assembly: Guid("056ef371-bf6b-42c3-82b7-a113cafa5718")]
 [assembly: NeutralResourcesLanguage("en-US")]
 

diff --git a/Source/Wifinian/Wifinian.csproj b/Source/Wifinian/Wifinian.csproj
@@ -194,7 +194,7 @@
       <Version>1.1.135</Version>
     </PackageReference>
     <PackageReference Include="ReactiveProperty">
-      <Version>9.6.0</Version>
+      <Version>9.7.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive.Core">
       <Version>6.0.1</Version>