- Add Sign, BugFix

Directory DeepMove
This commit is contained in:
2023-03-08 00:02:29 +09:00
parent db5a1cff63
commit 5f0ee1e4b9
3 changed files with 43 additions and 3 deletions

View File

@@ -1,4 +1,5 @@
using System.Text; using System.IO;
using System.Text;
namespace CommonLibrary namespace CommonLibrary
{ {
@@ -57,5 +58,40 @@ namespace CommonLibrary
{ {
return default(T).Equals(data); return default(T).Equals(data);
} }
public static void DeepMove(this DirectoryInfo sourceDirectoryInfo, DirectoryInfo targetDirectoryInfo)
{
if (!sourceDirectoryInfo.Exists)
{
return;
}
if (sourceDirectoryInfo.Root == targetDirectoryInfo.Root)
{
sourceDirectoryInfo.MoveTo(targetDirectoryInfo.FullName);
return;
}
DirectoryInfo[] directoryInfos = sourceDirectoryInfo.GetDirectories("*", SearchOption.AllDirectories);
FileInfo[] fileInfos = sourceDirectoryInfo.GetFiles("*", SearchOption.AllDirectories);
foreach (var directoryInfo in directoryInfos)
{
DirectoryInfo targetDirectory = new DirectoryInfo(directoryInfo.FullName.Replace(sourceDirectoryInfo.FullName, targetDirectoryInfo.FullName));
if (!targetDirectory.Exists)
{
targetDirectory.Create();
}
}
foreach (var file in fileInfos)
{
DirectoryInfo targetDirectory = new DirectoryInfo(file.DirectoryName.Replace(sourceDirectoryInfo.FullName, targetDirectoryInfo.FullName));
string targetFileName = System.IO.Path.Combine(targetDirectory.FullName, file.Name);
file.CopyTo(targetFileName, true);
}
sourceDirectoryInfo.Delete(true);
}
} }
} }

View File

@@ -287,4 +287,7 @@
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" /> <Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
</Target> </Target>
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" /> <Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
<PropertyGroup>
<PostBuildEvent>call "c:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /n "Crudelis Private Root Certificate Authority" $(TargetPath)</PostBuildEvent>
</PropertyGroup>
</Project> </Project>

View File

@@ -151,8 +151,9 @@ namespace Mitria_Minecraft_Launcher.Updater
if (System.IO.Directory.Exists(oldScreenshotsDirectory) && System.IO.Directory.GetFiles(oldScreenshotsDirectory, "*", System.IO.SearchOption.AllDirectories).Length > 0) if (System.IO.Directory.Exists(oldScreenshotsDirectory) && System.IO.Directory.GetFiles(oldScreenshotsDirectory, "*", System.IO.SearchOption.AllDirectories).Length > 0)
{ {
Log.INFO("[Package] Screenshots Directory Backup : " + newScreenshotsDirectory); Log.INFO("[Package] Screenshots Directory Backup : " + newScreenshotsDirectory);
DirectoryInfo oldScreenshotsDirectoryInfo = new DirectoryInfo(oldScreenshotsDirectory);
System.IO.Directory.Move(oldScreenshotsDirectory, newScreenshotsDirectory); DirectoryInfo newScreenshotsDirectoryInfo = new DirectoryInfo(newScreenshotsDirectory);
oldScreenshotsDirectoryInfo.DeepMove(newScreenshotsDirectoryInfo);
} }
Extensions.EmptyDirectory(rootDirectoryInfo.FullName); Extensions.EmptyDirectory(rootDirectoryInfo.FullName);