Skip to content

Commit 0eadd1b

Browse files
Rans4ckeRRans4ckeR
committed
.NET9, Windows 11 24H2, Server 2025
1 parent 3e8fbf4 commit 0eadd1b

File tree

120 files changed

+506
-526
lines changed

Some content is hidden

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

120 files changed

+506
-526
lines changed

Diff for: ‎.editorconfig

+37-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ insert_final_newline = false
2020
# Organize usings
2121
dotnet_separate_import_directive_groups = false
2222
dotnet_sort_system_directives_first = true
23-
file_header_template = unset
23+
file_header_template =
2424

2525
# this. and Me. preferences
2626
dotnet_style_qualification_for_event = false:warning
@@ -82,14 +82,14 @@ csharp_style_var_for_built_in_types = false:warning
8282
csharp_style_var_when_type_is_apparent = true:warning
8383

8484
# Expression-bodied members
85-
csharp_style_expression_bodied_accessors = true:warning
86-
csharp_style_expression_bodied_constructors = true:warning
87-
csharp_style_expression_bodied_indexers = true:warning
88-
csharp_style_expression_bodied_lambdas = true:warning
89-
csharp_style_expression_bodied_local_functions = true:warning
90-
csharp_style_expression_bodied_methods = true:warning
91-
csharp_style_expression_bodied_operators = true:warning
92-
csharp_style_expression_bodied_properties = true:warning
85+
csharp_style_expression_bodied_accessors = when_on_single_line:warning
86+
csharp_style_expression_bodied_constructors = when_on_single_line:warning
87+
csharp_style_expression_bodied_indexers = when_on_single_line:warning
88+
csharp_style_expression_bodied_lambdas = when_on_single_line:warning
89+
csharp_style_expression_bodied_local_functions = when_on_single_line:warning
90+
csharp_style_expression_bodied_methods = when_on_single_line:warning
91+
csharp_style_expression_bodied_operators = when_on_single_line:warning
92+
csharp_style_expression_bodied_properties = when_on_single_line:warning
9393

9494
# Pattern matching preferences
9595
csharp_style_pattern_matching_over_as_with_null_check = true:warning
@@ -132,7 +132,7 @@ csharp_style_unused_value_assignment_preference = discard_variable:warning
132132
csharp_style_unused_value_expression_statement_preference = discard_variable:warning
133133

134134
# 'using' directive preferences
135-
csharp_using_directive_placement = inside_namespace:warning
135+
csharp_using_directive_placement = outside_namespace:warning
136136

137137
# New line preferences
138138
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:warning
@@ -405,6 +405,13 @@ dotnet_diagnostic.CA1008.severity = none
405405
dotnet_diagnostic.API1002.severity = none
406406
dotnet_diagnostic.API1003.severity = warning
407407
dotnet_diagnostic.CA2263.severity = warning
408+
csharp_prefer_static_anonymous_function = true:warning
409+
csharp_prefer_system_threading_lock = true:warning
410+
dotnet_diagnostic.IDE0330.severity = warning
411+
dotnet_diagnostic.IDE0320.severity = warning
412+
413+
# ReSharper properties
414+
resharper_braces_redundant = false
408415

409416
[*.{cs,vb}]
410417
dotnet_style_operator_placement_when_wrapping = beginning_of_line
@@ -606,6 +613,26 @@ dotnet_diagnostic.CA1506.severity = warning
606613

607614
# CA1509: Invalid entry in code metrics rule specification file
608615
dotnet_diagnostic.CA1509.severity = warning
616+
dotnet_diagnostic.MSTEST0015.severity = warning
617+
dotnet_diagnostic.MSTEST0016.severity = warning
618+
dotnet_diagnostic.CA1871.severity = warning
619+
dotnet_diagnostic.MSTEST0007.severity = warning
620+
dotnet_diagnostic.CA1872.severity = warning
621+
dotnet_diagnostic.MSTEST0019.severity = warning
622+
dotnet_diagnostic.MSTEST0020.severity = warning
623+
dotnet_diagnostic.MSTEST0021.severity = warning
624+
dotnet_diagnostic.MSTEST0022.severity = warning
625+
dotnet_diagnostic.MSTEST0025.severity = warning
626+
dotnet_diagnostic.MSTEST0017.severity = warning
627+
dotnet_diagnostic.MSTEST0023.severity = warning
628+
dotnet_diagnostic.MSTEST0024.severity = warning
629+
dotnet_diagnostic.MSTEST0032.severity = warning
630+
dotnet_diagnostic.MSTEST0029.severity = warning
631+
dotnet_diagnostic.MSTEST0026.severity = warning
632+
dotnet_diagnostic.MSTEST0030.severity = warning
633+
dotnet_diagnostic.MSTEST0031.severity = warning
634+
dotnet_diagnostic.MSTEST0034.severity = warning
635+
dotnet_diagnostic.MSTEST0035.severity = warning
609636

