Merge pull request #66 from PowerShell/dev

Release of version 2.7.0.0 of PsDscResources
This commit is contained in:
Katie Keim
2017-06-02 12:11:17 -07:00
committed by GitHub
5 changed files with 15 additions and 7 deletions
@@ -626,7 +626,7 @@ function Get-ProductEntryInfo
{
try
{
$installDate = '{0:d}' -f [DateTime]::ParseExact($installDate, 'yyyyMMdd',[System.Globalization.CultureInfo]::CurrentCulture).Date
$installDate = '{0:d}' -f [DateTime]::ParseExact($installDate, 'yyyyMMdd',[System.Globalization.CultureInfo]::InvariantCulture).Date
}
catch
{
+5 -4
View File
@@ -4,7 +4,7 @@
# RootModule = ''
# Version number of this module.
ModuleVersion = '2.6.0.0'
ModuleVersion = '2.7.0.0'
# Supported PSEditions
# CompatiblePSEditions = @()
@@ -101,9 +101,9 @@ PrivateData = @{
# IconUri = ''
# ReleaseNotes of this module
ReleaseNotes = '* Archive:
* Fixed a minor bug in the unit tests where sometimes the incorrect DateTime format was used.
* Added MsiPackage
ReleaseNotes = '* MsiPackage
* Parse installation date from registry using invariant culture.
* Fix a bug in unit test failing, when regional setting differs from English-US.
'
@@ -124,3 +124,4 @@ PrivateData = @{
+6
View File
@@ -577,6 +577,12 @@ The following parameters will be the same for each process in the set:
### Unreleased
### 2.7.0.0
* MsiPackage
* Parse installation date from registry using invariant culture.
* Fix a bug in unit test failing, when regional setting differs from English-US.
### 2.6.0.0
* Archive:
+2 -2
View File
@@ -57,7 +57,7 @@ Describe 'MsiPackage Unit Tests' {
$script:mockProductEntryInfo = @{
Name = 'TestDisplayName'
InstallSource = 'TestInstallSource'
InstalledOn = '4/4/2017'
InstalledOn = ([DateTime]::new(2017, 4, 24).ToShortDateString())
Size = 2048
Version = '1.2.3.4'
PackageDescription = 'Test Description'
@@ -586,7 +586,7 @@ Describe 'MsiPackage Unit Tests' {
}
Describe 'Get-ProductEntryInfo' {
Mock -CommandName Get-ProductEntryValue -MockWith { return '20170404' } -ParameterFilter { $Property -eq 'InstallDate' }
Mock -CommandName Get-ProductEntryValue -MockWith { return '20170424' } -ParameterFilter { $Property -eq 'InstallDate' }
Mock -CommandName Get-ProductEntryValue -MockWith { return $script:mockProductEntryInfo.Publisher } -ParameterFilter { $Property -eq 'Publisher' }
Mock -CommandName Get-ProductEntryValue -MockWith { return $script:mockProductEntryInfo.Size } -ParameterFilter { $Property -eq 'EstimatedSize' }
Mock -CommandName Get-ProductEntryValue -MockWith { return $script:mockProductEntryInfo.Version } -ParameterFilter { $Property -eq 'DisplayVersion' }
+1
View File
@@ -2,6 +2,7 @@
# environment configuration #
#---------------------------------#
version: 2.4.{build}.0
os: Previous Visual Studio 2015
install:
- git clone https://github.com/PowerShell/DscResource.Tests
- ps: Import-Module -Name .\Tests\TestHelpers\WMF5Dot1Installation.psm1 -Force