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

DYN-7475: Cherry picks for 2.16.4 #15499

Merged
merged 14 commits into from
Oct 2, 2024
Merged

DYN-7475: Cherry picks for 2.16.4 #15499

merged 14 commits into from
Oct 2, 2024

Conversation

twastvedt
Copy link
Contributor

@twastvedt twastvedt commented Sep 23, 2024

Purpose

Cherry pick fixes agreed on for the 2.16.4 release. See this wiki for more info. The fixes are:

DYN-5710 #13855
DYN-6130 #14317
DYN-6073 #14338
DYN-5553, DYN-6103 #13820
DYN-5810 #13908
DYN-6158 #14314
DYN-6123 #14220
DYN-5314 #13647
DYN-5640 #13773

Declarations

Check these if you believe they are true

  • The codebase 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.
  • This PR modifies some build requirements and the readme is updated
  • This PR contains no files larger than 50 MB

Release Notes

(FILL ME IN) Brief description of the fix / enhancement. Use N/A to indicate that the changes in this pull request do not apply to Release Notes. Mandatory section

Reviewers

(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR)

(FILL ME IN, optional) Any additional notes to reviewers or testers.

FYIs

(FILL ME IN, Optional) Names of anyone else you wish to be notified of

@QilongTang
Copy link
Contributor

hmm even the EngOps build does not work and contains one build error, @twastvedt can you double check your change?

@twastvedt
Copy link
Contributor Author

Yeah, sorry, bad cherry picks. Now builds, but some tests are failing. How do I run tests locally? Trying to just "Run Tests" from VS skips all the tests...

@twastvedt
Copy link
Contributor Author

Also I'm uncertain on how to fix the LaunchDarkly.Logging.dll file, reported here. I think we had fixed that in the original 2.16.3, which had build issues, so we ended up publishing a much smaller update, but now I'm not sure where to find the change that fixed that?

@QilongTang
Copy link
Contributor

Also I'm uncertain on how to fix the LaunchDarkly.Logging.dll file, reported here. I think we had fixed that in the original 2.16.3, which had build issues, so we ended up publishing a much smaller update, but now I'm not sure where to find the change that fixed that?

This might be a side effect switching from .NET8 back to .NET48..

@twastvedt twastvedt reopened this Sep 26, 2024
@QilongTang
Copy link
Contributor

aparajit-pratap and others added 11 commits September 30, 2024 10:38
(cherry picked from commit 76021aa)
* Fix String display

* Adding Unit test

* Checking Formula

(cherry picked from commit a503dff)
…hen a custom node is created (#14220)

* Fix note in group in customnode

* add test

* merge test from other PR

(cherry picked from commit 5a74097)

# Conflicts:
#	src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
(cherry picked from commit 87c6b57)
(cherry picked from commit dbcc5b2)
* Fixing Ghost warning

* Keeping the Warning Color for the new state

* Adding the Unit test

* Revert "Keeping the Warning Color for the new state"

This reverts commit 40e9643.

* Revert "Fixing Ghost warning"

This reverts commit 04c14c1.

* Updates, Implementation and Test

(cherry picked from commit 62ac05c)
* DYN-6073 Civil3D Packages Guide Crashing

It was crashing due that the user tried to close the Step 4 clicking the PackageSearch window and the Popup is not closed but seems that is already disposed.

* DYN-6073 Civil3D Package Tour Crashing

This change is disabling the close button in the PackageManagerSearch window when running the Packages tour, when passing to the next Step the button is enabled again (unless the next step also requires to disable the button). I've added a new icon image that will be shown when the close button is disabled.
In this way we will be preventing the crash when the user try to close the Packages tour by closing the PackageManagerSearch window

* DYN-6073 Civil3D Package Tour Crashing

This fix will solve the problem of the packages guide crashing when clicking the Library (package installed) for passing from Step8 to Step9.

(cherry picked from commit 0c9eeb7)
* Make sure close the Toast notification when Dynamo closes

* Removing extra file

* Removing extra file

* Relocate the responsibility about the toast notification to the DynamoViewModel

* removing unnecessary using

* take advantage of already implementation to apply minimal changes

* Moving the code to a proper place

---------

Co-authored-by: Jesus Alfredo Alviño <[email protected]>
(cherry picked from commit 596f4fa)

# Conflicts:
#	src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
* Handle null values in watch node/preview bubble

* Add test

* Update WatchNodeTests.cs

(cherry picked from commit b1bc7c2)

# Conflicts:
#	test/DynamoCoreWpfTests/WatchNodeTests.cs
@twastvedt
Copy link
Contributor Author

@twastvedt twastvedt requested a review from QilongTang October 1, 2024 17:04
@twastvedt twastvedt changed the title Cherry picks for 2.16.4 DYN-7475: Cherry picks for 2.16.4 Oct 1, 2024
Copy link
Contributor

@QilongTang QilongTang left a comment

Choose a reason for hiding this comment

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

LGTM with one comment

@QilongTang QilongTang added this to the 2.16.4 milestone Oct 2, 2024
@twastvedt
Copy link
Contributor Author

I started the build again, will merge when that finishes.

@twastvedt twastvedt merged commit 46988c1 into RC2.16.4_master Oct 2, 2024
14 of 16 checks passed
@twastvedt twastvedt deleted the new-2.16.4 branch October 2, 2024 17:17
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.

7 participants