Skip to content
This repository was archived by the owner on Jun 13, 2024. It is now read-only.

Fix#240/add build step to construct psm1 #242

Merged
merged 20 commits into from
Apr 3, 2018
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
155e6b5
Updated build script to merge public and private .ps1 files into plac…
Benny1007 Mar 10, 2018
e9c72ef
refactor for functions subfolders and psm file construction
Benny1007 Mar 10, 2018
cbf6df2
reverted psm1 file to commit 88d3d9e, refactored psm1 file to be dot …
Benny1007 Mar 21, 2018
fb0e189
Removed update-modulemanifest and replace with manual version
Benny1007 Mar 24, 2018
b8cb0d5
update build artifact archiving
Benny1007 Mar 24, 2018
6836296
Change archive to write to tmp folder first
Mar 24, 2018
3f2855f
fix non-windows artifact archiving
Mar 24, 2018
b7b1c9b
remove appveyor commented code
Mar 24, 2018
bcda230
Fix non-windows artifact archiving
Benny1007 Mar 25, 2018
1692e26
Merge branch 'fix#240/Add-build-step-to-construct-psm1' of https://gi…
Mar 25, 2018
e035daa
fix import of localized data for merged module by moving import to ps…
Mar 27, 2018
08b091a
make use of join-path for multi os pathing
Mar 27, 2018
853d71f
moved install of new module outside of tests, into function that inst…
Mar 27, 2018
66ddc64
updated build scripts appveyor and travis
Mar 27, 2018
eff426c
Moved install of packagemanagement into function and called from inst…
Apr 3, 2018
a5f01d2
removed commented code
Apr 3, 2018
605a0f4
removed whitespace from test file
Apr 3, 2018
f7fec2b
add switch to Invoke-PowerShellGetTest in travis.sh
Apr 3, 2018
59a6226
fix file encoding of psm1 file
Apr 3, 2018
14abbc7
remove bootstrap of nuget from test function to install function, fix…
Apr 3, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# Generted artifacts
/dist

# User-specific files
*.suo
*.user
Expand Down Expand Up @@ -190,7 +193,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
Expand Down
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ matrix:

addons:
artifacts:
paths: $(ls ./../PowerShellGet.zip | tr "\n" ":")
#paths: $(ls ./../dist/PowerShellGet.zip | tr "\n" ":")
paths: ./dist/PowerShellGet.zip


install:
Expand All @@ -31,10 +32,10 @@ install:
fi
- bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh)
- pushd tools
- chmod +x travis.sh
- chmod +x travis.sh
- popd

script:
script:
- echo "TRAVIS_EVENT_TYPE value $TRAVIS_EVENT_TYPE"
- ./tools/travis.sh

Expand Down
927 changes: 11 additions & 916 deletions PowerShellGet/PSModule.psm1

Large diffs are not rendered by default.

67 changes: 40 additions & 27 deletions PowerShellGet/PowerShellGet.psd1
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
@{
@{
RootModule = 'PSModule.psm1'
ModuleVersion = '1.6.1'
ModuleVersion = '1.6.4'
GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
Author = 'Microsoft Corporation'
CompanyName = 'Microsoft Corporation'
Copyright = '(c) Microsoft Corporation. All rights reserved.'
Description = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
PowerShellVersion = '3.0'
FormatsToProcess = 'PSGet.Format.ps1xml'
FunctionsToExport = @('Install-Module',
'Find-Module',
'Save-Module',
'Update-Module',
'Publish-Module',
'Get-InstalledModule',
'Uninstall-Module',
'Find-Command',
'Find-DscResource',
'Find-RoleCapability',
'Install-Script',
'Find-Script',
'Save-Script',
'Update-Script',
'Publish-Script',
'Get-InstalledScript',
'Uninstall-Script',
'Test-ScriptFileInfo',
'New-ScriptFileInfo',
'Update-ScriptFileInfo',
'Get-PSRepository',
'Set-PSRepository',
'Register-PSRepository',
'Unregister-PSRepository',
'Update-ModuleManifest')
FunctionsToExport = @(
'Find-Command',
'Find-DSCResource',
'Find-Module',
'Find-RoleCapability',
'Find-Script',
'Get-InstalledModule',
'Get-InstalledScript',
'Get-PSRepository',
'Install-Module',
'Install-Script',
'New-ScriptFileInfo',
'Publish-Module',
'Publish-Script',
'Register-PSRepository',
'Save-Module',
'Save-Script',
'Set-PSRepository',
'Test-ScriptFileInfo',
'Uninstall-Module',
'Uninstall-Script',
'Unregister-PSRepository',
'Update-Module',
'Update-ModuleManifest',
'Update-Script',
'Update-ScriptFileInfo')

VariablesToExport = "*"
AliasesToExport = @('inmo','fimo','upmo','pumo')
FileList = @('PSModule.psm1',
Expand Down Expand Up @@ -147,3 +149,14 @@ Bug fixes

HelpInfoURI = 'https://go.microsoft.com/fwlink/?linkid=855963'
}











Loading