Skip to content

Commit

Permalink
Merge pull request #81 from batzen/Chocolatey
Browse files Browse the repository at this point in the history
Adding build script, dependency management and packaging for deployment
  • Loading branch information
cplotts committed Sep 7, 2018
2 parents ecf5bc0 + cffea97 commit 1f94efc
Show file tree
Hide file tree
Showing 31 changed files with 632 additions and 155 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -4,6 +4,8 @@ bin/
obj/
Debug/
Release/
packages/
paket-files/
*.vs
*.user
*.opensdf
Expand Down
296 changes: 296 additions & 0 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

Binary file added .paket/paket.bootstrapper.exe
Binary file not shown.
Binary file added .paket/paket.exe
Binary file not shown.
Binary file added Artwork/Banner.bmp
Binary file not shown.
Binary file added Artwork/Dialog.bmp
Binary file not shown.
File renamed without changes.
Binary file added Artwork/snoop.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Build/Debug/ManagedInjector32-4.0.dll
Binary file not shown.
Binary file removed Build/Debug/ManagedInjector64-4.0.dll
Binary file not shown.
Binary file removed Build/Debug/ManagedInjectorLauncher32-4.0.exe
Binary file not shown.
Binary file removed Build/Debug/ManagedInjectorLauncher64-4.0.exe
Binary file not shown.
Binary file added License.rtf
Binary file not shown.
31 changes: 31 additions & 0 deletions License.txt
@@ -0,0 +1,31 @@
Microsoft Public License (Ms-PL)

This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.

1. Definitions

The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.

A "contribution" is the original software, or any additions or changes to the software.

A "contributor" is any person that distributes its contribution under this license.

"Licensed patents" are a contributor's patent claims that read directly on its contribution.

2. Grant of Rights

