Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
f5ae8813
Commit
f5ae8813
authored
Dec 10, 2019
by
Honfika
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nuget upgrade & sample projects are using netcore 3.1
parent
045ec22f
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
24 additions
and
33 deletions
+24
-33
launch.json
.vscode/launch.json
+2
-2
Titanium.Web.Proxy.Examples.Basic.NetCore.csproj
...es.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj
+1
-1
Titanium.Web.Proxy.Examples.Basic.csproj
...y.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.csproj
+1
-1
Titanium.Web.Proxy.Examples.WindowsService.csproj
...Service/Titanium.Web.Proxy.Examples.WindowsService.csproj
+3
-3
Titanium.Web.Proxy.Examples.Wpf.NetCore.csproj
...amples.Wpf/Titanium.Web.Proxy.Examples.Wpf.NetCore.csproj
+1
-1
Titanium.Web.Proxy.Examples.Wpf.csproj
...Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj
+1
-1
Titanium.Web.Proxy.NetCore.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
+5
-14
Titanium.Web.Proxy.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
+2
-2
Titanium.Web.Proxy.nuspec
src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
+6
-6
Titanium.Web.Proxy.IntegrationTests.csproj
...tegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
+2
-2
No files found.
.vscode/launch.json
View file @
f5ae8813
...
...
@@ -5,7 +5,7 @@
"name"
:
"NetCore|Debug|Basic Example"
,
"type"
:
"coreclr"
,
"request"
:
"launch"
,
"program"
:
"${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp
2.0
/Titanium.Web.Proxy.Examples.Basic.NetCore.dll"
,
"program"
:
"${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp
3.1
/Titanium.Web.Proxy.Examples.Basic.NetCore.dll"
,
"args"
:
[],
"cwd"
:
"${workspaceRoot}"
,
"stopAtEntry"
:
false
,
...
...
@@ -16,7 +16,7 @@
"name"
:
"NetCore|Release|Basic Example"
,
"type"
:
"coreclr"
,
"request"
:
"launch"
,
"program"
:
"${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp
2.0
/Titanium.Web.Proxy.Examples.Basic.NetCore.dll"
,
"program"
:
"${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp
3.1
/Titanium.Web.Proxy.Examples.Basic.NetCore.dll"
,
"args"
:
[],
"cwd"
:
"${workspaceRoot}"
,
"stopAtEntry"
:
false
,
...
...
examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj
View file @
f5ae8813
...
...
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp
2
.1</TargetFrameworks>
<TargetFrameworks>netcoreapp
3
.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
...
...
examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.csproj
View file @
f5ae8813
...
...
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp3.
0
</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp3.
1
</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
...
...
examples/Titanium.Web.Proxy.Examples.WindowsService/Titanium.Web.Proxy.Examples.WindowsService.csproj
View file @
f5ae8813
...
...
@@ -103,16 +103,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference
Include=
"Microsoft.Win32.Registry"
>
<Version>
4.
6
.0
</Version>
<Version>
4.
7
.0
</Version>
</PackageReference>
<PackageReference
Include=
"System.Numerics.Vectors"
>
<Version>
4.5.0
</Version>
</PackageReference>
<PackageReference
Include=
"System.Runtime.CompilerServices.Unsafe"
>
<Version>
4.
6
.0
</Version>
<Version>
4.
7
.0
</Version>
</PackageReference>
<PackageReference
Include=
"System.ServiceProcess.ServiceController"
>
<Version>
4.
6
.0
</Version>
<Version>
4.
7
.0
</Version>
</PackageReference>
<PackageReference
Include=
"System.Threading.Tasks.Extensions"
>
<Version>
4.5.3
</Version>
...
...
examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.NetCore.csproj
View file @
f5ae8813
...
...
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.
0
</TargetFrameworks>
<TargetFrameworks>netcoreapp3.
1
</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>
...
...
examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj
View file @
f5ae8813
...
...
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net461;netcoreapp3.
0
</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp3.
1
</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
View file @
f5ae8813
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.
0;netcoreapp2.
1</TargetFrameworks>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<RootNamespace>Titanium.Web.Proxy</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5.2" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'
== 'netstandard2.0
'">
<ItemGroup Condition="'$(TargetFramework)'
!= 'net45
'">
<PackageReference Include="Microsoft.Win32.Registry">
<Version>4.
6
.0</Version>
<Version>4.
7
.0</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>4.6.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.Win32.Registry">
<Version>4.6.0</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>4.6.0</Version>
<Version>4.7.0</Version>
</PackageReference>
</ItemGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
View file @
f5ae8813
...
...
@@ -25,10 +25,10 @@
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
<PackageReference Include="Microsoft.Win32.Registry">
<Version>4.
6
.0</Version>
<Version>4.
7
.0</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>4.
6
.0</Version>
<Version>4.
7
.0</Version>
</PackageReference>
</ItemGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
View file @
f5ae8813
...
...
@@ -24,26 +24,26 @@
<group
targetFramework=
"net461"
>
<dependency
id=
"BrotliSharpLib"
version=
"0.3.3"
/>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.5.2"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
6
.0"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
7
.0"
/>
<dependency
id=
"System.Buffers"
version=
"4.5.0"
/>
<dependency
id=
"System.Memory"
version=
"4.5.3"
/>
<dependency
id=
"System.Threading.Tasks.Extensions"
version=
"4.5.3"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
6
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
7
.0"
/>
</group>
<group
targetFramework=
"netstandard2.0"
>
<dependency
id=
"BrotliSharpLib"
version=
"0.3.3"
/>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.5.2"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
6
.0"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
7
.0"
/>
<dependency
id=
"System.Buffers"
version=
"4.5.0"
/>
<dependency
id=
"System.Memory"
version=
"4.5.3"
/>
<dependency
id=
"System.Threading.Tasks.Extensions"
version=
"4.5.3"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
6
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
7
.0"
/>
</group>
<group
targetFramework=
"netstandard2.1"
>
<dependency
id=
"BrotliSharpLib"
version=
"0.3.3"
/>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.5.2"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
6
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
6
.0"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
7
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
7
.0"
/>
</group>
</dependencies>
</metadata>
...
...
tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
View file @
f5ae8813
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.
0
</TargetFramework>
<TargetFramework>netcoreapp3.
1
</TargetFramework>
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
...
...
@@ -16,7 +16,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.
0.1
" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.
1.0
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment