Skip to content

Commit

Permalink
Fixes some things chocolatey is complaining about at https://gist.git…
Browse files Browse the repository at this point in the history
  • Loading branch information
activescott committed Nov 21, 2018
1 parent 60addaf commit 95cbf94
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 28 deletions.
2 changes: 2 additions & 0 deletions src/.build/VERIFICATION.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VERIFICATION
This package is published by the author and this file is here only because chocolatey requires it as described at https://github.com/chocolatey/package-validator/wiki/VerificationFileMissing
60 changes: 34 additions & 26 deletions src/.build/lessmsi.msbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
http://msdn.microsoft.com/en-us/library/vstudio/ms164313.aspx
-->

<PropertyGroup>
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)</MSBuildCommunityTasksPath>
</PropertyGroup>
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
<PropertyGroup>
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)</MSBuildCommunityTasksPath>
</PropertyGroup>
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />

<PropertyGroup>
<PropertyGroup>
<RootDir>..\</RootDir>
<TheDeployDir>$(RootDir)\.deploy</TheDeployDir>
<AssemblyCopyright>Copyright Scott Willeke © 2004-2013</AssemblyCopyright>
<TheZipFileName>lessmsi-v$(TheVersion).zip</TheZipFileName>
<NugetPath>../.nuget/nuget.exe</NugetPath>
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
<NugetPath>../.nuget/nuget.exe</NugetPath>
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
</PropertyGroup>
<!-- Items: https://msdn.microsoft.com/en-us/library/ms171453.aspx -->

<!-- Items: https://msdn.microsoft.com/en-us/library/ms171453.aspx -->
<ItemGroup>
<TheProjects Include="$(RootDir)\LessMsi.Core\LessMsi.Core.csproj"></TheProjects>
<TheProjects Include="$(RootDir)\LessMsi.Cli\LessMsi.Cli.csproj"></TheProjects>
Expand All @@ -38,7 +38,7 @@
<DeployFiles Include="$(RootDir)\LessMsi.Gui\bin\Release\lessmsi-gui.exe.config"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.8.0\build\x86\mspack.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\LessIO.0.5.0\lib\net40\LessIO.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\LessIO.0.5.0\lib\net40\LessIO.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\..\lib\wix.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\..\lib\wixcab.dll"></DeployFiles>
</ItemGroup>
Expand All @@ -52,19 +52,19 @@
<ConvertToAbsolutePath Paths="$(TheDeployDir)">
<Output TaskParameter="AbsolutePaths" PropertyName="TheDeployDir"/>
</ConvertToAbsolutePath>
<ConvertToAbsolutePath Paths="$(NugetPath)">
<Output TaskParameter="AbsolutePaths" PropertyName="NugetPath"/>
</ConvertToAbsolutePath>
<ConvertToAbsolutePath Paths="$(NugetPath)">
<Output TaskParameter="AbsolutePaths" PropertyName="NugetPath"/>
</ConvertToAbsolutePath>

<Message Text="Project File Name = $(MSBuildProjectFile)" />
<Message Text="Project Extension = $(MSBuildProjectExtension)" />
<Message Text="MSBuildProjectDirectory = $(MSBuildProjectDirectory)" />
<Message Text="SolutionDir = $(SolutionDir)" />
<Message Text="Project File Name = $(MSBuildProjectFile)" />
<Message Text="Project Extension = $(MSBuildProjectExtension)" />
<Message Text="MSBuildProjectDirectory = $(MSBuildProjectDirectory)" />
<Message Text="SolutionDir = $(SolutionDir)" />

<Message Text="RootDir=$(RootDir)" />
<Message Text="TheDeployDir=$(TheDeployDir)" />
<Message Text="RootDir=$(RootDir)" />
<Message Text="TheDeployDir=$(TheDeployDir)" />

</Target>
</Target>

<Target Name="Validate">
<ItemGroup>
Expand Down Expand Up @@ -152,11 +152,11 @@
/>
</Target>

<Target Name="Zip" DependsOnTargets="Deploy">
<!-- see https://github.com/loresoft/msbuildtasks/blob/master/Source/MSBuild.Community.Tasks/Zip.cs -->
<Zip
<Target Name="Zip" DependsOnTargets="Deploy">
<!-- see https://github.com/loresoft/msbuildtasks/blob/master/Source/MSBuild.Community.Tasks/Zip.cs -->
<Zip
Files="@(DeployFiles)"
Flatten="True"
Flatten="True"
ZipFileName="$(TheDeployDir)\$(TheZipFileName)"
/>
</Target>
Expand All @@ -174,20 +174,28 @@
SourceFiles="lessmsi.nuspec"
DestinationFolder="$(PackageDir)"
/>
<Copy
<Copy
SourceFiles="$(TheDeployDir)\$(TheZipFileName)"
DestinationFolder="$(PackageDir)\tools"
/>
<Copy
SourceFiles="chocolateyInstall.ps1"
DestinationFolder="$(PackageDir)\tools"
/>
<Copy
SourceFiles="$(RootDir)\LICENSE"
DestinationFolder="$(PackageDir)\tools"
/>
<Copy
SourceFiles="$(RootDir)\.build\VERIFICATION.txt"
DestinationFolder="$(PackageDir)\tools"
/>
<XmlPoke
XmlInputPath="$(PackageDir)\lessmsi.nuspec"
Query="//package/metadata/version"
Value="$(TheVersion)"
/>
<FileUpdate Files="$(PackageDir)\tools\chocolateyInstall.ps1"
<FileUpdate Files="$(PackageDir)\tools\chocolateyInstall.ps1"
Regex="__ZIP_FILE__"
ReplacementText="$(TheZipFileName)"
/>
Expand Down
6 changes: 5 additions & 1 deletion src/.build/lessmsi.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
<summary>LessMSI - Easily extract the contents of an MSI</summary>
<description>LessMSI is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file. For Windows.
Usage on the command line: lessmsi x msiFileName [outDir]
</description>
</description>
<tags>msi extract extraction install</tags>
<projectUrl>https://lessmsi.activescott.com</projectUrl>
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://github.com/activescott/lessmsi</projectSourceUrl>
<docsUrl>https://github.com/activescott/lessmsi/wiki</docsUrl>
<releaseNotes>https://github.com/activescott/lessmsi/releases</releaseNotes>
<bugTrackerUrl>https://github.com/activescott/lessmsi/issues</bugTrackerUrl>
<!--<iconUrl>32x32.png</iconUrl>-->
</metadata>
</package>
7 changes: 6 additions & 1 deletion src/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
// Permission is hereby granted, free of charge, to any person obtaining

From: http://www.opensource.org/licenses/mit-license.php

LICENSE

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
Expand Down

0 comments on commit 95cbf94

Please sign in to comment.