Fix pdb not moving issue

Fix #57
nulastudio · Sep 23, 2023 · ab38bfc · ab38bfc
1 parent 529b2f3
commit ab38bfc
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 13 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.3</Version>
+        <Version>2.1.3.4</Version>
 
         <Company>nulastudio</Company>
         <Authors>LiesAuer</Authors>

diff --git a/NetBeauty/src/main/beauty.go b/NetBeauty/src/main/beauty.go
@@ -633,9 +633,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/NetBeauty/src/main/bindata.go b/NetBeauty/src/main/bindata.go
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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
   </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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
   </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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
     <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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
   </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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
   </ItemGroup>
 
 </Project>
diff --git a/NetBeautyTest/WPFTest/WPFTest.csproj b/NetBeautyTest/WPFTest/WPFTest.csproj
@@ -89,7 +89,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
     <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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
   </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.3" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.3.4" />
   </ItemGroup>
 
 </Project>