Skip to content

Commit 8bb02aa

Browse files
lpeyrlpeyr
authored
Merge pull request #700 from Leo-Corporation/vNext
Version 9.1.0.2602
2 parents 847ec51 + 520fc4f commit 8bb02aa

61 files changed

Lines changed: 289 additions & 180 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dotnet-core-desktop.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
name: .NET CI
22

33
on:
4-
push:
5-
pull_request:
4+
push:
5+
pull_request:
66

77
jobs:
8-
build:
9-
runs-on:
10-
windows-latest # For a list of available runner types, refer to
11-
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
12-
steps:
13-
- name: Checkout
14-
uses: actions/checkout@v3
15-
with:
16-
fetch-depth: 0
8+
build:
9+
runs-on:
10+
windows-latest # For a list of available runner types, refer to
11+
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v6
15+
with:
16+
fetch-depth: 0
1717

18-
# Install the .NET workload
19-
- name: Install .NET
20-
uses: actions/setup-dotnet@v3
21-
with:
22-
dotnet-version: 6.0.x
18+
# Install the .NET workload
19+
- name: Install .NET
20+
uses: actions/setup-dotnet@v5
21+
with:
22+
dotnet-version: 10.0.x
2323

24-
- name: Build App
25-
run: dotnet build InternetTest\InternetTest\InternetTest.csproj -c Release
24+
- name: Build App
25+
run: dotnet build InternetTest\InternetTest\InternetTest.csproj -c Release
2626

27-
- name: Test App
28-
run: dotnet test InternetTest\InternetTest\InternetTest.csproj
27+
- name: Test App
28+
run: dotnet test InternetTest\InternetTest\InternetTest.csproj

‎.github/workflows/nightly.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ name: Nightly Build
22
on: [pull_request, workflow_dispatch]
33

44
jobs:
5-
build:
6-
runs-on: windows-latest
7-
steps:
8-
- name: Checkout
9-
uses: actions/checkout@v4
10-
with:
11-
fetch-depth: 0
12-
# Install the .NET workload
13-
- name: Install .NET
14-
uses: actions/setup-dotnet@v4
15-
with:
16-
dotnet-version: 8.0.x
5+
build:
6+
runs-on: windows-latest
7+
steps:
8+
- name: Checkout
9+
uses: actions/checkout@v6
10+
with:
11+
fetch-depth: 0
12+
# Install the .NET workload
13+
- name: Install .NET
14+
uses: actions/setup-dotnet@v5
15+
with:
16+
dotnet-version: 10.0.x
1717

18-
- name: Build App
19-
run: dotnet publish InternetTest\InternetTest.sln -c Release -p:DefineConstants=NIGHTLY -r win-x64 -o InternetTest\InternetTest\bin\release\net8.0-windows\publish\win-x64
18+
- name: Build App
19+
run: dotnet publish InternetTest\InternetTest.sln -c Release -p:DefineConstants=NIGHTLY -r win-x64 -o InternetTest\InternetTest\bin\release\net10.0-windows\publish\win-x64
2020

21-
- name: Test App
22-
run: dotnet test InternetTest\InternetTest.sln
21+
- name: Test App
22+
run: dotnet test InternetTest\InternetTest.sln
2323

24-
- name: Build Setup
25-
uses: nadeemjazmawe/inno-setup-action-cli@v6.0.5
26-
with:
27-
filepath: "./InternetTest.Setup/Setup.iss"
24+
- name: Build Setup
25+
uses: nadeemjazmawe/inno-setup-action-cli@v6.0.5
26+
with:
27+
filepath: './InternetTest.Setup/Setup.iss'
2828

29-
- name: Upload Setup file
30-
uses: actions/upload-artifact@v4
31-
with:
32-
name: InternetTestProSetup.exe
33-
path: "./InternetTest.Setup/Output/InternetTestProSetup.exe"
29+
- name: Upload Setup file
30+
uses: actions/upload-artifact@v6
31+
with:
32+
name: InternetTestProSetup.exe
33+
path: './InternetTest.Setup/Output/InternetTestProSetup.exe'

‎BuildPortable.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd InternetTest\InternetTest && dotnet publish -r win-x64 -c Release --self-contained false -p:DefineConstants=PORTABLE -p:PublishSingleFile=true
1+
cd InternetTest\InternetTest && dotnet publish -r win-x64 -c Release -p:DefineConstants=PORTABLE -p:PublishSingleFile=true --no-self-contained

‎InternetTest.Setup/Setup.iss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ Name: "chinesesimplified"; MessagesFile: "Languages\ChineseSimplified.isl"
5959
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
6060

