From 45358d39e16737e3f7b4bbcf9673c442d73b158a Mon Sep 17 00:00:00 2001
From: alerickson <25858831+alerickson@users.noreply.github.com>
Date: Thu, 28 Feb 2019 16:23:57 -0800
Subject: [PATCH 1/4] Add config files for Azure DevOps code signing (#432)
---
SignCat.xml | 9 +++++++++
SignConfig.xml | 12 ++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 SignCat.xml
create mode 100644 SignConfig.xml
diff --git a/SignCat.xml b/SignCat.xml
new file mode 100644
index 00000000..9b16b2d4
--- /dev/null
+++ b/SignCat.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SignConfig.xml b/SignConfig.xml
new file mode 100644
index 00000000..943a73f6
--- /dev/null
+++ b/SignConfig.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From db006425f2c588d687d287a6cbd3279e41552bbb Mon Sep 17 00:00:00 2001
From: alerickson <25858831+alerickson@users.noreply.github.com>
Date: Fri, 8 Mar 2019 17:36:56 -0800
Subject: [PATCH 2/4] Update code-signing config file (#434)
---
SignConfig.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SignConfig.xml b/SignConfig.xml
index 943a73f6..7dfb151e 100644
--- a/SignConfig.xml
+++ b/SignConfig.xml
@@ -8,5 +8,9 @@
+
+
+
+
\ No newline at end of file
From 0927b20816cb9adc70c6cd21a0a8fa68e972917a Mon Sep 17 00:00:00 2001
From: alerickson <25858831+alerickson@users.noreply.github.com>
Date: Tue, 12 Mar 2019 16:47:49 -0700
Subject: [PATCH 3/4] Update version and changelog (#437)
---
CHANGELOG.md | 4 +
src/PowerShellGet/PowerShellGet.psd1 | 118 ++++++++++++++-------------
2 files changed, 65 insertions(+), 57 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cc86553..7063ff90 100644
--- a/CHANGELOG.md
+++ b/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)
diff --git a/src/PowerShellGet/PowerShellGet.psd1 b/src/PowerShellGet/PowerShellGet.psd1
index 4c82b748..9df2d0eb 100644
--- a/src/PowerShellGet/PowerShellGet.psd1
+++ b/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'
}
From c043b915b9066e1d826040f2a36bda97df4185d1 Mon Sep 17 00:00:00 2001
From: alerickson <25858831+alerickson@users.noreply.github.com>
Date: Wed, 13 Mar 2019 17:33:36 -0700
Subject: [PATCH 4/4] Update code signing config file (#439)
---
SignConfig.xml | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/SignConfig.xml b/SignConfig.xml
index 7dfb151e..d3d51d60 100644
--- a/SignConfig.xml
+++ b/SignConfig.xml
@@ -4,13 +4,20 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file