Skip to content

Commit f311460

Browse files
nlogozzonlogozzo
committed
feat: .NET 10
1 parent 23bc797 commit f311460

File tree

9 files changed

+33
-34
lines changed

9 files changed

+33
-34
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "Setup .NET"
3232
uses: actions/setup-dotnet@v5
3333
with:
34-
dotnet-version: '9.0.x'
34+
dotnet-version: '10.0.x'
3535
- name: "Unlock Keyring"
3636
uses: t1m0thyj/unlock-keyring@v1
3737
- name: "Setup Environment"

‎.github/workflows/macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: "Setup .NET"
3333
uses: actions/setup-dotnet@v5
3434
with:
35-
dotnet-version: '9.0.x'
35+
dotnet-version: '10.0.x'
3636
- name: "Setup Keyring"
3737
run: |
3838
security create-keychain -p ${{ env.KEYRING_PASSWORD }} build.keychain

‎.github/workflows/nuget.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: "Setup .NET"
1414
uses: actions/setup-dotnet@v5
1515
with:
16-
dotnet-version: '9.0.x'
16+
dotnet-version: '10.0.x'
1717
- name: "Restore"
1818
run: dotnet restore
1919
- name: "Build"

‎.github/workflows/windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "Setup .NET"
3232
uses: actions/setup-dotnet@v5
3333
with:
34-
dotnet-version: '9.0.x'
34+
dotnet-version: '10.0.x'
3535
- name: "Restore"
3636
run: dotnet restore ${{ env.TEST_PROJECT_NAME }}
3737
- name: "Build"

‎Nickvision.Desktop.Tests/MSTestSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
1+
[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.ClassLevel)]

‎Nickvision.Desktop.Tests/Nickvision.Desktop.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net9.0-windows10.0.22621.0</TargetFramework>
5-
<TargetFramework Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net9.0</TargetFramework>
4+
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0-windows10.0.22621.0</TargetFramework>
5+
<TargetFramework Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net10.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
77
<ImplicitUsings>disable</ImplicitUsings>
88
<Nullable>enable</Nullable>
@@ -19,8 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
23-
<PackageReference Include="MSTest" Version="3.11.0"/>
22+
<PackageReference Include="MSTest" Version="4.0.2"/>
2423
</ItemGroup>
2524

2625
<ItemGroup>

‎Nickvision.Desktop.Tests/PasswordGeneratorTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void Case001_Generate()
1212
var generator = new PasswordGenerator();
1313
var password = generator.Next();
1414
Console.WriteLine(password);
15-
Assert.IsTrue(password.Length == 16);
15+
Assert.AreEqual(16, password.Length);
1616
foreach (var c in password)
1717
{
1818
Assert.IsTrue(char.IsDigit(c) || char.IsLower(c) || char.IsUpper(c) || char.IsPunctuation(c) || char.IsSymbol(c) || char.IsWhiteSpace(c));
@@ -25,7 +25,7 @@ public void Case002_Generate()
2525
var generator = new PasswordGenerator(PasswordContent.Numeric);
2626
var password = generator.Next(23);
2727
Console.WriteLine(password);
28-
Assert.IsTrue(password.Length == 23);
28+
Assert.AreEqual(23, password.Length);
2929
foreach (var c in password)
3030
{
3131
Assert.IsTrue(char.IsDigit(c));
@@ -40,7 +40,7 @@ public void Case003_Generate()
4040
var generator = new PasswordGenerator(PasswordContent.Numeric | PasswordContent.Lowercase);
4141
var password = generator.Next(64);
4242
Console.WriteLine(password);
43-
Assert.IsTrue(password.Length == 64);
43+
Assert.AreEqual(64, password.Length);
4444
foreach (var c in password)
4545
{
4646
Assert.IsTrue(char.IsDigit(c) || char.IsLower(c));
@@ -55,7 +55,7 @@ public void Case004_Generate()
5555
var generator = new PasswordGenerator(PasswordContent.AllNoSpace);
5656
var password = generator.Next(64);
5757
Console.WriteLine(password);
58-
Assert.IsTrue(password.Length == 64);
58+
Assert.AreEqual(64, password.Length);
5959
foreach (var c in password)
6060
{
6161
Assert.IsTrue(char.IsDigit(c) || char.IsLower(c) || char.IsUpper(c) || char.IsPunctuation(c) || char.IsSymbol(c));

‎Nickvision.Desktop.Tests/SystemSecretServiceTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async Task Case003_Create()
5151
#endif
5252
Assert.IsNotNull(_secretService);
5353
var service = await _secretService.CreateAsync("Nickvision.Desktop.Test2");
54-
Assert.IsFalse(service is null);
54+
Assert.IsNotNull(service);
5555
Assert.IsFalse(service.Empty);
5656
}
5757

@@ -66,7 +66,7 @@ public void Case004_Create()
6666
#endif
6767
Assert.IsNotNull(_secretService);
6868
var service = _secretService.Create("Nickvision.Desktop.Test3");
69-
Assert.IsFalse(service is null);
69+
Assert.IsNotNull(service);
7070
Assert.IsFalse(service.Empty);
7171
}
7272

@@ -82,7 +82,7 @@ public async Task Case005_Get()
8282
Assert.IsNotNull(_secretService);
8383
Assert.IsTrue(await _secretService.AddAsync(new Secret("Nickvision.Desktop.Test4", "abc")));
8484
var secret = _secretService.Get("Nickvision.Desktop.Test4");
85-
Assert.IsFalse(secret is null);
85+
Assert.IsNotNull(secret);
8686
Assert.IsFalse(secret.Empty);
8787
Assert.AreEqual("abc", secret.Value);
8888
}
@@ -98,10 +98,10 @@ public async Task Case006_Get()
9898
#endif
9999
Assert.IsNotNull(_secretService);
100100
var secret = await _secretService.CreateAsync("Nickvision.Desktop.Test5");
101-
Assert.IsFalse(secret is null);
101+
Assert.IsNotNull(secret);
102102
Assert.IsFalse(secret.Empty);
103103
var secretFromGet = await _secretService.GetAsync("Nickvision.Desktop.Test5");
104-
Assert.IsFalse(secretFromGet is null);
104+
Assert.IsNotNull(secretFromGet);
105105
Assert.IsFalse(secretFromGet.Empty);
106106
Assert.AreEqual(secret.Value, secretFromGet.Value);
107107
}
@@ -118,12 +118,12 @@ public async Task Case007_Update()
118118
Assert.IsNotNull(_secretService);
119119
Assert.IsTrue(_secretService.Add(new Secret("Nickvision.Desktop.Test6", "abc123")));
120120
var secret = await _secretService.GetAsync("Nickvision.Desktop.Test6");
121-
Assert.IsFalse(secret is null);
121+
Assert.IsNotNull(secret);
122122
Assert.IsFalse(secret.Empty);
123123
Assert.AreEqual("abc123", secret.Value);
124124
Assert.IsTrue(await _secretService.UpdateAsync(new Secret("Nickvision.Desktop.Test6", "abc!")));
125125
secret = _secretService.Get("Nickvision.Desktop.Test6");
126-
Assert.IsFalse(secret is null);
126+
Assert.IsNotNull(secret);
127127
Assert.IsFalse(secret.Empty);
128128
Assert.AreEqual("abc!", secret.Value);
129129
}
@@ -140,12 +140,12 @@ public async Task Case008_Update()
140140
Assert.IsNotNull(_secretService);
141141
Assert.IsTrue(await _secretService.AddAsync(new Secret("Nickvision.Desktop.Test7", "abc123")));
142142
var secret = _secretService.Get("Nickvision.Desktop.Test7");
143-
Assert.IsFalse(secret is null);
143+
Assert.IsNotNull(secret);
144144
Assert.IsFalse(secret.Empty);
145145
Assert.AreEqual("abc123", secret.Value);
146146
Assert.IsTrue(_secretService.Update(new Secret("Nickvision.Desktop.Test7", "abc!")));
147147
secret = await _secretService.GetAsync("Nickvision.Desktop.Test7");
148-
Assert.IsFalse(secret is null);
148+
Assert.IsNotNull(secret);
149149
Assert.IsFalse(secret.Empty);
150150
Assert.AreEqual("abc!", secret.Value);
151151
}

