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

Commit f5ae881

Browse files
honfikahonfika
committed
nuget upgrade & sample projects are using netcore 3.1
1 parent 045ec22 commit f5ae881

File tree

10 files changed

+24
-33
lines changed

10 files changed

+24
-33
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "NetCore|Debug|Basic Example",
66
"type": "coreclr",
77
"request": "launch",
8-
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
8+
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp3.1/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
99
"args": [],
1010
"cwd": "${workspaceRoot}",
1111
"stopAtEntry": false,
@@ -16,7 +16,7 @@
1616
"name": "NetCore|Release|Basic Example",
1717
"type": "coreclr",
1818
"request": "launch",
19-
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
19+
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp3.1/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
2020
"args": [],
2121
"cwd": "${workspaceRoot}",
2222
"stopAtEntry": false,

‎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>netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</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.0</TargetFrameworks>
5+
<TargetFrameworks>net461;netcoreapp3.1</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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@
103103
</ItemGroup>
104104
<ItemGroup>
105105
<PackageReference Include="Microsoft.Win32.Registry">
106-
<Version>4.6.0</Version>
106+
<Version>4.7.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.6.0</Version>
112+
<Version>4.7.0</Version>
113113
</PackageReference>
114114
<PackageReference Include="System.ServiceProcess.ServiceController">
115-
<Version>4.6.0</Version>
115+
<Version>4.7.0</Version>
116116
</PackageReference>
117117
<PackageReference Include="System.Threading.Tasks.Extensions">
118118
<Version>4.5.3</Version>

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

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1</TargetFrameworks>
55
<RootNamespace>Titanium.Web.Proxy</RootNamespace>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<SignAssembly>True</SignAssembly>
88
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
99
<DelaySign>False</DelaySign>
1010
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
11+
<Nullable>enable</Nullable>
1112
<LangVersion>8.0</LangVersion>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
1516
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
1617
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5.2" />
17-
<PackageReference Include="System.Buffers" Version="4.5.0" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
20+
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
2121
<PackageReference Include="Microsoft.Win32.Registry">
22-
<Version>4.6.0</Version>
22+
<Version>4.7.0</Version>
2323
</PackageReference>
2424
<PackageReference Include="System.Security.Principal.Windows">
25-
<Version>4.6.0</Version>
26-
</PackageReference>
27-
</ItemGroup>
28-
29-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
30-
<PackageReference Include="Microsoft.Win32.Registry">
31-
<Version>4.6.0</Version>
32-
</PackageReference>
33-
<PackageReference Include="System.Security.Principal.Windows">
34-
<Version>4.6.0</Version>
25+
<Version>4.7.0</Version>
3526
</PackageReference>
3627
</ItemGroup>
3728

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

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

‎src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@
2424
<group targetFramework="net461">
2525
<dependency id="BrotliSharpLib" version="0.3.3" />
2626
<dependency id="Portable.BouncyCastle" version="1.8.5.2" />
27-
<dependency id="Microsoft.Win32.Registry" version="4.6.0" />
27+
<dependency id="Microsoft.Win32.Registry" version="4.7.0" />
2828
<dependency id="System.Buffers" version="4.5.0" />
2929
<dependency id="System.Memory" version="4.5.3" />
3030
<dependency id="System.Threading.Tasks.Extensions" version="4.5.3" />
31-
<dependency id="System.Security.Principal.Windows" version="4.6.0" />
31+
<dependency id="System.Security.Principal.Windows" version="4.7.0" />
3232
</group>
3333
<group targetFramework="netstandard2.0">
3434
<dependency id="BrotliSharpLib" version="0.3.3" />
3535
<dependency id="Portable.BouncyCastle" version="1.8.5.2" />
36-
<dependency id="Microsoft.Win32.Registry" version="4.6.0" />
36+
<dependency id="Microsoft.Win32.Registry" version="4.7.0" />
3737
<dependency id="System.Buffers" version="4.5.0" />
3838
<dependency id="System.Memory" version="4.5.3" />
3939
<dependency id="System.Threading.Tasks.Extensions" version="4.5.3" />
40-
<dependency id="System.Security.Principal.Windows" version="4.6.0" />
40+
<dependency id="System.Security.Principal.Windows" version="4.7.0" />
4141
</group>
4242
<group targetFramework="netstandard2.1">
4343
<dependency id="BrotliSharpLib" version="0.3.3" />
4444
<dependency id="Portable.BouncyCastle" version="1.8.5.2" />
45-
<dependency id="Microsoft.Win32.Registry" version="4.6.0" />
46-
<dependency id="System.Security.Principal.Windows" version="4.6.0" />
45+
<dependency id="Microsoft.Win32.Registry" version="4.7.0" />
46+
<dependency id="System.Security.Principal.Windows" version="4.7.0" />
4747
</group>
4848
</dependencies>
4949
</metadata>

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

Lines changed: 2 additions & 2 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.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1717
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
1818
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.1" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
2121
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
2222
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />

0 commit comments

Comments
 (0)