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

Commit c00f461

Browse files
alericksonalerickson
authored
Merge development to master (#440)
1 parent fd47e15 commit c00f461

File tree

4 files changed

+97
-57
lines changed

4 files changed

+97
-57
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 2.1.1
4+
- Fix DSC resource folder structure
5+
36
## 2.1.0
47

58
Breaking Change
@@ -18,6 +21,7 @@ Bug Fixes
1821
New Features
1922

2023
- New DSC resource, PSRepository (#426) (Thanks @johlju!)
24+
- Added tests and integration of DSC resource PSModule (Thanks @johlju!)
2125
- Piping of PS respositories (#420)
2226
- utf8 support for .nuspec (#419)
2327

‎SignCat.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
3+
<!-- Config files for Azure DevOps code-signing pipeline. -->
4+
<SignConfigXML>
5+
<!-- AnyCPU Release sign job -->
6+
<job platform="AnyCPU" configuration="Release" dest="__OUTPATHROOT__\signed" jobname="PowerShellGet" approvers="americks;edyoung">
7+
<file src="__INPATHROOT__\PowerShellGet.cat" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PowerShellGet.cat" />
8+
</job>
9+
</SignConfigXML>

‎SignConfig.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
3+
<!-- Config files for Azure DevOps code-signing pipeline. -->
4+
<SignConfigXML>
5+
<!-- AnyCPU Release sign job -->
6+
<job platform="AnyCPU" configuration="Release" dest="__OUTPATHROOT__\signed" jobname="PowerShellGet" approvers="vigarg;gstolt">
7+
<file src="__INPATHROOT__\PowerShellGet\PowerShellGet.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PowerShellGet.psd1" />
8+
<file src="__INPATHROOT__\PowerShellGet\PSGet.Format.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PSGet.Format.ps1xml" />
9+
<file src="__INPATHROOT__\PowerShellGet\PSGet.Resource.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PSGet.Resource.psd1" />
10+
<file src="__INPATHROOT__\PowerShellGet\PSModule.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PSModule.psm1" />
11+
12+
<file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSModule\MSFT_PSModule.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSModule\MSFT_PSModule.psm1" />
13+
<file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSModule\MSFT_PSModule.schema.mof" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSModule\MSFT_PSModule.schema.mof" />
14+
<file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSModule\en-US\MSFT_PSModule.strings.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSModule\en-US\MSFT_PSModule.strings.psd1" />
15+
16+
<file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\MSFT_PSRepository.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\MSFT_PSRepository.psm1" />
17+
<file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\MSFT_PSRepository.schema.mof" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\MSFT_PSRepository.schema.mof" />
18+
<file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\en-US\MSFT_PSRepository.strings.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\en-US\MSFT_PSRepository.strings.psd1" />
19+
20+
<file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" />
21+
<file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.ResourceHelper\PowerShellGet.ResourceHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.ResourceHelper\PowerShellGet.ResourceHelper.psm1" />
22+
</job>
23+
</SignConfigXML>

‎src/PowerShellGet/PowerShellGet.psd1

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,63 @@
11
@{
2-
RootModule = 'PSModule.psm1'
3-
ModuleVersion = '2.1.0'
4-
GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
5-
Author = 'Microsoft Corporation'
6-
CompanyName = 'Microsoft Corporation'
7-
Copyright = '(c) Microsoft Corporation. All rights reserved.'
8-
Description = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
9-
PowerShellVersion = '3.0'
10-
FormatsToProcess = 'PSGet.Format.ps1xml'
11-
FunctionsToExport = @(
12-
'Find-Command',
13-
'Find-DSCResource',
14-
'Find-Module',
15-
'Find-RoleCapability',
16-
'Find-Script',
17-
'Get-InstalledModule',
18-
'Get-InstalledScript',
19-
'Get-PSRepository',
20-
'Install-Module',
21-
'Install-Script',
22-
'New-ScriptFileInfo',
23-
'Publish-Module',
24-
'Publish-Script',
25-
'Register-PSRepository',
26-
'Save-Module',
27-
'Save-Script',
28-
'Set-PSRepository',
29-
'Test-ScriptFileInfo',
30-
'Uninstall-Module',
31-
'Uninstall-Script',
32-
'Unregister-PSRepository',
33-
'Update-Module',
34-
'Update-ModuleManifest',
35-
'Update-Script',
36-
'Update-ScriptFileInfo')
37-
38-
VariablesToExport = "*"
39-
AliasesToExport = @('inmo','fimo','upmo','pumo')
40-
FileList = @('PSModule.psm1',
41-
'PSGet.Format.ps1xml',
42-
'PSGet.Resource.psd1')
43-
RequiredModules = @(@{ModuleName='PackageManagement';ModuleVersion='1.1.7.0'})
44-
PrivateData = @{
45-
"PackageManagementProviders" = 'PSModule.psm1'
46-
"SupportedPowerShellGetFormatVersions" = @('1.x','2.x')
47-
PSData = @{
48-
Tags = @('Packagemanagement',
49-
'Provider',
50-
'PSEdition_Desktop',
51-
'PSEdition_Core',
52-
'Linux',
53-
'Mac')
54-
ProjectUri = 'https://go.microsoft.com/fwlink/?LinkId=828955'
55-
LicenseUri = 'https://go.microsoft.com/fwlink/?LinkId=829061'
56-
ReleaseNotes = @'
2+
RootModule = 'PSModule.psm1'
3+
ModuleVersion = '2.1.1'
4+
GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
5+
Author = 'Microsoft Corporation'
6+
CompanyName = 'Microsoft Corporation'
7+
Copyright = '(c) Microsoft Corporation. All rights reserved.'
8+
Description = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
9+
PowerShellVersion = '3.0'
10+
FormatsToProcess = 'PSGet.Format.ps1xml'
11+
FunctionsToExport = @(
12+
'Find-Command',
13+
'Find-DSCResource',
14+
'Find-Module',
15+
'Find-RoleCapability',
16+
'Find-Script',
17+
'Get-InstalledModule',
18+
'Get-InstalledScript',
19+
'Get-PSRepository',
20+
'Install-Module',
21+
'Install-Script',
22+
'New-ScriptFileInfo',
23+
'Publish-Module',
24+
'Publish-Script',
25+
'Register-PSRepository',
26+
'Save-Module',
27+
'Save-Script',
28+
'Set-PSRepository',
29+
'Test-ScriptFileInfo',
30+
'Uninstall-Module',
31+
'Uninstall-Script',
32+
'Unregister-PSRepository',
33+
'Update-Module',
34+
'Update-ModuleManifest',
35+
'Update-Script',
36+
'Update-ScriptFileInfo')
37+
38+
VariablesToExport = "*"
39+
AliasesToExport = @('inmo', 'fimo', 'upmo', 'pumo')
40+
FileList = @('PSModule.psm1',
41+
'PSGet.Format.ps1xml',
42+
'PSGet.Resource.psd1')
43+
RequiredModules = @(@{ModuleName = 'PackageManagement'; ModuleVersion = '1.1.7.0'})
44+
PrivateData = @{
45+
"PackageManagementProviders" = 'PSModule.psm1'
46+
"SupportedPowerShellGetFormatVersions" = @('1.x', '2.x')
47+
PSData = @{
48+
Tags = @('Packagemanagement',
49+
'Provider',
50+
'PSEdition_Desktop',
51+
'PSEdition_Core',
52+
'Linux',
53+
'Mac')
54+
ProjectUri = 'https://go.microsoft.com/fwlink/?LinkId=828955'
55+
LicenseUri = 'https://go.microsoft.com/fwlink/?LinkId=829061'
56+
ReleaseNotes = @'
57+
## 2.1.1
58+
59+
- Fix DSC resource folder structure
60+
5761
## 2.1.0
5862
5963
Breaking Change
@@ -243,8 +247,8 @@ Bug fixes
243247
* Proxy Authentication support.
244248
* Responses to a number of user requests and issues.
245249
'@
250+
}
246251
}
247-
}
248252

249-
HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=855963'
253+
HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=855963'
250254
}

0 commit comments

Comments
 (0)