RepoMirrors/DSInternals
1
0
Fork 0
mirror of https://github.com/MichaelGrafnetter/DSInternals synced 2025-02-19 12:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finalize Chocolatey package

Browse Source
This commit is contained in:
Michael Grafnetter 2019-05-10 23:12:10 +02:00
parent 3c7e730fe1
commit 0d58561049
11 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/README.md vendored
View File

@ -42,9 +42,11 @@ Several people who use DSInternals during AD security audits have asked to donat
</p>
## Downloads
[![PowerShell Gallery Downloads](https://img.shields.io/powershellgallery/dt/DSInternals.svg?label=PowerShell%20Gallery%20Downloads)](https://www.powershellgallery.com/packages/DSInternals/)
[![NuGet Gallery Downloads](https://img.shields.io/nuget/dt/DSInternals.Common.svg?label=NuGet%20Gallery%20Downloads)](https://www.nuget.org/profiles/MichaelGrafnetter)
[![GitHub Downloads](https://img.shields.io/github/downloads/MichaelGrafnetter/DSInternals/total.svg?label=GitHub%20Downloads)](https://github.com/MichaelGrafnetter/DSInternals/releases)
[![PowerShell Gallery Downloads](https://img.shields.io/powershellgallery/dt/DSInternals.svg?label=PowerShell%20Gallery%20Downloads&logo=PowerShell)](https://www.powershellgallery.com/packages/DSInternals/)
[![Chocolatey Downloads](https://img.shields.io/chocolatey/dt/dsinternals-psmodule.svg?label=Chocolatey%20Downloads&logo=NuGet)](https://chocolatey.org/packages/dsinternals-psmodule)
[![GitHub Downloads](https://img.shields.io/github/downloads/MichaelGrafnetter/DSInternals/total.svg?label=GitHub%20Downloads&logo=GitHub)](https://github.com/MichaelGrafnetter/DSInternals/releases)
[![NuGet Gallery Downloads](https://img.shields.io/nuget/dt/DSInternals.Common.svg?label=NuGet%20Gallery%20Downloads&logo=NuGet)](https://www.nuget.org/profiles/MichaelGrafnetter)
### PowerShell Gallery (PowerShell 5+)
@ -54,6 +56,16 @@ Since PowerShell 5, you can install the DSInternals module directly from the off
Install-Module DSInternals -Force
```
### Chocolatey Package
You can install the official [Chocolatey package](https://chocolatey.org/packages/dsinternals-psmodule) using the following Chocolatey command:
```bat
choco install dsinternals-psmodule
```
This package is self-contained and it will also install all dependencies.
### Offline Module Distribution (PowerShell 3+)
1. Download the [current release](https://github.com/MichaelGrafnetter/DSInternals/releases) from GitHub.
@ -62,8 +74,8 @@ Install-Module DSInternals -Force
4. (Optional) If you copied the module to a different directory than advised in the previous step, you have to manually import it using the `Import-Module` cmdlet.
### Commando VM
The DSInternals PowerShell module is part of FireEye's [Commando VM](https://github.com/fireeye/commando-vm), the Windows-based alternative to Kali Linux.
The DSInternals PowerShell module is part of FireEye's [Commando VM](https://github.com/fireeye/commando-vm), the Windows-based alternative to Kali Linux.
### NuGet Packages
@ -80,6 +92,7 @@ You can of course download the [source code](https://github.com/MichaelGrafnette
## Documentation
### Get-Help
The online version of [PowerShell Get-Help documentation](../Documentation/PowerShell/Readme.md) contains the list of all cmdlets and some usage examples.
### Blog Posts

6
Documentation/CHANGELOG.md
View File

@ -1,9 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
## [3.5] - 2019-05-10
### Added
- Official [Chocolatey Package](https://chocolatey.org/packages/dsinternals-psmodule)
- New password hash export formats: [JohnLMHistory](PowerShell/Readme.md#john-the-ripper), [HashcatLMHistory](PowerShell/Readme.md#hashcat), [PWDumpHistory](PowerShell/Readme.md#other-formats) and [LMHashHistory](PowerShell/Readme.md#other-formats).
### Changed
@ -295,7 +296,8 @@ All notable changes to this project will be documented in this file. The format
## 1.0 - 2015-01-20
Initial release!
[Unreleased]: https://github.com/MichaelGrafnetter/DSInternals/compare/v3.4...HEAD
[Unreleased]: https://github.com/MichaelGrafnetter/DSInternals/compare/v3.5...HEAD
[3.5]: https://github.com/MichaelGrafnetter/DSInternals/compare/v3.4...v3.5
[3.4]: https://github.com/MichaelGrafnetter/DSInternals/compare/v3.3...v3.4
[3.3]: https://github.com/MichaelGrafnetter/DSInternals/compare/v3.2.1...v3.3
[3.2.1]: https://github.com/MichaelGrafnetter/DSInternals/compare/v3.2...v3.2.1

2
Scripts/Invoke-SmokeTests.ps1
View File

@ -9,7 +9,7 @@ $pesterModulePath = Join-Path $root Src\packages\Pester*\tools\Pester.psd1 -Reso
$testsPath = Join-Path $root Src\DSInternals.PowerShell\Tests\
$resultsPath = Join-Path $root 'TestResults'
$docPath = Join-Path $root 'Documentation'
$nuspecPath = Join-Path $root 'Src\DSInternals.PowerShell.Chocolatey\DSInternals.nuspec'
$nuspecPath = Join-Path $root 'Src\DSInternals.PowerShell\Chocolatey\*.nuspec' -Resolve
# Create output dir if it does not exist
New-Item $resultsPath -ItemType Directory -Force | Out-Null

2
Scripts/Pack-Chocolatey.ps1
View File

@ -5,7 +5,7 @@ Generates a Chocolatey package. Requires Chocolatey to be installed.
#Requires -Version 5
$repoRoot = Join-Path $PSScriptRoot '..\' -Resolve
$nuspecPath = Join-Path $repoRoot 'Src\DSInternals.PowerShell.Chocolatey\DSInternals.nuspec'
$nuspecPath = Join-Path $repoRoot 'Src\DSInternals.PowerShell\Chocolatey\*.nuspec' -Resolve
$outputDir = Join-Path $repoRoot 'Build\packages\Chocolatey'
$moduleDir = Join-Path $repoRoot 'Build\bin\Release\DSInternals'

2
Scripts/Publish-PSModule.ps1
View File

@ -21,4 +21,4 @@ $modulePath = Join-Path $rootDir 'Build\bin\Release\DSInternals'
Publish-Module -Path $modulePath `
-NuGetApiKey $apiKey `
-Repository PSGallery
-Repository PSGallery -Force

6
Src/DSInternals.PowerShell.Chocolatey/dsinternals.nuspec → Src/DSInternals.PowerShell/Chocolatey/dsinternals-psmodule.nuspec
View File

@ -2,9 +2,9 @@
<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>DSInternals</id>
<id>DSInternals-PSModule</id>
<version>3.5</version>
<packageSourceUrl>https://github.com/MichaelGrafnetter/DSInternals/tree/master/Src/DSInternals.PowerShell.Chocolatey</packageSourceUrl>
<packageSourceUrl>https://github.com/MichaelGrafnetter/DSInternals/tree/master/Src/DSInternals.PowerShell/Chocolatey</packageSourceUrl>
<owners>MichaelGrafnetter</owners>
<title>DSInternals PowerShell Module</title>
<authors>Michael Grafnetter</authors>
@ -45,8 +45,6 @@
<!-- .NET Framework 4.5.1+. For RTM OS prior to Windows 8.1 and Windows Server 2012 R2. -->
<dependency id="dotnet4.5.1" />
</dependencies>
<conflicts>dsinternals-psmodule</conflicts>
<replaces>dsinternals-psmodule</replaces>
</metadata>
<files>
<file src="tools\**" target="tools" />

0
Src/DSInternals.PowerShell.Chocolatey/tools/VERIFICATION.txt → Src/DSInternals.PowerShell/Chocolatey/tools/VERIFICATION.txt
View File

0
Src/DSInternals.PowerShell.Chocolatey/tools/chocolateyinstall.ps1 → Src/DSInternals.PowerShell/Chocolatey/tools/chocolateyinstall.ps1
View File

2
Src/DSInternals.PowerShell.Chocolatey/tools/chocolateyuninstall.ps1 → Src/DSInternals.PowerShell/Chocolatey/tools/chocolateyuninstall.ps1
View File

@ -4,6 +4,6 @@
$destinationDir = Join-Path -Path $PSHOME -ChildPath 'Modules\DSInternals'
Remove-Item -Path $destinationDir -Recurse -Force -ErrorAction SilentlyContinue
# Remove Start Menu Icon
# Remove Start Menu Link
$shortcutPath = Join-Path -Path $env:ProgramData -ChildPath 'Microsoft\Windows\Start Menu\Programs\DSInternals PowerShell Module.lnk'
Remove-Item -Path $shortcutPath -Force -ErrorAction SilentlyContinue

4
Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj
View File

@ -148,6 +148,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Chocolatey\tools\VERIFICATION.txt" />
<Content Include="DSInternals.Bootstrap.psm1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -155,6 +156,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="ADDBRestoreFromMediaScriptTemplate.ps1" />
<None Include="Chocolatey\dsinternals-psmodule.nuspec" />
<None Include="Chocolatey\tools\chocolateyinstall.ps1" />
<None Include="Chocolatey\tools\chocolateyuninstall.ps1" />
<None Include="Commands\ADDBCommandHierarchy.cd" />
<Content Include="en-US\DSInternals.PowerShell.dll-Help.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

13
Src/DSInternals.sln
View File

@ -115,18 +115,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PowerShell", "PowerShell",
..\Documentation\PowerShell\Test-PasswordQuality.md = ..\Documentation\PowerShell\Test-PasswordQuality.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DSInternals.PowerShell.Chocolatey", "DSInternals.PowerShell.Chocolatey", "{DA5C8A2B-710B-417A-B646-A512C3B90801}"
ProjectSection(SolutionItems) = preProject
DSInternals.PowerShell.Chocolatey\dsinternals.nuspec = DSInternals.PowerShell.Chocolatey\dsinternals.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{AFB60B81-6978-434C-9224-C7A63960A6A1}"
ProjectSection(SolutionItems) = preProject
DSInternals.PowerShell.Chocolatey\tools\chocolateyinstall.ps1 = DSInternals.PowerShell.Chocolatey\tools\chocolateyinstall.ps1
DSInternals.PowerShell.Chocolatey\tools\chocolateyuninstall.ps1 = DSInternals.PowerShell.Chocolatey\tools\chocolateyuninstall.ps1
DSInternals.PowerShell.Chocolatey\tools\VERIFICATION.txt = DSInternals.PowerShell.Chocolatey\tools\VERIFICATION.txt
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@ -237,7 +225,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A47D652E-5EF7-44C0-AD85-4F0F9B738567} = {9735D030-AEE6-415A-BF03-074076FF776A}
{AFB60B81-6978-434C-9224-C7A63960A6A1} = {DA5C8A2B-710B-417A-B646-A512C3B90801}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {20AC2CF5-7C26-407B-B0A5-1BDE0FABABA8}