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

Cherry-pick language changes into 2.0.3 branch for Refinery #9730

Merged
merged 8 commits into from
May 28, 2019

Conversation

reddyashish
Copy link
Contributor

@reddyashish reddyashish commented May 21, 2019

Purpose

This PR is to cherry-pick language changes that went in after 2.0.3 branch was created.

Refer to this task for more information: https://jira.autodesk.com/browse/DYN-1879

The commits related to following tasks were cherry-picked:

  1. DYN-1056 : Fix over-indexing of lists and restore string indexing #9388
  2. DYN-1688 : DYN-1688: Fix regression with replication over list inputs with nested sublists #9559
  3. DYN-1722 : DYN-1722 #9578
  4. DYN-1496 : some of the cases in this task have been fixed using the PR referenced to DYN-1172 DYN-1722 #9578
  5. DYN-995 : Fix over-indexing of lists and restore string indexing #9388 (same PR as for the DYN-1056 task)
  6. DYN-1759 : Fixes in computing function endpoints for replication cases #9632
  7. DYN-1198 : DYN1198- Heterogeneous list update gives infinite loop #9408 and Cherr-pick revert of heterogeneous list fix and add workflow test that highlights performance degradation #9441

Declarations

Check these if you believe they are true

  • The code base is in a better state after this PR
  • Is documented according to the standards
  • The level of testing this PR includes is appropriate
  • User facing strings, if any, are extracted into *.resx files
  • All tests pass using the self-service CI.
  • Snapshot of UI changes, if any.
  • Changes to the API follow Semantic Versioning, and are documented in the API Changes document.

Reviewers

@aparajit-pratap @mjkkirschner

@reddyashish reddyashish changed the title 2.0.3 cherrypicking Cherry-pick language changes into 2.0.3 branch for Refinery May 21, 2019
@reddyashish reddyashish changed the title Cherry-pick language changes into 2.0.3 branch for Refinery [WIP]Cherry-pick language changes into 2.0.3 branch for Refinery May 22, 2019
@reddyashish reddyashish changed the title [WIP]Cherry-pick language changes into 2.0.3 branch for Refinery Cherry-pick language changes into 2.0.3 branch for Refinery May 23, 2019
@reddyashish reddyashish removed the WIP label May 23, 2019
@aparajit-pratap
Copy link
Contributor

aparajit-pratap commented May 24, 2019

@reddyashish it looks like your 5th and 6th commits are not in chronological order. Did you come across any conflicts?

  1. Fix over-indexing of lists and restore string indexing #9388 merged on Jan 10th
  2. DYN-1688: Fix regression with replication over list inputs with nested sublists #9559 merged on Mar 14th
  3. DYN-1722 #9578 merged on Mar 25th
  4. Fixes in computing function endpoints for replication cases #9632 merged on Apr 9th
  5. DYN1198- Heterogeneous list update gives infinite loop #9408 merged on Jan 12th
  6. Cherr-pick revert of heterogeneous list fix and add workflow test that highlights performance degradation #9441 merged on Jan 18th

We need to be careful that no other changes have gone into these files outside of these cherry-picks.

@aparajit-pratap
Copy link
Contributor

Have you run self-serve on this PR?

@reddyashish
Copy link
Contributor Author

@aparajit-pratap, the self serve has no regressions. The 5th and 6th commits are related to a one task(infinite loop bug) and the changes are made to different files compared to the other 4 commits. So there were no conflicts there.

…ed in a different commit and is not needed here.
@reddyashish
Copy link
Contributor Author

Removed the DsCoreDataTests file as this was introduced by a different PR https://github.com/DynamoDS/Dynamo/commits/master/test/DynamoCoreTests/DSCoreDataTests.cs.

The changes to this file, that were done by this PR(#9388) are being ignored.

@mjkkirschner
Copy link
Member

@saintentropy PTAL

@aparajit-pratap
Copy link
Contributor

LGTM!

@aparajit-pratap aparajit-pratap added the LGTM Looks good to me label May 26, 2019
@QilongTang QilongTang merged commit b3945d9 into DynamoDS:RC2.0.3_master May 28, 2019
@QilongTang
Copy link
Contributor

@saintentropy Since we will have daily build after this change, does it make sense for Black Team to also consume this build early and play with it? I expect installer change required still on your end to install Refinery on Dynamo 2.0.3 OOTB. Please check.

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

Successfully merging this pull request may close these issues.

4 participants