610637
[*.vb]
611638
dotnet_diagnostic.CA1047.severity = warning

Diff for: ‎.github/workflows/dotnet.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core SDK
1919
uses: actions/setup-dotnet@main
2020
with:
21-
dotnet-version: '8.x.x'
21+
dotnet-version: '9.x.x'
2222
- name: Install GitVersion
2323
uses: gittools/actions/gitversion/setup@main
2424
with:
@@ -27,14 +27,14 @@ jobs:
2727
uses: gittools/actions/gitversion/execute@main
2828
- name: Publish
2929
run: |
30-
dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --no-self-contained --framework net8.0-windows --runtime win-x86 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
31-
dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --no-self-contained --framework net8.0-windows --runtime win-x64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
32-
dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --no-self-contained --framework net8.0-windows --runtime win-arm64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
30+
dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --no-self-contained --framework net9.0-windows --runtime win-x86 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
31+
dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --no-self-contained --framework net9.0-windows --runtime win-x64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
32+
dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --no-self-contained --framework net9.0-windows --runtime win-arm64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
3333
- name: Zip
3434
run: |
35-
7z a -r "${{ format('CipherPunk-v{0}-net8.0-windows-x86.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net8.0-windows/win-x86/publish/*.*" "-x!*.xml"
36-
7z a -r "${{ format('CipherPunk-v{0}-net8.0-windows-x64.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net8.0-windows/win-x64/publish/*.*" "-x!*.xml"
37-
7z a -r "${{ format('CipherPunk-v{0}-net8.0-windows-ARM64.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net8.0-windows/win-arm64/publish/*.*" "-x!*.xml"
35+
7z a -r "${{ format('CipherPunk-v{0}-net9.0-windows-x86.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net9.0-windows/win-x86/publish/*.*" "-x!*.xml"
36+
7z a -r "${{ format('CipherPunk-v{0}-net9.0-windows-x64.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net9.0-windows/win-x64/publish/*.*" "-x!*.xml"
37+
7z a -r "${{ format('CipherPunk-v{0}-net9.0-windows-ARM64.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net9.0-windows/win-arm64/publish/*.*" "-x!*.xml"
3838
- name: Release
3939
run: gh release create v${{ env.GitVersion_SemVer }} (get-item *.zip) --generate-notes --target ${{ github.sha }} ${{ env.PreReleaseTag != '' && '--prerelease' || '' }}
4040
env:

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ StyleCopReport.xml
8282
*.pgc
8383
*.pgd
8484
*.rsp
85+
# but not Directory.Build.rsp, as it configures directory-level build defaults
86+
!Directory.Build.rsp
8587
*.sbr
8688
*.tlb
8789
*.tli

Diff for: ‎CipherPunk.CipherSuiteInfoApi/CipherPunk.CipherSuiteInfoApi.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<AssemblyName>CipherPunk.CipherSuiteInfoApi</AssemblyName>
55
<RootNamespace>CipherPunk.CipherSuiteInfoApi</RootNamespace>
66
<Title>CipherPunk.CipherSuiteInfoApi</Title>
@@ -29,6 +29,6 @@
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>
32-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
3333
</ItemGroup>
3434
</Project>

Diff for: ‎CipherPunk.CipherSuiteInfoApi/CipherSuiteInfoApiService.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
namespace CipherPunk.CipherSuiteInfoApi;
2-
3-
using System.Collections.Frozen;
1+
using System.Collections.Frozen;
42
using System.Net;
53
using System.Text.Json;
64
using System.Text.Json.Nodes;
75
using System.Text.Json.Serialization;
86

