Don't remove deps.json runtime infos for Non-SCDMode apps

related issues: #48, #50
nulastudio · May 29, 2023 · 8c0ac96 · 8c0ac96
1 parent 56713ae
commit 8c0ac96
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 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.3.4</Version>
+        <Version>2.1.4.0-beta.1</Version>
 
         <Company>nulastudio</Company>
         <Authors>LiesAuer</Authors>

diff --git a/NetBeauty/src/main/beauty.go b/NetBeauty/src/main/beauty.go
@@ -151,7 +151,7 @@ func main() {
 
 				usePatch = SCDMode && usePatch
 
-				allDeps, _useWPF, _ := manager.FixDeps(deps.deps, deps.main, enableDebug, usePatch, sharedRuntimeMode)
+				allDeps, _useWPF, _ := manager.FixDeps(deps.deps, deps.main, SCDMode, usePatch, enableDebug, sharedRuntimeMode)
 
 				useWPF = _useWPF
 

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
@@ -558,7 +558,7 @@ func FindFXRVersion(deps string) (string, string) {
 }
 
 // FixDeps 分析deps.json中的依赖项
-func FixDeps(deps string, entry string, enableDebug bool, usePatch bool, sharedRuntimeMode bool) ([]Deps, bool, bool) {
+func FixDeps(deps string, entry string, SCDMode bool, usePatch bool, enableDebug bool, sharedRuntimeMode bool) ([]Deps, bool, bool) {
 	var isAspNetCore = false
 	var useWPF = false
 	var verifyWpfDllSet = false
@@ -608,7 +608,7 @@ func FixDeps(deps string, entry string, enableDebug bool, usePatch bool, sharedR
 		}
 
 		// nbloader dependencies
-		if !usePatch {
+		if SCDMode && !usePatch {
 			if fileName == "System.Collections.dll" ||
 				fileName == "System.Memory.dll" ||
 				fileName == "System.Private.CoreLib.dll" ||
@@ -832,7 +832,7 @@ func FixDeps(deps string, entry string, enableDebug bool, usePatch bool, sharedR
 			}
 		}
 
-		if !strings.HasPrefix(analyzed.ItemKey, "./") {
+		if SCDMode && !strings.HasPrefix(analyzed.ItemKey, "./") {
 			delete(analyzed.Category, analyzed.ItemKey)
 		}
 	}

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
@@ -41,7 +41,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/ChromelyTest/ChromelyTest.csproj b/NetBeautyTest/ChromelyTest/ChromelyTest.csproj
@@ -69,7 +69,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/NetFxTest/NetFxTest.csproj b/NetBeautyTest/NetFxTest/NetFxTest.csproj
@@ -146,7 +146,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
     <PackageReference Include="SixLabors.ImageSharp">
       <Version>2.1.3</Version>
     </PackageReference>

diff --git a/NetBeautyTest/SharedRuntimeTest/WsClient/WsClient.csproj b/NetBeautyTest/SharedRuntimeTest/WsClient/WsClient.csproj
@@ -39,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj b/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj
@@ -39,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/WPFTest/WPFTest.csproj b/NetBeautyTest/WPFTest/WPFTest.csproj
@@ -71,7 +71,7 @@
     <!-- set to True if you want to disable -->
     <DisableBeauty>False</DisableBeauty>
     <!-- set to False if you want to beauty on build -->
-    <BeautyOnPublishOnly>True</BeautyOnPublishOnly>
+    <BeautyOnPublishOnly>False</BeautyOnPublishOnly>
     <!-- set to True if you want to allow 3rd debuggers(like dnSpy) debugs the app -->
     <BeautyEnableDebugging>False</BeautyEnableDebugging>
     <!-- the patch can reduce the file count -->
@@ -89,7 +89,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/NetBeautyTest/WebAppTest/WebAppTest.csproj b/NetBeautyTest/WebAppTest/WebAppTest.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Your `*.csproj` should be like:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.1" />
   </ItemGroup>
 
 </Project>