Skip to content
This repository was archived by the owner on Apr 28, 2018. It is now read-only.

Commit ca0f4de

Browse files
committed
Using Publish-Module instead of nuget pack
This is meant to resolve #145, using the powershell cmdlets for creating the nupkg instead of the nuget cmdline tool itself.
1 parent 9de38aa commit ca0f4de

File tree

3 files changed

+19
-32
lines changed

3 files changed

+19
-32
lines changed

appveyor.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pull_requests:
33
do_not_increment_build_number: true
44
image: WMF 5
55
init:
6-
- ps: Install-PackageProvider NuGet -Force -RequiredVersion 2.8.5.206
6+
- ps: Install-PackageProvider NuGet -Force
77
- ps: (new-object net.webclient).DownloadFile('https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.exe', "c:/dotnet-install.exe")
88
- cmd: c:\dotnet-install.exe /install /quiet
99
install:
@@ -40,12 +40,14 @@ build_script:
4040
Get-Content $manifest
4141
- ps: dotnet restore
4242
- ps: dotnet build src/Docker.PowerShell/project.json
43-
- ps: dotnet publish -f net46 -o $pwd\bin\net46 -c Release $pwd\src\Docker.PowerShell
44-
- ps: dotnet publish -f netstandard1.6 -o $pwd\bin\netstandard1.6 -c Release $pwd\src\Docker.PowerShell
45-
- ps: New-ExternalHelp -Path src\Docker.PowerShell\Help -OutputPath bin\en-US
46-
- ps: nuget pack src/Docker.PowerShell/Docker.nuspec -BasePath bin -OutputDirectory bin -Symbols -Version $version
43+
- ps: dotnet publish -f net46 -o $pwd\bin\Docker\clr -c Release $pwd\src\Docker.PowerShell
44+
- ps: dotnet publish -f netstandard1.6 -o $pwd\bin\Docker\coreclr -c Release $pwd\src\Docker.PowerShell
45+
- ps: cp $pwd\bin\Docker\coreclr\Docker.*ps* $pwd\bin\Docker\
46+
- ps: New-ExternalHelp -Path src\Docker.PowerShell\Help -OutputPath $pwd\bin\Docker\en-US
47+
- ps: mkdir $pwd\testRepo
48+
- ps: Register-PSRepository -Name test -SourceLocation $pwd\testRepo
49+
- ps: Publish-Module -Path $pwd\bin\Docker -Repository test
4750
test_script:
48-
- ps: Register-PSRepository -Name test -SourceLocation $pwd\bin
4951
- ps: Install-Module -Name Docker -Repository test -Force
5052
- ps: Import-Module Docker
5153
- ps: |
@@ -54,7 +56,6 @@ test_script:
5456
}
5557
- ps: git checkout -- src/Docker.PowerShell/Docker.psd1
5658
- ps: git checkout -- src/Docker.PowerShell/project.json
57-
- ps: git checkout -- src/Docker.PowerShell/Docker.nuspec
5859
- ps: git config core.autocrlf true
5960
- ps: New-MarkdownHelp -Module Docker -OutputFolder src\Docker.PowerShell\Help -ErrorAction SilentlyContinue
6061
- ps: Update-MarkdownHelp -Path src\Docker.PowerShell\Help
@@ -66,4 +67,4 @@ test_script:
6667
throw "Help files do not match updated cmdlets. Please update the help markdown to correspond to the latest changes."
6768
}
6869
artifacts:
69-
- path: bin/*.nupkg
70+
- path: bin/testRepo/*.nupkg

src/Docker.PowerShell/Docker.nuspec

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/Docker.PowerShell/Docker.psd1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ RootModule = "Docker.psm1"
1212
# Version number of this module. Gets replaced by appveyor at build time.
1313
ModuleVersion = '0.0.0'
1414

15+
Description = "This package contains Docker PowerShell cmdlets that can be used to interact with Windows and Linux Docker hosts."
16+
1517
# Minimum PowerShell version. This should match the reference assembly version
1618
# in project.json (we require 5.0 due to dependencies on parameter completion).
1719
PowerShellVersion = '5.0.0'
@@ -77,6 +79,14 @@ AliasesToExport = @(
7779
'Tag-ContainerImage'
7880
)
7981

82+
PrivateData = @{
83+
PSData = @{
84+
LicenseUri = "https://raw.githubusercontent.com/Microsoft/Docker-PowerShell/master/LICENSE"
85+
86+
ProjectUri = "https://github.com/Microsoft/Docker-PowerShell"
87+
}
88+
}
89+
8090
# HelpInfo
8191
HelpInfoUri="https://github.com/Microsoft/Docker-PowerShell"
8292

0 commit comments

Comments
 (0)