refactoring for SkyApm.Transport.Protocol

SkyAPM · Mar 27, 2024 · aa3fdde · aa3fdde
1 parent 6900a0f
commit aa3fdde
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/net7-ci-it.yml b/.github/workflows/net7-ci-it.yml
@@ -23,8 +23,8 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore
     - name: Build Protocol
-      run: dotnet build src/SkyApm.Transport.Grpc.Protocol --no-restore
+      run: dotnet build src/SkyApm.Transport.Protocol --no-restore
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-build --verbosity normal --framework net7.0
+      run: dotnet test --no-build --verbosity normal --framework net7.0
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 
-[submodule "src/SkyApm.Transport.Grpc.Protocol/protocol-v3"]
-	path = src/SkyApm.Transport.Grpc.Protocol/protocol-v3
+[submodule "src/SkyApm.Transport.Protocol/protocol-v3"]
+	path = src/SkyApm.Transport.Protocol/protocol-v3
 	url = https://github.com/apache/skywalking-data-collect-protocol
diff --git a/CONTIBUTING.md b/CONTIBUTING.md
@@ -24,7 +24,7 @@ git submodule update --init
 // Restore dependencies
 dotnet restore
 // Build Protocol
-dotnet build src/SkyApm.Transport.Grpc.Protocol --no-restore
+dotnet build src/SkyApm.Transport.Protocol --no-restore
 // Build
 dotnet build --no-restore
 // Test

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,7 +11,7 @@ skip_commits:
     - LICENSE
 install:
 - git submodule update --init
-- dotnet build -c Release src/SkyApm.Transport.Grpc.Protocol 
+- dotnet build -c Release src/SkyApm.Transport.Protocol
 build_script:
 - ps: ./scripts/build.ps1
 artifacts:

diff --git a/docs/guides/how-to-build.md b/docs/guides/how-to-build.md
@@ -12,5 +12,5 @@ This document helps people to compile and build the project.
 - `git submodule init`
 - `git submodule update`
 - Run `dotnet restore`
-- Run `dotnet build src/SkyApm.Transport.Grpc.Protocol`
+- Run `dotnet build src/SkyApm.Transport.Protocol`
 - Run `dotnet build skyapm-dotnet.sln`
diff --git a/skyapm-dotnet.sln b/skyapm-dotnet.sln
@@ -71,7 +71,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Utilities.Logging",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Agent.AspNetCore", "src\SkyApm.Agent.AspNetCore\SkyApm.Agent.AspNetCore.csproj", "{5CB2889E-33DD-4326-9403-4977849E065D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Transport.Grpc.Protocol", "src\SkyApm.Transport.Grpc.Protocol\SkyApm.Transport.Grpc.Protocol.csproj", "{BAF5C1ED-09C4-4B32-8190-47D16265F01E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Transport.Protocol", "src\SkyApm.Transport.Protocol\SkyApm.Transport.Protocol.csproj", "{BAF5C1ED-09C4-4B32-8190-47D16265F01E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Core", "src\SkyApm.Core\SkyApm.Core.csproj", "{60D34708-45A2-4374-9500-5B3FF80C0AA9}"
 EndProject

diff --git a/src/SkyApm.Transport.Grpc.Protocol/protocol-v3 b/src/SkyApm.Transport.Grpc.Protocol/protocol-v3
diff --git a/src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj b/src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj
@@ -19,6 +19,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
-        <ProjectReference Include="..\SkyApm.Transport.Grpc.Protocol\SkyApm.Transport.Grpc.Protocol.csproj" />
+        <ProjectReference Include="..\SkyApm.Transport.Protocol\SkyApm.Transport.Protocol.csproj" />
     </ItemGroup>
 </Project>
diff --git a/...col/SkyApm.Transport.Grpc.Protocol.csproj → ...Protocol/SkyApm.Transport.Protocol.csproj b/...col/SkyApm.Transport.Grpc.Protocol.csproj → ...Protocol/SkyApm.Transport.Protocol.csproj
@@ -2,15 +2,15 @@
     <Import Project="..\..\build\common.props" />
 
     <PropertyGroup>
-        <Description>$(Product) gRPC data transmitter.</Description>
-        <AssemblyTitle>$(PackagePrefix).Transport.Grpc.Protocol</AssemblyTitle>
-        <AssemblyName>$(PackagePrefix).Transport.Grpc.Protocol</AssemblyName>
-        <PackageId>$(PackagePrefix).Transport.Grpc.Protocol</PackageId>
-        <PackageTags>SkyWalking;Grpc</PackageTags>
+        <Description>$(Product) data protocol.</Description>
+        <AssemblyTitle>$(PackagePrefix).Transport.Protocol</AssemblyTitle>
+        <AssemblyName>$(PackagePrefix).Transport.Protocol</AssemblyName>
+        <PackageId>$(PackagePrefix).Transport.Protocol</PackageId>
+        <PackageTags>SkyWalking;Protocol</PackageTags>
         <PackageReleaseNotes>
         </PackageReleaseNotes>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <RootNamespace>SkyApm.Transport.Grpc.Protocol</RootNamespace>
+        <RootNamespace>SkyApm.Transport.Protocol</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
@@ -24,7 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Protobuf Include="protocol-v3/**/*.proto" ProtoRoot="protocol-v3" GrpcServices="Client" OutputDir="generated-v3" GrpcOutputDir="../SkyApm.Transport.Grpc/generated-v3" CompileOutputs="false" />
+        <Protobuf Include="protocol-v3/**/*.proto" ProtoRoot="protocol-v3" OutputDir="generated-v3" GrpcServices="Client" GrpcOutputDir="../SkyApm.Transport.Grpc/generated-v3" CompileOutputs="false" />
     </ItemGroup>
 
     <PropertyGroup>

diff --git a/src/SkyApm.Transport.Protocol/protocol-v3 b/src/SkyApm.Transport.Protocol/protocol-v3