-
Notifications
You must be signed in to change notification settings - Fork 668
First version with migration from packages.config to package reference #11186
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
Conversation
Update forked master branch
Update forked master branch
Update forked master branch
Update master forked repository
Update forked master branch
Update forked master branch
Update forked master branch
Update forked master branch
Update master forked branch
Update master forked repository
Update master forked branch
Update master forked branch
Update master forked branch
Update master forked branch
Update forked master branch
Update forked master branch
Update master forked branch
Update master forked branch
# Conflicts: # src/DynamoCore/packages.config # src/DynamoCoreWpf/packages.config # src/DynamoManipulation/packages.config # src/Libraries/Analysis/packages.config # src/Libraries/CoreNodes/packages.config # src/Libraries/GeometryColor/packages.config # src/Libraries/GeometryUI/packages.config # src/Libraries/GeometryUIWpf/packages.config # src/Libraries/Tesellation/packages.config # test/Libraries/AnalysisTests/packages.config # test/Libraries/CoreNodesTests/packages.config # test/Libraries/DynamoPythonTests/packages.config # test/Libraries/GeometryColorTests/packages.config # test/Libraries/TestServices/packages.config # test/Libraries/WorkflowTests/packages.config
Merge from master
aparajit-pratap
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mjkkirschner any final comments?
| <FilesToDelete Include="$(OutputPath)nodes\SharpDX*"/> | ||
| <FilesToDelete Include="$(OutputPath)nodes\HelixToolkit*"/> | ||
| <FilesToDelete Include="$(OutputPath)nodes\Cyotek*"/> | ||
| <FilesToDelete Include="$(OutputPath)nodes\Newtonsoft.Json*"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do all of these binaries also end up in the bin folder @alfredo-pozo ? Have you compared with the current build to make sure it is the same?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All those binaries are deleted from bin\Release\nodes folder and they already exist on bin\Release, I've already compared that to the current build, that's how I find that those nuget package binaries didn't exist on that subfolder (nodes)
|
Need to run binary_diff job right after this change if aiming for part of 2.9.0 |
mjkkirschner
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@aparajit-pratap @QilongTang @alfredo-pozo now that I think a bit more about this - I'm a bit concerned about this approach....
consider the following 2 cases:
A:
- We build RC 2.9 - everything looks good.
- we publish a new version of LibG to nuget - it includes bugs.
- our next automatic build of 2.9 RC picks up the buggy libG, but we don't discover it until later.
B:
- we release 2.9 - everything looks and is good.
- sometime later, we need to build a 2.9.1 hotfix - when we go to build this branch, we'll have no idea what version of the nuget packages we used, we'll just see "*" in the build files....
I think this warrants further discussion.
| <ProjectReference Include="..\NodeServices\DynamoServices.csproj"> | ||
| <Project>{ef879a10-041d-4c68-83e7-3192685f1bae}</Project> | ||
| <Name>DynamoServices</Name> | ||
| </ProjectReference> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
where do you see it marked as a missing assembly, I can't find it used in this project at all.
|
Answering to this question @mjkkirschner (#11186 (comment)), that error message appeared on my local and VM tests, I didn't record an evidence from this (screenshot or log file), but if you need it, give me some time to create an FB from the head of this PR and recreate that, like I said to @aparajit-pratap for me it was weird too, since on the current project doesn't have a reference for DynamoServices, not sure if its similar to other projects using reflection, and maybe that assembly was invoked or one of their dependencies. |
|
@alfredo-pozo it looks good to me, can I ask though, why not just add these props to the existing cs props file thats already imported? Do you think it's more explicit whats happening this way? ah - I see I guess this way it's also not adding that import to every project? |
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(SolutionDir)/Config/CS.props" /> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <Import Project=".\obj\WorkspaceDependencyViewExtension.csproj.nuget.g.props" Condition="Exists('.\obj\WorkspaceDependencyViewExtension.csproj.nuget.g.props')" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alfredo-pozo I missed this - can you find any docs about this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
LGTM |
* DYN-3177-Coverage-CoreNodeModelsWpf_2 Initial commit with 2 test methods added for covering the class SliderViewModel.cs * DYN-3177-Coverage-CoreNodeModelsWpf_2 Added comment for two test methods * DYN-3177-Coverage-CoreNodeModelsWpf_2 Added several tests for the next converters: - MediatoDSColorConverter - SelectionButtonContentConverter - StringToDateTimeOffsetConverter * DYN-3177-Coverage-CoreNodeModelsWpf_2 Removing the code that was loading the CoreNodeModelsWpf.dll file * Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Revert "Merge branch 'master' into DYN-3177-Coverage-CoreNodeModelsWpf_2" This reverts commit cf5fb64, reversing changes made to 5a08275. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Revert "Revert "Merge branch 'master' into DYN-3177-Coverage-CoreNodeModelsWpf_2"" This reverts commit 77e7b64. * DYN-3177-Coverage-CoreNodeModelsWpf_2-CodeReview Fixing some comments in the code that looked like dead code. Also I reorganized some usings.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace"
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions).
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3485 - Creating debug mode I just added one line in the DebugModes file so this debug mode will be used once the Dynamo menu is created and also when the Preferences menu is created. Also I added a .config file with the debug entry so i can be enabled/disabled when creating tests for the preferences panel or the menus .
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3513 - new modal dialog for preferences I added a new View(xaml) for the Preferences window also I added several entries in the Resources so they can be used in the PreferencesView.xaml. This changes only will satisfy the next requirements: - The modal dialog should come with Preferences Title - The modal dialog should come with Save Changes button - The modal dialog should come with split lines - Dynamo will be blocked until user exit that dialog * DYN-3513 - new modal dialog for preferences Updated the TabControl and TabItem because the Background property was set incorrectly in some places. * DYN-3513 - updating branch with latest code in master When merging the master branch (after updating my forked repo), i got several conflics in the Resources file, then I had to re-add the resources. In the DynamoView I added the necessary code to launch the Preferences window when the user click the option in the Dynamo menu. Finally I did some minor changes in the Preferences view. * DYN-3513 - Fixing the drag & drop In the title bar the drag & drop was not working correctly so I increased the width of the TextBlock. * Removing changes in Assembly file Removing changes in Assembly file * DYN-3513 - Fixing code review comments Based on the code review comments: I moved the styles to the DynamoModern.xml I added several comments in the PreferencesView.xaml * DYN-3513 - Fixing code review comments I removed one line in the csproj file because is not needed.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3518-Preferences-General Tab I added several controls in the General Tab of the Preferences window, i had to add some new styles in the DynamoModern.xaml for the ComboBoxes and the RadioButtons because they are using very specific backgrounds and font colors. Also I added 3 entries in resources so the ComboBoxes can be populated. * DYN-3518-GeneralTab-CodeReview Based on Aaron comments: - I removed the PreferencesWindowFontSizes and PreferencesWindowNumberFormats entries from the Resources files due that they already exists in the resources. - Renamed some private properties. - Change the Width value for the Number Format combox and remove the Height value. in the PreferencesView.xaml * DYN-3518-GeneralTab-CodeReview I removed hard-coded strings in the PreferencesView.xmal and were added to StaticResources in the resx file. Also I added extra comments in the PreferencesView.xaml
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3563-ManagePath option added in Debug menu I added the "Manage Nodes and Packages Path" option (previously deleted) in the Dynamo -> Debug menu.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3551 Moving the Save Changes button Due that the previous PR related to creating the Preference panel was approved and merged a new Jira task (also a branch - PR) was created for moving the Save Changes button further to the right. Then I modified the margin of the Save Changes button to be aligned with the Close button at the top.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3518 changes in controls space I updated settings for the grids due that some controls in the General tab had a different space between each control. Also I updated the FontWeight due that the labels should have the Bold value and the controls text should have Regular value.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3518 Testing Changes During the Quality Testing some issues were found in the General tab, so the next fixes were done: - When a specific tab in the left tab is selected the blue color was updated to use a lighter one (#ADE4DE). - The functionality of highlighting in blue the Tab when is selected was removed. - When a tab is selected the Font weight is Bold otherwise will be Regular.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3541-Preferences-VisualSettings I added the UI Controls for the Visual Settings tab. The next functionalities were implemented: - Add new Styles - Remove existing Styles - Validate against existing Styles. - Functionality for expand/collapse WPF Expanders * DYN-3541-Preferences-VisualSettings-2 Moving some steps located in the PreferencesView constructor to a method. * DYN-3541-Preferences-VisualSettings There was an extra color in DynamoModern.xaml that is not used then I remove it. * DYN-3541-Preferences-VisualSettings I added a new Style for the buttons Save and Cancel, since they have a specific Style Also I modified the Style for the Add Style button since it was not following the design in hig autodesk. * DYN-3541-Preferences-VisualSettings Also I added a Style for the color button picker, added one text resource so it can be used in the xaml and finally I indented the xaml code. * DYN-3541-Preferences-VisualSettings Display Settings I included the Display Settings sections and the two toggle buttons described in the AC Also I did a modification so when the "Add Style" button is pressed the focus goes to the Group Name edit box. * DYN-3541-Preferences-VisualSettings Code Review - Removed the png image and instead use fontawesome - Removed duplicated resources for Show Edges and Isolate Selected Geometry - Obsolete a enum in ChangeScaleFactorPrompt class - Some changes in indentation and creating region for private properties * DYN-3541-Preferences-VisualSettings Code Review2 Based on Aaron's comments I changed the visibility from public to internal in 4 methods located in PreferencesViewModel.
* Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e49. * Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c99. * Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" * Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). * DYN-3578-Enable-VisualSetting Enabling the Geometry Scaling section part 1 * DYN-3578-Enable-VisualSetting I added the functionality for re-loading the ScaleValue in the Geometry Scaling section when the Preferences window is re-opened. Also I set-up the binding functionality for the Render Precision section, so the precision will be reflected in the 3d Figure. * DYN-3578-Enable-VisualSetting I removed some code that won't be used due that the ChangelScaleFactorPrompt window was deleted (now instead of the window we have 4 radio buttons in the Preferences -> Visual Settings -> Geometry Scaling section). Also I deleted some events/commands used when the ScaleFactor changes due that the event won't be used. * DYN-3578-Enable-VisualSettings This functionality was additional and I think is not needed since is not forcing to re-run the Graph for updating the Render Precision, so it's been deleted. * DYN-3578-Enable-VisualSettings Fixing issue that was producing when merging the updated master branch into my feature branch. * DYN-3578-Enable-VisualSettings - Code Review Based on Aaron comments instead of removing the event and the method I added the Obsolete decorator.

Please Note:
DynamoRevitrepo will need to be cherry-picked into all the DynamoRevit Release branches that Dynamo supports. Contributors will be responsible for cherry-picking their reviewed commits to the other branches after aLGTMlabel is added to the PR.Purpose
This PR contains the changes that will allow to have always the latest versions of the LibG nuget packages by migrating from packages.config to packagereference
https://jira.autodesk.com/browse/DYN-3116
Declarations
Check these if you believe they are true
*.resxfilesReviewers
@QilongTang
FYIs