Merge pull request #170 from PowerShell/dev

Merging release pull request
dsccommunity · Jun 30, 2016 · b02750b · b02750b
2 parents ec27d9e + 75dc01d
commit b02750b
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 53 deletions.
diff --git a/DSCResources/MSFT_xArchive/MSFT_xArchive.psm1 b/DSCResources/MSFT_xArchive/MSFT_xArchive.psm1
@@ -73,7 +73,8 @@ InSetTargetResourceDestExistsAndTheSelectedTimestampChecksumMatchedWillLeaveIt =
 '@
 }
 
-Import-LocalizedData LocalizedData -FileName 'MSFT_xArchive.strings.psd1'
+# Commented-out until more languages are supported
+# Import-LocalizedData LocalizedData -FileName 'MSFT_xArchive.strings.psd1'
 
 Import-Module "$PSScriptRoot\..\CommonResourceHelper.psm1"
 

diff --git a/DSCResources/MSFT_xEnvironmentResource/MSFT_xEnvironmentResource.psm1 b/DSCResources/MSFT_xEnvironmentResource/MSFT_xEnvironmentResource.psm1
@@ -20,7 +20,8 @@ DATA localizedData
         EnvVarRemoved = (REMOVE) Environment variable '{0}'
 '@
 }
-Import-LocalizedData  LocalizedData -filename MSFT_xEnvironmentResource.strings.psd1
+# Commented-out until more languages are supported
+# Import-LocalizedData  LocalizedData -filename MSFT_xEnvironmentResource.strings.psd1
 
 
 #-------------------------------------

diff --git a/DSCResources/MSFT_xGroupResource/MSFT_xGroupResource.psm1 b/DSCResources/MSFT_xGroupResource/MSFT_xGroupResource.psm1
@@ -98,7 +98,8 @@ UnableToResolveAccount = Unable to resolve account '{0}'. Failed with message: {
 '@
 }
 
-Import-LocalizedData -BindingVariable 'LocalizedData' -FileName 'MSFT_xGroupResource.strings.psd1'
+# Commented-out until more languages are supported
+# Import-LocalizedData -BindingVariable 'LocalizedData' -FileName 'MSFT_xGroupResource.strings.psd1'
 
 Import-Module -Name "$PSScriptRoot\..\CommonResourceHelper.psm1"
 

diff --git a/DSCResources/MSFT_xProcessResource/MSFT_xProcessResource.psm1 b/DSCResources/MSFT_xProcessResource/MSFT_xProcessResource.psm1
@@ -22,7 +22,8 @@ FailureWaitingForProcessesToStop="Failed to wait for processes to stop"
 '@
 }
 
-Import-LocalizedData  LocalizedData -filename MSFT_xProcessResource.strings.psd1
+# Commented-out until more languages are supported
+# Import-LocalizedData  LocalizedData -filename MSFT_xProcessResource.strings.psd1
 
 function ExtractArguments($functionBoundParameters,[string[]]$argumentNames,[string[]]$newArgumentNames)
 {

diff --git a/DSCResources/MSFT_xRegistryResource/MSFT_xRegistryResource.psm1 b/DSCResources/MSFT_xRegistryResource/MSFT_xRegistryResource.psm1
@@ -28,7 +28,9 @@ DATA localizedData
         DefaultValueDisplayName = (Default)
 '@
 }
-Import-LocalizedData LocalizedData -filename MSFT_xRegistryResource.strings.psd1
+
+# Commented-out until more languages are supported
+# Import-LocalizedData LocalizedData -filename MSFT_xRegistryResource.strings.psd1
 
 #--------------------------------------
 # The Get-TargetResourceInternal cmdlet

diff --git a/DSCResources/MSFT_xScriptResource/MSFT_xScriptResource.psm1 b/DSCResources/MSFT_xScriptResource/MSFT_xScriptResource.psm1
@@ -17,7 +17,8 @@ ExecutingScriptMessage=Executing Script: {0}
 '@
 }
 
-Import-LocalizedData  LocalizedData -filename MSFT_xScriptResource.strings.psd1
+# Commented-out until more languages are supported
+# Import-LocalizedData  LocalizedData -filename MSFT_xScriptResource.strings.psd1
 
 # The Get-TargetResource cmdlet is used to fetch the desired state of the DSC managed node through a powershell script.
 # This cmdlet executes the user supplied script (i.e., the script is responsible for validating the desired state of the 

diff --git a/DSCResources/MSFT_xServiceResource/MSFT_xServiceResource.psm1 b/DSCResources/MSFT_xServiceResource/MSFT_xServiceResource.psm1
@@ -44,7 +44,8 @@ WritePropertiesIgnored=Service '{0}' already exists. Write properties such as St
 "@
 }
 
-Import-LocalizedData LocalizedData -FileName 'MSFT_xServiceResource.strings.psd1'
+# Commented-out until more languages are supported
+# Import-LocalizedData LocalizedData -FileName 'MSFT_xServiceResource.strings.psd1'
 
 function Get-TargetResource
 {

diff --git a/DSCResources/MSFT_xUserResource/MSFT_xUserResource.psm1 b/DSCResources/MSFT_xUserResource/MSFT_xUserResource.psm1
@@ -28,7 +28,8 @@ MultipleMatches = There could be a possible multiple matches exception while try
 '@
 }
 
-Import-LocalizedData LocalizedData -FileName MSFT_xUserResource.strings.psd1
+# Commented-out until more languages are supported
+# Import-LocalizedData LocalizedData -FileName MSFT_xUserResource.strings.psd1
 
 Import-Module "$PSScriptRoot\..\CommonResourceHelper.psm1"
 

