From 7ffba99278a517936bea65caaf63f3d2a9ec8dc0 Mon Sep 17 00:00:00 2001 From: Michael Brehm Date: Fri, 2 Dec 2016 13:55:48 -0500 Subject: [PATCH] Get rid of the .MSI (GAC) installer project Don't want to put the effort in to duplicate command line tools that already exist just for testing/sample purposes and if anyone wants to distribute the DLL they should do it as part of their project/package (myself included) --- README.md | 3 +- compression.setup/buildenv.wxi | 25 ------- compression.setup/compression.setup.wixproj | 64 ----------------- compression.setup/compression.wxs | 78 --------------------- compression.setup/mergemods.wxs | 28 -------- compression.setup/version.ini | 11 --- io.compression.sln | 11 --- 7 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 compression.setup/buildenv.wxi delete mode 100644 compression.setup/compression.setup.wixproj delete mode 100644 compression.setup/compression.wxs delete mode 100644 compression.setup/mergemods.wxs delete mode 100644 compression.setup/version.ini diff --git a/README.md b/README.md index caac55a..a5743f3 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,7 @@ PM> Install-Package zuki.io.compression ## __BUILD__ ###__System Requirements__ -* Microsoft Visual Studio 2015 Community Edition (or higher) -* Windows Installer XML (WiX) Toolset v3.10.3 +* Microsoft Visual Studio 2015 Community Edition (or higher) ###__Source Code Repositories__ [__djp952/build__](https://github.com/djp952/build) - build tools diff --git a/compression.setup/buildenv.wxi b/compression.setup/buildenv.wxi deleted file mode 100644 index e14cb36..0000000 --- a/compression.setup/buildenv.wxi +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compression.setup/compression.setup.wixproj b/compression.setup/compression.setup.wixproj deleted file mode 100644 index 73aa122..0000000 --- a/compression.setup/compression.setup.wixproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - Debug - x86 - 3.10 - 73f246c7-d809-48f6-8408-d394cea32dec - 2.0 - zuki.io.compression - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - $(SolutionDir)out\setup\$(Platform)\ - obj\$(Configuration)\ - Debug - ICE03;ICE82;ICE61 - - - $(SolutionDir)out\setup\$(Platform)\ - obj\$(Configuration)\ - ICE03;ICE82;ICE61 - - - Debug - $(SolutionDir)out\setup\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ICE03;ICE82;ICE61 - - - $(SolutionDir)out\setup\$(Platform)\ - obj\$(Platform)\$(Configuration)\ - ICE03;ICE82;ICE61 - - - - - - - - - version.wxi - - - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - - - "$(SolutionDir)..\build\zuki.build.tools.mkversion.exe" "$(ProjectDir)tmp" "-ini:$(ProjectDir)version.ini" -rebuild -format:txt,wxi - - - \ No newline at end of file diff --git a/compression.setup/compression.wxs b/compression.setup/compression.wxs deleted file mode 100644 index d0e6a7a..0000000 --- a/compression.setup/compression.wxs +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/compression.setup/mergemods.wxs b/compression.setup/mergemods.wxs deleted file mode 100644 index 96b351d..0000000 --- a/compression.setup/mergemods.wxs +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/compression.setup/version.ini b/compression.setup/version.ini deleted file mode 100644 index c48ff44..0000000 --- a/compression.setup/version.ini +++ /dev/null @@ -1,11 +0,0 @@ -;----------------------------------------------------------------------------- -; version.ini -; -; This file was automatically generated by zuki.build.tools.mkversion.exe -;----------------------------------------------------------------------------- - -[Version] -Company=Michael G. Brehm -Copyright= -Product=zuki.io.compression -Version=1.0 diff --git a/io.compression.sln b/io.compression.sln index 0bb568c..2e87547 100644 --- a/io.compression.sln +++ b/io.compression.sln @@ -15,11 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "compression.setup", "compression.setup\compression.setup.wixproj", "{73F246C7-D809-48F6-8408-D394CEA32DEC}" - ProjectSection(ProjectDependencies) = postProject - {E43C0386-D486-493E-BCDB-560A1FCE167E} = {E43C0386-D486-493E-BCDB-560A1FCE167E} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -44,12 +39,6 @@ Global {CB2B2FA8-4062-4E54-9053-0FC028B76A61}.Release|Win32.Build.0 = Release|x86 {CB2B2FA8-4062-4E54-9053-0FC028B76A61}.Release|x64.ActiveCfg = Release|x64 {CB2B2FA8-4062-4E54-9053-0FC028B76A61}.Release|x64.Build.0 = Release|x64 - {73F246C7-D809-48F6-8408-D394CEA32DEC}.Debug|Win32.ActiveCfg = Debug|x86 - {73F246C7-D809-48F6-8408-D394CEA32DEC}.Debug|x64.ActiveCfg = Debug|x64 - {73F246C7-D809-48F6-8408-D394CEA32DEC}.Release|Win32.ActiveCfg = Release|x86 - {73F246C7-D809-48F6-8408-D394CEA32DEC}.Release|Win32.Build.0 = Release|x86 - {73F246C7-D809-48F6-8408-D394CEA32DEC}.Release|x64.ActiveCfg = Release|x64 - {73F246C7-D809-48F6-8408-D394CEA32DEC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE