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.

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

Add Edition and Customized script support for SSIS IR #4001

Merged
merged 1 commit into from
Jan 29, 2018

Conversation

chinadragon0515
Copy link
Contributor

Description

This change is add edition and customized script support for SSIS IR, there is no manually code change, all the code change are generated with spec change in this PR
Azure/azure-rest-api-specs#2266

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

General Guidelines

  • [ Y] Title of the pull request is clear and informative.
  • [ Y] 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

  • [ Y] Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • [ Y] 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.
  • [ Y] 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.
  • [ Y] The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

Copy link
Member

@shahabhijeet shahabhijeet left a comment

Choose a reason for hiding this comment

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

Can you do the following in the below order:

  1. Pull latest from upstream (if you have already done this good)
  2. Execute msbuild.exe build.proj from the repo root
    a. This will update the build tools in the current repo
  3. Generate your SDK using generate.cmd
    a. this creates meta data files that are needed.
  4. Build you sdk at least once from command line of IDE
    a. (From command line use this) Msbuild.exe build.proj /t:build /p:Scope=SDKs\DataFactory
    b. this will create another additional meta data file that is also needed.
  5. Update the PR

@chinadragon0515
Copy link
Contributor Author

Have follow the steps, and for step 3, I use this command to generate code
src\SDKs\DataFactory\Management.DataFactory\generate.cmd

@shahabhijeet
Copy link
Member

@chinadragon0515 can you resolve the conflict.

@chinadragon0515
Copy link
Contributor Author

Just update the code with regenerated code based on newest specification, can someone help to review and merge the PR, thanks.

Copy link
Member

@shahabhijeet shahabhijeet left a comment

Choose a reason for hiding this comment

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

Still missing 1 meta data file.
Build your project from command line to get the new meta data file
msbuild build.proj /t:build /p:Scope=SDKs\DataFactory

@chinadragon0515
Copy link
Contributor Author

I have run msbuild build.proj /t:build /p:Scope=SDKs\DataFactory, and there is meta file changed, I just commit the meta file change into single commit, the file changed is src/SDKs/_metadata/datafactory_resource-manager.txt

Anything else I missed and need to be done? thanks

@shahabhijeet
Copy link
Member

@chinadragon0515 I just cloned your fork and regenerated the SDK.
My hunch is that you are not using latest autorest
Do the following:

  1. Pull from upstream
  2. msbuild build.proj (this will also update the build tools)
  3. generate.cmd (this should generate SDKInfo*.cs)
  4. msbuild build.proj /t:Build /p:Scope=SDKs\DataFactory (this should generate AzSdk.RP.props)

@chinadragon0515
Copy link
Contributor Author

  1. I checked my autoreset, it is newest version.
  2. I follow the process again, there is no change on file AzSdk.RP.props, and note file AzSdk.RP.props is checked in 24 days ago, refer to https://github.com/Azure/azure-sdk-for-net/blob/psSdkJson6/src/SDKs/DataFactory/AzSdk.RP.props and this is same case for SDKInfo*.cs

Detail steps I have done,

  1. pull newest specification
    2 reset my sdk change, and rebase newest SDK
  2. msbuild build.proj
  3. run command src\SDKs\DataFactory\Management.DataFactory\generate.cmd
  4. msbuild build.proj /t:Build /p:Scope=SDKs\DataFactory
    Anything I missed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants