Fix deps.json compatibility issue

Fix #65
nulastudio · May 21, 2024 · b7db256 · b7db256
1 parent e9df68b
commit b7db256
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 15 deletions.
diff --git a/Common/Common.props b/Common/Common.props
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <PackageOutputPath>.nupkg</PackageOutputPath>
-        <Version>2.1.4.4</Version>
+        <Version>2.1.4.5</Version>
 
         <Company>nulastudio</Company>
         <Authors>LiesAuer</Authors>

diff --git a/NetBeauty/src/main/beauty.go b/NetBeauty/src/main/beauty.go
@@ -37,6 +37,7 @@ type patchedAppHost struct {
 }
 
 var startupHook = "nbloader"
+var startupHookVersion = "1.3.0.0"
 
 var workingDir, _ = os.Getwd()
 
@@ -156,7 +157,7 @@ func main() {
 					log.LogDetail("Use Patch: No")
 				}
 
-				success := manager.AddStartUpHookToDeps(deps.deps, startupHook)
+				success := manager.AddStartUpHookToDeps(deps.deps, startupHook, startupHookVersion)
 
 				usePatch = SCDMode && usePatch
 

diff --git a/NetBeauty/src/main/bindata.go b/NetBeauty/src/main/bindata.go
diff --git a/NetBeauty/src/manager/manager.go b/NetBeauty/src/manager/manager.go
@@ -265,7 +265,7 @@ func PatchAppHost(apphost AppHost, entry string) bool {
 }
 
 // AddStartUpHookToDeps 添加nbloader启动时钩子到deps.json
-func AddStartUpHookToDeps(deps string, hook string) bool {
+func AddStartUpHookToDeps(deps string, hook string, version string) bool {
 	jsonBytes, err := ioutil.ReadFile(deps)
 	if err != nil {
 		log.LogError(fmt.Errorf("can not read deps.json: %s : %s", deps, err.Error()), false)
@@ -283,14 +283,14 @@ func AddStartUpHookToDeps(deps string, hook string) bool {
 	json.SetPath([]string{
 		"targets",
 		runtimeTarget,
-		hook,
+		hook + "/" + version,
 		"runtime",
 		hook + ".dll",
 	}, make(map[string]interface{}))
 
 	json.SetPath([]string{
 		"libraries",
-		hook,
+		hook + "/" + version,
 	}, map[string]interface{}{
 		"type":        "project",
 		"serviceable": false,

diff --git a/NetBeauty/src/nbloader/nbloader.dll b/NetBeauty/src/nbloader/nbloader.dll
diff --git a/NetBeautyTest/AvaloniaTest/AvaloniaTest/AvaloniaTest.csproj b/NetBeautyTest/AvaloniaTest/AvaloniaTest/AvaloniaTest.csproj
@@ -51,7 +51,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/ChromelyTest/ChromelyTest.csproj b/NetBeautyTest/ChromelyTest/ChromelyTest.csproj
@@ -79,7 +79,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/NetFxTest/NetFxTest.csproj b/NetBeautyTest/NetFxTest/NetFxTest.csproj
@@ -156,7 +156,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
     <PackageReference Include="SixLabors.ImageSharp">
       <Version>2.1.3</Version>
     </PackageReference>

diff --git a/NetBeautyTest/SharedRuntimeTest/WsClient/WsClient.csproj b/NetBeautyTest/SharedRuntimeTest/WsClient/WsClient.csproj
@@ -49,7 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj b/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj
@@ -49,7 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/WPFTest/WPFTest.csproj b/NetBeautyTest/WPFTest/WPFTest.csproj
@@ -99,7 +99,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/NetBeautyTest/WebAppTest/WebAppTest.csproj b/NetBeautyTest/WebAppTest/WebAppTest.csproj
@@ -44,7 +44,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ Your `*.csproj` should be like:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
 
 </Project>