diff --git a/README.md b/README.md index e53cc24..4e73650 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,10 @@ Defaults to false. ## Versions +### Unreleased + +### 1.1.0.0 + ### 1.0.1.1 * Reduced the number of acceptable values for PrimaryProtector in xBLAutoBitlocker and xBLBitlocker. diff --git a/appveyor.yml b/appveyor.yml index 62d98c2..4b977c2 100644 --- 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,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 +deploy_script: + - ps: | + # Creating project artifact + $stagingDirectory = (Resolve-Path ..).Path + $manifest = Join-Path $pwd "xBitlocker.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/xBitlocker.psd1 b/xBitlocker.psd1 index 875ace5..50e5cbc 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' @@ -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 = ''