Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

Commit 81a14a2

Browse files
honfikahonfika
committed
.net 5 target
1 parent a7ca823 commit 81a14a2

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net50</TargetFrameworks>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<LangVersion>7.1</LangVersion>
88
</PropertyGroup>

‎examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net461;net50</TargetFrameworks>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<LangVersion>7.1</LangVersion>
88
</PropertyGroup>

‎examples/Titanium.Web.Proxy.Examples.WindowsService/Titanium.Web.Proxy.Examples.WindowsService.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{63635F50-7D6F-4A93-84C6-04CF9D2754C5}</ProjectGuid>
77
<OutputType>WinExe</OutputType>
8-
<RuntimeIdentifier>win</RuntimeIdentifier>
8+
<RuntimeIdentifier>win</RuntimeIdentifier>
99
<RootNamespace>WindowsServiceExample</RootNamespace>
1010
<AssemblyName>WindowsServiceExample</AssemblyName>
1111
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
@@ -32,7 +32,7 @@
3232
</PropertyGroup>
3333
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3434
<PlatformTarget>AnyCPU</PlatformTarget>
35-
<RuntimeIdentifier>win</RuntimeIdentifier>
35+
<RuntimeIdentifier>win</RuntimeIdentifier>
3636
<DebugSymbols>true</DebugSymbols>
3737
<DebugType>full</DebugType>
3838
<Optimize>false</Optimize>
@@ -45,7 +45,7 @@
4545
</PropertyGroup>
4646
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4747
<PlatformTarget>AnyCPU</PlatformTarget>
48-
<RuntimeIdentifier>win</RuntimeIdentifier>
48+
<RuntimeIdentifier>win</RuntimeIdentifier>
4949
<DebugType>pdbonly</DebugType>
5050
<Optimize>true</Optimize>
5151
<OutputPath>bin\Release\</OutputPath>
@@ -103,19 +103,19 @@
103103
</ItemGroup>
104104
<ItemGroup>
105105
<PackageReference Include="Microsoft.Win32.Registry">
106-
<Version>4.7.0</Version>
106+
<Version>5.0.0</Version>
107107
</PackageReference>
108108
<PackageReference Include="System.Numerics.Vectors">
109109
<Version>4.5.0</Version>
110110
</PackageReference>
111111
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
112-
<Version>4.7.0</Version>
112+
<Version>5.0.0</Version>
113113
</PackageReference>
114114
<PackageReference Include="System.ServiceProcess.ServiceController">
115-
<Version>4.7.0</Version>
115+
<Version>5.0.0</Version>
116116
</PackageReference>
117117
<PackageReference Include="System.Threading.Tasks.Extensions">
118-
<Version>4.5.3</Version>
118+
<Version>4.5.4</Version>
119119
</PackageReference>
120120
</ItemGroup>
121121
<ItemGroup>

‎examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.NetCore.csproj

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net50</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
</PropertyGroup>
88

‎examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.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-
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net461;net50-windows</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
</PropertyGroup>
88

‎src/Titanium.Web.Proxy/Helpers/RunTime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class RunTime
1313
{
1414
private static readonly Lazy<bool> isRunningOnMono = new Lazy<bool>(() => Type.GetType("Mono.Runtime") != null);
1515

16-
#if NET45
16+
#if NET45 || NET461
1717
/// <summary>
1818
/// cache for Windows platform check
1919
/// </summary>

‎src/Titanium.Web.Proxy/ProxyServer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ private void listen(ProxyEndPoint endPoint)
685685
endPoint.Port = ((IPEndPoint)endPoint.Listener.LocalEndpoint).Port;
686686

687687
// accept clients asynchronously
688-
endPoint.Listener.BeginAcceptTcpClient(onAcceptConnection, endPoint);
688+
endPoint.Listener.BeginAcceptSocket(onAcceptConnection, endPoint);
689689
}
690690
catch (SocketException ex)
691691
{
@@ -766,7 +766,7 @@ private void onAcceptConnection(IAsyncResult asyn)
766766
}
767767

768768
// Get the listener that handles the client request.
769-
endPoint.Listener!.BeginAcceptTcpClient(onAcceptConnection, endPoint);
769+
endPoint.Listener!.BeginAcceptSocket(onAcceptConnection, endPoint);
770770
}
771771

772772

‎src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
17-
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5.2" />
17+
<PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
21-
<PackageReference Include="System.Buffers" Version="4.5.0" />
22-
<PackageReference Include="System.Memory" Version="4.5.3" />
23-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
21+
<PackageReference Include="System.Buffers" Version="4.5.1" />
22+
<PackageReference Include="System.Memory" Version="4.5.4" />
23+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
2424
</ItemGroup>
2525

2626
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
2727
<PackageReference Include="Microsoft.Win32.Registry">
28-
<Version>4.7.0</Version>
28+
<Version>5.0.0</Version>
2929
</PackageReference>
3030
<PackageReference Include="System.Security.Principal.Windows">
31-
<Version>4.7.0</Version>
31+
<Version>5.0.0</Version>
3232
</PackageReference>
3333
</ItemGroup>
3434

‎tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net50</TargetFramework>
55
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
</PropertyGroup>
@@ -14,11 +14,11 @@
1414

1515
<ItemGroup>
1616
<FrameworkReference Include="Microsoft.AspNetCore.App" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
19-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
20-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
21-
<PackageReference Include="System.IO.Pipelines" Version="4.7.1" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
19+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
20+
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
21+
<PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
12-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
12+
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)