Skip to content
This repository was archived by the owner on Jun 25, 2025. It is now read-only.

Commit 70418f7

Browse files
HMBSbigeHMBSbige
committed
dep: Update to .NET 7.0
1 parent b3fbdb2 commit 70418f7

File tree

3 files changed

+89
-90
lines changed

3 files changed

+89
-90
lines changed

‎UnitTest/DnsTest.cs‎

Lines changed: 87 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -7,112 +7,111 @@
77
using System.Net.Sockets;
88
using System.Threading.Tasks;
99

10-
namespace UnitTest
10+
namespace UnitTest;
11+
12+
[TestClass]
13+
public class DnsTest
1114
{
12-
[TestClass]
13-
public class DnsTest
15+
[TestMethod]
16+
public async Task DefaultTest()
17+
{
18+
var ip1 = await DnsUtil.QueryDefaultAsync(@"dns.google");
19+
Assert.IsTrue(Equals(ip1, IPAddress.Parse(@"8.8.8.8")) || Equals(ip1, IPAddress.Parse(@"8.8.4.4")));
20+
var ip2 = await DnsUtil.QueryDefaultAsync(@"dns.google", true);
21+
Assert.IsTrue(Equals(ip2, IPAddress.Parse(@"2001:4860:4860::8888")) || Equals(ip2, IPAddress.Parse(@"2001:4860:4860::8844")));
22+
}
23+
24+
[TestMethod]
25+
public async Task Test()
1426
{
15-
[TestMethod]
16-
public async Task DefaultTest()
27+
var client = new Shadowsocks.Model.DnsClient(DnsType.Default)
1728
{
18-
var ip1 = await DnsUtil.QueryDefaultAsync(@"dns.google");
19-
Assert.IsTrue(Equals(ip1, IPAddress.Parse(@"8.8.8.8")) || Equals(ip1, IPAddress.Parse(@"8.8.4.4")));
20-
var ip2 = await DnsUtil.QueryDefaultAsync(@"dns.google", true);
21-
Assert.IsTrue(Equals(ip2, IPAddress.Parse(@"2001:4860:4860::8888")) || Equals(ip2, IPAddress.Parse(@"2001:4860:4860::8844")));
22-
}
29+
DnsServer = @"101.6.6.6",
30+
Port = 5353,
31+
IsTcpEnabled = true,
32+
IsUdpEnabled = false
33+
};
34+
var ip = await client.QueryIpAddressAsync(@"www.google.com", default);
35+
Assert.IsNotNull(ip);
36+
Console.WriteLine(ip);
37+
}
2338

24-
[TestMethod]
25-
public async Task Test()
39+
[TestMethod]
40+
public async Task DnsOverTlsTest()
41+
{
42+
var client = new Shadowsocks.Model.DnsClient(DnsType.DnsOverTls);
43+
var ip = await client.QueryIpAddressAsync(@"www.google.com", default);
44+
Assert.IsNotNull(ip);
45+
Console.WriteLine(ip);
46+
}
47+
48+
[TestMethod]
49+
public async Task TestTwoDnsAsync()
50+
{
51+
const string host = @"www.google.com";
52+
var clients = new List<Shadowsocks.Model.DnsClient>
2653
{
27-
var client = new Shadowsocks.Model.DnsClient(DnsType.Default)
54+
new(DnsType.Default)
2855
{
2956
DnsServer = @"101.6.6.6",
3057
Port = 5353,
3158
IsTcpEnabled = true,
3259
IsUdpEnabled = false
33-
};
34-
var ip = await client.QueryIpAddress(@"www.google.com", default);
35-
Assert.IsNotNull(ip);
36-
Console.WriteLine(ip);
37-
}
60+
},
61+
new(DnsType.DnsOverTls)
62+
};
63+
var res = await DnsUtil.QueryAsync(host, clients);
64+
Assert.IsNotNull(res);
65+
Console.WriteLine(res);
66+
}
3867

