Skip to content

Commit 8f0170e

Browse files
emoachtemoacht
authored
Merge pull request #92 from emoacht/develop
Develop
2 parents dcedeb4 + 01d7546 commit 8f0170e

File tree

12 files changed

+35
-29
lines changed

12 files changed

+35
-29
lines changed

‎HISTORY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## History
22

3+
Ver 3.6.0 2024-4-25
4+
5+
- Widen range of timeout duration
6+
37
Ver 3.5.0 2023-10-22
48

59
- Improve internal codes

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Snowy is a Windows desktop app to copy images from FlashAir by a wireless connec
1111
## Requirements
1212

1313
- Windows 10 or newer
14-
- .NET 6.0 or .NET Framework 4.8
14+
- .NET 8.0 or .NET Framework 4.8
1515

1616
Tested on Windows 10 with SD-WB008G, SD-WC016G (W-02), SD-WE016G (W-03) and SD-UWA032G (W-04).
1717

‎Source/SnowyImageCopy.Lexicon/SnowyImageCopy.Lexicon.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
6-
<Version>3.2.0</Version>
6+
<Version>3.6.0</Version>
77
<Authors>emoacht</Authors>
88
<Copyright>Copyright © 2020 emoacht</Copyright>
99
</PropertyGroup>
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
20+
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎Source/SnowyImageCopy.Net48/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
// You can specify all the values or you can default the Build and Revision Numbers
5353
// by using the '*' as shown below:
5454
// [assembly: AssemblyVersion("1.0.*")]
55-
[assembly: AssemblyVersion("3.5.1.0")]
56-
[assembly: AssemblyFileVersion("3.5.1.0")]
55+
[assembly: AssemblyVersion("3.6.0.0")]
56+
[assembly: AssemblyFileVersion("3.6.0.0")]
5757

5858
// For unit test
5959
[assembly: InternalsVisibleTo("SnowyImageCopy.Test")]

‎Source/SnowyImageCopy.Net48/SnowyImageCopy.Net48.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,22 @@
126126
<Version>7.1.2</Version>
127127
</PackageReference>
128128
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
129-
<Version>1.1.39</Version>
129+
<Version>1.1.77</Version>
130130
</PackageReference>
131131
<PackageReference Include="System.Reactive.Core">
132-
<Version>5.0.0</Version>
132+
<Version>6.0.0</Version>
133133
</PackageReference>
134134
<PackageReference Include="System.Reactive.Interfaces">
135-
<Version>5.0.0</Version>
135+
<Version>6.0.0</Version>
136136
</PackageReference>
137137
<PackageReference Include="System.Reactive.Linq">
138-
<Version>5.0.0</Version>
138+
<Version>6.0.0</Version>
139139
</PackageReference>
140140
<PackageReference Include="System.Reactive.PlatformServices">
141-
<Version>5.0.0</Version>
141+
<Version>6.0.0</Version>
142142
</PackageReference>
143143
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
144-
<Version>5.0.0</Version>
144+
<Version>6.0.0</Version>
145145
</PackageReference>
146146
<PackageReference Include="System.Threading.Tasks.Extensions">
147147
<Version>4.5.4</Version>

‎Source/SnowyImageCopy.Shared/Models/WindowPlacement.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ internal class WindowPlacement
2323
#region Win32
2424

2525
[DllImport("User32.dll", SetLastError = true)]
26+
[return: MarshalAs(UnmanagedType.Bool)]
2627
private static extern bool SetWindowPlacement(
2728
IntPtr hWnd,
2829
[In] ref WINDOWPLACEMENT lpwndpl);
2930

3031
[DllImport("User32.dll", SetLastError = true)]
32+
[return: MarshalAs(UnmanagedType.Bool)]
3133
private static extern bool GetWindowPlacement(
3234
IntPtr hWnd,
3335
out WINDOWPLACEMENT lpwndpl);