diff --git a/DSCResources/MSFT_xWindowsFeature/MSFT_xWindowsFeature.psm1 b/DSCResources/MSFT_xWindowsFeature/MSFT_xWindowsFeature.psm1
@@ -27,7 +27,8 @@ InstallSuccess=Successfully installed the feature {0}.
 '@
 }
 
-Import-LocalizedData  LocalizedData -filename MSFT_xWindowsFeature.strings.psd1
+# Commented-out until more languages are supported
+# Import-LocalizedData  LocalizedData -filename MSFT_xWindowsFeature.strings.psd1
 
 # The Get-TargetResource cmdlet is used to fetch the status of role or feature on the target machine.
 # It gives the feature info of the requested role/feature on the target machine.

diff --git a/README.md b/README.md
@@ -335,6 +335,10 @@ These parameters will be the same for each Windows optional feature in the set.
 
 ### Unreleased
 
+### 1.13.0.0
+
+* Removed localization for now so that resources can run on non-English systems.
+
 ### 3.11.0.0
 
 * xRemoteFile: Added parameters:

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,14 +2,27 @@
 #      environment configuration  #
 #---------------------------------#
 os: WMF 5
-version: 3.11.{build}.0
+version: 1.13.{build}.0
 install:
-  - cinst -y pester
-  - git clone https://github.com/PowerShell/DscResource.Tests
-  - ps: Push-Location
-  - cd DscResource.Tests
-  - ps: Import-Module .\TestHelper.psm1 -force
-  - ps: Pop-Location
+    - git clone https://github.com/PowerShell/DscResource.Tests
+    - ps: Push-Location
+    - cd DscResource.Tests
+    - ps: Import-Module .\TestHelper.psm1 -force
+    - ps: Pop-Location
+    - ps: |
+        Get-PackageProvider -Name nuget -ForceBootstrap -Force 
+        Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
+        (Get-date).AddHours(3).AddMinutes(-5) | Export-Clixml -Path ..\BuildTimeout.xml
+        $installed = $false
+        $retries = 1
+        while($retries -lt 10 -and !$installed)
+        {
+            Write-Verbose -message "Attempting to install Pester, attempt # $retries"
+            $pesterModule = @(find-module 'Pester' -Repository PSGallery -ErrorAction SilentlyContinue)
+            Install-Module -InputObject $pesterModule -Force
+            $installed = ($LASTEXITCODE -eq 0)
+            $retries++
+        }
 
 #---------------------------------#
 #      build configuration        #
@@ -42,7 +55,7 @@ deploy_script:
       # Creating project artifact
       $stagingDirectory = (Resolve-Path ..).Path
       $manifest = Join-Path $pwd "xPSDesiredStateConfiguration.psd1"
-      (Get-Content $manifest -Raw).Replace("3.11.0.0", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
+      (Get-Content $manifest -Raw).Replace("1.13.0.0", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
       $zipFilePath = Join-Path $stagingDirectory "$(Split-Path $pwd -Leaf).zip"
       Add-Type -assemblyname System.IO.Compression.FileSystem
       [System.IO.Compression.ZipFile]::CreateFromDirectory($pwd, $zipFilePath)

diff --git a/xPSDesiredStateConfiguration.psd1 b/xPSDesiredStateConfiguration.psd1
@@ -1,6 +1,6 @@
 @{
 # Version number of this module.
-ModuleVersion = '3.11.0.0'
+ModuleVersion = '1.13.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'cc8dc021-fa5f-4f96-8ecf-dfd68a6d9d48'
@@ -52,41 +52,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* xRemoteFile: Added parameters:
-                - TimeoutSec
-                - Proxy
-                - ProxyCredential
-               Added unit tests.
-               Corrected Style Guidelines issues.
-               Added Localization support.
-               URI parameter supports File://.
-               Get-TargetResource returns URI parameter.
-               Fixed logging of error message reported when download fails.
-               Added new example Sample_xRemoteFileUsingProxy.ps1.
-* Examples: Fixed missing newline at end of PullServerSetupTests.ps1.
-* xFileUpload: Added PSSA rule suppression attribute.
-* xPackageResource: Removed hardcoded ComputerName "localhost" parameter from Get-WMIObject to eliminate PSSA rule violation. The parameter is not required.
-* Added .gitignore to prevent DSCResource.Tests from being commited to repo.
-* Updated AppVeyor.yml to use WMF 5 build OS so that latest test methods work.
-* Updated xWebService resource to not deploy Devices.mdb if esent provider is used
-* Fixed $script:netsh parameter initialization in xWebService resource that was causing CIM exception when EnableFirewall flag was specified.
-* xService:
-    - Fixed a bug where, despite no state specified in the config, the resource test returns false if the service is not running
-    - Fixed bug in which Automatice StartupType did not match the "Auto" StartMode in Test-TargetResource.
-* xPackage: Fixes bug where CreateCheckRegValue was not being removed when uninstalling packages
-* Replaced New-NetFirewallRule cmdlets with netsh as this cmdlet is not available by default on some downlevel OS such as Windows 2012 R2 Core.
-* Added the xEnvironment resource
-* Added the xWindowsFeature resource
-* Added the xScript resource
-* Added the xUser resource
-* Added the xGroupSet resource
-* Added the xProcessSet resource
-* Added the xServiceSet resource
-* Added the xWindowsFeatureSet resource
-* Added the xWindowsOptionalFeatureSet resource
-* Merged the in-box Service resource with xService and added tests for xService
-* Merged the in-box Archive resource with xArchive and added tests for xArchive
-* Merged the in-box Group resource with xGroup and added tests for xGroup
+        ReleaseNotes = '* Removed localization for now so that resources can run on non-English systems.
 
 '
 
@@ -97,3 +63,4 @@ PrivateData = @{
 
 
 
+