feat: modify script and dependencies

megaease · Jan 10, 2023 · e561e28 · e561e28
1 parent 5f10307
commit e561e28
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 43 deletions.
diff --git a/doc/how-to-use.md b/doc/how-to-use.md
@@ -2,7 +2,7 @@
 
 First ***production ready***, simple and full Easeagent SDK implementation without dependencies.
 
-## Installing via Composer
+## Installing via dotnet
 
 easeagent-sdk-net can be installed package:
 ```bash

diff --git a/paket.dependencies b/paket.dependencies
@@ -18,11 +18,5 @@ nuget System.Threading 4.3.0
 nuget System.Threading.Tasks.Dataflow 4.7.0
 nuget System.Threading.Thread 4.3.0
 nuget YamlDotNet 12.3.1
-
-
-http https://github.com/megaease/zipkin4net/releases/download/1.5.0-megaease/megaease.zipkin4net.1.5.0.nupkg megaease/megaease.zipkin4net.1.5.0.nupkg
-http https://github.com/megaease/zipkin4net/releases/download/1.5.0-megaease/megaease.zipkin4net.middleware.aspnetcore.1.5.0.nupkg  megaease/megaease.zipkin4net.middleware.aspnetcore.1.5.0.nupkg
-
-source paket-files/github.com/megaease
 nuget megaease.zipkin4net 1.5.0
 nuget megaease.zipkin4net.middleware.aspnetcore 1.5.0
diff --git a/paket.lock b/paket.lock
@@ -6,6 +6,23 @@ NUGET
       System.Diagnostics.EventLog (>= 4.7) - restriction: || (&& (< net462) (>= netstandard2.0) (< netstandard2.1)) (&& (< net6.0) (>= netstandard2.1))
       System.Diagnostics.EventLog (>= 6.0) - restriction: >= net6.0
       System.Reflection.Emit (>= 4.7) - restriction: && (< net462) (>= netstandard2.0) (< netstandard2.1)
+    megaease.zipkin4net (1.5)
+      Apache.Thrift (>= 1.0.2) - restriction: || (>= net451) (>= netstandard1.4)
+      NETStandard.Library (>= 1.6.1) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+      System.Collections.Specialized (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+      System.Net.Http (>= 4.3) - restriction: || (>= net451) (>= netstandard1.4)
+      System.Net.NameResolution (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+      System.Net.NetworkInformation (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+      System.Runtime.Serialization.Formatters (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+      System.Threading (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+      System.Threading.Tasks.Dataflow (>= 4.7) - restriction: || (>= net451) (>= netstandard1.4)
+      System.Threading.Thread (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
+    megaease.zipkin4net.middleware.aspnetcore (1.5)
+      megaease.zipkin4net (>= 1.5) - restriction: || (>= net461) (>= netstandard1.6)
+      Microsoft.AspNetCore.Hosting (>= 1.1.1) - restriction: || (>= net461) (>= netstandard1.6)
+      Microsoft.Extensions.Logging (>= 1.1.1) - restriction: || (>= net461) (>= netstandard1.6)
+      NETStandard.Library (>= 1.6.1) - restriction: && (< net461) (>= netstandard1.6)
+      System.Net.Http (>= 4.3) - restriction: || (>= net461) (>= netstandard1.6)
     Microsoft.AspNet.WebApi.Client (5.2.9) - restriction: >= netcoreapp2.1
       Newtonsoft.Json (>= 10.0.1) - restriction: && (< net45) (>= netstandard2.0)
       Newtonsoft.Json.Bson (>= 1.0.1) - restriction: && (< net45) (>= netstandard2.0)
@@ -1426,25 +1443,3 @@ NUGET
       System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Xml.ReaderWriter (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
     YamlDotNet (12.3.1)
-  remote: paket-files/github.com/megaease
-    megaease.zipkin4net (1.5.0)
-      Apache.Thrift (>= 1.0.2) - restriction: || (>= net451) (>= netstandard1.4)
-      NETStandard.Library (>= 1.6.1) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-      System.Collections.Specialized (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-      System.Net.Http (>= 4.3) - restriction: || (>= net451) (>= netstandard1.4)
-      System.Net.NameResolution (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-      System.Net.NetworkInformation (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-      System.Runtime.Serialization.Formatters (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-      System.Threading (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-      System.Threading.Tasks.Dataflow (>= 4.7) - restriction: || (>= net451) (>= netstandard1.4)
-      System.Threading.Thread (>= 4.3) - restriction: || (&& (< net451) (>= netstandard1.4) (< netstandard1.6)) (&& (< net451) (>= netstandard1.6))
-    megaease.zipkin4net.middleware.aspnetcore (1.5.0)
-      megaease.zipkin4net (>= 1.5) - restriction: || (>= net461) (>= netstandard1.6)
-      Microsoft.AspNetCore.Hosting (>= 1.1.1) - restriction: || (>= net461) (>= netstandard1.6)
-      Microsoft.Extensions.Logging (>= 1.1.1) - restriction: || (>= net461) (>= netstandard1.6)
-      NETStandard.Library (>= 1.6.1) - restriction: && (< net461) (>= netstandard1.6)
-      System.Net.Http (>= 4.3) - restriction: || (>= net461) (>= netstandard1.6)
-HTTP
-  remote: https://github.com
-    megaease/megaease.zipkin4net.1.5.0.nupkg (/megaease/zipkin4net/releases/download/1.5.0-megaease/megaease.zipkin4net.1.5.0.nupkg)
-    megaease/megaease.zipkin4net.middleware.aspnetcore.1.5.0.nupkg (/megaease/zipkin4net/releases/download/1.5.0-megaease/megaease.zipkin4net.middleware.aspnetcore.1.5.0.nupkg)
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -5,10 +5,5 @@ SCRIPT_PATH=`pwd -P`
 cd $SCRIPT_PATH/../
 
 dotnet tool restore
-dotnet paket restore
 dotnet paket install
-dotnet restore Src
-dotnet restore Tests
-dotnet restore Examples/aspnetcore/common
-dotnet restore Examples/aspnetcore/backend
-dotnet restore Examples/aspnetcore/frontend
+./scripts/restore.sh
diff --git a/scripts/clear.sh b/scripts/clear.sh
@@ -6,4 +6,6 @@ cd $SCRIPT_PATH/../
 
 dotnet nuget locals all --clear
 dotnet tool restore
-dotnet paket restore
+rm -rf source
+rm -rf packages
+rm -rf paket-files
diff --git a/scripts/restore.sh b/scripts/restore.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+pushd `dirname $0` > /dev/null
+SCRIPT_PATH=`pwd -P`
+cd $SCRIPT_PATH/../
+
+dotnet restore Src
+dotnet restore Tests
+dotnet restore Examples/aspnetcore/common
+dotnet restore Examples/aspnetcore/backend
+dotnet restore Examples/aspnetcore/frontend
diff --git a/scripts/update.sh b/scripts/update.sh
@@ -5,4 +5,4 @@ SCRIPT_PATH=`pwd -P`
 cd $SCRIPT_PATH/../
 
 dotnet paket update
-$SCRIPT_PATH/build.sh
+./scripts/restore.sh
diff --git a/source.cmd b/source.cmd
@@ -9,8 +9,7 @@ dotnet restore Tests
 dotnet restore Examples/aspnetcore/common
 dotnet restore Examples/aspnetcore/backend
 dotnet restore Examples/aspnetcore/frontend
-dotnet pack Src
+dotnet pack Src  --configuration Release
 
 MD source
-COPY Src/bin/Debug/*.nupkg source
-COPY paket-files/github.com/megaease/zipkin4net/source/* source
+COPY Src/bin/Release/*.nupkg source
diff --git a/source.sh b/source.sh
@@ -4,8 +4,9 @@ pushd `dirname $0` > /dev/null
 SCRIPT_PATH=`pwd -P`
 cd $SCRIPT_PATH/
 
+rm -rf Src/bin/Release/*.nupkg
+rm -rf source
 ./scripts/build.sh
-dotnet pack Src
+dotnet pack Src --configuration Release
 mkdir source
-cp Src/bin/Debug/*.nupkg source
-cp paket-files/github.com/megaease/zipkin4net/source/* source
+cp Src/bin/Release/*.nupkg source