39-
[TestMethod]
40-
public async Task DnsOverTlsTest()
41-
{
42-
var client = new Shadowsocks.Model.DnsClient(DnsType.DnsOverTls);
43-
var ip = await client.QueryIpAddress(@"www.google.com", default);
44-
Assert.IsNotNull(ip);
45-
Console.WriteLine(ip);
46-
}
68+
[TestMethod]
69+
public async Task TestIpv6FallbackAsync()
70+
{
71+
const string host = @"speed.neu6.edu.cn";
4772

48-
[TestMethod]
49-
public async Task TestTwoDnsAsync()
50-
{
51-
const string host = @"www.google.com";
52-
var clients = new List<Shadowsocks.Model.DnsClient>
53-
{
54-
new(DnsType.Default)
55-
{
56-
DnsServer = @"101.6.6.6",
57-
Port = 5353,
58-
IsTcpEnabled = true,
59-
IsUdpEnabled = false
60-
},
61-
new(DnsType.DnsOverTls)
62-
};
63-
var res = await DnsUtil.QueryAsync(host, clients);
64-
Assert.IsNotNull(res);
65-
Console.WriteLine(res);
66-
}
73+
var resDefault = await DnsUtil.QueryDefaultAsync(host);
74+
Assert.IsNotNull(resDefault);
75+
Console.WriteLine(resDefault);
6776

68-
[TestMethod]
69-
public async Task TestIpv6FallbackAsync()
77+
var clients = new List<Shadowsocks.Model.DnsClient>
7078
{
71-
const string host = @"speed.neu6.edu.cn";
72-
73-
var resDefault = await DnsUtil.QueryDefaultAsync(host);
74-
Assert.IsNotNull(resDefault);
75-
Console.WriteLine(resDefault);
76-
77-
var clients = new List<Shadowsocks.Model.DnsClient>
79+
new(DnsType.DnsOverTls)
80+
{
81+
DnsServer = @"dns.alidns.com"
82+
},
83+
new(DnsType.Default)
7884
{
79-
new(DnsType.DnsOverTls)
80-
{
81-
DnsServer = @"dns.alidns.com"
82-
},
83-
new(DnsType.Default)
84-
{
85-
DnsServer = @"114.114.114.114",
86-
Port = 53,
87-
IsTcpEnabled = true,
88-
IsUdpEnabled = false
89-
}
90-
};
91-
var res = await DnsUtil.QueryAsync(host, clients);
92-
Assert.IsNotNull(res);
93-
Console.WriteLine(res);
94-
}
85+
DnsServer = @"114.114.114.114",
86+
Port = 53,
87+
IsTcpEnabled = true,
88+
IsUdpEnabled = false
89+
}
90+
};
91+
var res = await DnsUtil.QueryAsync(host, clients);
92+
Assert.IsNotNull(res);
93+
Console.WriteLine(res);
94+
}
9595

96-
[TestMethod]
97-
public async Task TestIpv6FirstAsync()
96+
[TestMethod]
97+
public async Task TestIpv6FirstAsync()
98+
{
99+
const string host = @"speed.neu.edu.cn";
100+
var clients = new List<Shadowsocks.Model.DnsClient>
98101
{
99-
const string host = @"speed.neu.edu.cn";
100-
var clients = new List<Shadowsocks.Model.DnsClient>
102+
new(DnsType.Default)
101103
{
102-
new(DnsType.Default)
103-
{
104-
DnsServer = @"114.114.114.114",
105-
Port = 53,
106-
IsTcpEnabled = true,
107-
IsUdpEnabled = false,
108-
Ipv6First = true
109-
}
110-
};
111-
var res = await DnsUtil.QueryAsync(host, clients);
104+
DnsServer = @"114.114.114.114",
105+
Port = 53,
106+
IsTcpEnabled = true,
107+
IsUdpEnabled = false,
108+
Ipv6First = true
109+
}
110+
};
111+
var res = await DnsUtil.QueryAsync(host, clients);
112112

113-
Assert.IsNotNull(res);
114-
Assert.AreEqual(AddressFamily.InterNetworkV6, res.AddressFamily);
115-
Console.WriteLine(res);
116-
}
113+
Assert.IsNotNull(res);
114+
Assert.AreEqual(AddressFamily.InterNetworkV6, res.AddressFamily);
115+
Console.WriteLine(res);
117116
}
118117
}

‎UnitTest/UnitTest.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
4+
<TargetFramework>net7.0-windows</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎shadowsocks-csharp/shadowsocksr.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
5+
<TargetFramework>net7.0-windows</TargetFramework>
66
<LangVersion>latest</LangVersion>
77
<UseWPF>true</UseWPF>
88
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

0 commit comments

Comments
 (0)