From e78dd2449ad9f66b94d196eed865fa962dc4c300 Mon Sep 17 00:00:00 2001 From: KarolKaczmarek Date: Wed, 12 Aug 2015 13:57:58 -0700 Subject: [PATCH 1/8] Update appveyor.yml --- appveyor.yml | 63 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 62d98c2..7aa02ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,25 @@ +#---------------------------------# +# environment configuration # +#---------------------------------# +version: 1.0.1.{build} 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,37 @@ 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 "xBitlocker.psd1" + (Get-Content $manifest -Raw).Replace("1.0.1.1", $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 $_ + } + + + From 79e8392906c3a4e9a724733ba06276fa4f257b37 Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Tue, 25 Aug 2015 16:47:59 -0700 Subject: [PATCH 2/8] Moving build number to third section of version --- appveyor.yml | 4 ++-- xBitlocker.psd1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7aa02ac..0419370 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ #---------------------------------# # environment configuration # #---------------------------------# -version: 1.0.1.{build} +version: 1.1.{build}.0 install: - cinst -y pester - git clone https://github.com/PowerShell/DscResource.Tests @@ -39,7 +39,7 @@ before_deploy: # Creating project artifact $stagingDirectory = (Resolve-Path ..).Path $manifest = Join-Path $pwd "xBitlocker.psd1" - (Get-Content $manifest -Raw).Replace("1.0.1.1", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest + (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) diff --git a/xBitlocker.psd1 b/xBitlocker.psd1 index 875ace5..ed10e00 100644 --- a/xBitlocker.psd1 +++ b/xBitlocker.psd1 @@ -12,7 +12,7 @@ # RootModule = '' # Version number of this module. -ModuleVersion = '1.0.1.1' +ModuleVersion = '1.1.0.0' # ID used to uniquely identify this module GUID = 'dc4f3fd0-4e1d-4916-84f8-d0bb89d52507' From b1276d43680f7ffcc5368ea735ecbeb44294fe4e Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Mon, 7 Dec 2015 16:48:40 -0800 Subject: [PATCH 3/8] Replacing before_deploy with deploy_script --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0419370..4b977c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ test_script: #---------------------------------# # scripts to run before deployment -before_deploy: +deploy_script: - ps: | # Creating project artifact $stagingDirectory = (Resolve-Path ..).Path From e423f7c2313418db9b95e0f4185fd8e3aaa5fb4a Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Wed, 16 Dec 2015 15:22:08 -0800 Subject: [PATCH 4/8] Temporary workaround for pester issue causing build to get stuck --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4b977c2..85d8130 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ #---------------------------------# version: 1.1.{build}.0 install: - - cinst -y pester + - cinst -y pester --version 3.3.13 - git clone https://github.com/PowerShell/DscResource.Tests - ps: Push-Location - cd DscResource.Tests From b2f1bcf8bfd4f2d64fa5d19ed4f5fa5cdc9cc1a0 Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Thu, 7 Jan 2016 10:17:19 -0800 Subject: [PATCH 5/8] Reverting temporary workaround for pester issue causing build to get stuck --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 85d8130..4b977c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ #---------------------------------# version: 1.1.{build}.0 install: - - cinst -y pester --version 3.3.13 + - cinst -y pester - git clone https://github.com/PowerShell/DscResource.Tests - ps: Push-Location - cd DscResource.Tests From e85d4f853bc44c0e8553aba533b97442bc9b07cb Mon Sep 17 00:00:00 2001 From: KarolKaczmarek Date: Tue, 2 Feb 2016 11:21:34 -0800 Subject: [PATCH 6/8] Update xBitlocker.psd1 --- xBitlocker.psd1 | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/xBitlocker.psd1 b/xBitlocker.psd1 index ed10e00..50e5cbc 100644 --- a/xBitlocker.psd1 +++ b/xBitlocker.psd1 @@ -83,8 +83,29 @@ AliasesToExport = '*' # List of all files packaged with this module # FileList = @() -# Private data to pass to the module specified in RootModule/ModuleToProcess -# PrivateData = '' +# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. +PrivateData = @{ + + PSData = @{ + + # Tags applied to this module. These help with module discovery in online galleries. + Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource') + + # A URL to the license for this module. + LicenseUri = 'https://github.com/PowerShell/xBitlocker/blob/master/LICENSE' + + # A URL to the main website for this project. + ProjectUri = 'https://github.com/PowerShell/xBitlocker' + + # A URL to an icon representing this module. + # IconUri = '' + + # ReleaseNotes of this module + # ReleaseNotes = '' + + } # End of PSData hashtable + +} # End of PrivateData hashtable # HelpInfo URI of this module # HelpInfoURI = '' From 3e1b4b3135f4acdb8e7c39f3ee93453b54e62a43 Mon Sep 17 00:00:00 2001 From: KarolKaczmarek Date: Tue, 2 Feb 2016 11:22:02 -0800 Subject: [PATCH 7/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e53cc24..a1edd94 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,8 @@ Defaults to false. ## Versions +### Unreleased + ### 1.0.1.1 * Reduced the number of acceptable values for PrimaryProtector in xBLAutoBitlocker and xBLBitlocker. From 4b8e5e90a0a0245f395109c68fa2713af97608e0 Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Tue, 2 Feb 2016 13:35:34 -0800 Subject: [PATCH 8/8] Releasing version 1.1.0.0 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a1edd94..4e73650 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,8 @@ Defaults to false. ### Unreleased +### 1.1.0.0 + ### 1.0.1.1 * Reduced the number of acceptable values for PrimaryProtector in xBLAutoBitlocker and xBLBitlocker.