Merge pull request #14 from NickEales/master

Correctly handle post-domain join reboot
theonlyway · Aug 20, 2019 · 6effbff · 6effbff
2 parents 7612837 + f133815
commit 6effbff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,5 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+*.psm1  diff=astextplain
+*.psd1  diff=astextplain
diff --git a/DSCResources/xDSCDomainjoin/xDSCDomainjoin.psm1 b/DSCResources/xDSCDomainjoin/xDSCDomainjoin.psm1
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ skip_commits:
 #---------------------------------#
 #      environment configuration  #
 #---------------------------------#
-version: '1.1.{build}'
+version: '1.2.{build}'
 os: WMF 5
 pull_requests:
   do_not_increment_build_number: true
@@ -49,7 +49,7 @@ deploy_script:
         Write-Verbose -Message 'Creating project artifact' -Verbose
         $stagingDirectory = (Resolve-Path -Path ..).Path
         $manifest = Join-Path -Path $pwd -ChildPath '*.psd1' -Resolve
-        (Get-Content $manifest -Raw).Replace('1.1', $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
+        (Get-Content $manifest -Raw).Replace('1.2', $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
         $zipFilePath = Join-Path -Path $stagingDirectory -ChildPath "$env:APPVEYOR_PROJECT_NAME-$env:APPVEYOR_BUILD_VERSION.zip"
         Add-Type -AssemblyName System.IO.Compression.FileSystem
         [System.IO.Compression.ZipFile]::CreateFromDirectory($pwd, $zipFilePath)

diff --git a/xDSCDomainjoin.psd1 b/xDSCDomainjoin.psd1