‎Source/SnowyImageCopy.Shared/Views/Options.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
Header="{Binding Resources.Options_TimeoutDuration, Source={x:Static lexicon:ResourceService.Current}}">
155155
<controls:NumericUpDown
156156
Width="90" Height="24"
157-
Minimum="10" Maximum="60" Frequency="10"
157+
Minimum="5" Medium="10" Maximum="60" MediumFrequency="1" Frequency="10"
158158
Value="{Binding Settings.TimeoutDuration}"/>
159159
</GroupBox>
160160
</StackPanel>

‎Source/SnowyImageCopy.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
[assembly: Guid("fbfe3c9c-8d09-4abf-82c6-c9b6d0b27aeb")]
1717

1818
// [assembly: AssemblyVersion("1.0.*")]
19-
[assembly: AssemblyVersion("3.4.0.0")]
20-
[assembly: AssemblyFileVersion("3.4.0.0")]
19+
[assembly: AssemblyVersion("3.6.0.0")]
20+
[assembly: AssemblyFileVersion("3.6.0.0")]

‎Source/SnowyImageCopy.Test/SnowyImageCopy.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Version>2.2.10</Version>
7171
</PackageReference>
7272
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
73-
<Version>5.0.0</Version>
73+
<Version>6.0.0</Version>
7474
</PackageReference>
7575
<PackageReference Include="System.Threading.Tasks.Extensions">
7676
<Version>4.5.4</Version>

‎Source/SnowyImageCopy/SnowyImageCopy.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
5+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<AssemblyTitle>Snowy</AssemblyTitle>
88
<ApplicationIcon>Resources\Feather.ico</ApplicationIcon>
99
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
10-
<Version>3.5.1</Version>
10+
<Version>3.6.0</Version>
1111
<Authors>emoacht</Authors>
1212
<Copyright>Copyright © 2014 emoacht</Copyright>
1313
<PackageProjectUrl>https://github.com/emoacht/SnowyImageCopy</PackageProjectUrl>
@@ -35,15 +35,15 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
38-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
39-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
40-
<PackageReference Include="System.Management" Version="6.0.0" />
41-
<PackageReference Include="System.Reactive" Version="5.0.0" />
42-
<PackageReference Include="System.Reactive.Core" Version="5.0.0" />
43-
<PackageReference Include="System.Reactive.Interfaces" Version="5.0.0" />
44-
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
45-
<PackageReference Include="System.Reactive.PlatformServices" Version="5.0.0" />
46-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
38+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
39+
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
40+
<PackageReference Include="System.Management" Version="8.0.0" />
41+
<PackageReference Include="System.Reactive" Version="6.0.0" />
42+
<PackageReference Include="System.Reactive.Core" Version="6.0.0" />
43+
<PackageReference Include="System.Reactive.Interfaces" Version="6.0.0" />
44+
<PackageReference Include="System.Reactive.Linq" Version="6.0.0" />
45+
<PackageReference Include="System.Reactive.PlatformServices" Version="6.0.0" />
46+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
4747
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
4848
</ItemGroup>
4949

‎docs/readme_en.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h2>Requirements</h2>
6262

6363
<ul>
6464
<li>Windows 10 or newer</li>
65-
<li>.NET 6.0</li>
65+
<li>.NET 8.0</li>
6666
</ul>
6767
<p>Tested on Windows 10 with SD-WB008G, SD-WC016G (W-02), SD-WE016G (W-03) and SD-UWA032G (W-04).</p>
6868

‎docs/readme_jp.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h2>動作条件</h2>
6262

6363
<ul>
6464
<li>Windows 10以降</li>
65-
<li>.NET 6.0</li>
65+
<li>.NET 8.0</li>
6666
</ul>
6767
<p>Windows 10上でSD-WB008G、SD-WC016G (W-02)、SD-WE016G (W-03)とSD-UWA032G (W-04)を相手に動作確認しています。</p>
6868

0 commit comments

Comments
 (0)