Fix pdb not moving issue

liesauer · liesauer · commit 07db92fd4b4b · 2023-09-15T20:52:21.000+08:00
Fix #57
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.0-beta.2</Version>
+        <Version>2.1.4.1</Version>
 
         <Company>nulastudio</Company>
         <Authors>LiesAuer</Authors>
diff --git a/NetBeauty/src/main/beauty.go b/NetBeauty/src/main/beauty.go
@@ -757,9 +757,11 @@ func moveDeps(deps []manager.Deps, entry string, sharedRuntimeMode bool) (int, i
 			fmt.Println(err.Error())
 		}
 
+		fileNameNoExt := fileName[:len(fileName)-len(filepath.Ext(fileName))]
+
 		for _, extFile := range []string{".pdb", ".xml"} {
-			oldFile := filepath.Join(oldPath, fileName+extFile)
-			newFile := filepath.Join(newPath, fileName+extFile)
+			oldFile := filepath.Join(oldPath, fileNameNoExt+extFile)
+			newFile := filepath.Join(newPath, fileNameNoExt+extFile)
 			if util.PathExists(oldFile) {
 				os.Rename(oldFile, newFile)
 			}
diff --git a/NetBeautyTest/AvaloniaTest/AvaloniaTest/AvaloniaTest.csproj b/NetBeautyTest/AvaloniaTest/AvaloniaTest/AvaloniaTest.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/ChromelyTest/ChromelyTest.csproj b/NetBeautyTest/ChromelyTest/ChromelyTest.csproj
@@ -77,7 +77,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/NetFxTest/NetFxTest.csproj b/NetBeautyTest/NetFxTest/NetFxTest.csproj
@@ -154,7 +154,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.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
@@ -47,7 +47,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj b/NetBeautyTest/SharedRuntimeTest/WsServer/WsServer.csproj
@@ -47,7 +47,7 @@
 
   <ItemGroup>
     <PackageReference Include="WatsonWebsocket" Version="2.3.2.5" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/WPFTest/WPFTest.csproj b/NetBeautyTest/WPFTest/WPFTest.csproj
@@ -97,7 +97,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
   </ItemGroup>
 
diff --git a/NetBeautyTest/WebAppTest/WebAppTest.csproj b/NetBeautyTest/WebAppTest/WebAppTest.csproj
@@ -42,7 +42,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Your `*.csproj` should be like:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.0-beta.2" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.1" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -757,9 +757,11 @@ func moveDeps(deps []manager.Deps, entry string, sharedRuntimeMode bool) (int, i`
`757`	`757`	`fmt.Println(err.Error())`
`758`	`758`	`}`
`759`	`759`
	`760`	`+ fileNameNoExt := fileName[:len(fileName)-len(filepath.Ext(fileName))]`
	`761`	`+`
`760`	`762`	`for _, extFile := range []string{".pdb", ".xml"} {`
`761`		`- oldFile := filepath.Join(oldPath, fileName+extFile)`
`762`		`- newFile := filepath.Join(newPath, fileName+extFile)`
	`763`	`+ oldFile := filepath.Join(oldPath, fileNameNoExt+extFile)`
	`764`	`+ newFile := filepath.Join(newPath, fileNameNoExt+extFile)`
`763`	`765`	`if util.PathExists(oldFile) {`
`764`	`766`	`os.Rename(oldFile, newFile)`
`765`	`767`	`}`