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
62067838
Unverified
Commit
62067838
authored
Jun 17, 2018
by
Lemon
Committed by
GitHub
Jun 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support .NET Framework 4.6.1 (#60)
* support .NET Framework 461 * change ":" to "-" in CarrierItem
parent
12066739
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
5 deletions
+7
-5
CarrierItem.cs
src/SkyWalking.Abstractions/Context/CarrierItem.cs
+1
-1
SkyWalking.Abstractions.csproj
src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj
+1
-1
SkyWalking.Core.csproj
src/SkyWalking.Core/SkyWalking.Core.csproj
+3
-1
SkyWalking.NetworkProtocol.Trace.csproj
...orkProtocol.Trace/SkyWalking.NetworkProtocol.Trace.csproj
+1
-1
SkyWalking.NetworkProtocol.csproj
...Walking.NetworkProtocol/SkyWalking.NetworkProtocol.csproj
+1
-1
No files found.
src/SkyWalking.Abstractions/Context/CarrierItem.cs
View file @
62067838
...
@@ -64,7 +64,7 @@ namespace SkyWalking.Context
...
@@ -64,7 +64,7 @@ namespace SkyWalking.Context
}
}
else
else
{
{
_headKey
=
$"
{
AgentConfig
.
Namespace
}
:
{
headKey
}
"
;
_headKey
=
$"
{
AgentConfig
.
Namespace
}
-
{
headKey
}
"
;
}
}
_headValue
=
headValue
;
_headValue
=
headValue
;
_next
=
next
;
_next
=
next
;
...
...
src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj
View file @
62067838
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<PropertyGroup>
<PropertyGroup>
<Description>SkyWalking Core abstractions and interfaces for apm agent.</Description>
<Description>SkyWalking Core abstractions and interfaces for apm agent.</Description>
<AssemblyTitle>SkyWalking.Abstractions</AssemblyTitle>
<AssemblyTitle>SkyWalking.Abstractions</AssemblyTitle>
<TargetFramework
>netstandard2.0</TargetFramework
>
<TargetFramework
s>netstandard2.0;net461</TargetFrameworks
>
<AssemblyName>SkyWalking.Abstractions</AssemblyName>
<AssemblyName>SkyWalking.Abstractions</AssemblyName>
<PackageId>SkyWalking.Abstractions</PackageId>
<PackageId>SkyWalking.Abstractions</PackageId>
<PackageTags>SkyWalking;APM</PackageTags>
<PackageTags>SkyWalking;APM</PackageTags>
...
...
src/SkyWalking.Core/SkyWalking.Core.csproj
View file @
62067838
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<PropertyGroup>
<PropertyGroup>
<Description>SkyWalking core components.</Description>
<Description>SkyWalking core components.</Description>
<AssemblyTitle>SkyWalking.Core</AssemblyTitle>
<AssemblyTitle>SkyWalking.Core</AssemblyTitle>
<TargetFramework
>netstandard2.0</TargetFramework
>
<TargetFramework
s>netstandard2.0;net461</TargetFrameworks
>
<AssemblyName>SkyWalking.Core</AssemblyName>
<AssemblyName>SkyWalking.Core</AssemblyName>
<PackageId>SkyWalking.Core</PackageId>
<PackageId>SkyWalking.Core</PackageId>
<PackageTags>SkyWalking;APM</PackageTags>
<PackageTags>SkyWalking;APM</PackageTags>
...
@@ -18,5 +18,7 @@
...
@@ -18,5 +18,7 @@
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
src/SkyWalking.NetworkProtocol.Trace/SkyWalking.NetworkProtocol.Trace.csproj
View file @
62067838
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<PropertyGroup>
<PropertyGroup>
<Description>SkyWalking trace protocol.</Description>
<Description>SkyWalking trace protocol.</Description>
<AssemblyTitle>SkyWalking.NetworkProtocol.Trace</AssemblyTitle>
<AssemblyTitle>SkyWalking.NetworkProtocol.Trace</AssemblyTitle>
<TargetFramework
>netstandard2.0</TargetFramework
>
<TargetFramework
s>netstandard2.0;net461</TargetFrameworks
>
<AssemblyName>SkyWalking.NetworkProtocol.Trace</AssemblyName>
<AssemblyName>SkyWalking.NetworkProtocol.Trace</AssemblyName>
<PackageId>SkyWalking.NetworkProtocol.Trace</PackageId>
<PackageId>SkyWalking.NetworkProtocol.Trace</PackageId>
<PackageTags>SkyWalking</PackageTags>
<PackageTags>SkyWalking</PackageTags>
...
...
src/SkyWalking.NetworkProtocol/SkyWalking.NetworkProtocol.csproj
View file @
62067838
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<PropertyGroup>
<PropertyGroup>
<Description>SkyWalking gRPC protocol and generated codes.</Description>
<Description>SkyWalking gRPC protocol and generated codes.</Description>
<AssemblyTitle>SkyWalking.NetworkProtocol</AssemblyTitle>
<AssemblyTitle>SkyWalking.NetworkProtocol</AssemblyTitle>
<TargetFramework
>netstandard2.0</TargetFramework
>
<TargetFramework
s>netstandard2.0;net461</TargetFrameworks
>
<AssemblyName>SkyWalking.NetworkProtocol</AssemblyName>
<AssemblyName>SkyWalking.NetworkProtocol</AssemblyName>
<PackageId>SkyWalking.NetworkProtocol</PackageId>
<PackageId>SkyWalking.NetworkProtocol</PackageId>
<PackageTags>SkyWalking</PackageTags>
<PackageTags>SkyWalking</PackageTags>
...
...
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