Skip to content

Commit

Permalink
dotnet6対応
Browse files Browse the repository at this point in the history
モーダルダイアログの処理をModernWPFのものを使用するようにした。
  • Loading branch information
logue committed Nov 18, 2021
1 parent e2cd8d3 commit 6d0ea61
Show file tree
Hide file tree
Showing 13 changed files with 92 additions and 86 deletions.
64 changes: 32 additions & 32 deletions NgsPacker.sln
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
stylecop.json = stylecop.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZamboniLib", "ZamboniLib\ZamboniLib\ZamboniLib.csproj", "{38B71E78-7E24-4D28-92CD-2F12204D2B33}"
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "NgsPacker (Package)", "NgsPacker (Package)\NgsPacker (Package).wapproj", "{9B4F198F-785A-4203-AC41-CE8AA6C28217}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZamboniLib", "ZamboniLib\ZamboniLib\ZamboniLib.csproj", "{2F24AB89-3D2D-4DB4-A054-718B61C936B7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -69,36 +69,6 @@ Global
{1469A306-6324-4E7D-B435-C0DA536C3D9F}.Release|x64.Build.0 = Release|Any CPU
{1469A306-6324-4E7D-B435-C0DA536C3D9F}.Release|x86.ActiveCfg = Release|Any CPU
{1469A306-6324-4E7D-B435-C0DA536C3D9F}.Release|x86.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|ARM.ActiveCfg = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|ARM.Build.0 = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|arm64.ActiveCfg = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|arm64.Build.0 = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|x64.ActiveCfg = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|x64.Build.0 = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|x86.ActiveCfg = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Debug|x86.Build.0 = Debug|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|Any CPU.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|Any CPU.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|ARM.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|ARM.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|arm64.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|arm64.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|x64.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|x64.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|x86.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Experimental|x86.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|Any CPU.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|ARM.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|ARM.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|arm64.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|arm64.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x64.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x64.Build.0 = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x86.ActiveCfg = Release|Any CPU
{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x86.Build.0 = Release|Any CPU
{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -144,6 +114,36 @@ Global
{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x86.ActiveCfg = Release|x86
{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x86.Build.0 = Release|x86
{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x86.Deploy.0 = Release|x86
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|ARM.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|ARM.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|arm64.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|arm64.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|x64.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|x64.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|x86.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Debug|x86.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|Any CPU.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|Any CPU.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|ARM.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|ARM.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|arm64.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|arm64.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|x64.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|x64.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|x86.ActiveCfg = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Experimental|x86.Build.0 = Debug|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|Any CPU.Build.0 = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|ARM.ActiveCfg = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|ARM.Build.0 = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|arm64.ActiveCfg = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|arm64.Build.0 = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|x64.ActiveCfg = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|x64.Build.0 = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|x86.ActiveCfg = Release|Any CPU
{2F24AB89-3D2D-4DB4-A054-718B61C936B7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions NgsPacker/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
/// <param name="moduleCatalog"></param>
protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
{
// _ = moduleCatalog.AddModule<ProgressDialogModule.Module>();
}
}
}
2 changes: 1 addition & 1 deletion NgsPacker/Interfaces/IZamboniService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using System.Collections.Generic;
using System.Threading.Tasks;
using zamboni;
using Zamboni;

namespace NgsPacker.Interfaces
{
Expand Down
52 changes: 26 additions & 26 deletions NgsPacker/NgsPacker.csproj
Original file line number Diff line number Diff line change
@@ -1,47 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>NgsPacker</RootNamespace>
<ApplicationIcon>ice-cubes.ico</ApplicationIcon>
<AssemblyName>NgsPacker</AssemblyName>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.20348.0</TargetFramework>
<UseWPF>true</UseWPF>
<StartupObject>NgsPacker.App</StartupObject>
<Authors>Masashi Yoshikawa</Authors>
<Company>Logue</Company>
<Copyright>(c) 2021 Logue</Copyright>
<Description>Data packer and unpacker for Phantasy Star Online 2 New Genesis.</Description>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<OutputType>WinExe</OutputType>
<PackageIcon>ice-cubes.png</PackageIcon>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://logue.dev/NgsPacker</PackageProjectUrl>
<RepositoryUrl>[email protected]:logue/NgsPacker.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Version>1.2.0</Version>
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageTags>PSO2;Phantasy Star Online2;Phantasy Star Online New Genesis;PSO2NGS;Packer;Unpacker</PackageTags>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<ApplicationIcon>ice-cubes.ico</ApplicationIcon>
<PackageIcon>ice-cubes.png</PackageIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>[email protected]:logue/NgsPacker.git</RepositoryUrl>
<RootNamespace>NgsPacker</RootNamespace>
<StartupObject>NgsPacker.App</StartupObject>
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
<TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
<UseWPF>true</UseWPF>
<Version>1.2.1</Version>
<IsPublishable>False</IsPublishable>
<PlatformTarget>AnyCPU</PlatformTarget>
<PackageReleaseNotes>dotnet6に移行。</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<Content Include="ice-cubes.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentWPF" Version="0.10.2" />
<PackageReference Include="FluentWPF" Version="0.9.0" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.1" />
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
<PackageReference Include="ModernWpfUIs.MessageBox" Version="0.5.2" />
<PackageReference Include="Prism.DryIoc" Version="8.1.97" />
<PackageReference Include="ReactiveProperty" Version="7.12.0" />
<PackageReference Include="ReactiveProperty" Version="8.0.0" />
<PackageReference Include="WPFLocalizeExtension" Version="3.9.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ZamboniLib\ZamboniLib\ZamboniLib.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
Expand Down Expand Up @@ -75,16 +72,19 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ZamboniLib\ZamboniLib\ZamboniLib.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="rd &quot;$(TargetDir)af-ZA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)am-ET&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ar-SA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)az-Latn-AZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)be-BY&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)bg-BG&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)bn-BD&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)bs-Latn-BA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ca-ES&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)cs-CZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)da-DK&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)de-DE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)el-GR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)es-ES&quot; /S /Q &#xD;&#xA;rd &quot;$(TargetDir)es-MX&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)et-EE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)eu-ES&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fa-IR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fi-FI&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fr-CA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fr-FR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)gl-ES&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ha-Latn-NG&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)he-IL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)hi-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)hr-HR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)hu-HU&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)id-ID&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)is-IS&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)it-IT&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ka-GE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)kk-KZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)km-KH&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)kn-KH&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)kn-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ko-KR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)lo-LA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)lt-LT&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)lv-LV&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)mk-MK&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ml-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ms-MY&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nb-NL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nb-NO&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nl-NL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nn-NO&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)pl-PL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)pt-BR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)pt-PT&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ro-RO&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ru-RU&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sk-SK&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sl-SI&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sq-AL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sr-Latn-RS&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sv-SE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sw-KE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ta-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)te-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)th-TH&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)tr-TR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)uk-UA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)uz-Latn-UZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)vi-VN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)zh-CN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)zh-TW&quot; /S /Q&#xD;&#xA;" />
<Exec Command="rd &quot;$(TargetDir)af-ZA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)am-ET&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ar-SA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)az-Latn-AZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)be-BY&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)bg-BG&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)bn-BD&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)bs-Latn-BA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ca-ES&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)cs-CZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)da-DK&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)de-DE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)el-GR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)en-GB&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)es-ES&quot; /S /Q &#xD;&#xA;rd &quot;$(TargetDir)es-MX&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)et-EE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)eu-ES&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fa&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fa-IR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fi-FI&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fr-CA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)fr-FR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)gl-ES&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ha-Latn-NG&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)he-IL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)hi-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)hr-HR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)hu-HU&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)id-ID&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)is-IS&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)it-IT&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ka-GE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)kk-KZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)km-KH&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)kn-KH&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)kn-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ko-KR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)lo-LA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)lt-LT&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)lv-LV&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)mk-MK&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ml-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ms-MY&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nb-NL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nb-NO&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nl-NL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)nn-NO&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)pl-PL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)pt-BR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)pt-PT&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ro-RO&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ru-RU&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sk-SK&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sl-SI&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sq-AL&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sr-Latn-RS&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sv-SE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)sw-KE&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)ta-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)te-IN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)th-TH&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)tr-TR&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)uk-UA&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)uz-Latn-UZ&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)vi-VN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)zh-CN&quot; /S /Q&#xD;&#xA;rd &quot;$(TargetDir)zh-TW&quot; /S /Q&#xD;&#xA;" />
</Target>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<!--Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="copy &quot;$(SolutionDir)x64\$(Configuration)\ooz.dll&quot; $(TargetDir)" />
</Target>
</Target-->
</Project>
5 changes: 3 additions & 2 deletions NgsPacker/Services/ZamboniService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using zamboni;
using static zamboni.IceHeaderStructures;
using Zamboni;
using Zamboni.IceFileFormats;
using static Zamboni.IceFileFormats.IceHeaderStructures;

namespace NgsPacker.Services
{
Expand Down
3 changes: 2 additions & 1 deletion NgsPacker/ViewModels/PackPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ private async void ExecutePackCommand()
}
else
{
_ = AcrylicMessageBox.Show(System.Windows.Application.Current.MainWindow,
// _ = AcrylicMessageBox.Show(System.Windows.Application.Current.MainWindow,
_= ModernWpf.MessageBox.Show(
LocalizerService.GetLocalizedString("PackText"), LocalizerService.GetLocalizedString("CompleteText"));
}
}
Expand Down
3 changes: 1 addition & 2 deletions NgsPacker/ViewModels/SettingsPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using NgsPacker.Interfaces;
using Prism.Commands;
using Prism.Mvvm;
using SourceChord.FluentWPF;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Expand Down Expand Up @@ -125,7 +124,7 @@ private void ExecuteBrowseCommand()

if (!File.Exists(picker.ResultPath + Path.DirectorySeparatorChar + "pso2.exe"))
{
_ = AcrylicMessageBox.Show(System.Windows.Application.Current.MainWindow,
_ = ModernWpf.MessageBox.Show(
LocalizerService.GetLocalizedString("Pso2ExeNotFoundErrorText"), LocalizerService.GetLocalizedString("ErrorTitleText"));
return;
}
Expand Down
Loading

0 comments on commit 6d0ea61

Please sign in to comment.