‎Nickvision.Desktop/Nickvision.Desktop.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net8.0-windows10.0.22621.0;net9.0;net9.0-windows10.0.22621.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net8.0-windows10.0.22621.0;net9.0;net9.0-windows10.0.22621.0;net10.0;net10.0-windows10.0.22621.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>enable</Nullable>
@@ -31,27 +31,27 @@
3131
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
3232
<DefineConstants>OS_MAC</DefineConstants>
3333
</PropertyGroup>
34-
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.22621.0' Or '$(TargetFramework)'=='net9.0-windows10.0.22621.0'">
34+
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.22621.0' Or '$(TargetFramework)'=='net9.0-windows10.0.22621.0' Or '$(TargetFramework)'=='net10.0-windows10.0.22621.0'">
3535
<DefineConstants>OS_WINDOWS,NET_WINDOWS</DefineConstants>
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="GetText.NET" Version="8.0.5"/>
40-
<PackageReference Include="Markdig" Version="0.43.0"/>
41-
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.10"/>
42-
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3"/>
39+
<PackageReference Include="GetText.NET" Version="8.0.5" />
40+
<PackageReference Include="Markdig" Version="0.43.0" />
41+
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="10.0.0" />
42+
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
4343
<PackageReference Include="Octokit" Version="14.0.0" />
44-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.11"/>
45-
<PackageReference Include="Vanara.PInvoke.Kernel32" Version="4.2.1"/>
46-
<PackageReference Include="Vanara.PInvoke.PowrProf" Version="4.2.1"/>
47-
<PackageReference Include="Vanara.PInvoke.Security" Version="4.2.1"/>
48-
<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.2.1"/>
44+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.11" />
45+
<PackageReference Include="Vanara.PInvoke.Kernel32" Version="4.2.1" />
46+
<PackageReference Include="Vanara.PInvoke.PowrProf" Version="4.2.1" />
47+
<PackageReference Include="Vanara.PInvoke.Security" Version="4.2.1" />
48+
<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.2.1" />
4949
</ItemGroup>
5050

5151
<ItemGroup>
5252
<None Include="..\resources\icon.png">
5353
<Pack>True</Pack>
54-
<PackagePath/>
54+
<PackagePath />
5555
<Link>icon.png</Link>
5656
</None>
5757
</ItemGroup>

0 commit comments

Comments
 (0)