Merge pull request #1 from PowerShell/master

Pulling updates from upstream
rsWinAutomationSupport · Nov 17, 2015 · 3e084bd · 3e084bd
2 parents 1624cb0 + c96e520
commit 3e084bd
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 16 deletions.
diff --git a/DSCResources/xIEEsc/xIEEsc.schema.psm1 b/DSCResources/xIEEsc/xIEEsc.schema.psm1
@@ -15,11 +15,11 @@ Configuration xIEEsc
     $key = ""
     if ($UserRole -eq "Administrators") 
     {
-        $key = “HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A7-37EF-4b3f-8CFC-4F3A74704073}”
+        $key = 'HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A7-37EF-4b3f-8CFC-4F3A74704073}'
     }
     else
     {
-        $key = “HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A8-37EF-4b3f-8CFC-4F3A74704073}”
+        $key = 'HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A8-37EF-4b3f-8CFC-4F3A74704073}'
     }
 
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/u3h1665qqneo98bh/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xsystemsecurity/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/u3h1665qqneo98bh/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xsystemsecurity/branch/master)
 
 # xSystemSecurity
 
@@ -62,6 +62,10 @@ Please refer to [this article](http://technet.microsoft.com/en-us/library/dd8832
 
 ## Versions
 
+### 1.1.0.0
+
+* Fixed encoding
+
 ### 1.0.0.0
 
 * Initial release with the following resources 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,25 @@
+#---------------------------------# 
+#      environment configuration  # 
+#---------------------------------# 
+version: 1.1.{build}.0
 install: 
-    - cinst -y pester
-    - git clone https://github.com/PowerShell/DscResource.Tests
+  - 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
+
+#---------------------------------# 
+#      build configuration        # 
+#---------------------------------# 
 
 build: false
 
+#---------------------------------# 
+#      test configuration         # 
+#---------------------------------# 
+
 test_script:
     - ps: |
         $testResultsFile = ".\TestsResults.xml"
@@ -12,14 +28,38 @@ test_script:
         if ($res.FailedCount -gt 0) { 
             throw "$($res.FailedCount) tests failed."
         }
-on_finish:
-    - ps: |
-        $stagingDirectory = (Resolve-Path ..).Path
-        $zipFile = Join-Path $stagingDirectory "$(Split-Path $pwd -Leaf).zip"
-        Add-Type -assemblyname System.IO.Compression.FileSystem
-        [System.IO.Compression.ZipFile]::CreateFromDirectory($pwd, $zipFile)
-        @(
-            # You can add other artifacts here
-            (ls $zipFile)
-        ) | % { Push-AppveyorArtifact $_.FullName }
+    
+#---------------------------------# 
+#      deployment configuration   # 
+#---------------------------------# 
+
+# scripts to run before deployment 
+before_deploy: 
+  - ps: |
+      # Creating project artifact
+      $stagingDirectory = (Resolve-Path ..).Path
+      $manifest = Join-Path $pwd "xSystemSecurity.psd1"
+      (Get-Content $manifest -Raw).Replace("1.1.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)
+      
+      # Creating NuGet package artifact
+      New-Nuspec -packageName $env:APPVEYOR_PROJECT_NAME -version $env:APPVEYOR_BUILD_VERSION -author "Microsoft" -owners "Microsoft" -licenseUrl "https://github.com/PowerShell/DscResources/blob/master/LICENSE" -projectUrl "https://github.com/$($env:APPVEYOR_REPO_NAME)" -packageDescription $env:APPVEYOR_PROJECT_NAME -tags "DesiredStateConfiguration DSC DSCResourceKit" -destinationPath .
+      nuget pack ".\$($env:APPVEYOR_PROJECT_NAME).nuspec" -outputdirectory .
+      $nuGetPackageName = $env:APPVEYOR_PROJECT_NAME + "." + $env:APPVEYOR_BUILD_VERSION + ".nupkg"
+      $nuGetPackagePath = (Get-ChildItem $nuGetPackageName).FullName
+      
+      @(
+          # You can add other artifacts here
+          $zipFilePath,
+          $nuGetPackagePath
+      ) | % { 
+          Write-Host "Pushing package $_ as Appveyor artifact"
+          Push-AppveyorArtifact $_
+        }
+        
+        
+
+
 
diff --git a/xSystemSecurity.psd1 b/xSystemSecurity.psd1
@@ -7,7 +7,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '1.0.1'
+ModuleVersion = '1.1.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'e30107af-a22a-48fb-b7bc-7d2b98489ac5'