Skip to content

Commit

Permalink
Remove NanaZipInstaller project because we should use WiX-based MSI i…
Browse files Browse the repository at this point in the history
…nstaller in the future if we need to make unpackaged version of NanaZip.
  • Loading branch information
MouriNaruto committed Oct 6, 2023
1 parent 37ab42b commit a546b78
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 197 deletions.
30 changes: 1 addition & 29 deletions BuildAllTargets.proj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project
DefaultTargets="Restore;Build;BuildSfxSetup;BuildInstaller"
DefaultTargets="Restore;Build;BuildSfxSetup"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="Restore">
<ItemGroup>
Expand Down Expand Up @@ -47,32 +47,4 @@
StopOnFirstFailure="True"
Properties="PreferredToolArchitecture=x64" />
</Target>
<Target Name="BuildInstaller">
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.sln">
<AdditionalProperties>Configuration=Debug;Platform=x86</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.sln">
<AdditionalProperties>Configuration=Release;Platform=x86</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.sln">
<AdditionalProperties>Configuration=Debug;Platform=x64</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.sln">
<AdditionalProperties>Configuration=Release;Platform=x64</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.sln">
<AdditionalProperties>Configuration=Debug;Platform=ARM64</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.sln">
<AdditionalProperties>Configuration=Release;Platform=ARM64</AdditionalProperties>
</ProjectReference>
</ItemGroup>
<MSBuild
Projects="@(ProjectReference)"
Targets="NanaZipInstaller"
BuildInParallel="True"
StopOnFirstFailure="True"
Properties="PreferredToolArchitecture=x64" />
</Target>
</Project>
14 changes: 0 additions & 14 deletions NanaZip.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NanaZipConsole", "NanaZipCo
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "NanaZipPackage", "NanaZipPackage\NanaZipPackage.wapproj", "{9A119A76-97CB-4490-B8C2-651576CB9302}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NanaZipInstaller", "NanaZipInstaller\NanaZipInstaller.vcxproj", "{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NanaZip.Shared.ModernExperienceShims", "NanaZip.Shared\NanaZip.Shared.ModernExperienceShims.vcxproj", "{501956AB-67C3-47FA-BE2B-8AEFF463AF1C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NanaZip.Shared.Mitigations", "NanaZip.Shared\NanaZip.Shared.Mitigations.vcxproj", "{3B6BA400-CFE5-44E1-A8E3-2DF0CCC5492B}"
Expand Down Expand Up @@ -129,18 +127,6 @@ Global
{9A119A76-97CB-4490-B8C2-651576CB9302}.Release|x86.ActiveCfg = Release|x86
{9A119A76-97CB-4490-B8C2-651576CB9302}.Release|x86.Build.0 = Release|x86
{9A119A76-97CB-4490-B8C2-651576CB9302}.Release|x86.Deploy.0 = Release|x86
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Debug|ARM64.ActiveCfg = Debug|ARM64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Debug|ARM64.Build.0 = Debug|ARM64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Debug|x64.ActiveCfg = Debug|x64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Debug|x64.Build.0 = Debug|x64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Debug|x86.ActiveCfg = Debug|Win32
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Debug|x86.Build.0 = Debug|Win32
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Release|ARM64.ActiveCfg = Release|ARM64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Release|ARM64.Build.0 = Release|ARM64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Release|x64.ActiveCfg = Release|x64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Release|x64.Build.0 = Release|x64
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Release|x86.ActiveCfg = Release|Win32
{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}.Release|x86.Build.0 = Release|Win32
{501956AB-67C3-47FA-BE2B-8AEFF463AF1C}.Debug|ARM64.ActiveCfg = Debug|ARM64
{501956AB-67C3-47FA-BE2B-8AEFF463AF1C}.Debug|ARM64.Build.0 = Debug|ARM64
{501956AB-67C3-47FA-BE2B-8AEFF463AF1C}.Debug|x64.ActiveCfg = Debug|x64
Expand Down
38 changes: 0 additions & 38 deletions NanaZipInstaller/NanaZipInstaller.cpp

This file was deleted.

36 changes: 0 additions & 36 deletions NanaZipInstaller/NanaZipInstaller.manifest

This file was deleted.

Binary file removed NanaZipInstaller/NanaZipInstaller.rc
Binary file not shown.
46 changes: 0 additions & 46 deletions NanaZipInstaller/NanaZipInstaller.vcxproj

This file was deleted.

18 changes: 0 additions & 18 deletions NanaZipInstaller/NanaZipInstaller.vcxproj.filters

This file was deleted.

16 changes: 0 additions & 16 deletions NanaZipInstaller/resource.h

This file was deleted.

0 comments on commit a546b78

Please sign in to comment.