v1.1.0 Release

nulastudio · Oct 22, 2019 · 10789c8 · 10789c8
1 parent 42d274a
commit 10789c8
Show file tree

Hide file tree

Showing 15 changed files with 828 additions and 5,062 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,9 +10,21 @@
             "env": {},
             "cwd": "${workspaceFolder}",
             "args": [
-                "./test/",
-                "libraries",
-            ]
+				"--gitcdn",
+				"https://github.com/nulastudio/HostFXRPatcher",
+				// "https://gitee.com/liesauer/HostFXRPatcher",
+				"--loglevel=Info",
+				"--nopatch=False",
+				"./test/",
+				"runtimes",
+			],
+			"dlvLoadConfig": {
+				"followPointers": true,
+				"maxVariableRecurse": 1,
+				"maxStringLen": 1024,
+				"maxArrayValues": 1000,
+				"maxStructFields": -1
+			}
 		}
 	]
 }
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/Makefile b/Makefile
@@ -8,13 +8,13 @@ BUILD_FLAGS=-ldflags="-s -w"
 build-all: build-win-x86 build-win-x64 build-linux-x64 build-osx-x64
 
 build-win-x86:
-	CGO_ENABLED=0 GOOS=windows GOARCH=386 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_WIN_X86) ./src/main/beauty.go ./src/main/bindata.go
+	CGO_ENABLED=0 GOOS=windows GOARCH=386 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_WIN_X86) github.com/nulastudio/NetCoreBeauty/src/main
 
 build-win-x64:
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_WIN_X64) ./src/main/beauty.go ./src/main/bindata.go
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_WIN_X64) github.com/nulastudio/NetCoreBeauty/src/main
 
 build-linux-x64:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_LINUX_X64) ./src/main/beauty.go ./src/main/bindata.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_LINUX_X64) github.com/nulastudio/NetCoreBeauty/src/main
 
 build-osx-x64:
-	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_MAC_X64) ./src/main/beauty.go ./src/main/bindata.go
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build $(BUILD_FLAGS) -o ./$(OUTPUT)/$(BINARY_MAC_X64) github.com/nulastudio/NetCoreBeauty/src/main
diff --git a/NetCoreBeautyNuget/Beauty.targets b/NetCoreBeautyNuget/Beauty.targets
@@ -9,12 +9,15 @@
     <BeautyBinExt Condition="$(IsWindows) == 'True'">.exe</BeautyBinExt>
     <BeautyBin>"$(MSBuildThisFileDirectory)../tools/$(RuntimeOS)/ncbeauty$(BeautyBinExt)"</BeautyBin>
     <BeautyDir>"$(MSBuildProjectDirectory)/$(PublishDir).HERE/.."</BeautyDir>
-    <BeautyLibsDir Condition="$(BeautyLibsDir) == ''">libraries</BeautyLibsDir>
+    <BeautyLibsDir Condition="$(BeautyLibsDir) == ''">runtimes</BeautyLibsDir>
     <BeautyAfterTasks>Publish;$(BeautyAfterTasks)</BeautyAfterTasks>
-    <DisablePatch Condition="$(DisablePatch) == ''">False</DisablePatch>
+    <GitCDN Condition="$(GitCDN) != ''">--gitcdn $(GitCDN)</GitCDN>
+    <BeautyLogLevel Condition="$(BeautyLogLevel) != ''">--loglevel $(BeautyLogLevel)</BeautyLogLevel>
+    <DisablePatch Condition="$(DisablePatch) == 'True'">--nopatch</DisablePatch>
+    <DisablePatch Condition="$(DisablePatch) != 'True'"></DisablePatch>
   </PropertyGroup>
 
   <Target Name="NetCoreBeauty" AfterTargets="$(BeautyAfterTasks)" Condition="$(DisableBeauty) != 'True' And $(RuntimeIdentifier) != ''">
-    <Exec Command="$(BeautyBin) $(BeautyDir) $(BeautyLibsDir) $(DisablePatch) $(PatchCDN)" />
+    <Exec Command="$(BeautyBin) $(GitCDN) $(BeautyLogLevel) $(DisablePatch) $(BeautyDir) $(BeautyLibsDir)" />
   </Target>
 </Project>
diff --git a/NetCoreBeautyNuget/NetCoreBeauty.nuspec b/NetCoreBeautyNuget/NetCoreBeauty.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>nulastudio.NetCoreBeauty</id>
     <description>Move a .NET Core app runtime components and dependencies into a sub-directory and make it beauty.</description>
-    <version>1.0.4</version>
+    <version>1.1.0</version>
     <authors>LiesAuer</authors>
     <owners>nulastudio</owners>
     <projectUrl>https://github.com/nulastudio/NetCoreBeauty</projectUrl>

diff --git a/NetCoreBeautyNugetTest/NetCoreBeautyTest.csproj b/NetCoreBeautyNugetTest/NetCoreBeautyTest.csproj
@@ -4,18 +4,20 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <!-- beauty into sub-directory, default is libs, quote with "" if contains space  -->
-    <BeautyLibsDir>libraries</BeautyLibsDir>
+    <BeautyLibsDir>runtimes</BeautyLibsDir>
     <!-- set to True if you want to disable -->
     <DisableBeauty>False</DisableBeauty>
     <!-- <BeautyAfterTasks></BeautyAfterTasks> -->
     <!-- set to True if you want to disable -->
-    <DisablePatch>True</DisablePatch>
+    <DisablePatch>False</DisablePatch>
+    <!-- valid values: Error|Detail|Log -->
+    <BeautyLogLevel>Error</BeautyLogLevel>
     <!-- set to a repo mirror if you have troble in connecting github -->
-    <PatchCDN>https://github-like.com/someone/HostFXRPatcherMirror</PatchCDN>
+    <!-- <GitCDN>https://github-like.com/someone/HostFXRPatcherMirror</GitCDN> -->
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.0.4" />
+    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -22,18 +22,20 @@ your `*.csproj` should be similar like this
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <!-- beauty into sub-directory, default is libs, quote with "" if contains space  -->
-    <BeautyLibsDir>libraries</BeautyLibsDir>
+    <BeautyLibsDir>runtimes</BeautyLibsDir>
     <!-- set to True if you want to disable -->
     <DisableBeauty>False</DisableBeauty>
     <!-- <BeautyAfterTasks></BeautyAfterTasks> -->
     <!-- set to True if you want to disable -->
     <DisablePatch>False</DisablePatch>
+    <!-- valid values: Error|Detail|Log -->
+    <BeautyLogLevel>Error</BeautyLogLevel>
     <!-- set to a repo mirror if you have troble in connecting github -->
-    <PatchCDN>https://github-like.com/someone/HostFXRPatcherMirror</PatchCDN>
+    <!-- <GitCDN>https://github-like.com/someone/HostFXRPatcherMirror</GitCDN> -->
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.0.4" />
+    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.1.0" />
   </ItemGroup>
 
 </Project>
@@ -43,7 +45,7 @@ when you run `dotnet publish` , everything is done automatically.
 2. Use the binary application if your project has already be published.
 ```
 Usage:
-ncbeauty <beautyDir> [<LibsDir>]
+ncbeauty [--<gitcdn>] [--<loglevel=Error|Detail|Log>] [--<nopatch=True|False>] <beautyDir> [<libsDir>]
 ```
 for example
 ```