Merge development to master

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.1.1
+- Fix DSC resource folder structure
+
 ## 2.1.0
 
 Breaking Change
@@ -18,6 +21,7 @@ Bug Fixes
 New Features
 
 - New DSC resource, PSRepository (#426) (Thanks @johlju!)
+- Added tests and integration of DSC resource PSModule (Thanks @johlju!)
 - Piping of PS respositories (#420)
 - utf8 support for .nuspec (#419)
 

SignCat.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!-- Config files for Azure DevOps code-signing pipeline. -->
+<SignConfigXML>
+  <!-- AnyCPU Release sign job -->
+  <job platform="AnyCPU" configuration="Release" dest="__OUTPATHROOT__\signed" jobname="PowerShellGet" approvers="americks;edyoung">
+    <file src="__INPATHROOT__\PowerShellGet.cat" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PowerShellGet.cat" />
+  </job>
+</SignConfigXML>

SignConfig.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!-- Config files for Azure DevOps code-signing pipeline. -->
+<SignConfigXML>
+  <!-- AnyCPU Release sign job -->
+  <job platform="AnyCPU" configuration="Release" dest="__OUTPATHROOT__\signed" jobname="PowerShellGet" approvers="vigarg;gstolt">
+    <file src="__INPATHROOT__\PowerShellGet\PowerShellGet.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PowerShellGet.psd1" />
+    <file src="__INPATHROOT__\PowerShellGet\PSGet.Format.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PSGet.Format.ps1xml" />
+    <file src="__INPATHROOT__\PowerShellGet\PSGet.Resource.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PSGet.Resource.psd1" />
+    <file src="__INPATHROOT__\PowerShellGet\PSModule.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\PSModule.psm1" />
+
+    <file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSModule\MSFT_PSModule.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSModule\MSFT_PSModule.psm1" />
+    <file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSModule\MSFT_PSModule.schema.mof" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSModule\MSFT_PSModule.schema.mof" />
+    <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" />
+
+    <file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\MSFT_PSRepository.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\MSFT_PSRepository.psm1" />
+    <file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\MSFT_PSRepository.schema.mof" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\MSFT_PSRepository.schema.mof" />
+    <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" />
+
+    <file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" />
+    <file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.ResourceHelper\PowerShellGet.ResourceHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.ResourceHelper\PowerShellGet.ResourceHelper.psm1" />
+  </job>
+</SignConfigXML>

src/PowerShellGet/PowerShellGet.psd1

@@ -1,59 +1,63 @@
 @{
-RootModule = 'PSModule.psm1'
-ModuleVersion = '2.1.0'
-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 = @(
-	'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',
-             'PSGet.Format.ps1xml',
-             'PSGet.Resource.psd1')
-RequiredModules = @(@{ModuleName='PackageManagement';ModuleVersion='1.1.7.0'})
-PrivateData = @{
-                "PackageManagementProviders" = 'PSModule.psm1'
-                 "SupportedPowerShellGetFormatVersions" = @('1.x','2.x')
-    PSData = @{
-        Tags = @('Packagemanagement',
-                 'Provider',
-                 'PSEdition_Desktop',                 
-		         'PSEdition_Core',
-                 'Linux',
-                 'Mac')
-        ProjectUri = 'https://go.microsoft.com/fwlink/?LinkId=828955'
-        LicenseUri = 'https://go.microsoft.com/fwlink/?LinkId=829061'
-        ReleaseNotes = @'
+    RootModule        = 'PSModule.psm1'
+    ModuleVersion     = '2.1.1'
+    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 = @(
+        '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',
+        'PSGet.Format.ps1xml',
+        'PSGet.Resource.psd1')
+    RequiredModules   = @(@{ModuleName = 'PackageManagement'; ModuleVersion = '1.1.7.0'})
+    PrivateData       = @{
+        "PackageManagementProviders"           = 'PSModule.psm1'
+        "SupportedPowerShellGetFormatVersions" = @('1.x', '2.x')
+        PSData                                 = @{
+            Tags         = @('Packagemanagement',
+                'Provider',
+                'PSEdition_Desktop',
+                'PSEdition_Core',
+                'Linux',
+                'Mac')
+            ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
+            LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
+            ReleaseNotes = @'
+## 2.1.1
+
+- Fix DSC resource folder structure
+
 ## 2.1.0
 
 Breaking Change
@@ -243,8 +247,8 @@ Bug fixes
 * Proxy Authentication support.
 * Responses to a number of user requests and issues.
 '@
+        }
     }
-}
 
-HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=855963'
+    HelpInfoURI       = 'http://go.microsoft.com/fwlink/?linkid=855963'
 }