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

Jump to bottom

[data factory] add tumblingWindowTrigger dependsOn and add Folder to pipeline and da… #4741

Merged
merged 4 commits into from
Sep 7, 2018
Merged

[data factory] add tumblingWindowTrigger dependsOn and add Folder to pipeline and da… #4741

merged 4 commits into from
Sep 7, 2018

Conversation

haoyingli
Copy link
Contributor

…taset

This SDK includes 2 swagger changes:

  1. New diagnostic settings operation with multi setting support #3636 [Datafactory] Add folders to Pipeline and Dataset
    [Datafactory] Add folders to Pipeline and Dataset azure-rest-api-specs#3636
  2. Azure WebJob Not Running #3445 [Data Factory] add tumbling window dependsOn property under stable
    [Data Factory] add tumbling window dependsOn property under stable azure-rest-api-specs#3445

Description

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
  • The generate.cmd file for the SDK has been updated with the version of AutoRest, as well as the commitid of your swagger spec or link to the swagger spec, used to generate the code.
  • The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

@haoyingli
add tumblingWindowTrigger dependsOn and add Folder to pipeline and da…
466c7b4 
…taset

This SDK includes 2 swagger changes:
1.  #3636 [Datafactory] Add folders to Pipeline and Dataset
2.  #3445 [Data Factory] add tumbling window dependsOn property under stable
@haoyingli haoyingli changed the title add tumblingWindowTrigger dependsOn and add Folder to pipeline and da… [data factory] add tumblingWindowTrigger dependsOn and add Folder to pipeline and da… Sep 5, 2018
hvermis
hvermis approved these changes Sep 5, 2018
View reviewed changes
Copy link
Contributor

@hvermis hvermis left a comment

Choose a reason for hiding this comment

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

:shipit:

hvermis
hvermis approved these changes Sep 5, 2018
View reviewed changes
Copy link
Contributor

@hvermis hvermis left a comment

Choose a reason for hiding this comment

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

We will need to update the version of SDK separately

dsgouda
dsgouda suggested changes Sep 6, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Please update PackageReleaseNotes in the csproj

src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs
@@ -149,6 +149,60 @@ public class TriggerJsonSamples : JsonSampleCollection<TriggerJsonSamples>
}
}
}
";

[JsonSample]
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: please fix indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The current Json samples also use these indentation, 8 spaces before [JsonSample], what do you want me to change to?

Copy link
Contributor

@dsgouda dsgouda Sep 6, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Move the Json indentation to the right wrt code. Won't block on this.

@dsgouda
Copy link
Contributor

dsgouda commented Sep 6, 2018

@haoyingli Please fix failing tests too

dsgouda
dsgouda suggested changes Sep 6, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Please update PackageReleaseNotes

@haoyingli
Copy link
Contributor Author

When will this PR be merged? I see the status is "Merging is blocked", is there anything blocking it?

@dsgouda dsgouda merged commit 63192c2 into Azure:psSdkJson6 Sep 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hvermis hvermis hvermis approved these changes

@dsgouda dsgouda dsgouda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@haoyingli @dsgouda @hvermis