Skip to content

Commit

Permalink
Bug fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
kirkone committed Jan 16, 2017
1 parent 4b46149 commit 663ff85
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Please have a look here: [GitHub Issues](https://github.com/kirkone/vsts-dnx-tas

### Release Notes

#### Version 0.1.15
#### Version 0.1.18

- added support for App_Offline.htm in Web Publish Task

Expand Down
4 changes: 2 additions & 2 deletions VSTS.DNX.Tasks.BuildNugetPackage/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "DNX.Tasks.BuildNugetPackage",
"friendlyName": "DNX Tasks Build Nuget Package",
"description": "Build a Nuget package with dotnet cli.",
"helpMarkDown": "Version: 0.1.15",
"helpMarkDown": "Version: 0.1.18",
"category": "Build",
"author": "Kirsten Kluge",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 15
"Patch": 17
},
"visibility": [
"Build"
Expand Down
4 changes: 2 additions & 2 deletions VSTS.DNX.Tasks.BuildWebPackage/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "DNX.Tasks.BuildWebPackage",
"friendlyName": "DNX Tasks Build Web Package",
"description": "Build a package with dotnet cli for Deployment",
"helpMarkDown": "Version: 0.1.15",
"helpMarkDown": "Version: 0.1.18",
"category": "Build",
"author": "Kirsten Kluge",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 15
"Patch": 17
},
"visibility": [
"Build"
Expand Down
4 changes: 2 additions & 2 deletions VSTS.DNX.Tasks.ClearNugetCache/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "DNX.Tasks.ClearNugetCache",
"friendlyName": "DNX Tasks NuGet Clear Cache",
"description": "Clear out the package cache for NuGet.",
"helpMarkDown": "Version: 0.1.15\n## Caution:\nUse this only when you exactly know what you are doing!\n This will clear the package cache and if there are any other build processes running at the same time at the same mashine **very bad things** will happen!",
"helpMarkDown": "Version: 0.1.18\n## Caution:\nUse this only when you exactly know what you are doing!\n This will clear the package cache and if there are any other build processes running at the same time at the same mashine **very bad things** will happen!",
"category": "Package",
"author": "Kirsten Kluge",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 15
"Patch": 17
},
"visibility": [
"Build"
Expand Down
4 changes: 2 additions & 2 deletions VSTS.DNX.Tasks.GenerateChangeLog/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "DNX.Tasks.GenerateChangeLog",
"friendlyName": "DNX Tasks Generate Change Log",
"description": "Generate a markdown file with all changeset for this build.",
"helpMarkDown": "Version: 0.1.15 \nTo use this task **Allow Scripts to Access OAuth Token** has to be enabled in **Options** of this build definition.",
"helpMarkDown": "Version: 0.1.18 \nTo use this task **Allow Scripts to Access OAuth Token** has to be enabled in **Options** of this build definition.",
"category": "Build",
"author": "Kirsten Kluge",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 15
"Patch": 17
},
"visibility": [
"Build"
Expand Down
14 changes: 6 additions & 8 deletions VSTS.DNX.Tasks.PublishWebPackage/PublishWebPackage.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
$Destination,
[String] [Parameter(Mandatory = $true)]
$UseAppOffline,
[String] [Parameter(Mandatory = $true)]
[String] [Parameter(Mandatory = $false)]
$AppOfflineFile,
[String] [Parameter(Mandatory = $true)]
$StopBeforeDeploy,
Expand Down Expand Up @@ -79,9 +79,8 @@ Function Main
$apiUserAgent = "powershell/1.0"

$commandApiUri = JoinParts ($baseUri, "/api/command")
$vsfApiUri = JoinParts ($baseUri, "/api/vsf", $Destination) '/'
$deployApiUri = JoinParts ($baseUri, "api/zip/", $Destination) '/'

$vfsApiUri = JoinParts ($baseUri, "/api/vfs", $Destination)
$deployApiUri = JoinParts ($baseUri, "api/zip/", $Destination)

$publishZip = $Source
if(Test-Path $Source -pathtype container)
Expand All @@ -106,7 +105,7 @@ Function Main
Write-Host " No App_Offline.htm specified, using default"
$AppOfflineFile = "$(Split-Path -parent $PSCommandPath)\app_offline.htm"
}
Invoke-RestMethod -Uri "$($vsfApiUri)app_offline.htm" -Headers $authHeader -UserAgent $userAgent -Method PUT -InFile $AppOfflineFile -ContentType "multipart/form-data" -TimeoutSec $timeout | Out-Null
Invoke-RestMethod -Uri "$vfsApiUri/app_offline.htm" -Headers $authHeader -UserAgent $userAgent -Method PUT -InFile $AppOfflineFile -ContentType "multipart/form-data" -TimeoutSec $timeout | Out-Null
Write-Host " Done."
}

Expand All @@ -129,9 +128,8 @@ Function Main
Write-Host " Done."
}

$deployApiUri = JoinParts ($baseUri, "api/zip/", $Destination) '/'
Write-Host ("Publishing to URI '{0}'..." -f $deployApiUri)
Invoke-RestMethod -Uri $deployApiUri -Headers $authHeader -UserAgent $userAgent -Method PUT -InFile $publishZip -ContentType "multipart/form-data" -TimeoutSec $timeout | Out-Null
Invoke-RestMethod -Uri "$deployApiUri/" -Headers $authHeader -UserAgent $userAgent -Method PUT -InFile $publishZip -ContentType "multipart/form-data" -TimeoutSec $timeout | Out-Null

Write-Host " Finished publishing of $WebSiteName"

Expand All @@ -144,7 +142,7 @@ Function Main

if($isUseAppOffline){
Write-Host "Removing app_offline.htm"
Invoke-RestMethod -Uri "$($vsfApiUri)app_offline.htm" -Headers $authHeader -UserAgent $userAgent -Method DELETE -TimeoutSec $timeout | Out-Null
Invoke-RestMethod -Uri "$vfsApiUri/app_offline.htm" -Headers $authHeader -UserAgent $userAgent -Method DELETE -TimeoutSec $timeout | Out-Null
Write-Host " Done."

}
Expand Down
4 changes: 2 additions & 2 deletions VSTS.DNX.Tasks.PublishWebPackage/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "DNX.Tasks.PublishWebPackage",
"friendlyName": "DNX Tasks Azure PublishWebPackage",
"description": "Publish a Dotnet package to Azure Website",
"helpMarkDown": "Version: 0.1.15",
"helpMarkDown": "Version: 0.1.18",
"category": "Deploy",
"author": "Kirsten Kluge",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 15
"Patch": 17
},
"visibility": [
"Build",
Expand Down
4 changes: 2 additions & 2 deletions VSTS.DNX.Tasks.SlotSwap/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "DNX.Tasks.SlotSwap",
"friendlyName": "DNX Tasks Azure SlotSwap",
"description": "Swap a slot in Azure web site deployment slots.",
"helpMarkDown": "Version: 0.1.15",
"helpMarkDown": "Version: 0.1.18",
"category": "Deploy",
"author": "Kirsten Kluge",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 15
"Patch": 17
},
"visibility": [
"Build",
Expand Down
2 changes: 1 addition & 1 deletion vss-extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifestVersion": 1,
"id": "vsts-dnx-tasks",
"name": "VSTS DNX Tasks",
"version": "0.1.15",
"version": "0.1.18",
"publisher": "kirkone",
"public": true,
"targets": [
Expand Down

0 comments on commit 663ff85

Please sign in to comment.