6161
[Files]
62-
Source: "..\InternetTest\InternetTest\bin\Release\net8.0-windows\publish\win-x64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
63-
Source: "..\InternetTest\Xalyus Updater\bin\Release\net8.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
64-
Source: "..\InternetTest\InternetTest\bin\Release\net8.0-windows\publish\win-x64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
62+
Source: "..\InternetTest\InternetTest\bin\Release\net10.0-windows\publish\win-x64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
63+
Source: "..\InternetTest\Xalyus Updater\bin\Release\net10.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
64+
Source: "..\InternetTest\InternetTest\bin\Release\net10.0-windows\publish\win-x64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
6565
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
6666

6767
[Icons]
@@ -115,13 +115,13 @@ end;
115115
116116
function IsDotNetCore60RuntimeInstalled(): Boolean;
117117
begin
118-
Result := IsDotNetInstalled('Microsoft.WindowsDesktop.App 8.0.');
118+
Result := IsDotNetInstalled('Microsoft.WindowsDesktop.App 10.0.');
119119
end;
120120
121121
function InitializeSetup(): Boolean;
122122
begin
123123
if not IsDotNetCore60RuntimeInstalled() then begin
124-
MsgBox('The required .NET Core 8.0 Windows Desktop Runtime is not installed on your system. Please install it and try again.', mbError, MB_OK);
124+
MsgBox('The required .NET 10.0 Windows Desktop Runtime is not installed on your system. Please install it and try again.', mbError, MB_OK);
125125
Result := False;
126126
Exit;
127127
end;

‎InternetTest/InternetTest/App.xaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,12 @@
678678
VerticalAlignment="Center"
679679
RecognizesAccessKey="True" />
680680
</Border>
681+
<ControlTemplate.Triggers>
682+
<Trigger Property="IsEnabled" Value="False">
683+
<Setter Property="Opacity" Value="0.7" />
684+
<Setter Property="Cursor" Value="No" />
685+
</Trigger>
686+
</ControlTemplate.Triggers>
681687
</ControlTemplate>
682688
</Setter.Value>
683689
</Setter>

‎InternetTest/InternetTest/Commands/RelayCommand.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2424
using System.Windows.Input;
2525

2626
namespace InternetTest.Commands;
27+
2728
public class RelayCommand(Action<object> execute, Func<object, bool> canExecute) : ICommand
2829
{
2930
private readonly Action<object> _execute = execute ?? throw new ArgumentNullException(nameof(execute));

‎InternetTest/InternetTest/Components/ConnectWiFiItem.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
Margin="5 0 0 0"
6464
Padding="5 2"
6565
VerticalAlignment="Center"
66-
BorderBrush="{DynamicResource Green}"
66+
Background="{DynamicResource LightGreen}"
6767
BorderThickness="1"
68-
CornerRadius="10"
68+
CornerRadius="5"
6969
Visibility="{Binding IsConnected, Converter={StaticResource BoolToVis}}">
7070
<TextBlock
7171
FontWeight="SemiBold"
72-
Foreground="{DynamicResource Green}"
72+
Foreground="{DynamicResource ForegroundGreen}"
7373
Text="{x:Static lang:Resources.ConnectedS}" />
7474
</Border>
7575
<Button

‎InternetTest/InternetTest/Components/IpConfigItem.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@
6161
Margin="5 0 0 0"
6262
Padding="5 2"
6363
VerticalAlignment="Center"
64-
d:BorderBrush="{DynamicResource Green}"
65-
BorderBrush="{Binding StatusBrush}"
64+
d:Background="{DynamicResource LightGreen}"
65+
Background="{Binding StatusBackgroundBrush}"
6666
BorderThickness="1"
67-
CornerRadius="10">
67+
CornerRadius="5">
6868
<TextBlock
69-
d:Foreground="{DynamicResource Green}"
69+
d:Foreground="{DynamicResource ForegroundGreen}"
7070
d:Text="{x:Static lang:Resources.ConnectedS}"
7171
FontWeight="SemiBold"
7272
Foreground="{Binding StatusBrush}"

‎InternetTest/InternetTest/Components/NetworkAdapterItem.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
Margin="5 0 0 0"
5656
Padding="5 2"
5757
VerticalAlignment="Center"
58-
d:BorderBrush="Green"
59-
BorderBrush="{Binding StatusColor}"
58+
d:Background="{DynamicResource LightGreen}"
59+
Background="{Binding StatusBackgroundColor}"
6060
BorderThickness="1"
61-
CornerRadius="10">
61+
CornerRadius="5">
6262
<TextBlock
63-
d:Foreground="Green"
63+
d:Foreground="{DynamicResource ForegroundGreen}"
6464
d:Text="Connected"
6565
FontWeight="SemiBold"
6666
Foreground="{Binding StatusColor}"

‎InternetTest/InternetTest/Converters/BoolToStringConverter.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2525
using System.Windows.Data;
2626

2727
namespace InternetTest.Converters;
28+
2829
public class BoolToStringConverter : IValueConverter
2930
{
3031
// Expect parameter format: "TrueValue,FalseValue"

0 commit comments

Comments
 (0)