(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.

(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.

3. Conditions and Limitations

(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.

(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.

(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.

(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.

(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
8 changes: 0 additions & 8 deletions ManagedInjector/ManagedInjector32-4.0.vcxproj
Expand Up @@ -14,14 +14,6 @@
<ProjectGuid>{8072B47B-5611-4BAB-8EF4-CB3125D676A5}</ProjectGuid>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<RootNamespace>ManagedInjector</RootNamespace>
<SccProjectName>
</SccProjectName>
<SccAuxPath>
</SccAuxPath>
<SccLocalPath>
</SccLocalPath>
<SccProvider>
</SccProvider>
<Keyword>ManagedCProj</Keyword>
<ProjectName>ManagedInjector32-4.0</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
Expand Down
8 changes: 0 additions & 8 deletions ManagedInjector/ManagedInjector64-4.0.vcxproj
Expand Up @@ -14,14 +14,6 @@
<ProjectGuid>{A27C8B34-2527-4258-8C07-D2720C576B90}</ProjectGuid>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<RootNamespace>ManagedInjector</RootNamespace>
<SccProjectName>
</SccProjectName>
<SccAuxPath>
</SccAuxPath>
<SccLocalPath>
</SccLocalPath>
<SccProvider>
</SccProvider>
<Keyword>ManagedCProj</Keyword>
<ProjectName>ManagedInjector64-4.0</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
Expand Down
52 changes: 0 additions & 52 deletions ManagedInjectorLauncher/ManagedInjectorLauncher32-4.0.csproj
Expand Up @@ -14,29 +14,6 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand Down Expand Up @@ -82,34 +59,5 @@
<Name>ManagedInjector32-4.0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
57 changes: 1 addition & 56 deletions ManagedInjectorLauncher/ManagedInjectorLauncher64-4.0.csproj
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{21E131D3-760F-4E93-8BDD-502591BD1F97}</ProjectGuid>
Expand All @@ -14,32 +14,6 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -79,34 +53,5 @@
<Name>ManagedInjector64-4.0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
4 changes: 2 additions & 2 deletions ManagedInjectorLauncher/Properties/AssemblyInfo.cs
Expand Up @@ -34,5 +34,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.9.0.0")]
[assembly: AssemblyFileVersion("2.9.0.0")]
[assembly: AssemblyVersion("2.10.0.0")]
[assembly: AssemblyFileVersion("2.10.0.0")]
124 changes: 124 additions & 0 deletions Snoop.wxs
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- ID="*" will generate a new GUID for product code at time of build. -->
<!-- Product code changes AND version number changes (first 3 digits), then a major upgrade will be triggered. -->

<Product
Id="*"
Name="Snoop"
Manufacturer="Cory Plotts"
Language="1033"
Version="$(var.ProductVersion)"
UpgradeCode="FBEC01D7-CE1B-46F4-9498-71A96FEA8A15"
>
<Package InstallerVersion="301" Compressed="yes"/>

<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="Newer version already installed." AllowSameVersionUpgrades="yes" />

<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>

<Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>

<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="Snoop">
<Component Id="Snoop" Guid="5624FD27-2409-4E5A-86E1-7C1A9C52A2F4">
<File
Id="SnoopEXE"
Name="Snoop.exe"
Source="Snoop.exe"
KeyPath="yes"
>
<Shortcut
Id="desktopSnoopShortcut"
Directory="DesktopFolder"
Name="Snoop $(var.ProductVersion)"
WorkingDirectory="INSTALLDIR"
Icon="Snoop.exe"
IconIndex="0"
Advertise="yes"
/>
<Shortcut
Id="startMenuSnoopShortcut"
Directory="ProgramMenuDir"
Name="Snoop $(var.ProductVersion)"
WorkingDirectory="INSTALLDIR"
Icon="Snoop.exe"
IconIndex="0"
Advertise="yes"
/>
</File>

<File
Id="SnoopCFG"
Name="Snoop.exe.config"
Source="Snoop.exe.config"
/>

<File
Id="ManagedInjectorLauncher3240"
Name="ManagedInjectorLauncher32-4.0.exe"
Source="ManagedInjectorLauncher32-4.0.exe"
/>
<File
Id="ManagedInjector3240"
Name="ManagedInjector32-4.0.dll"
Source="ManagedInjector32-4.0.dll"
/>

<File
Id="ManagedInjectorLauncher6440"
Name="ManagedInjectorLauncher64-4.0.exe"
Source="ManagedInjectorLauncher64-4.0.exe"
/>
<File
Id="ManagedInjector6440"
Name="ManagedInjector64-4.0.dll"
Source="ManagedInjector64-4.0.dll"
/>
</Component>

<Directory Id="SnoopScriptsFolder" Name="Scripts">
<Component Id="SnoopScriptsComponent" Guid="65AD97C3-5B32-4020-892C-1D0E38656D6D">
<File
Id="SnoopScriptsFile"
Name="Snoop.psm1"
Source="Scripts\Snoop.psm1"
/>
</Component>
</Directory>
</Directory>
</Directory>

<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="Snoop">
<Component Id="ProgramMenuDir" Guid="F04C55F5-09D6-40CD-90E3-FA46E5E4A93D">
<RemoveFolder Id='ProgramMenuDir' On='uninstall'/>
<RegistryValue Root='HKCU' Key='Software\[ProductName]' Type='string' Value='' KeyPath='yes'/>
</Component>
</Directory>
</Directory>

<Directory Id="DesktopFolder" Name="Desktop"/>
</Directory>

<Feature Id="ProductFeature" Title="Snoop" Description="Snoop, the WPF Spying Utility" Level="1" ConfigurableDirectory="INSTALLDIR">
<ComponentRef Id="Snoop"/>
<ComponentRef Id="SnoopScriptsComponent"/>
<ComponentRef Id="ProgramMenuDir"/>
</Feature>

<UIRef Id="WixUI_InstallDir"/>
<WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
<WixVariable Id="WixUIBannerBmp" Value="..\..\Artwork\Banner.bmp"/>
<WixVariable Id="WixUIDialogBmp" Value="..\..\Artwork\Dialog.bmp"/>
<!-- <WixVariable Id="WixUIExclamationIco" Value="Bitmaps\Exclamation.ico"/>
<WixVariable Id="WixUIInfoIco" Value="Bitmaps\Information.ico"/>
<WixVariable Id="WixUINewIco" Value="Bitmaps\New.ico"/>
<WixVariable Id="WixUIUpIco" Value="Bitmaps\Up.ico"/> -->

<Icon Id="Snoop.exe" SourceFile="Snoop.exe"/>
<Icon Id="icon.ico" SourceFile="..\..\Artwork\Snoop.ico"/>
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
</Product>
</Wix>
4 changes: 2 additions & 2 deletions Snoop/Properties/AssemblyInfo.cs
Expand Up @@ -34,5 +34,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.9.0.0")]
[assembly: AssemblyFileVersion("2.9.0.0")]
[assembly: AssemblyVersion("2.10.0.0")]
[assembly: AssemblyFileVersion("2.10.0.0")]

0 comments on commit 1f94efc

Please sign in to comment.