7+
namespace CipherPunk.CipherSuiteInfoApi;
8+
99
internal sealed class CipherSuiteInfoApiService(IHttpClientFactory httpClientFactory)
1010
: ICipherSuiteInfoApiService
1111
{

Diff for: ‎CipherPunk.CipherSuiteInfoApi/Entities/CipherSuite.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace CipherPunk.CipherSuiteInfoApi;
1+
using System.Text.Json.Serialization;
22

3-
using System.Text.Json.Serialization;
3+
namespace CipherPunk.CipherSuiteInfoApi;
44

55
public readonly record struct CipherSuite(
66
[property: JsonPropertyName("iana_name")] string IanaName,

Diff for: ‎CipherPunk.CipherSuiteInfoApi/Extensions/ServiceCollectionExtensions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
namespace CipherPunk.CipherSuiteInfoApi;
2-
3-
using System.Net;
1+
using System.Net;
42
using Microsoft.Extensions.DependencyInjection;
53

4+
namespace CipherPunk.CipherSuiteInfoApi;
5+
66
public static class ServiceCollectionExtensions
77
{
88
/// <summary>

Diff for: ‎CipherPunk.CipherSuiteInfoApi/ICipherSuiteInfoApiService.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace CipherPunk.CipherSuiteInfoApi;
1+
using System.Collections.Frozen;
22

3-
using System.Collections.Frozen;
3+
namespace CipherPunk.CipherSuiteInfoApi;
44

55
public interface ICipherSuiteInfoApiService
66
{

Diff for: ‎CipherPunk.UI/App.xaml.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
namespace CipherPunk.UI;
2-
3-
using System.Globalization;
1+
using System.Globalization;
42
using System.Windows;
53
using System.Windows.Input;
64
using System.Windows.Markup;
@@ -9,6 +7,8 @@
97
using Microsoft.Extensions.DependencyInjection;
108
using Microsoft.Extensions.Hosting;
119

10+
namespace CipherPunk.UI;
11+
1212
internal sealed partial class App
1313
{
1414
private readonly IHost host;

Diff for: ‎CipherPunk.UI/CipherPunk.UI.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0-windows</TargetFramework>
4+
<TargetFramework>net9.0-windows</TargetFramework>
55
<AssemblyName>CipherPunk.UI</AssemblyName>
66
<RootNamespace>CipherPunk.UI</RootNamespace>
77
<Title>CipherPunk.UI</Title>
@@ -30,20 +30,21 @@
3030
<ApplicationIcon>..\CipherPunk.ico</ApplicationIcon>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
34-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
35-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
33+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
34+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
35+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
3636
<PrivateAssets>all</PrivateAssets>
37+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3738
</PackageReference>
3839
<PackageReference Include="Microsoft.Windows.SDK.Win32Docs" Version="0.1.42-alpha">
3940
<PrivateAssets>all</PrivateAssets>
4041
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4142
</PackageReference>
42-
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="59.0.13-preview">
43+
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="63.0.31-preview">
4344
<PrivateAssets>all</PrivateAssets>
4445
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4546
</PackageReference>
46-
<PackageReference Include="Microsoft.Windows.WDK.Win32Metadata" Version="0.10.7-experimental">
47+
<PackageReference Include="Microsoft.Windows.WDK.Win32Metadata" Version="0.13.25-experimental">
4748
<PrivateAssets>all</PrivateAssets>
4849
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4950
</PackageReference>

Diff for: ‎CipherPunk.UI/Entities/UiMemberStatus.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace CipherPunk.UI;
1+
using CommunityToolkit.Mvvm.ComponentModel;
22

3-
using CommunityToolkit.Mvvm.ComponentModel;
3+
namespace CipherPunk.UI;
44

55
internal sealed class UiMemberStatus<T>(T member, bool enabled) : ObservableObject
66
{

Diff for: ‎CipherPunk.UI/Entities/UiRemoteServerTestResult.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
namespace CipherPunk.UI;
22

3-
using CipherPunk;
4-
53
internal readonly record struct UiRemoteServerTestResult(
64
TlsVersion TlsVersion,
75
string CipherSuiteId,

Diff for: ‎CipherPunk.UI/Entities/UiSchannelProtocolSettings.cs

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
namespace CipherPunk.UI;
1+
using CommunityToolkit.Mvvm.ComponentModel;
22

3-
using CommunityToolkit.Mvvm.ComponentModel;
3+
namespace CipherPunk.UI;
44

55
internal sealed class UiSchannelProtocolSettings : ObservableObject
66
{
7-
private SchannelProtocol protocol;
8-
private SchannelProtocolStatus clientStatus;
9-
private SchannelProtocolStatus serverStatus;
10-
117
public UiSchannelProtocolSettings(SchannelProtocolSettings schannelProtocolSettings)
128
{
139
Protocol = schannelProtocolSettings.Protocol;
@@ -17,19 +13,19 @@ public UiSchannelProtocolSettings(SchannelProtocolSettings schannelProtocolSetti
1713

1814
public SchannelProtocol Protocol
1915
{
20-
get => protocol;
21-
set => SetProperty(ref protocol, value);
16+
get;
17+
set => SetProperty(ref field, value);
2218
}
2319

2420
public SchannelProtocolStatus ClientStatus
2521
{
26-
get => clientStatus;
27-
set => SetProperty(ref clientStatus, value);
22+
get;
23+
set => SetProperty(ref field, value);
2824
}
2925

3026
public SchannelProtocolStatus ServerStatus
3127
{
32-
get => serverStatus;
33-
set => SetProperty(ref serverStatus, value);
28+
get;
29+
set => SetProperty(ref field, value);
3430
}
3531
}

0 commit comments

Comments
 (0)