Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved UseDiffPackage checkbox to Upgrade section and enabled it by default #7345

Merged
merged 4 commits into from
Jun 5, 2018
Merged

Moved UseDiffPackage checkbox to Upgrade section and enabled it by default #7345

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01c6cf4
Moved UseDiffPackage checkbox to Upgrade section and enabled it by de…
vinodkumar3 May 31, 2018
e3d2cfe
Keeping default value same
vinodkumar3 Jun 4, 2018
06e7965
Moving input code location
vinodkumar3 Jun 4, 2018
2ebe0bc
Updating patch version
vinodkumar3 Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/ServiceFabricDeployV1/Create-DiffPackage.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Create-DiffPackage
function New-DiffPackage
{
[CmdletBinding()]
param(
Expand Down
2 changes: 1 addition & 1 deletion Tasks/ServiceFabricDeployV1/deploy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ try {
if ($isPackageValid)
{
Import-Module "$PSScriptRoot\Create-DiffPackage.psm1"
$diffPackagePath = Create-DiffPackage -ApplicationName $applicationName -ApplicationPackagePath $applicationPackagePath -ConnectedServiceEndpoint $connectedServiceEndpoint -ClusterConnectionParameters $clusterConnectionParameters
$diffPackagePath = New-DiffPackage -ApplicationName $applicationName -ApplicationPackagePath $applicationPackagePath -ConnectedServiceEndpoint $connectedServiceEndpoint -ClusterConnectionParameters $clusterConnectionParameters
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions Tasks/ServiceFabricDeployV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
],
"version": {
"Major": 1,
"Minor": 7,
"Patch": 9
"Minor": 8,
"Patch": 0
},
"demands": [
"Cmd"
Expand Down Expand Up @@ -95,9 +95,9 @@
"name": "useDiffPackage",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please show me how the UI looks like?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

"type": "boolean",
"label": "Use Diff Package",
"defaultValue": "false",
"defaultValue": "true",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should also enable compression option by default

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required now as per requirements

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: move this code piece to all other inputs which are in upgrade group

"required": false,
"groupname": "advanced",
"groupname": "upgrade",
"helpMarkDown": "Upgrade by using a diff package that contains only the updated application files, the updated application manifest, and the service manifest files."
},
{
Expand Down
8 changes: 4 additions & 4 deletions Tasks/ServiceFabricDeployV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
],
"version": {
"Major": 1,
"Minor": 7,
"Patch": 9
"Minor": 8,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just update patch version. No need to update minor version.

"Patch": 0
},
"demands": [
"Cmd"
Expand Down Expand Up @@ -95,9 +95,9 @@
"name": "useDiffPackage",
"type": "boolean",
"label": "ms-resource:loc.input.label.useDiffPackage",
"defaultValue": "false",
"defaultValue": "true",
"required": false,
"groupname": "advanced",
"groupname": "upgrade",
"helpMarkDown": "ms-resource:loc.input.help.useDiffPackage"
},
{
Expand Down