diff --git a/AssetStudio.sln b/AssetStudio.sln index ed5e94f..6d5b1fe 100644 --- a/AssetStudio.sln +++ b/AssetStudio.sln @@ -1,20 +1,39 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30611.23 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemHalf", "thirdparty\SystemHalf\SystemHalf.csproj", "{8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|Any CPU.ActiveCfg = Debug|x86 {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x86.ActiveCfg = Debug|x86 {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x86.Build.0 = Debug|x86 + {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|Any CPU.ActiveCfg = Release|x86 {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x86.ActiveCfg = Release|x86 {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x86.Build.0 = Release|x86 + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Debug|x86.Build.0 = Debug|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Release|Any CPU.Build.0 = Release|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Release|x86.ActiveCfg = Release|Any CPU + {8E79039E-85DD-4ED4-9C3C-2FB2D8CB8324}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {08189501-F88C-4EE0-AB61-D84C344075C3} + EndGlobalSection EndGlobal diff --git a/AssetStudio/7zip/7z.dll b/AssetStudio/7z.dll similarity index 100% rename from AssetStudio/7zip/7z.dll rename to AssetStudio/7z.dll diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj index f03acc9..2c42d93 100644 --- a/AssetStudio/AssetStudio.csproj +++ b/AssetStudio/AssetStudio.csproj @@ -55,9 +55,6 @@ - - ..\..\..\..\..\Tools\LIBRARIES\csharp-half-code-2\System.Half\bin\Release\System.Half.dll - @@ -67,9 +64,8 @@ - - False - ..\..\..\..\..\Tools\SDK\taoframework-2.1.0\taoframework-2.1.0\bin\Tao.DevIl.dll + + ..\thirdparty\Tao.DevIl.dll @@ -219,15 +215,21 @@ - + PreserveNewest - + + PreserveNewest - + + + {8e79039e-85dd-4ed4-9c3c-2fb2d8cb8324} + SystemHalf + +