Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
tsai
CAP
Commits
68b5c358
Unverified
Commit
68b5c358
authored
Apr 26, 2018
by
Lemon
Committed by
GitHub
Apr 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support ASP.NET Core v2.0.0 (#32)
* Fix sample * Downgrade dependencies
parent
8cec412e
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
34 additions
and
29 deletions
+34
-29
SkyWalking.Sample.Backend.csproj
...kyWalking.Sample.Backend/SkyWalking.Sample.Backend.csproj
+3
-3
ValuesController.cs
...kyWalking.Sample.Frontend/Controllers/ValuesController.cs
+4
-6
SkyWalking.Sample.Frontend.csproj
...Walking.Sample.Frontend/SkyWalking.Sample.Frontend.csproj
+3
-3
SkyWalking.Abstractions.csproj
src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj
+3
-0
SkyWalking.AspNetCore.csproj
src/SkyWalking.AspNetCore/SkyWalking.AspNetCore.csproj
+4
-4
SkyWalkingHostedService.cs
src/SkyWalking.AspNetCore/SkyWalkingHostedService.cs
+1
-0
SkyWalking.Core.csproj
src/SkyWalking.Core/SkyWalking.Core.csproj
+1
-0
SkyWalking.Diagnostics.HttpClient.csproj
...stics.HttpClient/SkyWalking.Diagnostics.HttpClient.csproj
+1
-0
SkyWalking.Extensions.DependencyInjection.csproj
...njection/SkyWalking.Extensions.DependencyInjection.csproj
+2
-1
SkyWalking.NetworkProtocol.Trace.csproj
...orkProtocol.Trace/SkyWalking.NetworkProtocol.Trace.csproj
+7
-6
SkyWalking.NetworkProtocol.csproj
...Walking.NetworkProtocol/SkyWalking.NetworkProtocol.csproj
+5
-6
No files found.
sample/SkyWalking.Sample.Backend/SkyWalking.Sample.Backend.csproj
View file @
68b5c358
...
...
@@ -5,13 +5,13 @@
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\SkyWalking.AspNetCore\SkyWalking.AspNetCore.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
</ItemGroup>
</Project>
\ No newline at end of file
sample/SkyWalking.Sample.Frontend/Controllers/ValuesController.cs
View file @
68b5c358
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Collections.Generic
;
using
System.Net.Http
;
using
System.Threading.Tasks
;
using
Microsoft.AspNetCore.Mvc
;
using
SkyWalking.AspNetCore
;
namespace
SkyWalking.Sample.Frontend.Controllers
{
...
...
@@ -12,9 +10,9 @@ namespace SkyWalking.Sample.Frontend.Controllers
{
// GET api/values
[
HttpGet
]
public
async
Task
<
IEnumerable
<
string
>>
Get
(
[
FromServices
]
TracingHttpClient
httpClient
)
public
async
Task
<
IEnumerable
<
string
>>
Get
()
{
await
httpClient
.
HttpClient
.
GetAsync
(
"http://localhost:5002/api/values"
);
await
new
HttpClient
()
.
GetAsync
(
"http://localhost:5002/api/values"
);
return
new
string
[]
{
"value1"
,
"value2"
};
}
...
...
sample/SkyWalking.Sample.Frontend/SkyWalking.Sample.Frontend.csproj
View file @
68b5c358
...
...
@@ -5,13 +5,13 @@
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\SkyWalking.AspNetCore\SkyWalking.AspNetCore.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
</ItemGroup>
</Project>
\ No newline at end of file
src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj
View file @
68b5c358
...
...
@@ -15,4 +15,7 @@
<ProjectReference Include="..\SkyWalking.NetworkProtocol.Trace\SkyWalking.NetworkProtocol.Trace.csproj" />
<ProjectReference Include="..\SkyWalking.NetworkProtocol\SkyWalking.NetworkProtocol.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
</ItemGroup>
</Project>
\ No newline at end of file
src/SkyWalking.AspNetCore/SkyWalking.AspNetCore.csproj
View file @
68b5c358
...
...
@@ -12,14 +12,14 @@
<RootNamespace>SkyWalking.AspNetCore</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.
1.0-preview2-final
" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.
1.0-preview2-final
" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.
1.0-preview2-final
" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.
0.0
" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.
0.0
" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.
0.0
" />
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.
1.0-preview2-final
" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.
0.0
" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
...
...
src/SkyWalking.AspNetCore/SkyWalkingHostedService.cs
View file @
68b5c358
...
...
@@ -20,6 +20,7 @@ using System;
using
System.Diagnostics
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.AspNetCore.Hosting
;
using
Microsoft.Extensions.Hosting
;
using
Microsoft.Extensions.Options
;
using
SkyWalking.Boot
;
...
...
src/SkyWalking.Core/SkyWalking.Core.csproj
View file @
68b5c358
...
...
@@ -15,6 +15,7 @@
<ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0-pre-05" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" />
</ItemGroup>
...
...
src/SkyWalking.Diagnostics.HttpClient/SkyWalking.Diagnostics.HttpClient.csproj
View file @
68b5c358
...
...
@@ -13,6 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.1.0-preview2-final" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
...
...
src/SkyWalking.Extensions.DependencyInjection/SkyWalking.Extensions.DependencyInjection.csproj
View file @
68b5c358
...
...
@@ -15,6 +15,7 @@
<ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0-preview2-final" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
</ItemGroup>
</Project>
\ No newline at end of file
src/SkyWalking.NetworkProtocol.Trace/SkyWalking.NetworkProtocol.Trace.csproj
View file @
68b5c358
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>SkyWalking trace protocol.</Description>
<AssemblyTitle>SkyWalking.NetworkProtocol.Trace</AssemblyTitle>
...
...
@@ -9,7 +7,10 @@
<AssemblyName>SkyWalking.NetworkProtocol.Trace</AssemblyName>
<PackageId>SkyWalking.NetworkProtocol.Trace</PackageId>
<PackageTags>SkyWalking</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageReleaseNotes>
</PackageReleaseNotes>
</PropertyGroup>
</Project>
<ItemGroup>
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
</ItemGroup>
</Project>
\ No newline at end of file
src/SkyWalking.NetworkProtocol/SkyWalking.NetworkProtocol.csproj
View file @
68b5c358
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>SkyWalking gRPC protocol and generated codes.</Description>
<AssemblyTitle>SkyWalking.NetworkProtocol</AssemblyTitle>
...
...
@@ -9,13 +7,14 @@
<AssemblyName>SkyWalking.NetworkProtocol</AssemblyName>
<PackageId>SkyWalking.NetworkProtocol</PackageId>
<PackageTags>SkyWalking</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageReleaseNotes>
</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.5.1" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.5.1" />
<PackageReference Include="Grpc" Version="1.9.0" />
<PackageReference Include="Grpc.Tools" Version="1.9.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
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