Merged PR 118: merge develop to master branch
d5c340a5
Adam Rush
committed
succeeded
5 changed files
build.ps1
/Build/build.ps1-2+2
/Build/build.ps1
Add comment 217
Add comment 218 # Get current manifest version
Add comment 219 try {
Add comment 220 Minus   $manifest = Test-ModuleManifest -Path $StagingModulePath -ErrorAction 'Stop'
Add comment 220 Plus   $manifest = Test-ModuleManifest -Path $StagingModuleManifestPath -ErrorAction 'Stop'
Add comment 221 [Version]$manifestVersion = $manifest.Version
Add comment 222
Add comment 223 } catch {
Add comment 224 Minus   throw "Could not get manifest version from [$StagingModulePath]"
Add comment 224 Plus   throw "Could not get manifest version from [$StagingModuleManifestPath]"
Add comment 225 }
Add comment 226
Add comment 227 # Create zip file
build.psake.ps1
/Build/build.psake.ps1-2+2
/Build/build.psake.ps1
Add comment 217
Add comment 218 # Get current manifest version
Add comment 219 try {
Add comment 220 Minus   $manifest = Test-ModuleManifest -Path $StagingModulePath -ErrorAction 'Stop'
Add comment 220 Plus   $manifest = Test-ModuleManifest -Path $StagingModuleManifestPath -ErrorAction 'Stop'
Add comment 221 [Version]$manifestVersion = $manifest.Version
Add comment 222
Add comment 223 } catch {
Add comment 224 Minus   throw "Could not get manifest version from [$StagingModulePath]"
Add comment 224 Plus   throw "Could not get manifest version from [$StagingModuleManifestPath]"
Add comment 225 }
Add comment 226
Add comment 227 # Create zip file
CreateBuildArtifactStandalone.ps1
/Demo/CreateBuildArtifactStandalone.ps1-2+2
/Demo/CreateBuildArtifactStandalone.ps1
Add comment 217
Add comment 218 # Get current manifest version
Add comment 219 try {
Add comment 220 Minus   $manifest = Test-ModuleManifest -Path $StagingModulePath -ErrorAction 'Stop'
Add comment 220 Plus   $manifest = Test-ModuleManifest -Path $StagingModuleManifestPath -ErrorAction 'Stop'
Add comment 221 [Version]$manifestVersion = $manifest.Version
Add comment 222
Add comment 223 } catch {
Add comment 224 Minus   throw "Could not get manifest version from [$StagingModulePath]"
Add comment 224 Plus   throw "Could not get manifest version from [$StagingModuleManifestPath]"
Add comment 225 }
Add comment 226
Add comment 227 # Create zip file
DemoBuildTasks.ps1
/Demo/DemoBuildTasks.ps1-2+2
/Demo/DemoBuildTasks.ps1
Add comment 217
Add comment 218 # Get current manifest version
Add comment 219 try {
Add comment 220 Minus   $manifest = Test-ModuleManifest -Path $StagingModulePath -ErrorAction 'Stop'
Add comment 220 Plus   $manifest = Test-ModuleManifest -Path $StagingModuleManifestPath -ErrorAction 'Stop'
Add comment 221 [Version]$manifestVersion = $manifest.Version
Add comment 222
Add comment 223 } catch {
Add comment 224 Minus   throw "Could not get manifest version from [$StagingModulePath]"
Add comment 224 Plus   throw "Could not get manifest version from [$StagingModuleManifestPath]"
Add comment 225 }
Add comment 226
Add comment 227 # Create zip file
azure-pipelines.yml
/azure-pipelines.yml-2+2
/azure-pipelines.yml
Add comment 217
Add comment 218 # Get current manifest version
Add comment 219 try {
Add comment 220 Minus   $manifest = Test-ModuleManifest -Path $StagingModulePath -ErrorAction 'Stop'
Add comment 220 Plus   $manifest = Test-ModuleManifest -Path $StagingModuleManifestPath -ErrorAction 'Stop'
Add comment 221 [Version]$manifestVersion = $manifest.Version
Add comment 222
Add comment 223 } catch {
Add comment 224 Minus   throw "Could not get manifest version from [$StagingModulePath]"
Add comment 224 Plus   throw "Could not get manifest version from [$StagingModuleManifestPath]"
Add comment 225 }
Add comment 226
Add comment 227 # Create zip file