diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e8bef83431e..5dc1c6dbfb0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,4 @@ + ### Purpose -(FILL ME IN) This section describes why this PR is here. Usually it would include a reference -to the tracking task that it is part or all of the solution for. +(FILL ME IN) This section describes why this PR is here. Usually it would include a reference to the tracking task that it is part or all of the solution for. ### Declarations @@ -24,16 +25,15 @@ Check these if you believe they are true - [ ] Snapshot of UI changes, if any. - [ ] Changes to the API follow [Semantic Versioning](https://github.com/DynamoDS/Dynamo/wiki/Dynamo-Versions) and are documented in the [API Changes](https://github.com/DynamoDS/Dynamo/wiki/API-Changes) document. - [ ] This PR modifies some build requirements and the readme is updated -- [ ] This PR contains no files larger than 50 MB +- [ ] This PR contains no files larger than 50 MB ### Release Notes -(FILL ME IN) Brief description of the fix / enhancement. **Mandatory section** - +(FILL ME IN) Brief description of the fix / enhancement. **Mandatory section** ### Reviewers -(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR) +(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR) (FILL ME IN, optional) Any additional notes to reviewers or testers. diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..aaf2397626f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: ".github/workflows" + schedule: + interval: "weekly" diff --git a/.github/workflows/Issues_workflow.yaml b/.github/workflows/Issues_workflow.yaml index 3c94be700f6..06d505f6aed 100644 --- a/.github/workflows/Issues_workflow.yaml +++ b/.github/workflows/Issues_workflow.yaml @@ -17,7 +17,7 @@ jobs: outputs: result: ${{env.content_analysis_response}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 #Detect if the issue_title follows the regex expression - name: Check Issue Title @@ -107,7 +107,7 @@ jobs: acceptable_missing_info: 1 steps: #Checkout the repo - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 #Removes conflicting characters before using the issue content as a script parameter - name: Remove conflicting chars diff --git a/.github/workflows/PR_merged.yaml b/.github/workflows/PR_merged.yaml index 854a319c487..d3c38e9573f 100644 --- a/.github/workflows/PR_merged.yaml +++ b/.github/workflows/PR_merged.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Getting PR information from the commit SHA - name: Getting PR information diff --git a/.github/workflows/check_file_size.yml b/.github/workflows/check_file_size.yml index 337200fd61b..8103a0e4649 100644 --- a/.github/workflows/check_file_size.yml +++ b/.github/workflows/check_file_size.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get changed files id: get_changed_files - uses: tj-actions/changed-files@v35 + uses: tj-actions/changed-files@v39 - name: Check file size run: | for file in ${{ steps.get_changed_files.outputs.all_changed_files }}; do diff --git a/.github/workflows/close_stale_issues.yaml b/.github/workflows/close_stale_issues.yaml index 2def1ec97b9..6f7f4097d98 100644 --- a/.github/workflows/close_stale_issues.yaml +++ b/.github/workflows/close_stale_issues.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: close stale issues - uses: actions/stale@v3 + uses: actions/stale@v8 with: repo-token: ${{ secrets.GITHUB_TOKEN }} #By default the action will leave a message when marking the issue as stale and another-one when closing the issue. diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d3cc447c360..e56b89d23ef 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: Dynamo repository: DynamoDS/Dynamo diff --git a/.github/workflows/dynamoAllNet6.0_build.yml b/.github/workflows/dynamoAllNet6.0_build.yml index 2c9cf656b83..34c1d2a3ca1 100644 --- a/.github/workflows/dynamoAllNet6.0_build.yml +++ b/.github/workflows/dynamoAllNet6.0_build.yml @@ -6,7 +6,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout Dynamo Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: Dynamo repository: DynamoDS/Dynamo diff --git a/.github/workflows/dynamoBinDiff.yml b/.github/workflows/dynamoBinDiff.yml index 44f36964f17..92108408997 100644 --- a/.github/workflows/dynamoBinDiff.yml +++ b/.github/workflows/dynamoBinDiff.yml @@ -6,7 +6,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout Dynamo Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: net60_Win_Dynamo repository: DynamoDS/Dynamo @@ -40,7 +40,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout Dynamo Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: master path: master_net60_Win_Dynamo diff --git a/.github/workflows/dynamoNet6.0_build.yml b/.github/workflows/dynamoNet6.0_build.yml index a29d95e985c..034aa66856b 100644 --- a/.github/workflows/dynamoNet6.0_build.yml +++ b/.github/workflows/dynamoNet6.0_build.yml @@ -6,7 +6,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout Dynamo Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: Dynamo repository: DynamoDS/Dynamo diff --git a/.github/workflows/dynamoNet6.0_linux_build.yml b/.github/workflows/dynamoNet6.0_linux_build.yml index 49dd4ae8c1a..b0e9c3bc355 100644 --- a/.github/workflows/dynamoNet6.0_linux_build.yml +++ b/.github/workflows/dynamoNet6.0_linux_build.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Dynamo Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: Dynamo - name: Setup dotnet diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml index 015c3c045f0..32b727affb8 100644 --- a/.github/workflows/generate_changelog.yml +++ b/.github/workflows/generate_changelog.yml @@ -18,11 +18,11 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v1.0.0 + uses: metcalfc/changelog-generator@v4.1.0 with: myToken: ${{ secrets.GITHUB_TOKEN }} head-ref: ${{ github.event.inputs.head-ref }} diff --git a/.github/workflows/issue_type_predicter.yaml b/.github/workflows/issue_type_predicter.yaml index a9150631c80..97d4cc0817d 100644 --- a/.github/workflows/issue_type_predicter.yaml +++ b/.github/workflows/issue_type_predicter.yaml @@ -23,7 +23,7 @@ jobs: acceptable_missing_info: 1 steps: #Removes conflicting characters before using the issue content as a script parameter - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Remove conflicting chars env: ISSUE_BODY: ${{github.event.issue.body}} @@ -66,7 +66,7 @@ jobs: #Now checkout the IssuesTypePredicter source code from the repo https://github.com/DynamoDS/IssuesTypePredicter - name: Checkout IssuesTypePredicter if: env.analysis_response == 'Valid' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DynamoDS/IssuesTypePredicter path: IssuesTypePredicter diff --git a/.github/workflows/move_issue.yaml b/.github/workflows/move_issue.yaml index 898870b6f67..588ce33e39b 100644 --- a/.github/workflows/move_issue.yaml +++ b/.github/workflows/move_issue.yaml @@ -24,6 +24,7 @@ env: gh_organization: DynamoDS gh_token: ${{ secrets.DYNAMO_ISSUES_TOKEN }} project_id: 4 + project_name: 'Dynamo Issues' jobs: issue_labeled_as_revit: @@ -31,9 +32,11 @@ jobs: runs-on: ubuntu-latest if: github.event.label.name == 'Revit' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Transfer issue to DynamoRevit Repository - run: gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoRevit + run: | + gh issue edit ${{ github.event.issue.number }} --remove-project "${{ env.project_name }}" + gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoRevit env: GITHUB_TOKEN: ${{ env.gh_token }} issue_labeled_as_dynamo_advance_steel: @@ -41,9 +44,11 @@ jobs: runs-on: ubuntu-latest if: github.event.label.name == 'Advance-Steel' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Transfer issue to Dynamo-Advance-Steel Repository - run: gh issue transfer ${{ github.event.issue.number }} DynamoDS/Dynamo-Advance-Steel + run: | + gh issue edit ${{ github.event.issue.number }} --remove-project "${{ env.project_name }}" + gh issue transfer ${{ github.event.issue.number }} DynamoDS/Dynamo-Advance-Steel env: GITHUB_TOKEN: ${{ env.gh_token }} issue_labeled_as_wishlist: @@ -51,9 +56,11 @@ jobs: runs-on: ubuntu-latest if: github.event.label.name == 'Wishlist' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Transfer issue to DynamoWishlist Repository - run: gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoWishlist + run: | + gh issue edit ${{ github.event.issue.number }} --remove-project "${{ env.project_name }}" + gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoWishlist env: GITHUB_TOKEN: ${{ env.gh_token }} issue_labeled_as_tracked: @@ -62,7 +69,7 @@ jobs: if: github.event.label.name == 'tracked' steps: - name: Move tracked issue to Todo - uses: leonsteinhaeuser/project-beta-automations@v2.1.0 + uses: leonsteinhaeuser/project-beta-automations@v2.2.1 with: gh_token: ${{ env.gh_token }} organization: ${{ env.gh_organization }} diff --git a/LICENSE.txt b/LICENSE.txt index 5f3938059a0..633503812da 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -21,7 +21,7 @@ All other brand names, product names or trademarks belong to their respective ho Autodesk Cloud and Desktop Components This Product or Service may incorporate or use background Autodesk online and desktop technology components. For information about these components, see Autodesk Cloud Platform Components and Autodesk Desktop Platform Components. -LIBG, ProtoGeometry v.2.7.0, Analytics.NET, ADP, GRegRevitAuth, AGET, IDSDK, and IDSDK Wrapper are closed source files licensed by Autodesk under the license that can be found here https://github.com/DynamoDS/Dynamo/tree/master/doc/distrib/Autodesk.rtf +LIBG, ProtoGeometry v.2.7.0, Analytics.NET, ADP, GRegRevitAuth, AGET, IDSDK, IDSDK Wrapper, and Autodesk.GeometryPrimitive are closed source files licensed by Autodesk under the license that can be found here https://github.com/DynamoDS/Dynamo/tree/master/doc/distrib/Autodesk.rtf Third-Party Trademarks, Software Credits and Attributions @@ -635,4 +635,4 @@ The terms "reproduce," "reproduction," "derivative works," and "distribution" ha (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. (D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. -(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees, or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. \ No newline at end of file +(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees, or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. diff --git a/README.md b/README.md index e550b0376da..c462edb2c4c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,12 @@ [![Nuget](https://img.shields.io/nuget/v/DynamoVisualProgramming.Core?logo=nuget)](https://www.nuget.org/packages/DynamoVisualProgramming.Core) [![DynamoVisualProgramming.Core on fuget.org](https://www.fuget.org/packages/DynamoVisualProgramming.Core/badge.svg)](https://www.fuget.org/packages/DynamoVisualProgramming.Core) -![Image](https://raw.github.com/ikeough/Dynamo/master/doc/distrib/Images/dynamo_logo_dark.png) + + + + Dynamo Logo + + Dynamo is a visual programming tool that aims to be accessible to both non-programmers and programmers alike. It gives users the ability to visually script behavior, define custom pieces of logic, and script using various textual programming languages. ## Get Dynamo @@ -33,21 +38,23 @@ You can learn more about developing libraries for Dynamo on the [Dynamo wiki](ht You will need the following to build the latest Dynamo on Windows: - [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) (any edition) -- Microsoft .NET Framework 4.8 (included with Visual Studio 2022) -- Node.js v16 and npm v8 -- - [Download](https://nodejs.org/en/download/) and install the latest LTS version of Node.js -- - Open up your Command Prompt and check you have successfully installed Node by inputting `node -v`. If you have Node installed, it will tell you the version. -- [GitHub for Windows](https://windows.github.com/) -- For runnning Dynamo tests within Visual Studio -[NUnit Test Adapter 2](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTestAdapter) +- [Microsoft .NET Framework 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) (included with Visual Studio 2022) +- [Node.js LTS](https://nodejs.org/en/download/) and npm +- [NUnit Test Adapter 2](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTestAdapter) (For runnning Dynamo tests within Visual Studio) If you are working on legacy branches, you may need to install legacy .NET Framework versions through Visual Studio `Tools > Get Tools and Features...` or downloading from [the archive here](https://www.microsoft.com/net/download/archives). -The Dynamo user interface is Windows-only, but with some extra effort the Dynamo engine can be built for other platforms. [Directions for building Dynamo on Linux or OS X can be found here](https://github.com/DynamoDS/Dynamo/wiki/Dynamo-on-Linux,-Mac). -Find more about how to build Dynamo at our [wiki](https://github.com/DynamoDS/Dynamo/wiki) and [Dynamo Developer Resources](https://developer.dynamobim.org/) +The Dynamo user interface is Windows-only, but the Dynamo engine can be built for other platforms. [Directions for building Dynamo on Linux or OS X can be found here](https://github.com/DynamoDS/Dynamo/wiki/Dynamo-on-Linux,-Mac). +Find more about how to build Dynamo at our [wiki](https://github.com/DynamoDS/Dynamo/wiki) and [Dynamo Developer Resources](https://developer.dynamobim.org/). ## Contribute -Dynamo is an open-source project and would be nothing without its community. You can make suggestions or track and submit bugs via [Github issues](https://github.com/DynamoDS/Dynamo/issues). You can submit your own code to the Dynamo project via a Github [pull request](https://github.com/DynamoDS/Dynamo/blob/master/CONTRIBUTING.md). +Dynamo is an open source project and would be nothing without its community. + +- You can make suggestions or improvement requests via [Dynamo Wishlist](https://github.com/DynamoDS/DynamoWishlist/issues/new/choose). +- You can submit and track bugs via [Dynamo Issues](https://github.com/DynamoDS/Dynamo/issues/new/choose). +- You can submit your own code to via a [pull request](https://github.com/DynamoDS/Dynamo/pulls). For more info read [CONTRIBUTING.md](CONTRIBUTING.md). +- If you have any questions, ideas or have something to share with the community, please visit us at [Dynamo Forum](https://forum.dynamobim.com). ## Releases diff --git a/doc/distrib/Images/dynamo_logo_light.png b/doc/distrib/Images/dynamo_logo_light.png new file mode 100644 index 00000000000..9f2b9635009 Binary files /dev/null and b/doc/distrib/Images/dynamo_logo_light.png differ diff --git a/doc/distrib/License.rtf b/doc/distrib/License.rtf index ec9bca10cf5..97e2d4ac829 100644 --- a/doc/distrib/License.rtf +++ b/doc/distrib/License.rtf @@ -139,7 +139,7 @@ INK "https://www.autodesk.com/company/legal-notices-trademarks/autodesk-desktop- \linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \fs22\ul\cf26\lang2057\langfe2052\langnp2057\insrsid9658238 . \par }{\rtlch\fcs1 \af40\afs18 \ltrch\fcs0 \f40\fs18\lang2057\langfe2052\langnp2057\insrsid9658238 \par }\pard \ltrpar\ql \li0\ri0\sb168\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af4\afs22 \ltrch\fcs0 \b\fs22\cf25\lang2057\langfe2052\langnp2057\insrsid9658238 \hich\af4\dbch\af31505\loch\f4 -LIBG, ProtoGeometry v.2.7.0, Analytics.NET, ADP, GRegRevitAuth, AGET, IDSDK, and IDSDK Wrapper}{\rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \fs22\cf25\lang2057\langfe2052\langnp2057\insrsid9658238 \hich\af4\dbch\af31505\loch\f4 +LIBG, ProtoGeometry v.2.7.0, Analytics.NET, ADP, GRegRevitAuth, AGET, IDSDK, IDSDK Wrapper, and Autodesk.GeometryPrimitive}{\rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \fs22\cf25\lang2057\langfe2052\langnp2057\insrsid9658238 \hich\af4\dbch\af31505\loch\f4 are closed source files licensed by Autodesk under the license that can be found here }{\field{\*\fldinst {\rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \fs22\lang2057\langfe2052\langnp2057\insrsid9658238 \hich\af4\dbch\af31505\loch\f4 HYPERLINK https://github.com/DynamoDS/Dynamo/tree/master/doc/distrib/Autodesk.rtf }{\rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \fs22\lang2057\langfe2052\langnp2057\insrsid1784394 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90ba8000000680074007400700073003a002f002f006700690074006800750062002e0063006f006d002f00440079006e0061006d006f00440053002f00440079006e0061006d006f002f0074007200650065002f006d00 @@ -1752,4 +1752,4 @@ ffffffffffffffffffffffffffffffff52006f006f007400200045006e0074007200790000000000 d5e7f1c6d901feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file +0000000000000000000000000000000000000000000000000105000000000000}} diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs index ca451bc2aae..75dcee02c63 100644 --- a/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs +++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs @@ -26,6 +26,8 @@ public partial class DocumentationBrowserView : UserControl, IDisposable internal string WebBrowserUserDataFolder { get; set; } internal string FallbackDirectoryName { get; set; } + //This folder will be used to store images and dyn files previosuly located in /rootDirectory/en-US/fallback_docs so we don't need to copy all those files per each language + internal static readonly string SharedDocsDirectoryName = "NodeHelpSharedDocs"; //Path in which the virtual folder for loading images will be created internal string VirtualFolderPath { get; set; } @@ -132,7 +134,11 @@ async void InitializeAsync() { if (viewModel.Link != null && !string.IsNullOrEmpty(viewModel.CurrentPackageName)) { - VirtualFolderPath = Path.GetDirectoryName(HttpUtility.UrlDecode(viewModel.Link.AbsolutePath)); + var absolutePath = Path.GetDirectoryName(HttpUtility.UrlDecode(viewModel.Link.AbsolutePath)); + //We move two levels up so it will be located in same level than the the NodeHelpSharedDocs directory + var imagesLocation = new DirectoryInfo(absolutePath).Parent.Parent.FullName; + //Adds the NodeHelpSharedDocs directory to the path + VirtualFolderPath = Path.Combine(imagesLocation, SharedDocsDirectoryName); } else VirtualFolderPath = FallbackDirectoryName; diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj index 447b9ddc1ba..5160a588cd2 100644 --- a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj +++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj @@ -16,19 +16,6 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - - - - - - - - - - - ..\..\extern\prism\Microsoft.Practices.Prism.dll - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} @@ -116,7 +103,7 @@ - + diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewModel.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewModel.cs index afb55ae768f..07dd12fad5d 100644 --- a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewModel.cs +++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewModel.cs @@ -446,7 +446,9 @@ internal void InsertGraph() private string DynamoGraphFromMDFilePath(string path) { path = HttpUtility.UrlDecode(path); - return Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path)) + ".dyn"; + var rootLevelDir = Path.GetDirectoryName(path); + var imagesLocation = Path.Combine(new DirectoryInfo(rootLevelDir).Parent.Parent.FullName, DocumentationBrowserView.SharedDocsDirectoryName); + return Path.Combine(imagesLocation, Path.GetFileNameWithoutExtension(path)) + ".dyn"; } diff --git a/src/Dynamo.All.sln b/src/Dynamo.All.sln index c8df590b1ea..e5b0e4c705b 100644 --- a/src/Dynamo.All.sln +++ b/src/Dynamo.All.sln @@ -203,6 +203,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ViewExtensionLibraryTests", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfVisualizationTests", "..\test\VisualizationTests\WpfVisualizationTests.csproj", "{C4964946-B367-44EE-9ED2-451FF2A83D32}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoPythonTests", "..\test\Libraries\DynamoPythonTests\DynamoPythonTests.csproj", "{773988FE-EDF6-45CB-A63F-482955EB3553}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -524,6 +526,10 @@ Global {C4964946-B367-44EE-9ED2-451FF2A83D32}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4964946-B367-44EE-9ED2-451FF2A83D32}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4964946-B367-44EE-9ED2-451FF2A83D32}.Release|Any CPU.Build.0 = Release|Any CPU + {773988FE-EDF6-45CB-A63F-482955EB3553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {773988FE-EDF6-45CB-A63F-482955EB3553}.Debug|Any CPU.Build.0 = Debug|Any CPU + {773988FE-EDF6-45CB-A63F-482955EB3553}.Release|Any CPU.ActiveCfg = Release|Any CPU + {773988FE-EDF6-45CB-A63F-482955EB3553}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -602,6 +608,7 @@ Global {7DD8077A-201E-4C56-96C5-3C901A51BDF3} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} {AE7F2579-104A-4AF4-AA7B-614AE9E79279} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} {C4964946-B367-44EE-9ED2-451FF2A83D32} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {773988FE-EDF6-45CB-A63F-482955EB3553} = {4CA0BC62-DCB3-456B-80D6-348247640BAB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D} diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs index 29ba5f77703..e4b75db05a0 100644 --- a/src/DynamoApplications/StartupUtils.cs +++ b/src/DynamoApplications/StartupUtils.cs @@ -188,8 +188,8 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin var versions = new[] { + new Version(230,0,0), new Version(229,0,0), - new Version(228,5,0), }; var preloader = new Preloader(rootFolder, versions); diff --git a/src/DynamoCLI/DynamoCLI.csproj b/src/DynamoCLI/DynamoCLI.csproj index 24ab84ef6be..abc9fab6a46 100644 --- a/src/DynamoCLI/DynamoCLI.csproj +++ b/src/DynamoCLI/DynamoCLI.csproj @@ -12,10 +12,6 @@ true - - - - {aa782772-fe61-4226-baa4-eb529fa1646b} diff --git a/src/DynamoCore/Core/CustomNodeManager.cs b/src/DynamoCore/Core/CustomNodeManager.cs index 30928003aeb..8dabe1ec45b 100644 --- a/src/DynamoCore/Core/CustomNodeManager.cs +++ b/src/DynamoCore/Core/CustomNodeManager.cs @@ -684,18 +684,18 @@ internal bool TryGetInfoFromPath(string path, bool isTestMode, out CustomNodeInf Exception ex; try { - if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex)) + if (DynamoUtilities.PathHelper.isValidJson(path, out jsonDoc, out ex)) { - if (!WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out header)) + if (!WorkspaceInfo.FromJsonDocument(jsonDoc, path, isTestMode, false, AsLogger(), out header)) { Log(String.Format(Properties.Resources.FailedToLoadHeader, path)); info = null; return false; } } - else if (DynamoUtilities.PathHelper.isValidJson(path, out jsonDoc, out ex)) + else if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex)) { - if (!WorkspaceInfo.FromJsonDocument(jsonDoc, path, isTestMode, false, AsLogger(), out header)) + if (!WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out header)) { Log(String.Format(Properties.Resources.FailedToLoadHeader, path)); info = null; @@ -854,7 +854,14 @@ private bool InitializeCustomNode( XmlDocument xmlDoc; string strInput; Exception ex; - if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex)) + + if (DynamoUtilities.PathHelper.isValidJson(path, out strInput, out ex)) + { + WorkspaceInfo.FromJsonDocument(strInput, path, isTestMode, false, AsLogger(), out info); + info.ID = functionId.ToString(); + return InitializeCustomNode(info, null, out workspace); + } + else if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex)) { if (WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out info)) { @@ -865,13 +872,6 @@ private bool InitializeCustomNode( } } } - else if (DynamoUtilities.PathHelper.isValidJson(path, out strInput, out ex)) - { - // TODO: Skip Json migration for now - WorkspaceInfo.FromJsonDocument(strInput, path, isTestMode, false, AsLogger(), out info); - info.ID = functionId.ToString(); - return InitializeCustomNode(info, null, out workspace); - } else throw ex; Log(string.Format(Properties.Resources.CustomNodeCouldNotBeInitialized, customNodeInfo.Name)); workspace = null; diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index f57ee6115a8..73bb1d1763a 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -27,8 +27,8 @@ - - + + @@ -116,13 +116,19 @@ - + - + - + + + + + + + @@ -131,17 +137,23 @@ - + + + + + + + - - + + - + diff --git a/src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs b/src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs index abcbff4149b..b31a1025553 100644 --- a/src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs +++ b/src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs @@ -8,6 +8,7 @@ using System.Reflection; using System.Threading; using System.Xml; +using Dynamo.Configuration; using Dynamo.Core; using Dynamo.Engine; using Dynamo.Engine.CodeGeneration; @@ -49,6 +50,34 @@ public class ExtraWorkspaceViewInfo public double X; public double Y; public double Zoom; + + /// + /// Load the extra view information required to fully construct a WorkspaceModel object + /// + /// + static internal ExtraWorkspaceViewInfo ExtraWorkspaceViewInfoFromJson(string json) + { + JsonReader reader = new JsonTextReader(new StringReader(json)); + var obj = JObject.Load(reader); + var viewBlock = obj["View"]; + if (viewBlock == null) + return null; + + var settings = new JsonSerializerSettings + { + Error = (sender, args) => + { + args.ErrorContext.Handled = true; + Console.WriteLine(args.ErrorContext.Error); + }, + ReferenceLoopHandling = ReferenceLoopHandling.Ignore, + TypeNameHandling = TypeNameHandling.Auto, + Formatting = Newtonsoft.Json.Formatting.Indented, + Culture = CultureInfo.InvariantCulture + }; + + return JsonConvert.DeserializeObject(viewBlock.ToString(), settings); + } } /// @@ -1943,6 +1972,53 @@ internal void IncrementPasteOffset() this.currentPasteOffset = (this.currentPasteOffset + PasteOffsetStep) % PasteOffsetMax; } + #region [Nodes Info] + + /// + /// Boolean indicates if the workspace run with warnings + /// + internal bool HasWarnings + { + get { return Nodes.Any(n => n.State == ElementState.Warning || n.State == ElementState.PersistentWarning); } + } + + /// + /// Boolean indicates if the workspace run with warnings with no Geometry + /// + internal bool HasNoneGeometryRelatedWarnings + { + get { return Nodes.Any(n => (n.State == ElementState.Warning || n.State == ElementState.PersistentWarning) && !n.Category.StartsWith("Geometry.")); } + } + + /// + /// Boolean indicates if workspace run with errors + /// + internal bool HasErrors + { + get { return Nodes.Any(n => n.State == ElementState.Error); } + } + + /// + /// Boolean indicates if home workspace is displayed with infos + /// + internal bool HasInfos + { + get { return Nodes.Any(n => n.State == ElementState.Info); } + } + + /// + /// Indicates if the workspace is valid for sending to the FDX + /// + internal bool IsValidForFDX + { + get + { + return !HasErrors && !HasNoneGeometryRelatedWarnings; + } + } + + #endregion + #endregion #region private/internal methods diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs index a6125cbe956..4ca4738f112 100644 --- a/src/DynamoCore/Models/DynamoModel.cs +++ b/src/DynamoCore/Models/DynamoModel.cs @@ -678,7 +678,7 @@ protected DynamoModel(IStartConfiguration config) OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenInitPreferencesSettings, 30)); - PreferenceSettings = CreatePreferences(config); + PreferenceSettings = (PreferenceSettings)CreateOrLoadPreferences(config.Preferences); if (PreferenceSettings != null) { PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged; @@ -921,16 +921,7 @@ protected DynamoModel(IStartConfiguration config) CustomNodeManager = new CustomNodeManager(NodeFactory, MigrationManager, LibraryServices); - LuceneSearch.LuceneUtilityNodeSearch = new LuceneSearchUtility(this); - - if (IsTestMode) - { - LuceneUtility.InitializeLuceneConfig(string.Empty, LuceneSearchUtility.LuceneStorage.RAM); - } - else - { - LuceneUtility.InitializeLuceneConfig(LuceneConfig.NodesIndexingDirectory); - } + LuceneSearch.LuceneUtilityNodeSearch = new LuceneSearchUtility(this, LuceneSearchUtility.DefaultNodeIndexStartConfig); InitializeCustomNodeManager(); @@ -1013,6 +1004,13 @@ protected DynamoModel(IStartConfiguration config) TraceReconciliationProcessor = this; State = DynamoModelState.StartedUIless; + // Write index to disk only once + LuceneUtility.CommitWriterChanges(); + //Disposed writer if it is in file system mode so that the index files can be used by other processes (potentially a second Dynamo session) + if (LuceneUtility.startConfig.StorageType == LuceneSearchUtility.LuceneStorage.FILE_SYSTEM) + { + LuceneUtility.DisposeWriter(); + } // This event should only be raised at the end of this method. DynamoReady(new ReadyParams(this)); } @@ -1048,29 +1046,6 @@ internal PathManager CreatePathManager(IStartConfiguration config) } } - /// - /// It returns a PreferenceSettings instance based on the mode in order to reuse it's Singleton instance or create a new one - /// - /// - /// - internal PreferenceSettings CreatePreferences(IStartConfiguration config) - { - PreferenceSettings preferences = null; - if (!config.StartInTestMode) - { - if (config.Preferences is PreferenceSettings settings) - { - preferences = settings; - } - } - else - { - preferences = (PreferenceSettings)CreateOrLoadPreferences(config.Preferences); - } - - return preferences; - } - /// /// Create or load a preference checking the usage mode and if it already exists /// @@ -1426,12 +1401,8 @@ public void Dispose() PreferenceSettings.MessageLogged -= LogMessage; } - //The writer have to be disposed at DynamoModel level due that we could index package-nodes as new packages are installed - LuceneUtility.DisposeWriter(); - // Lucene disposals (just if LuceneNET was initialized) - LuceneUtility.indexDir?.Dispose(); - LuceneUtility.dirReader?.Dispose(); + LuceneUtility.DisposeAll(); #if DEBUG CurrentWorkspace.NodeAdded -= CrashOnDemand.CurrentWorkspace_NodeAdded; @@ -1495,11 +1466,9 @@ private void InitializeCustomNodeManager() var iDoc = LuceneUtility.InitializeIndexDocumentForNodes(); if (searchElement != null) { - AddNodeTypeToSearchIndex(searchElement, iDoc); + LuceneUtility.AddNodeTypeToSearchIndex(searchElement, iDoc); } - LuceneUtility.CommitWriterChanges(); - Action infoUpdatedHandler = null; infoUpdatedHandler = newInfo => { @@ -1566,7 +1535,7 @@ private void InitializeIncludedNodes() var cnbNode = new CodeBlockNodeSearchElement(cbnData, LibraryServices); SearchModel?.Add(cnbNode); - AddNodeTypeToSearchIndex(cnbNode, iDoc); + LuceneUtility.AddNodeTypeToSearchIndex(cnbNode, iDoc); var symbolSearchElement = new NodeModelSearchElement(symbolData) { @@ -1585,10 +1554,10 @@ private void InitializeIncludedNodes() }; SearchModel?.Add(symbolSearchElement); - AddNodeTypeToSearchIndex(symbolSearchElement, iDoc); + LuceneUtility.AddNodeTypeToSearchIndex(symbolSearchElement, iDoc); SearchModel?.Add(outputSearchElement); - AddNodeTypeToSearchIndex(outputSearchElement, iDoc); + LuceneUtility.AddNodeTypeToSearchIndex(outputSearchElement, iDoc); } @@ -1675,12 +1644,6 @@ private void InitializeNodeLibrary() } CustomNodeManager.AddUninitializedCustomNodesInPath(pathManager.CommonDefinitions, IsTestMode); - - // Initialize searcher, if the applyAllDeletes is true all buffered deletes on documents will be applied (made visible) in the returned reader - // When running parallel tests several are trying to write in the AppData folder then the job - // is failing and in a wrong state so we prevent to initialize Lucene index writer during test mode. - // Without the index files on disk, the dirReader cant be initialized correctly. So does the searcher. - LuceneUtility.CommitWriterChanges(); } /// @@ -1748,7 +1711,7 @@ private void LoadNodeModels(List nodes, bool isPackageMember) // TODO: get search element some other way if (ele != null) { - AddNodeTypeToSearchIndex(ele, iDoc); + LuceneUtility.AddNodeTypeToSearchIndex(ele, iDoc); } } catch (Exception e) @@ -1970,11 +1933,12 @@ public void OpenFileFromJson(string fileContents, bool forceManualExecutionMode /// execution mode specified in the file and set manual mode public void OpenFileFromPath(string filePath, bool forceManualExecutionMode = false) { - XmlDocument xmlDoc; - Exception ex; - if (DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex)) + + Exception ex; + string fileContents; + if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex)) { - OpenXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode); + OpenJsonFileFromPath(fileContents, filePath, forceManualExecutionMode); return; } else @@ -1984,24 +1948,20 @@ public void OpenFileFromPath(string filePath, bool forceManualExecutionMode = fa { throw ex; } - if (ex is System.Xml.XmlException) - { - // XML opening failure can indicate that this file is corrupted XML or Json - string fileContents; - if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex)) - { - OpenJsonFileFromPath(fileContents, filePath, forceManualExecutionMode); - return; - } - else - { - // When Json opening also failed, either this file is corrupted or there - // are other kind of failures related to Json de-serialization - throw ex; - } + XmlDocument xmlDoc; + + // When Json opening failed, either this file is corrupted or file might be XML + if (ex is JsonReaderException && DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex)) + { + OpenXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode); + return; } - } + else + { + throw ex; + } + } } /// @@ -2011,11 +1971,12 @@ public void OpenFileFromPath(string filePath, bool forceManualExecutionMode = fa /// public void InsertFileFromPath(string filePath, bool forceManualExecutionMode = false) { - XmlDocument xmlDoc; Exception ex; - if (DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex)) + string fileContents; + + if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex)) { - InsertXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode); + InsertJsonFileFromPath(fileContents, filePath, forceManualExecutionMode); return; } else @@ -2025,24 +1986,20 @@ public void InsertFileFromPath(string filePath, bool forceManualExecutionMode = { throw ex; } - if (ex is System.Xml.XmlException) - { - // XML opening failure can indicate that this file is corrupted XML or Json - string fileContents; - if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex)) + if (ex is JsonReaderException) + { + XmlDocument xmlDoc; + if (DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex)) { - InsertJsonFileFromPath(fileContents, filePath, forceManualExecutionMode); + InsertXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode); return; } - else - { - // When Json opening also failed, either this file is corrupted or there - // are other kind of failures related to Json de-serialization - throw ex; - } } - + else + { + throw ex; + } } } @@ -2126,10 +2083,9 @@ private bool InsertJsonFileFromPath(string fileContents, string filePath, bool f { if (true) //MigrationManager.ProcessWorkspace(dynamoPreferences.Version, xmlDoc, IsTestMode, NodeFactory)) { - WorkspaceModel ws; - if (OpenJsonFile(filePath, fileContents, dynamoPreferences, forceManualExecutionMode, out ws)) + if (OpenJsonFile(filePath, fileContents, dynamoPreferences, forceManualExecutionMode, out WorkspaceModel ws)) { - ExtraWorkspaceViewInfo viewInfo = ExtraWorkspaceViewInfoFromJson(fileContents); + ExtraWorkspaceViewInfo viewInfo = ExtraWorkspaceViewInfo.ExtraWorkspaceViewInfoFromJson(fileContents); InsertWorkspace(ws, viewInfo); } @@ -2383,34 +2339,6 @@ private bool OpenJsonFile( return true; } - /// - /// Load the extra view information required to fully construct a WorkspaceModel object - /// - /// - static internal ExtraWorkspaceViewInfo ExtraWorkspaceViewInfoFromJson(string json) - { - JsonReader reader = new JsonTextReader(new StringReader(json)); - var obj = JObject.Load(reader); - var viewBlock = obj["View"]; - if (viewBlock == null) - return null; - - var settings = new JsonSerializerSettings - { - Error = (sender, args) => - { - args.ErrorContext.Handled = true; - Console.WriteLine(args.ErrorContext.Error); - }, - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - TypeNameHandling = TypeNameHandling.Auto, - Formatting = Newtonsoft.Json.Formatting.Indented, - Culture = CultureInfo.InvariantCulture - }; - - return JsonConvert.DeserializeObject(viewBlock.ToString(), settings); - } - // Attempts to reload all the dummy nodes in the current workspace and replaces them with resolved version. private void ReloadDummyNodes() { @@ -3283,24 +3211,6 @@ private NodeModelSearchElement AddNodeTypeToSearch(TypeLoadData typeLoadData) return node; } - /// - /// Add node information to Lucene index - /// - /// node info that will be indexed - /// Lucene document in which the node info will be indexed - internal void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc) - { - if (LuceneUtility.addedFields == null) return; - - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.FullCategoryName), node.FullCategoryName); - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Name), node.Name); - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Description), node.Description); - if (node.SearchKeywords.Count > 0) LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.SearchKeywords), node.SearchKeywords.Aggregate((x, y) => x + " " + y), true, true); - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Parameters), node.Parameters ?? string.Empty); - - LuceneUtility.writer?.AddDocument(doc); - } - /// /// Remove node information from Lucene indexing. /// @@ -3360,7 +3270,7 @@ private void AddZeroTouchNodeToSearch(FunctionDescriptor functionDescriptor, Doc { var ele = new ZeroTouchSearchElement(functionDescriptor); SearchModel?.Add(ele); - AddNodeTypeToSearchIndex(ele, iDoc); + LuceneUtility.AddNodeTypeToSearchIndex(ele, iDoc); } } diff --git a/src/DynamoCore/Search/NodeSearchModel.cs b/src/DynamoCore/Search/NodeSearchModel.cs index 641738f88d5..92149fddef5 100644 --- a/src/DynamoCore/Search/NodeSearchModel.cs +++ b/src/DynamoCore/Search/NodeSearchModel.cs @@ -10,6 +10,7 @@ using Dynamo.Utilities; using DynamoUtilities; using Lucene.Net.Documents; +using Lucene.Net.Index; using Lucene.Net.QueryParsers.Classic; using Lucene.Net.Search; @@ -236,9 +237,14 @@ internal IEnumerable Search(string search, LuceneSearchUtilit if (luceneSearchUtility != null) { //The DirectoryReader and IndexSearcher have to be assigned after commiting indexing changes and before executing the Searcher.Search() method, otherwise new indexed info won't be reflected - luceneSearchUtility.dirReader = luceneSearchUtility.writer?.GetReader(applyAllDeletes: true); - if (luceneSearchUtility.dirReader == null) return null; - + if (luceneSearchUtility.writer != null) + { + luceneSearchUtility.dirReader = luceneSearchUtility.writer.GetReader(applyAllDeletes: true); + } + else + { + luceneSearchUtility.dirReader = DirectoryReader.Open(luceneSearchUtility.indexDir); + } luceneSearchUtility.Searcher = new IndexSearcher(luceneSearchUtility.dirReader); string searchTerm = search.Trim(); diff --git a/src/DynamoCore/Utilities/LuceneSearchUtility.cs b/src/DynamoCore/Utilities/LuceneSearchUtility.cs index 71a4516ef77..dbf3274ce19 100644 --- a/src/DynamoCore/Utilities/LuceneSearchUtility.cs +++ b/src/DynamoCore/Utilities/LuceneSearchUtility.cs @@ -3,7 +3,12 @@ using System.IO; using System.Linq; using Dynamo.Configuration; +using Dynamo.Core; +using Dynamo.Events; +using Dynamo.Logging; using Dynamo.Models; +using Dynamo.Search.SearchElements; +using Dynamo.Session; using Lucene.Net.Analysis; using Lucene.Net.Analysis.Br; using Lucene.Net.Analysis.Cjk; @@ -25,15 +30,52 @@ namespace Dynamo.Utilities { + /// + /// Lucene search utility class that will be used for indexing and searching nodes and packages + /// internal class LuceneSearchUtility { internal DynamoModel dynamoModel; + + /// + /// Index fields that were added to the document + /// internal List addedFields; + + /// + /// Lucene Directory Reader + /// internal DirectoryReader dirReader; + + /// + /// Lucene Index Directory, it can be RAMDirectory or FSDirectory + /// internal Lucene.Net.Store.Directory indexDir; + + /// + /// Lucene Index write + /// internal IndexWriter writer; - internal string directory; - internal LuceneStorage currentStorageType; + + /// + /// Start config for Lucene + /// + internal LuceneStartConfig startConfig; + + /// + /// Default start config for Lucene, it will use RAM storage type and empty directory + /// + internal static readonly LuceneStartConfig DefaultStartConfig = new LuceneStartConfig(); + + /// + /// Start config for node index, it will use file storage type and node index directory + /// + internal static readonly LuceneStartConfig DefaultNodeIndexStartConfig = new LuceneStartConfig(LuceneSearchUtility.LuceneStorage.FILE_SYSTEM, LuceneConfig.NodesIndexingDirectory); + + /// + /// Start config for package index, it will use file storage type and package index directory + /// + internal static readonly LuceneStartConfig DefaultPkgIndexStartConfig = new LuceneStartConfig(LuceneSearchUtility.LuceneStorage.FILE_SYSTEM, LuceneConfig.PackagesIndexingDirectory); public enum LuceneStorage { @@ -50,28 +92,31 @@ public enum LuceneStorage // Holds the instance for the IndexSearcher internal IndexSearcher Searcher; - internal LuceneSearchUtility(DynamoModel model) + /// + /// Constructor for LuceneSearchUtility, it will use the storage type passed as parameter + /// + /// + internal LuceneSearchUtility(DynamoModel model, LuceneStartConfig config) { dynamoModel = model; + // If under test mode, use the default StartConfig - RAM storage type and empty directory + startConfig = DynamoModel.IsTestMode? DefaultStartConfig : config; + InitializeLuceneConfig(); } /// - /// Initialize Lucene config file writer. + /// Initialize Lucene index writer based on start config. /// - internal void InitializeLuceneConfig(string dirName, LuceneStorage storageType = LuceneStorage.FILE_SYSTEM) + internal void InitializeLuceneConfig() { addedFields = new List(); DirectoryInfo luceneUserDataFolder; var userDataDir = new DirectoryInfo(dynamoModel.PathManager.UserDataDirectory); luceneUserDataFolder = userDataDir.Exists ? userDataDir : null; + string indexPath = Path.Combine(luceneUserDataFolder.FullName, LuceneConfig.Index, startConfig.Directory); - directory = dirName; - string indexPath = Path.Combine(luceneUserDataFolder.FullName, LuceneConfig.Index, dirName); - - currentStorageType = storageType; - - if (storageType == LuceneStorage.RAM) + if (startConfig.StorageType == LuceneStorage.RAM) { indexDir = new RAMDirectory(); } @@ -79,32 +124,35 @@ internal void InitializeLuceneConfig(string dirName, LuceneStorage storageType = { indexDir = FSDirectory.Open(indexPath); } - - // Create an analyzer to process the text Analyzer = CreateAnalyzerByLanguage(dynamoModel.PreferenceSettings.Locale); + CreateLuceneIndexWriter(); + } - // Initialize Lucene index writer, unless in test mode or we are using RAMDirectory for indexing info. - if (!DynamoModel.IsTestMode || currentStorageType == LuceneStorage.RAM) + /// + /// Create index writer for followup doc indexing + /// + internal void CreateLuceneIndexWriter() + { + // Create an index writer + IndexWriterConfig indexConfig = new IndexWriterConfig(LuceneConfig.LuceneNetVersion, Analyzer) + { + OpenMode = OpenMode.CREATE + }; + try + { + writer = new IndexWriter(indexDir, indexConfig); + } + catch (LockObtainFailedException ex) { - try - { - // Create an index writer - IndexWriterConfig indexConfig = new IndexWriterConfig(LuceneConfig.LuceneNetVersion, Analyzer) - { - OpenMode = OpenMode.CREATE - }; - writer = new IndexWriter(indexDir, indexConfig); - } - catch (LockObtainFailedException ex) - { - DisposeWriter(); - dynamoModel.Logger.LogError($"LuceneNET LockObtainFailedException {ex}"); - } - catch (Exception ex) { - dynamoModel.Logger.LogError($"LuceneNET Exception {ex}"); - } + DisposeWriter(); + (ExecutionEvents.ActiveSession.GetParameterValue(ParameterKeys.Logger) as DynamoLogger).LogError($"LuceneNET LockObtainFailedException {ex}"); + + } + catch (Exception ex) + { + (ExecutionEvents.ActiveSession.GetParameterValue(ParameterKeys.Logger) as DynamoLogger).LogError($"LuceneNET Exception {ex}"); } } @@ -114,7 +162,7 @@ internal void InitializeLuceneConfig(string dirName, LuceneStorage storageType = /// internal Document InitializeIndexDocumentForNodes() { - if (DynamoModel.IsTestMode && currentStorageType == LuceneStorage.FILE_SYSTEM) return null; + if (DynamoModel.IsTestMode && startConfig.StorageType == LuceneStorage.FILE_SYSTEM) return null; var name = new TextField(nameof(LuceneConfig.NodeFieldsEnum.Name), string.Empty, Field.Store.YES); var fullCategory = new TextField(nameof(LuceneConfig.NodeFieldsEnum.FullCategoryName), string.Empty, Field.Store.YES); @@ -170,11 +218,11 @@ internal Document InitializeIndexDocumentForPackages() internal void SetDocumentFieldValue(Document doc, string field, string value, bool isTextField = true, bool isLast = false) { string[] indexedFields = null; - if (directory.Equals(LuceneConfig.NodesIndexingDirectory)) + if (startConfig.Directory.Equals(LuceneConfig.NodesIndexingDirectory)) { indexedFields = LuceneConfig.NodeIndexFields; } - else if (directory.Equals(LuceneConfig.PackagesIndexingDirectory)) + else if (startConfig.Directory.Equals(LuceneConfig.PackagesIndexingDirectory)) { indexedFields = LuceneConfig.PackageIndexFields; } @@ -338,21 +386,49 @@ internal Analyzer CreateAnalyzerByLanguage(string language) internal void DisposeWriter() { - //We need to check if we are not running Dynamo tests because otherwise parallel test start to fail when trying to write in the same Lucene directory location - if (!DynamoModel.IsTestMode || currentStorageType == LuceneStorage.RAM) - { - writer?.Dispose(); - writer = null; - } + writer?.Dispose(); + writer = null; + } + + /// + /// Dispose all the Lucene objects + /// + internal void DisposeAll() + { + writer?.Dispose(); + dirReader?.Dispose(); + indexDir?.Dispose(); + Analyzer?.Dispose(); } + /// + /// Commit the changes made to the Lucene index + /// internal void CommitWriterChanges() { - if (!DynamoModel.IsTestMode || currentStorageType == LuceneStorage.RAM) + //Commit the info indexed if index writer exists + writer?.Commit(); + } + + /// + /// Add node information to existing Lucene index + /// + /// node info that will be indexed + /// Lucene document in which the node info will be indexed + internal void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc) + { + if (addedFields == null) return; + + SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.FullCategoryName), node.FullCategoryName); + SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Name), node.Name); + SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Description), node.Description); + if (node.SearchKeywords.Count > 0) { - //Commit the info indexed - writer?.Commit(); + SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.SearchKeywords), node.SearchKeywords.Aggregate((x, y) => x + " " + y), true, true); } + SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Parameters), node.Parameters ?? string.Empty); + + writer?.AddDocument(doc); } } @@ -361,7 +437,7 @@ internal void CommitWriterChanges() /// public class LuceneCustomAnalyzer : Analyzer { - private LuceneVersion luceneVersion; + private readonly LuceneVersion luceneVersion; public LuceneCustomAnalyzer(LuceneVersion matchVersion) { @@ -391,4 +467,31 @@ protected override TokenStreamComponents CreateComponents(string fieldName, Text return new TokenStreamComponents(tokenizer, tok); } } + + /// + /// Start up config for Lucene indexing + /// + internal class LuceneStartConfig + { + /// + /// Lucene Index Directory name, e.g. Nodes, Packages + /// + internal string Directory { get; set; } + + /// + /// Current Lucene Index Storage type, it could be either RAM or FILE_SYSTEM + /// + internal LuceneSearchUtility.LuceneStorage StorageType { get; set; } + + /// + /// Constructor for LuceneStartConfig + /// + /// + /// + internal LuceneStartConfig(LuceneSearchUtility.LuceneStorage storageType = LuceneSearchUtility.LuceneStorage.RAM, string directory = "") + { + Directory = directory; + StorageType = storageType; + } + } } diff --git a/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs b/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs index bc7c63f61d8..0dc564c6a99 100644 --- a/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs +++ b/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs @@ -4,7 +4,6 @@ using Dynamo.Controls; using Dynamo.Graph; using Dynamo.Models; -using Dynamo.UI; using Dynamo.Utilities; using Dynamo.ViewModels; using Dynamo.Wpf.Utilities; @@ -67,23 +66,28 @@ private void OnDynamoNodeButtonClick(object sender, RoutedEventArgs e) // if (null != this.model && (!string.IsNullOrEmpty(this.eventName))) { - MessageBoxResult result = MessageBoxResult.None; + // Only show the prompt if it is a Python node + var nodeVM = (sender as DynamoNodeButton)?.DataContext as NodeViewModel; + if (nodeVM?.NodeModel is PythonNodeModels.PythonNode) + { + MessageBoxResult result = MessageBoxResult.None; - if (eventName.Equals("RemoveInPort") && ShowWarningForRemovingInPort) - { - result = MessageBoxService.Show - ( - Owner, - Dynamo.Wpf.Properties.Resources.MessageRemovePythonPort, - Dynamo.Wpf.Properties.Resources.RemovePythonPortWarningMessageBoxTitle, - MessageBoxButton.OKCancel, - MessageBoxImage.Information - ); - } + if (eventName.Equals("RemoveInPort") && ShowWarningForRemovingInPort) + { + result = MessageBoxService.Show + ( + Owner, + Dynamo.Wpf.Properties.Resources.MessageRemovePythonPort, + Dynamo.Wpf.Properties.Resources.RemovePythonPortWarningMessageBoxTitle, + MessageBoxButton.OKCancel, + MessageBoxImage.Information + ); + } - if (result == MessageBoxResult.Cancel) - { - return; + if (result == MessageBoxResult.Cancel) + { + return; + } } var command = new DynamoModel.ModelEventCommand(model.GUID, eventName); diff --git a/src/DynamoCoreWpf/Controls/StartPage.xaml.cs b/src/DynamoCoreWpf/Controls/StartPage.xaml.cs index b33d05dcc47..133ff831a31 100644 --- a/src/DynamoCoreWpf/Controls/StartPage.xaml.cs +++ b/src/DynamoCoreWpf/Controls/StartPage.xaml.cs @@ -23,12 +23,12 @@ namespace Dynamo.UI.Controls { /// - /// This class represents the unified data class that is bound to all the - /// list boxes on the StartPageView. The bound data item can be handled in + /// This class represents the unified data class that is bound to all the + /// list boxes on the StartPageView. The bound data item can be handled in /// different ways depending on their ClickAction and ContextData properties. /// See "Action" enumeration below for more details of each item sub-type. /// - /// + /// public class StartPageListItem : NotificationObject { private ImageSource icon = null; @@ -36,16 +36,16 @@ public class StartPageListItem : NotificationObject public enum Action { /// - /// Indicates a regular command should be invoked if the list view - /// item corresponding to this StartPageListItem is clicked. The + /// Indicates a regular command should be invoked if the list view + /// item corresponding to this StartPageListItem is clicked. The /// meaning of ContextData will be interpreted in StartPageViewModel /// and corresponding action taken as a result. /// RegularCommand, /// - /// Indicates that the StartPageListItem carries a file path. When - /// clicked, StartPageViewModel issues a file open command to open + /// Indicates that the StartPageListItem carries a file path. When + /// clicked, StartPageViewModel issues a file open command to open /// the file path indicated by ContextData property. /// FilePath, @@ -53,7 +53,7 @@ public enum Action /// /// Indicates that the StartPageListItem points to an external URL. /// When the list view item corresponding to this StartPageListItem - /// is clicked, StartPageViewModel brings up the default browser and + /// is clicked, StartPageViewModel brings up the default browser and /// navigate to the URL indicated by ContextData property. /// ExternalUrl @@ -188,7 +188,7 @@ internal StartPageViewModel(DynamoViewModel dynamoViewModel, bool isFirstRun) ContextData = Configurations.DynamoDictionary, ClickAction = StartPageListItem.Action.ExternalUrl }); - + #endregion #region Contribution Links @@ -201,7 +201,7 @@ internal StartPageViewModel(DynamoViewModel dynamoViewModel, bool isFirstRun) contributeLinks.Add(new StartPageListItem(Resources.StartPageSendIssues, "icon-issues.png") { - ContextData = Configurations.GitHubBugReportingLink, + ContextData = Configurations.GitHubBugReportingLink + "?template=issue.yml", ClickAction = StartPageListItem.Action.ExternalUrl }); @@ -222,7 +222,7 @@ internal void WalkDirectoryTree(System.IO.DirectoryInfo root, SampleFileEntry ro { foreach (System.IO.DirectoryInfo directory in directories) { - //Make sure the folder's name is not "backup" + //Make sure the folder's name is not "backup" if (!directory.Name.Equals(Configurations.BackupFolderName)) { // Resursive call for each subdirectory. @@ -234,7 +234,7 @@ internal void WalkDirectoryTree(System.IO.DirectoryInfo root, SampleFileEntry ro } } - // Secondly, process all the files directly under this folder + // Secondly, process all the files directly under this folder System.IO.FileInfo[] dynamoFiles = null; dynamoFiles = root.GetFiles("*.dyn", System.IO.SearchOption.TopDirectoryOnly); @@ -243,7 +243,7 @@ internal void WalkDirectoryTree(System.IO.DirectoryInfo root, SampleFileEntry ro foreach (System.IO.FileInfo file in dynamoFiles) { if (sampleFolderPath == null) - { + { sampleFolderPath = Path.GetDirectoryName(file.FullName); } // Add each file under the root directory property list. @@ -333,7 +333,7 @@ public string BackupTitle { get { - if (StabilityUtils.IsLastShutdownClean + if (StabilityUtils.IsLastShutdownClean || DynamoViewModel.Model.PreferenceSettings.BackupFiles.Count == 0) { return Dynamo.Wpf.Properties.Resources.StartPageBackupNoCrash; @@ -375,7 +375,7 @@ private void RefreshFileList(ObservableCollection files, try { var extension = Path.GetExtension(filePath).ToUpper(); - // If not extension specified and code reach here, this means this is still a valid file + // If not extension specified and code reach here, this means this is still a valid file // only without file type. Otherwise, simply take extension substring skipping the 'dot'. var subScript = extension.IndexOf(".") == 0 ? extension.Substring(1) : ""; var caption = Path.GetFileNameWithoutExtension(filePath); @@ -397,7 +397,7 @@ private void RefreshFileList(ObservableCollection files, private void HandleRegularCommand(StartPageListItem item) { - var dvm = this.DynamoViewModel; + var dvm = this.DynamoViewModel; switch (item.ContextData) { @@ -408,7 +408,7 @@ private void HandleRegularCommand(StartPageListItem item) case ButtonNames.OpenWorkspace: dvm.ShowOpenDialogAndOpenResultCommand.Execute(null); break; - + case ButtonNames.NewCustomNodeWorkspace: dvm.ShowNewFunctionDialogCommand.Execute(null); break; @@ -487,7 +487,7 @@ private void OnItemSelectionChanged(object sender, SelectionChangedEventArgs e) var startPageViewModel = this.DataContext as StartPageViewModel; startPageViewModel.HandleListItemClicked(selected); - // Clear list box selection so that the same item, when + // Clear list box selection so that the same item, when // clicked, still triggers "selection changed" notification. var listBox = sender as ListBox; listBox.SelectedIndex = -1; @@ -507,7 +507,7 @@ private void OnSampleFileSelected(object sender, RoutedEventArgs e) if (!Path.GetExtension(filePath).Equals(".dyn")) return; - + var dvm = this.dynamoViewModel; if (dvm.OpenCommand.CanExecute(filePath)) dvm.OpenCommand.Execute(filePath); @@ -516,7 +516,7 @@ private void OnSampleFileSelected(object sender, RoutedEventArgs e) private void ShowSamplesInFolder(object sender, MouseButtonEventArgs e) { var startPageViewModel = this.DataContext as StartPageViewModel; - Process.Start(new ProcessStartInfo("explorer.exe", "/select," + Process.Start(new ProcessStartInfo("explorer.exe", "/select," + startPageViewModel.SampleFolderPath) { UseShellExecute = true }); } @@ -533,7 +533,7 @@ private void StartPage_OnDrop(object sender, DragEventArgs e) { // Note that you can have more than one file. var homespace = dynamoViewModel.HomeSpace; - if (homespace.HasUnsavedChanges && + if (homespace.HasUnsavedChanges && !dynamoViewModel.AskUserToSaveWorkspaceOrCancel(homespace)) { return; diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index cc11e1e25ad..033a94c9893 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -141,11 +141,11 @@ - + - + diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 0e45fbd1ef7..f9e99c3ec6d 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -2603,7 +2603,7 @@ public static string DynamoViewViewMenuShowConsole { } /// - /// Looks up a localized string similar to _Show Grid. + /// Looks up a localized string similar to _Show Helpers. /// public static string DynamoViewViewMenuShowGrid { get { diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 6a1d77c6a23..69207837e4c 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -970,8 +970,8 @@ Don't worry, you'll have the option to save your work. View menu | Show console - _Show Grid - View menu | Show Grid + _Show Helpers + View menu | Show Helpers _Zoom diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index fd667d83bfc..cc65fed88a5 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -677,8 +677,8 @@ View menu | Navigate background 3D preview - _Show Grid - View menu | Show Grid + _Show Helpers + View menu | Show Helpers Showing Background 3D Preview diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs index a128f518531..08c82561638 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs @@ -1431,7 +1431,7 @@ private void WorkspaceAdded(WorkspaceModel item) Exception ex; if (DynamoUtilities.PathHelper.isValidJson(newVm.Model.FileName, out fileContents, out ex)) { - ExtraWorkspaceViewInfo viewInfo = WorkspaceViewModel.ExtraWorkspaceViewInfoFromJson(fileContents); + ExtraWorkspaceViewInfo viewInfo = ExtraWorkspaceViewInfo.ExtraWorkspaceViewInfoFromJson(fileContents); newVm.Model.UpdateWithExtraWorkspaceViewInfo(viewInfo); } workspaces.Add(newVm); @@ -1889,7 +1889,7 @@ private void model_ComputeModelDeserialized() } // This call will fail in the case of an XML file - ExtraWorkspaceViewInfo viewInfo = WorkspaceViewModel.ExtraWorkspaceViewInfoFromJson(fileContentsInUse); + ExtraWorkspaceViewInfo viewInfo = ExtraWorkspaceViewInfo.ExtraWorkspaceViewInfoFromJson(fileContentsInUse); Model.CurrentWorkspace.UpdateWithExtraWorkspaceViewInfo(viewInfo); Model.OnWorkspaceOpening(viewInfo); @@ -2096,8 +2096,9 @@ private void InternalSaveAs(string path, SaveContext saveContext, bool isBackup { Model.Logger.Log(String.Format(Properties.Resources.SavingInProgress, path)); CurrentSpaceViewModel.Save(path, isBackup, Model.EngineController, saveContext); - if (!isBackup) AddToRecentFiles(path); + if (currentWorkspaceViewModel?.IsHomeSpace ?? true) + Model.Logger.Log("The Workspace is valid for FDX : " + (HomeSpace.HasRunWithoutCrash && Model.CurrentWorkspace.IsValidForFDX).ToString()); } catch (Exception ex) { diff --git a/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs index a1d602d3118..972e1ddf214 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs @@ -75,7 +75,7 @@ public string CurrentNotificationMessage /// public bool HasErrors { - get { return Model.Nodes.Any(n => n.State == ElementState.Error); } + get { return Model.HasErrors; } } /// @@ -83,7 +83,7 @@ public bool HasErrors /// public bool HasInfos { - get { return Model.Nodes.Any(n => n.State == ElementState.Info || n.State == ElementState.PersistentInfo); } + get { return Model.HasInfos; } } /// @@ -91,7 +91,7 @@ public bool HasInfos /// public bool HasWarnings { - get { return Model.Nodes.Any(n => n.State == ElementState.Warning || n.State == ElementState.PersistentWarning); } + get { return Model.HasWarnings; } } /// diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs index b0c63bd893a..2c410c077f4 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs @@ -573,6 +573,7 @@ public override void Dispose() Errors.Clear(); Annotations.Clear(); InCanvasSearchViewModel?.Dispose(); + NodeAutoCompleteSearchViewModel.LuceneUtility?.DisposeAll(); NodeAutoCompleteSearchViewModel?.Dispose(); } @@ -628,7 +629,7 @@ internal void Save(string filePath, bool isBackup = false, EngineController engi { // For intentional SaveAs either through UI or API calls, replace workspace elements' Guids and workspace Id jo["Uuid"] = Guid.NewGuid().ToString(); - if (jo["Bindings"] != JToken.Parse("[]")) + if (jo["Bindings"] != null && jo["Bindings"].Any()) { jo["Bindings"] = JToken.Parse("[]"); @@ -689,34 +690,6 @@ private JObject AddViewBlockToJSON(JObject modelData) return modelData; } - /// - /// Load the extra view information required to fully construct a WorkspaceModel object - /// - /// - static public ExtraWorkspaceViewInfo ExtraWorkspaceViewInfoFromJson(string json) - { - JsonReader reader = new JsonTextReader(new StringReader(json)); - var obj = JObject.Load(reader); - var viewBlock = obj["View"]; - if (viewBlock == null) - return null; - - var settings = new JsonSerializerSettings - { - Error = (sender, args) => - { - args.ErrorContext.Handled = true; - Console.WriteLine(args.ErrorContext.Error); - }, - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - TypeNameHandling = TypeNameHandling.Auto, - Formatting = Newtonsoft.Json.Formatting.Indented, - Culture = CultureInfo.InvariantCulture - }; - - return JsonConvert.DeserializeObject(viewBlock.ToString(), settings); - } - void CopyPasteChanged(object sender, EventArgs e) { RaisePropertyChanged("CanPaste", "CanCopy", "CanCopyOrPaste"); diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs index a21e0c3c266..4c3b2a1fa65 100644 --- a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs @@ -195,7 +195,7 @@ public string SelectedUnits selectedUnits = value; RaisePropertyChanged(nameof(SelectedUnits)); - if (UseHostScaleUnits) return; + if (UseHostScaleUnits && IsDynamoRevit) return; var result = Enum.TryParse(selectedUnits, out Configurations.Units currentUnit); if (!result) return; @@ -206,6 +206,14 @@ public string SelectedUnits preferenceSettings.GraphicScaleUnit = value; preferenceSettings.GridScaleFactor = (float)units; dynamoViewModel.UpdateGraphicHelpersScaleCommand.Execute(null); + + // We have turn the grid visilibilty on + // Check the current visibility settings, and turn it back off + if (!preferenceSettings.IsBackgroundGridVisible) + { + dynamoViewModel.ToggleBackgroundGridVisibilityCommand.Execute(null); // switch 'on' + dynamoViewModel.ToggleBackgroundGridVisibilityCommand.Execute(null); // switch 'off' + } } } } diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs index 003ab25e22e..957232cb769 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs @@ -20,6 +20,7 @@ using Dynamo.Wpf.Utilities; using Greg.Responses; using Lucene.Net.Documents; +using Lucene.Net.Index; using Lucene.Net.QueryParsers.Classic; using Lucene.Net.Search; #if NETFRAMEWORK @@ -592,7 +593,7 @@ internal void AddPackageToSearchIndex(PackageManagerSearchElement package, Docum LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Name), package.Name); LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Description), package.Description); - if (package.Keywords.Count() > 0) + if (package.Keywords.Length > 0) { LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.SearchKeywords), package.Keywords); } @@ -620,15 +621,7 @@ internal void InitializeLuceneForPackageManager() { if(LuceneUtility == null) { - LuceneSearch.LuceneUtilityPackageManager = new LuceneSearchUtility(PackageManagerClientViewModel.DynamoViewModel.Model); - } - if (DynamoModel.IsTestMode) - { - LuceneUtility.InitializeLuceneConfig(string.Empty, LuceneSearchUtility.LuceneStorage.RAM); - } - else - { - LuceneUtility.InitializeLuceneConfig(LuceneConfig.PackagesIndexingDirectory); + LuceneSearch.LuceneUtilityPackageManager = new LuceneSearchUtility(PackageManagerClientViewModel.DynamoViewModel.Model, LuceneSearchUtility.DefaultPkgIndexStartConfig); } } @@ -1040,7 +1033,14 @@ public void RefreshAndSearchAsync() if (!DynamoModel.IsTestMode) { - LuceneUtility.dirReader = LuceneUtility.writer?.GetReader(applyAllDeletes: true); + if (LuceneUtility.writer != null) + { + LuceneUtility.dirReader = LuceneUtility.writer.GetReader(applyAllDeletes: true); + } + else + { + LuceneUtility.dirReader = DirectoryReader.Open(LuceneUtility.indexDir); + } LuceneUtility.Searcher = new IndexSearcher(LuceneUtility.dirReader); LuceneUtility.CommitWriterChanges(); @@ -1582,6 +1582,7 @@ internal void Close() InitialResultsLoaded = false; // reset the loading screen settings RequestShowFileDialog -= OnRequestShowFileDialog; nonHostFilter.ForEach(f => f.PropertyChanged -= filter_PropertyChanged); + LuceneUtility.DisposeAll(); } } } diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs index 2366f225af1..55f4fd57bfc 100644 --- a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs @@ -45,7 +45,7 @@ public class NodeAutoCompleteSearchViewModel : SearchViewModel private const string nodeAutocompleteMLEndpoint = "MLNodeAutocomplete"; // Lucene search utility to perform indexing operations just for NodeAutocomplete. - private LuceneSearchUtility LuceneUtility + internal LuceneSearchUtility LuceneUtility { get { @@ -682,16 +682,13 @@ internal void SearchAutoCompleteCandidates(string input) } else { - LuceneSearch.LuceneUtilityNodeAutocomplete = new LuceneSearchUtility(dynamoViewModel.Model); - - //The dirName parameter doesn't matter because we are using RAMDirectory indexing and no files are created - LuceneUtility.InitializeLuceneConfig(string.Empty, LuceneSearchUtility.LuceneStorage.RAM); + LuceneSearch.LuceneUtilityNodeAutocomplete = new LuceneSearchUtility(dynamoViewModel.Model, LuceneSearchUtility.DefaultStartConfig); //Memory indexing process for Node Autocomplete (indexing just the nodes returned by the NodeAutocomplete service so we limit the scope of the query search) foreach (var node in searchElementsCache.Select(x => x.Model)) { var doc = LuceneUtility.InitializeIndexDocumentForNodes(); - AddNodeTypeToSearchIndex(node, doc); + LuceneUtility.AddNodeTypeToSearchIndex(node, doc); } //Write the Lucene documents to memory @@ -722,24 +719,6 @@ internal void SearchAutoCompleteCandidates(string input) } } - /// - /// Add node information to Lucene index - /// - /// node info that will be indexed - /// Lucene document in which the node info will be indexed - private void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc) - { - if (LuceneUtility.addedFields == null) return; - - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.FullCategoryName), node.FullCategoryName); - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Name), node.Name); - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Description), node.Description); - if (node.SearchKeywords.Count > 0) LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.SearchKeywords), node.SearchKeywords.Aggregate((x, y) => x + " " + y), true, true); - LuceneUtility.SetDocumentFieldValue(doc, nameof(LuceneConfig.NodeFieldsEnum.Parameters), node.Parameters ?? string.Empty); - - LuceneUtility.writer?.AddDocument(doc); - } - /// /// Returns a collection of node search elements for nodes /// that output a type compatible with the port type if it's an input port. diff --git a/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs index 49b40d6d363..4526b1f3afc 100644 --- a/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs @@ -937,7 +937,10 @@ internal IEnumerable Search(string search) if (LuceneUtility != null) { var searchElements = Model.Search(search, LuceneUtility); - return searchElements.Select(MakeNodeSearchElementVM); + if (searchElements != null) + { + return searchElements.Select(MakeNodeSearchElementVM); + } } return null; } diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml index a96a6eb21a3..ec0e01e7c4e 100644 --- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml +++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml @@ -93,8 +93,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + public class Quantity { - internal readonly ForgeUnitsCLR.Quantity forgeQuantity; + internal readonly ForgeUnits.Quantity forgeQuantity; - internal Quantity(ForgeUnitsCLR.Quantity quantity) + internal Quantity(ForgeUnits.Quantity quantity) { this.forgeQuantity = quantity ?? throw new ArgumentNullException(); } diff --git a/src/Libraries/DynamoUnits/Symbol.cs b/src/Libraries/DynamoUnits/Symbol.cs index 9437fcb39f2..7345b01a564 100644 --- a/src/Libraries/DynamoUnits/Symbol.cs +++ b/src/Libraries/DynamoUnits/Symbol.cs @@ -2,10 +2,7 @@ using System.Collections.Generic; using System.Text; using Autodesk.DesignScript.Runtime; - -#if NET6_0_OR_GREATER -using ForgeUnitsCLR = Autodesk.ForgeUnits; -#endif +using ForgeUnits = Autodesk.ForgeUnits; namespace DynamoUnits { @@ -14,10 +11,10 @@ namespace DynamoUnits /// public class Symbol { - internal readonly ForgeUnitsCLR.Symbol forgeSymbol; - internal readonly ForgeUnitsCLR.PrefixOrSuffix forgePrefixOrSuffix; + internal readonly ForgeUnits.Symbol forgeSymbol; + internal readonly ForgeUnits.PrefixOrSuffix forgePrefixOrSuffix; - internal Symbol(ForgeUnitsCLR.Symbol symbol) + internal Symbol(ForgeUnits.Symbol symbol) { this.forgeSymbol = symbol ?? throw new ArgumentNullException(); this.forgePrefixOrSuffix = symbol.getPrefixOrSuffix(); diff --git a/src/Libraries/DynamoUnits/Unit.cs b/src/Libraries/DynamoUnits/Unit.cs index 5d6fccce194..349bd9af483 100644 --- a/src/Libraries/DynamoUnits/Unit.cs +++ b/src/Libraries/DynamoUnits/Unit.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using Autodesk.DesignScript.Runtime; -#if NET6_0_OR_GREATER -using ForgeUnitsCLR = Autodesk.ForgeUnits; -#endif +using ForgeUnits = Autodesk.ForgeUnits; namespace DynamoUnits { @@ -12,9 +10,9 @@ namespace DynamoUnits /// public class Unit { - internal readonly ForgeUnitsCLR.Unit forgeUnit; + internal readonly ForgeUnits.Unit forgeUnit; - internal Unit(ForgeUnitsCLR.Unit unit) + internal Unit(ForgeUnits.Unit unit) { this.forgeUnit = unit ?? throw new ArgumentNullException(); } @@ -39,7 +37,7 @@ public IEnumerable ConvertibleUnits { get { - Dictionary units = Utilities.ForgeUnitsEngine.getConvertibleUnits(TypeId); + Dictionary units = Utilities.ForgeUnitsEngine.getConvertibleUnits(TypeId); return Utilities.ConvertForgeUnitDictionaryToCollection(units); } } diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj index c3a78a75a04..360f8714ec6 100644 --- a/src/Libraries/DynamoUnits/UnitsCore.csproj +++ b/src/Libraries/DynamoUnits/UnitsCore.csproj @@ -13,18 +13,16 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - - + + + - - - - - - build + + + runtime;build - + @@ -43,6 +41,7 @@ + diff --git a/src/Libraries/DynamoUnits/Utilities.cs b/src/Libraries/DynamoUnits/Utilities.cs index 651befda698..d58d5350827 100644 --- a/src/Libraries/DynamoUnits/Utilities.cs +++ b/src/Libraries/DynamoUnits/Utilities.cs @@ -4,11 +4,7 @@ using System.Reflection; using System.IO; using System.Configuration; - -#if NET6_0_OR_GREATER -using ForgeUnitsCLR = Autodesk.ForgeUnits; -using SchemasCLR = Autodesk.ForgeUnits; -#endif +using ForgeUnits = Autodesk.ForgeUnits; namespace DynamoUnits { @@ -17,7 +13,7 @@ namespace DynamoUnits /// public static class Utilities { - private static ForgeUnitsCLR.UnitsEngine unitsEngine; + private static ForgeUnits.UnitsEngine unitsEngine; /// /// Path to the directory used load the schema definitions. @@ -53,8 +49,8 @@ internal static void Initialize() try { - unitsEngine = new ForgeUnitsCLR.UnitsEngine(); - SchemasCLR.SchemaUtility.addDefinitionsFromFolder(SchemaDirectory, unitsEngine); + unitsEngine = new ForgeUnits.UnitsEngine(); + ForgeUnits.SchemaUtility.addDefinitionsFromFolder(SchemaDirectory, unitsEngine); unitsEngine.resolveSchemas(); } catch @@ -72,8 +68,8 @@ internal static void SetTestEngine(string testSchemaDir) { try { - unitsEngine = new ForgeUnitsCLR.UnitsEngine(); - SchemasCLR.SchemaUtility.addDefinitionsFromFolder(testSchemaDir, unitsEngine); + unitsEngine = new ForgeUnits.UnitsEngine(); + ForgeUnits.SchemaUtility.addDefinitionsFromFolder(testSchemaDir, unitsEngine); unitsEngine.resolveSchemas(); } catch @@ -146,7 +142,7 @@ public static double ParseExpression(string expression) /// /// Engine which loads schemas and is responsible for all ForgeUnit operations. /// - internal static ForgeUnitsCLR.UnitsEngine ForgeUnitsEngine + internal static ForgeUnits.UnitsEngine ForgeUnitsEngine { get { @@ -205,7 +201,7 @@ public static IEnumerable GetAllSymbols() /// A dictionary keyed by a forge typeID and Forge SDK Quantities as values /// internal static IEnumerable CovertForgeQuantityDictionaryToCollection( - Dictionary forgeDictionary) + Dictionary forgeDictionary) { var dynQuantities = new List(); @@ -229,7 +225,7 @@ internal static IEnumerable CovertForgeQuantityDictionaryToCollection( /// A dictionary keyed by a forge typeID and Forge SDK Symbols as values /// internal static IEnumerable ConvertForgeSymbolDictionaryToCollection( - Dictionary forgeDictionary) + Dictionary forgeDictionary) { var dynSymbols = new List(); @@ -253,7 +249,7 @@ internal static IEnumerable ConvertForgeSymbolDictionaryToCollection( /// A dictionary keyed by a forge typeID and Forge SDK Units as values /// internal static IEnumerable ConvertForgeUnitDictionaryToCollection( - Dictionary forgeDictionary) + Dictionary forgeDictionary) { var dynUnits = new List(); @@ -285,7 +281,7 @@ internal static Dictionary GetAllRegisteredQuantityVersions() /// /// A dictionary keyed by a forge typeID and Forge SDK Quantities as values /// A dictionary keyed by a version-less typeID and the latest registered version as value - internal static Dictionary GetAllRegisteredQuantityVersions(Dictionary forgeDictionary) + internal static Dictionary GetAllRegisteredQuantityVersions(Dictionary forgeDictionary) { var versionDictionary = new Dictionary(); @@ -322,7 +318,7 @@ internal static Dictionary GetAllLastestRegisteredSymbolVersion /// /// A dictionary keyed by a forge typeID and Forge SDK Symbols as values /// A dictionary keyed by a version-less typeID and the latest registered version as value - internal static Dictionary GetAllLastestRegisteredSymbolVersions(Dictionary forgeDictionary) + internal static Dictionary GetAllLastestRegisteredSymbolVersions(Dictionary forgeDictionary) { var versionDictionary = new Dictionary(); @@ -359,7 +355,7 @@ internal static Dictionary GetAllLatestRegisteredUnitVersions() /// /// A dictionary keyed by a forge typeID and Forge SDK Units as values /// A dictionary keyed by a version-less typeID and the latest registered version as value - internal static Dictionary GetAllLatestRegisteredUnitVersions(Dictionary forgeDictionary) + internal static Dictionary GetAllLatestRegisteredUnitVersions(Dictionary forgeDictionary) { var versionDictionary = new Dictionary(); diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index 0b64a5f4b1f..8d66aac19f1 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index ded75a15204..9d4377ada52 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index 939ad65b5f1..77adbcb2c2b 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -21,13 +21,7 @@ - - - - - - - + diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj index 29bb4d9abe4..c674a6bde48 100644 --- a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj +++ b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj @@ -43,20 +43,6 @@ - - - False - - - False - - - - - ..\..\..\extern\prism\Microsoft.Practices.Prism.dll - False - - {51bb6014-43f7-4f31-b8d3-e3c37ebedaf4} diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 7ddf53adb0b..07b48c6df2c 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + diff --git a/src/Libraries/UnitsUI/UnitsUI.csproj b/src/Libraries/UnitsUI/UnitsUI.csproj index 56f13056aef..d2722d5c9e8 100644 --- a/src/Libraries/UnitsUI/UnitsUI.csproj +++ b/src/Libraries/UnitsUI/UnitsUI.csproj @@ -21,12 +21,6 @@ ..\ - - - - - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} diff --git a/src/LibraryViewExtensionWebView2/LibraryViewExtensionWebView2.csproj b/src/LibraryViewExtensionWebView2/LibraryViewExtensionWebView2.csproj index d66870393f5..428eed2ece2 100644 --- a/src/LibraryViewExtensionWebView2/LibraryViewExtensionWebView2.csproj +++ b/src/LibraryViewExtensionWebView2/LibraryViewExtensionWebView2.csproj @@ -177,26 +177,13 @@ - + ..\..\extern\Microsoft.Xaml.Behaviors\$(TargetFramework)\Dynamo.Microsoft.Xaml.Behaviors.dll - - - - - - - - - - ..\..\extern\prism\Microsoft.Practices.Prism.dll - false - - MSBuild:Compile diff --git a/src/LintingViewExtension/LinterView.xaml b/src/LintingViewExtension/LinterView.xaml index fc57e9b4df1..79896581ba3 100644 --- a/src/LintingViewExtension/LinterView.xaml +++ b/src/LintingViewExtension/LinterView.xaml @@ -43,7 +43,7 @@ - + - - + + Value="Solid_ChevronUp" /> @@ -110,7 +110,7 @@ DockPanel.Dock="Top" Template="{StaticResource expanderButton}" Content="{TemplateBinding Header}" - IsChecked="{Binding Path=IsExpanded, + IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" Padding="1.5,0"> diff --git a/src/LintingViewExtension/LintingViewExtension.csproj b/src/LintingViewExtension/LintingViewExtension.csproj index ad4bcb712ff..8e99756d58d 100644 --- a/src/LintingViewExtension/LintingViewExtension.csproj +++ b/src/LintingViewExtension/LintingViewExtension.csproj @@ -16,13 +16,6 @@ - - - - - - - {51bb6014-43f7-4f31-b8d3-e3c37ebedaf4} diff --git a/src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.csproj b/src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.csproj index 92fba6b9c83..b0918e08017 100644 --- a/src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.csproj +++ b/src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.csproj @@ -12,12 +12,6 @@ Dynamo.NodeAutoComplete NodeAutoCompleteViewExtension - - - - - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj index 0eaadf9349e..eba69a4cf91 100644 --- a/src/Notifications/Notifications.csproj +++ b/src/Notifications/Notifications.csproj @@ -58,18 +58,8 @@ - + - - - - - - - ..\..\extern\prism\Microsoft.Practices.Prism.dll - False - - {51bb6014-43f7-4f31-b8d3-e3c37ebedaf4} diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj index 773fd78bf20..e0db6072434 100644 --- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj +++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj @@ -18,13 +18,6 @@ - - - - - - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} diff --git a/src/PythonMigrationViewExtension/PythonMigrationViewExtension.csproj b/src/PythonMigrationViewExtension/PythonMigrationViewExtension.csproj index ff954266242..6f91383c779 100644 --- a/src/PythonMigrationViewExtension/PythonMigrationViewExtension.csproj +++ b/src/PythonMigrationViewExtension/PythonMigrationViewExtension.csproj @@ -22,23 +22,6 @@ False - - - False - - - False - - - False - - - False - - - False - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} diff --git a/src/Tools/AssemblyRenamerCLI/AssemblyRenamerCLI.csproj b/src/Tools/AssemblyRenamerCLI/AssemblyRenamerCLI.csproj index b7d306f9bd3..8309d02bda3 100644 --- a/src/Tools/AssemblyRenamerCLI/AssemblyRenamerCLI.csproj +++ b/src/Tools/AssemblyRenamerCLI/AssemblyRenamerCLI.csproj @@ -13,14 +13,4 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj b/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj index 63f6d7c06e6..dcf7be77ddc 100644 --- a/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj +++ b/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj @@ -9,9 +9,6 @@ DynamoInstallDetective DynamoInstallDetective - - - diff --git a/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj b/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj index a70d23a84e9..e74a8741034 100644 --- a/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj +++ b/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj @@ -10,9 +10,6 @@ DynamoShapeManager true - - - diff --git a/src/Tools/DynamoShapeManager/Preloader.cs b/src/Tools/DynamoShapeManager/Preloader.cs index 426d34821dc..b10f0a911a8 100644 --- a/src/Tools/DynamoShapeManager/Preloader.cs +++ b/src/Tools/DynamoShapeManager/Preloader.cs @@ -58,59 +58,12 @@ public class Preloader public Preloader(string rootFolder) : this(rootFolder, new[] { + new Version(230,0,0), new Version(229,0,0), - new Version(228,5,0), }) { } - // TODO: Remove in Dynamo 3.0 -> The following old libG Folder mapping usage - // used to convert libraryVersions to the real asm versions they represented - private static Dictionary ASMLibVersionToVersion = new Dictionary() - { - { LibraryVersion.Version221, new Version(221,0,0) }, - { LibraryVersion.Version222, new Version(222,0,0) }, - { LibraryVersion.Version223, new Version(223,0,1) }, - { LibraryVersion.Version224, new Version(224,0,1) }, - - }; - - internal static Version MapLibGVersionEnumToFullVersion(LibraryVersion libVersion) - { - Version version; - if (ASMLibVersionToVersion.TryGetValue(libVersion, out version)) - { - return version; - } - else - { - version = new Version((int)libVersion, 0, 0); - Console.WriteLine("Could not find a full version mapping for LibGVersion: " + libVersion + "returning: " + version.ToString()); - return version; - } - } - - /// - /// Constructs a preloader object to help preload a specific version of - /// shape manager. - /// - /// Full path of the directory that contains - /// LibG_xxx folder, where 'xxx' represents the library version. In a - /// typical setup this would be the same directory that contains Dynamo - /// core modules. This must represent a valid directory. - /// - /// A list of version numbers to check for in order - /// of preference. This argument cannot be null or empty. -#if NET6_0_OR_GREATER - [System.Runtime.Versioning.SupportedOSPlatform("windows")] -#endif - [Obsolete("please use constructor Preloader constructor with signature Preloader(string,IEnumerable)")] - public Preloader(string rootFolder, IEnumerable versions) : - this(rootFolder, versions.Select(libVersion => MapLibGVersionEnumToFullVersion(libVersion))) - { - - } - /// /// Constructs a preloader object to help preload a specific version of /// shape manager. @@ -144,60 +97,6 @@ public Preloader(string rootFolder, IEnumerable versions) Utilities.GeometryFactoryAssembly); } - /// - /// Constructs a preloader object to help preload the specified version - /// of shape manager from the given directory. - /// - /// Full path of the directory that contains - /// LibG_xxx folder, where 'xxx' represents the library version. In a - /// typical setup this would be the same directory that contains Dynamo - /// core modules. This must represent a valid directory. - /// - /// The directory from where shape manager - /// binaries can be preloaded from. - /// The version of shape manager. - /// - [Obsolete("please use Preloader constructor with signature Preloader(string,IEnumerable)")] - public Preloader(string rootFolder, string shapeManagerPath, LibraryVersion version) - { - if (string.IsNullOrEmpty(rootFolder)) - throw new ArgumentNullException("rootFolder"); - if (!Directory.Exists(rootFolder)) - throw new DirectoryNotFoundException(rootFolder); - - if (string.IsNullOrEmpty(shapeManagerPath)) - throw new ArgumentNullException("shapeManagerPath"); - if (!Directory.Exists(shapeManagerPath)) - throw new DirectoryNotFoundException(shapeManagerPath); - - if (version == LibraryVersion.None) - throw new ArgumentOutOfRangeException("version"); - - this.Version2 = MapLibGVersionEnumToFullVersion(version); - this.ShapeManagerPath = shapeManagerPath; - - var libGFolderName = string.Format("libg_{0}_{1}_{2}", this.Version2.Major, this.Version2.Minor, this.Version2.Build); - PreloaderLocation = Path.Combine(rootFolder, libGFolderName); - GeometryFactoryPath = Path.Combine(PreloaderLocation, - Utilities.GeometryFactoryAssembly); - } - - /// - /// Construct a Preloader by specifying a required library version. - /// - /// Full path of the directory that contains - /// LibG_xxx folder, where 'xxx' represents the library version. In a - /// typical setup this would be the same directory that contains Dynamo - /// core modules. This must represent a valid directory. - /// - /// The version of shape manager. - /// - [Obsolete("please use constructor Preloader constructor with signature Preloader(string,IEnumerable)")] -#if NET6_0_OR_GREATER - [System.Runtime.Versioning.SupportedOSPlatform("windows")] -#endif - public Preloader(string rootFolder, LibraryVersion version) - : this(rootFolder, new[] { version }) { } /// /// Attempts to load the geometry library binaries using the version and location diff --git a/src/Tools/DynamoShapeManager/Utilities.cs b/src/Tools/DynamoShapeManager/Utilities.cs index 0643fe54213..47d3b6ac820 100644 --- a/src/Tools/DynamoShapeManager/Utilities.cs +++ b/src/Tools/DynamoShapeManager/Utilities.cs @@ -47,51 +47,49 @@ private static List ProductsWithASM // #region ASM DLLs per version (to be kept in sync with LibG) - private static readonly ISet ASM228DllNames = new HashSet() + private static readonly ISet ASM230DllNames = new HashSet() { - "TBB.DLL", + "TBB12.DLL", "TBBMALLOC.DLL", - "TSPLINES10A.DLL", - "ASMAHL228A.DLL", - "ASMBASE228A.DLL", - "ASMBLND228A.DLL", - "ASMBOOL228A.DLL", - "ASMCOVR228A.DLL", - "ASMCSTR228A.DLL", - "ASMCT228A.DLL", - "ASMDATAX228A.DLL", - "ASMDEFM228A.DLL", - "ASMEULR228A.DLL", - "ASMFCT228A.DLL", - "ASMFREC228A.DLL", - "ASMGA228A.DLL", - "ASMHEAL228A.DLL", - "ASMIMPORT228A.DLL", - "ASMINTR228A.DLL", - "ASMKERN228A.DLL", - "ASMLAW228A.DLL", - "ASMLOP228A.DLL", - "ASMLOPT228A.DLL", - "ASMNPCH228A.DLL", - "ASMOFST228A.DLL", - "ASMOPER228A.DLL", - "ASMPID228A.DLL", - "ASMRBASE228A.DLL", - "ASMRBI228A.DLL", - "ASMREM228A.DLL", - "ASMSASM228A.DLL", - "ASMSBAP228A.DLL", - "ASMSBOOL228A.DLL", - "ASMSHL228A.DLL", - "ASMSKIN228A.DLL", - "ASMSWP228A.DLL", - "ASMTOPT228A.DLL", - "ASMTWK228A.DLL", - "ASMUFLD228A.DLL", - "ASMWELD228A.DLL", - "ADPSDKWRAPPER.DLL", - "ADPSDKUI.DLL", - "ADPSDKCORE.DLL" + "TSPLINES12.DLL", + "ASMAHL230A.DLL", + "ASMBASE230A.DLL", + "ASMBLND230A.DLL", + "ASMBOOL230A.DLL", + "ASMCOVR230A.DLL", + "ASMCSTR230A.DLL", + "ASMCT230A.DLL", + "ASMDATAX230A.DLL", + "ASMDEFM230A.DLL", + "ASMEULR230A.DLL", + "ASMFCT230A.DLL", + "ASMFREC230A.DLL", + "ASMGA230A.DLL", + "ASMHEAL230A.DLL", + "ASMIMPORT230A.DLL", + "ASMINTR230A.DLL", + "ASMKERN230A.DLL", + "ASMLAW230A.DLL", + "ASMLOP230A.DLL", + "ASMLOPT230A.DLL", + "ASMNPCH230A.DLL", + "ASMOFST230A.DLL", + "ASMOPER230A.DLL", + "ASMPID230A.DLL", + "ASMRBASE230A.DLL", + "ASMRBI230A.DLL", + "ASMREM230A.DLL", + "ASMSASM230A.DLL", + "ASMSBAP230A.DLL", + "ASMSBOOL230A.DLL", + "ASMSHL230A.DLL", + "ASMSKIN230A.DLL", + "ASMSWP230A.DLL", + "ASMTOPT230A.DLL", + "ASMTWK230A.DLL", + "ASMUFLD230A.DLL", + "ASMWELD230A.DLL", + "MMSDK.DLL", }; private static readonly ISet ASM229DllNames = new HashSet() { @@ -417,13 +415,7 @@ public static void PreloadAsmFromPath(string preloaderLocation, string asmLocati // if we can't find the preloader location directly as passed // try converting it to a precise version location. - if (!Directory.Exists(preloaderLocation)) - { - // Path/To/Extern/LibG_223 -> Path/To/Extern/LibG_223_0_1 - preloaderLocationToLoad = RemapOldLibGPathToNewVersionPath(preloaderLocation); - } - // the directory exists, just load it. - else + if (Directory.Exists(preloaderLocation)) { preloaderLocationToLoad = preloaderLocation; } @@ -476,57 +468,6 @@ public static void PreloadAsmFromPath(string preloaderLocation, string asmLocati Debug.WriteLine("Successfully loaded ASM binaries"); } - /// - /// Attempts to remap a an old LibG path to a new one using a version map. - /// We assume that the leaf directory is of the form LibG_[Version]. - /// - /// - /// new version LibG path or Empty string if the path could not be remapped. - internal static string RemapOldLibGPathToNewVersionPath(string preloaderLocation) - { - if (String.IsNullOrEmpty(preloaderLocation)) - { - return string.Empty; - } - var folderName = Path.GetFileName(preloaderLocation); - var splitName = folderName.Split('_'); - if (splitName.Count() == 2) - { - LibraryVersion outVersion; - if (Enum.TryParse(string.Format("Version{0}", splitName[1]), out outVersion)) - { - var version = DynamoShapeManager.Preloader.MapLibGVersionEnumToFullVersion(outVersion); - return Path.Combine( - Path.GetDirectoryName(preloaderLocation), - string.Format("libg_{0}_{1}_{2}", version.Major, version.Minor, version.Build) - ); - } - } - - return ""; - } - - /// - /// This method will return the path to the GeometryFactory assembly location - /// for a requested version of the geometry library. - /// This method is tolerant to the requested version in that it will attempt to - /// locate an exact or lower version of the GeometryFactory assembly. - /// - /// Full path of the directory that contains - /// LibG_xxx_y_z folder, where 'xxx y z' represents the library version of asm. In a - /// typical setup this would be the same directory that contains Dynamo - /// core modules. This must represent a valid directory - it cannot be null. - /// Version number of the targeted geometry library. - /// If the resulting assembly does not exist, this method will look for a lower version match. - /// This parameter cannot be null. - /// The full path to GeometryFactoryAssembly assembly. - /// - [Obsolete("Please use GetGeometryFactoryPath2(string rootFolder, Version version).")] - public static string GetGeometryFactoryPath(string rootFolder, LibraryVersion version) - { - return GetGeometryFactoryPath2(rootFolder, Preloader.MapLibGVersionEnumToFullVersion(version)); - } - /// /// This method will return the path to the GeometryFactory assembly location /// for a requested version of the geometry library. @@ -627,10 +568,10 @@ internal static bool IsASMInstallationComplete(IEnumerable filePaths, in var fileNames = filePaths.Select(path => Path.GetFileName(path).ToUpper()); switch (majorVersion) { - case 228: - return !ASM228DllNames.Except(fileNames).Any(); case 229: return !ASM229DllNames.Except(fileNames).Any(); + case 230: + return !ASM230DllNames.Except(fileNames).Any(); default: // We don't know this version so it's safest to assume it's not complete. return false; diff --git a/src/Tools/Md2Html/Md2Html.csproj b/src/Tools/Md2Html/Md2Html.csproj index 639af6ccadb..ac7c41f87ff 100644 --- a/src/Tools/Md2Html/Md2Html.csproj +++ b/src/Tools/Md2Html/Md2Html.csproj @@ -14,16 +14,6 @@ true false - - - - - - - - - - 2.8.0 @@ -31,9 +21,6 @@ 5.0.372 - - 3.0.41 - 0.22.0 @@ -44,22 +31,4 @@ - - - - - \ No newline at end of file diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/MdFileInfo.cs b/src/Tools/NodeDocumentationMarkdownGenerator/MdFileInfo.cs index 68b7c82f230..3e0bc64a1ef 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/MdFileInfo.cs +++ b/src/Tools/NodeDocumentationMarkdownGenerator/MdFileInfo.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Xml; using Dynamo.Graph.Workspaces; using Dynamo.Logging; @@ -73,13 +73,13 @@ internal static MdFileInfo FromCustomNode(string path) WorkspaceInfo header = null; ILogger log = new DummyConsoleLogger(); - if (DynamoUtilities.PathHelper.isValidXML(path, out XmlDocument xmlDoc, out Exception ex)) + if (DynamoUtilities.PathHelper.isValidJson(path, out string jsonDoc, out Exception ex)) { - WorkspaceInfo.FromXmlDocument(xmlDoc, path, true, false, log, out header); + WorkspaceInfo.FromJsonDocument(jsonDoc, path, true, false, log, out header); } - else if (DynamoUtilities.PathHelper.isValidJson(path, out string jsonDoc, out ex)) + else if (DynamoUtilities.PathHelper.isValidXML(path, out XmlDocument xmlDoc, out ex)) { - WorkspaceInfo.FromJsonDocument(jsonDoc, path, true, false, log, out header); + WorkspaceInfo.FromXmlDocument(xmlDoc, path, true, false, log, out header); } else throw ex; diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj index b90d9534828..ba8013a26cc 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj +++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.csproj b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.csproj index 5a0f7f95174..e12e430132d 100644 --- a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.csproj +++ b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.csproj @@ -16,13 +16,6 @@ - - - - - - - diff --git a/test/DynamoCoreTests/Configuration/PreferenceSettingsTests.cs b/test/DynamoCoreTests/Configuration/PreferenceSettingsTests.cs index 29210f9ad9a..0b1880756b0 100644 --- a/test/DynamoCoreTests/Configuration/PreferenceSettingsTests.cs +++ b/test/DynamoCoreTests/Configuration/PreferenceSettingsTests.cs @@ -375,7 +375,7 @@ PreferencesComparison comparePrefenceSettings(PreferenceSettings defaultSettings } [Test] - [Category("UnitTests"), Category("FailureNET6")] + [Category("UnitTests")] public void TestImportCopySettings() { string settingDirectory = Path.Combine(TestDirectory, "settings"); diff --git a/test/DynamoCoreTests/SearchModelTests.cs b/test/DynamoCoreTests/SearchModelTests.cs index 1d5201434be..ce2d642b6bd 100644 --- a/test/DynamoCoreTests/SearchModelTests.cs +++ b/test/DynamoCoreTests/SearchModelTests.cs @@ -565,7 +565,7 @@ private void AddNodeElementToSearchIndex(NodeSearchElement element) var iDoc = CurrentDynamoModel.LuceneUtility.InitializeIndexDocumentForNodes(); if (element != null) { - CurrentDynamoModel.AddNodeTypeToSearchIndex(element, iDoc); + CurrentDynamoModel.LuceneUtility.AddNodeTypeToSearchIndex(element, iDoc); } } diff --git a/test/DynamoCoreTests/libGPreloaderTests.cs b/test/DynamoCoreTests/libGPreloaderTests.cs index ad98b9fe3e3..48975b32959 100644 --- a/test/DynamoCoreTests/libGPreloaderTests.cs +++ b/test/DynamoCoreTests/libGPreloaderTests.cs @@ -429,26 +429,6 @@ public void GetInstalledASMVersions2_ReturnsFirstLocationWithSameVersion() libG22401path.Delete(true); } - [Test] - public void GetGeometryFactoryPath_CalledFromOldClient_ShouldGetNewVersion() - { - var rootFolder = Path.Combine(Path.GetTempPath(), "LibGTest"); - - //setup some mock libG folders with protoInterface.dll nested. - var libG22440path = System.IO.Directory.CreateDirectory(Path.Combine(rootFolder, "LibG_224_4_0")); - File.WriteAllText(Path.Combine(libG22440path.FullName, DynamoShapeManager.Utilities.GeometryFactoryAssembly), "someText"); - var libG22401path = System.IO.Directory.CreateDirectory(Path.Combine(rootFolder, "LibG_224_0_1")); - File.WriteAllText(Path.Combine(libG22401path.FullName, DynamoShapeManager.Utilities.GeometryFactoryAssembly), "someText"); - - //look for old version of libG 224 from old client - var foundGeoPath = DynamoShapeManager.Utilities.GetGeometryFactoryPath(rootFolder, LibraryVersion.Version224); - - var expectedDirectoryInfo = new DirectoryInfo(Path.Combine(libG22401path.FullName, DynamoShapeManager.Utilities.GeometryFactoryAssembly)); - Assert.AreEqual(expectedDirectoryInfo, new DirectoryInfo(foundGeoPath)); - //cleanup - libG22440path.Delete(true); - libG22401path.Delete(true); - } [Test] public void GetGeometryFactoryPath2_CalledFromNewClient_ShouldGetCorrectVersion() @@ -471,27 +451,6 @@ public void GetGeometryFactoryPath2_CalledFromNewClient_ShouldGetCorrectVersion( libG22401path.Delete(true); } - [Test] - public void LoadASMFromPathShouldWorkWithOldPath() - { - var oldPath = Path.Combine("C", "Dynamo", "Extern", "FakePath", "LibG_223"); - var newPath = DynamoShapeManager.Utilities.RemapOldLibGPathToNewVersionPath(oldPath); - Assert.AreEqual(new DirectoryInfo(Path.Combine("C", "Dynamo", "Extern", "FakePath", "LibG_223_0_1")), new DirectoryInfo(newPath)); - } - [Test] - public void RemapPathShouldReturnEmptyStringForNewPath() - { - var oldPath = Path.Combine("C", "Dynamo", "Extern", "FakePath", "LibG_223_0_1"); - var newPath = DynamoShapeManager.Utilities.RemapOldLibGPathToNewVersionPath(oldPath); - Assert.AreEqual(String.Empty, newPath); - } - [Test] - public void RemapPathShouldReturnEmptyStringForNullPath() - { - string oldPath = null; - var newPath = DynamoShapeManager.Utilities.RemapOldLibGPathToNewVersionPath(oldPath); - Assert.AreEqual(string.Empty, newPath); - } [Test] public void PreloaderThatDoesNotFindASMDoesNotThrow() { @@ -501,15 +460,6 @@ public void PreloaderThatDoesNotFindASMDoesNotThrow() }); } - [Test] - public void ASM228InstallationsAreValidated() - { - var incomplete228List = LoadListFromCsv("incomplete228List.csv"); - Assert.IsFalse(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete228List, 228)); - // Add missing DLLs. Now the the installation should be valid. - incomplete228List.Add("tsplines10A.dll"); - Assert.IsTrue(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete228List, 228)); - } [Test] public void ASM229InstallationsAreValidated() { @@ -521,6 +471,16 @@ public void ASM229InstallationsAreValidated() Assert.IsTrue(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete229List, 229)); } + [Test] + public void ASM230InstallationsAreValidated() + { + var incomplete230List = LoadListFromCsv("incomplete230List.csv"); + Assert.IsFalse(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete230List, 230)); + // Add missing DLLs. Now the the installation should be valid. + incomplete230List.Add("tsplines12.dll"); + Assert.IsTrue(DynamoShapeManager.Utilities.IsASMInstallationComplete(incomplete230List, 230)); + } + [Test] public void UnknownASMVersionInstallationsAreDiscarded() { diff --git a/test/DynamoCoreWpfTests/DynamoViewTests.cs b/test/DynamoCoreWpfTests/DynamoViewTests.cs index 298cf4a8558..0de1fcf4698 100644 --- a/test/DynamoCoreWpfTests/DynamoViewTests.cs +++ b/test/DynamoCoreWpfTests/DynamoViewTests.cs @@ -170,7 +170,8 @@ public void ElementBinding_SaveAs() File.Delete(filePath); File.Delete(saveAsPath); } - + + [Test] public void TestToastNotificationClosingBehavior() { var preferencesWindow = new PreferencesView(View); diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerSearchElementViewModelTests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerSearchElementViewModelTests.cs index 9307074873e..708913b8876 100644 --- a/test/DynamoCoreWpfTests/PackageManager/PackageManagerSearchElementViewModelTests.cs +++ b/test/DynamoCoreWpfTests/PackageManager/PackageManagerSearchElementViewModelTests.cs @@ -583,8 +583,6 @@ public void PackageSearchDialogSearchDifferentLanguage() packageManagerSearchViewModel.AddToSearchResults(tmpPackage); } - //This line will be indexing the package information using Lucene - packageManagerSearchViewModel.LuceneUtility.InitializeLuceneConfig(string.Empty, Utilities.LuceneSearchUtility.LuceneStorage.RAM); foreach (var package in packageManagerSearchViewModel.SearchResults) { var iDoc = packageManagerSearchViewModel.LuceneUtility.InitializeIndexDocumentForPackages(); diff --git a/test/DynamoCoreWpfTests/SearchViewModelTests.cs b/test/DynamoCoreWpfTests/SearchViewModelTests.cs index 239a16ce38f..813d8251631 100644 --- a/test/DynamoCoreWpfTests/SearchViewModelTests.cs +++ b/test/DynamoCoreWpfTests/SearchViewModelTests.cs @@ -803,7 +803,7 @@ private NodeSearchElement CreateCustomNode(string name, string category, var iDoc = ViewModel.Model.LuceneUtility.InitializeIndexDocumentForNodes(); if (element != null) { - ViewModel.Model.AddNodeTypeToSearchIndex(element, iDoc); + ViewModel.Model.LuceneUtility.AddNodeTypeToSearchIndex(element, iDoc); } diff --git a/test/DynamoCoreWpfTests/UnitsUITests.cs b/test/DynamoCoreWpfTests/UnitsUITests.cs index 27981534ad6..9e6bc6f270e 100644 --- a/test/DynamoCoreWpfTests/UnitsUITests.cs +++ b/test/DynamoCoreWpfTests/UnitsUITests.cs @@ -1,4 +1,4 @@ -using System.Xml; +using System.Xml; using Dynamo.Graph; using Dynamo.Models; using Dynamo.Tests; @@ -15,7 +15,7 @@ namespace DynamoCoreWpfTests { - [TestFixture, Category("Failure")] + [TestFixture] public class UnitsUITests : DynamoTestUIBase { private LengthFromString lengthFromString; @@ -61,7 +61,7 @@ public void MigrateLengthFromFeetToMetersTest() lengthFromString.MigrateLengthFromFeetToMeters(root); - string oneFeetInMeters = "0.304800000001219"; + string oneFeetInMeters = "0.3048000000012192"; Assert.AreEqual(oneFeetInMeters, systemDouble.Attributes[0].Value); } diff --git a/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs index 8079cfe37a1..2aeb2ef082c 100644 --- a/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs +++ b/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs @@ -763,6 +763,44 @@ public void AddGraphInSpecificLocationToWorkspace() Assert.AreEqual(ViewModel.Model.CurrentWorkspace.Nodes.Count(), 5); } + [Test] + public void Validate_GetGraphLinkFromMDLocation() + { + var nodeName = "Number"; + this.ViewModel.ExecuteCommand( + new DynamoModel.CreateNodeCommand( + Guid.NewGuid().ToString(), nodeName, 0, 0, false, false) + ); + + //Validates that we have just one node in the CurrentWorkspace + Assert.AreEqual(ViewModel.Model.CurrentWorkspace.Nodes.Count(), 1); + + var node = ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault(); + + //In this call the GetGraphLinkFromMDLocation() method is executed internally + RequestNodeDocs(node); + + // Show the DocumentationBrowser so we can get the DocumentationBrowserViewModel + ShowDocsBrowser(); + var docsView = GetDocsTabItem().Content as DocumentationBrowserView; + var docsViewModel = docsView.DataContext as DocumentationBrowserViewModel; + + //Due that graphPath is a private we use reflection to get the value. + FieldInfo type = typeof(DocumentationBrowserViewModel).GetField("graphPath", BindingFlags.NonPublic | BindingFlags.Instance); + var graphPathValue = type.GetValue(docsViewModel); + + var dynFileName = Path.GetFileNameWithoutExtension(docsViewModel.Link.AbsolutePath) + ".dyn"; + + //This will return a path with the NodeHelpSharedDocs + dyn file name + var sharedFilesPath = Path.Combine(DocumentationBrowserView.SharedDocsDirectoryName, dynFileName); + + Assert.IsNotNull(graphPathValue); + Assert.IsTrue(!string.IsNullOrEmpty(graphPathValue.ToString())); + + //Chech that the pathPath contains "NodeHelpSharedDocs//dynfilename" + Assert.That(graphPathValue.ToString().Contains(sharedFilesPath)); + } + #region Helpers private DocumentationBrowserViewExtension SetupNewViewExtension(bool runLoadedMethod = false) diff --git a/test/Engine/FFITarget/FFITarget.csproj b/test/Engine/FFITarget/FFITarget.csproj index 0533e6dc0e6..5bd3236dbc1 100644 --- a/test/Engine/FFITarget/FFITarget.csproj +++ b/test/Engine/FFITarget/FFITarget.csproj @@ -15,22 +15,6 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - - - - - - - - - - - - True - tlbimp - False - - all diff --git a/test/Engine/ProtoTest/ProtoTest.csproj b/test/Engine/ProtoTest/ProtoTest.csproj index f447f0f8168..26e00ea2f5b 100644 --- a/test/Engine/ProtoTest/ProtoTest.csproj +++ b/test/Engine/ProtoTest/ProtoTest.csproj @@ -23,22 +23,6 @@ - - - - - - - - - - - - - False - ..\..\test_support_projects\EmbeddedInterop.dll - - diff --git a/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj b/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj index c43d78a3687..bdc502fbcab 100644 --- a/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj +++ b/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj @@ -17,12 +17,6 @@ - - - - - - {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85} diff --git a/test/Engine/ProtoTestFx/ProtoTestFx.csproj b/test/Engine/ProtoTestFx/ProtoTestFx.csproj index 3235641405c..e8cbc7fbeec 100644 --- a/test/Engine/ProtoTestFx/ProtoTestFx.csproj +++ b/test/Engine/ProtoTestFx/ProtoTestFx.csproj @@ -12,18 +12,6 @@ - - - - - - - - - - - - diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index b4c9626fb32..f5983b03129 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -10,20 +10,9 @@ AnalysisTests - + - - - - - - - - - - - diff --git a/test/Libraries/CommandLineTests/CommandLineTests.csproj b/test/Libraries/CommandLineTests/CommandLineTests.csproj index 097133532e1..5d9052239a7 100644 --- a/test/Libraries/CommandLineTests/CommandLineTests.csproj +++ b/test/Libraries/CommandLineTests/CommandLineTests.csproj @@ -15,23 +15,8 @@ - - - - - - - - - - - - - ..\..\..\extern\prism\Microsoft.Practices.Prism.dll - - - + diff --git a/test/Libraries/CoreNodesTests/CoreNodesTests.csproj b/test/Libraries/CoreNodesTests/CoreNodesTests.csproj index 45ca6133ff6..507d20c549f 100644 --- a/test/Libraries/CoreNodesTests/CoreNodesTests.csproj +++ b/test/Libraries/CoreNodesTests/CoreNodesTests.csproj @@ -18,15 +18,6 @@ - - - - - - - - - diff --git a/test/Libraries/DataBridgeTests/DataBridgeTests.csproj b/test/Libraries/DataBridgeTests/DataBridgeTests.csproj index 0d031abb347..21585d2fe02 100644 --- a/test/Libraries/DataBridgeTests/DataBridgeTests.csproj +++ b/test/Libraries/DataBridgeTests/DataBridgeTests.csproj @@ -17,12 +17,6 @@ - - - - - - diff --git a/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj b/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj index 846fd04df0c..290a684e9f5 100644 --- a/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj +++ b/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj @@ -11,18 +11,6 @@ DynamoMSOfficeTests DynamoMSOfficeTests - - - - - - - - {9b4fdc96-e2f9-4b8f-894a-4294405d50e7} - DSOffice - False - - @@ -33,12 +21,7 @@ - - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} - DynamoCoreWpf - False - + {7858FA8C-475F-4B8E-B468-1F8200778CF8} DynamoCore @@ -64,14 +47,6 @@ DynamoUtilities False - - {7dd8077a-201e-4c56-96c5-3c901a51bdf3} - DynamoCoreWpfTests - - - {89563cd0-509b-40a5-8728-9d3ec6fe8410} - SystemTestServices - diff --git a/test/Libraries/DynamoPythonTests/CodeCompletionTests.cs b/test/Libraries/DynamoPythonTests/CodeCompletionTests.cs index c704460ddda..a1faa500ed7 100644 --- a/test/Libraries/DynamoPythonTests/CodeCompletionTests.cs +++ b/test/Libraries/DynamoPythonTests/CodeCompletionTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -42,8 +42,7 @@ public void SharedCoreCanReturnCLRCompletionData() Assert.IsTrue(completionList.Any()); Assert.IsTrue(completionList.Intersect(new[] { "Hashtable", "Queue", "Stack" }).Count() == 3); - // Serial tests load an extra type (System.Collections.Immutable) in the Python engine - Assert.IsTrue(completionData.Length >= 29 && completionData.Length <= 30); + Assert.IsTrue(completionData.Length == 31); } } @@ -237,8 +236,7 @@ public void CanImportSystemCollectionsLibraryAndGetCompletionData() Assert.IsTrue(completionList.Any()); Assert.IsTrue(completionList.Intersect(new[] { "Hashtable", "Queue", "Stack" }).Count() == 3); - // Serial tests load an extra type (System.Collections.Immutable) in the Python engine - Assert.IsTrue(completionData.Length >= 29 && completionData.Length <= 30); + Assert.IsTrue(completionData.Length == 31); } [Test] diff --git a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj index db52bfe5adf..7b8d22e20fd 100644 --- a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj +++ b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj @@ -12,28 +12,18 @@ DynamoPythonTests - - - + + + + - ..\..\..\extern\Python\Python.Runtime.dll False - - - - - - - ..\..\..\extern\prism\Microsoft.Practices.Prism.dll - False - - {51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4} diff --git a/test/Libraries/DynamoPythonTests/PythonEditTests.cs b/test/Libraries/DynamoPythonTests/PythonEditTests.cs index 875d80811db..5197b0b1e62 100644 --- a/test/Libraries/DynamoPythonTests/PythonEditTests.cs +++ b/test/Libraries/DynamoPythonTests/PythonEditTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -14,10 +14,11 @@ using PythonNodeModels; using Dynamo.PythonServices; using DynCmd = Dynamo.Models.DynamoModel; +using System.Threading; namespace Dynamo.Tests { - [RequiresSTA] + [RequiresThread(ApartmentState.STA)] public class PythonEditTests : DynamoViewModelUnitTest { protected override void GetLibrariesToPreload(List libraries) @@ -787,4 +788,4 @@ def get_data(self): } } } -} \ No newline at end of file +} diff --git a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj index 92ce3889e55..33c45f6447d 100644 --- a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj +++ b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj @@ -13,17 +13,6 @@ - - - - - - - - - - - diff --git a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj index bbbbe5a95d6..177baba191c 100644 --- a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj +++ b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj @@ -10,20 +10,9 @@ DisplayTests - + - - - - - - - - - - - diff --git a/test/Libraries/IronPythonTests/IronPythonTests.csproj b/test/Libraries/IronPythonTests/IronPythonTests.csproj index 0e0d6050c94..22aa930c172 100644 --- a/test/Libraries/IronPythonTests/IronPythonTests.csproj +++ b/test/Libraries/IronPythonTests/IronPythonTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj b/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj index aef9fc073b2..cd192e60362 100644 --- a/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj +++ b/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj @@ -14,17 +14,6 @@ DynamoServicesTests DynamoServicesTests - - - - - - - - - - - diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 3aba4da863f..2b2599ad402 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -22,19 +22,6 @@ compile; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - diff --git a/test/Libraries/SystemTestServices/SystemTestServices.csproj b/test/Libraries/SystemTestServices/SystemTestServices.csproj index 4f3a0c0e677..fde6c81c728 100644 --- a/test/Libraries/SystemTestServices/SystemTestServices.csproj +++ b/test/Libraries/SystemTestServices/SystemTestServices.csproj @@ -20,22 +20,6 @@ - - - - - - - - - - False - - - ..\..\..\extern\prism\Microsoft.Practices.Prism.dll - False - - {51bb6014-43f7-4f31-b8d3-e3c37ebedaf4} diff --git a/test/Libraries/TestServices/TestServices.csproj b/test/Libraries/TestServices/TestServices.csproj index 06cf7f765da..a4b4d85fb11 100644 --- a/test/Libraries/TestServices/TestServices.csproj +++ b/test/Libraries/TestServices/TestServices.csproj @@ -10,20 +10,13 @@ TestServices - + - - - - - - - {7858fa8c-475f-4b8e-b468-1f8200778cf8} diff --git a/test/Libraries/TestServices/TestSessionConfiguration.cs b/test/Libraries/TestServices/TestSessionConfiguration.cs index c64401adc2b..ae4b2befdf9 100644 --- a/test/Libraries/TestServices/TestSessionConfiguration.cs +++ b/test/Libraries/TestServices/TestSessionConfiguration.cs @@ -99,13 +99,6 @@ public TestSessionConfiguration(string dynamoCoreDirectory, string configFileDir { RequestedLibraryVersion2 = version; } - // else try to load the older one and convert it to a known precise version. - else if (Enum.TryParse(versionStrOld, out libVersion)) - { - var realVersion = Preloader.MapLibGVersionEnumToFullVersion(libVersion); - RequestedLibraryVersion2 = realVersion; - - } // find an installed ASM version if we could not find a specified version in the config file. else { diff --git a/test/Libraries/WorkflowTests/WorkflowTests.csproj b/test/Libraries/WorkflowTests/WorkflowTests.csproj index d74e157a5da..acf6ee454e4 100644 --- a/test/Libraries/WorkflowTests/WorkflowTests.csproj +++ b/test/Libraries/WorkflowTests/WorkflowTests.csproj @@ -14,13 +14,7 @@ - - - - - - - + diff --git a/test/System/IntegrationTests/IntegrationTests.csproj b/test/System/IntegrationTests/IntegrationTests.csproj index 320a36e9947..7685be1a6cf 100644 --- a/test/System/IntegrationTests/IntegrationTests.csproj +++ b/test/System/IntegrationTests/IntegrationTests.csproj @@ -14,18 +14,6 @@ IntegrationTests IntegrationTests - - - - - - - - - - - - diff --git a/test/TestUINodes/TestUINodes.csproj b/test/TestUINodes/TestUINodes.csproj index 6b96d5d34de..bcfc2e40876 100644 --- a/test/TestUINodes/TestUINodes.csproj +++ b/test/TestUINodes/TestUINodes.csproj @@ -20,12 +20,6 @@ - - - - - - diff --git a/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj b/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj index dd368c572d1..0867d9bbf84 100644 --- a/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj +++ b/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj @@ -15,17 +15,6 @@ - - - - - - - - - - - diff --git a/test/core/libGPreloader/incomplete227List.csv b/test/core/libGPreloader/incomplete227List.csv deleted file mode 100644 index ef11e75a64b..00000000000 --- a/test/core/libGPreloader/incomplete227List.csv +++ /dev/null @@ -1 +0,0 @@ -c:\Program Files\Company\Product1 2022\ac1st24.dll;c:\Program Files\Company\Product1 2022\acbr24.dbx;c:\Program Files\Company\Product1 2022\acdb24.dll;c:\Program Files\Company\Product1 2022\AcDbMgd.dll;c:\Program Files\Company\Product1 2022\acdbmgdbrep.dll;c:\Program Files\Company\Product1 2022\AcDgnIO.dbx;c:\Program Files\Company\Product1 2022\AcDgnLS.dbx;c:\Program Files\Company\Product1 2022\AcDgnLsTrans.dbx;c:\Program Files\Company\Product1 2022\AcDgnMsStr.dll;c:\Program Files\Company\Product1 2022\AcDs.dll;c:\Program Files\Company\Product1 2022\acge24.dll;c:\Program Files\Company\Product1 2022\AcGeoLocationObj.dbx;c:\Program Files\Company\Product1 2022\AcGeomentObj.dbx;c:\Program Files\Company\Product1 2022\acgex24.dll;c:\Program Files\Company\Product1 2022\AcGradient24.dll;c:\Program Files\Company\Product1 2022\acismobj24.dbx;c:\Program Files\Company\Product1 2022\acpal.dll;c:\Program Files\Company\Product1 2022\AcPersSubentNaming24.dll;c:\Program Files\Company\Product1 2022\AcSceneOE.dbx;c:\Program Files\Company\Product1 2022\AcShareViewPropsACA.dbx;c:\Program Files\Company\Product1 2022\AcTaskDialogs.dll;c:\Program Files\Company\Product1 2022\AcUt.dll;c:\Program Files\Company\Product1 2022\AdApplicationFrame.dll;c:\Program Files\Company\Product1 2022\AdCoreUnits-16.dll;c:\Program Files\Company\Product1 2022\AdCoreUnitsUI-16.dll;c:\Program Files\Company\Product1 2022\AddInJournalClient.dll;c:\Program Files\Company\Product1 2022\AddInJournalEngine.dll;c:\Program Files\Company\Product1 2022\AddInJournaling.dll;c:\Program Files\Company\Product1 2022\AddInManager.dll;c:\Program Files\Company\Product1 2022\AddInManagerUI.dll;c:\Program Files\Company\Product1 2022\AdImaging.dll;c:\Program Files\Company\Product1 2022\AdIntImgServices.dll;c:\Program Files\Company\Product1 2022\AdMaterialUI.dll;c:\Program Files\Company\Product1 2022\ADPClientService.exe;c:\Program Files\Company\Product1 2022\AdPreviewGenerator.exe;c:\Program Files\Company\Product1 2022\AdpSDKCore.dll;c:\Program Files\Company\Product1 2022\AdpSDKCSharpWrapper.dll;c:\Program Files\Company\Product1 2022\AdpSDKUI.dll;c:\Program Files\Company\Product1 2022\AdpSDKWrapper.dll;c:\Program Files\Company\Product1 2022\adp_application-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\adp_core-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\adp_core-6_1.dll;c:\Program Files\Company\Product1 2022\adp_data-6_1.dll;c:\Program Files\Company\Product1 2022\adp_service_opczip-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\adp_service_opczip-6_1.dll;c:\Program Files\Company\Product1 2022\adp_service_reporting-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\adp_toolkit-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\adp_toolkit-6_1.dll;c:\Program Files\Company\Product1 2022\adskassetapi_new-16.dll;c:\Program Files\Company\Product1 2022\CompHardwareCertificationReport.xml;c:\Program Files\Company\Product1 2022\CompLicensingSDK_3.dll;c:\Program Files\Company\Product1 2022\CompOAuth.dll;c:\Program Files\Company\Product1 2022\CompRcAdp.dll;c:\Program Files\Company\Product1 2022\CompRcAssetExtraction.dll;c:\Program Files\Company\Product1 2022\CompRcCommon.dll;c:\Program Files\Company\Product1 2022\CompRcConfig.dll;c:\Program Files\Company\Product1 2022\CompRcData.dll;c:\Program Files\Company\Product1 2022\CompRcDataAccess.dll;c:\Program Files\Company\Product1 2022\CompRcDevTools.dll;c:\Program Files\Company\Product1 2022\CompRcDispatch.dll;c:\Program Files\Company\Product1 2022\CompRcExport.dll;c:\Program Files\Company\Product1 2022\CompRcFileSystemUtility.dll;c:\Program Files\Company\Product1 2022\CompRcFilter.dll;c:\Program Files\Company\Product1 2022\CompRcFoundation.dll;c:\Program Files\Company\Product1 2022\CompRcImageIO.dll;c:\Program Files\Company\Product1 2022\CompRcImport.dll;c:\Program Files\Company\Product1 2022\CompRcPointCloudEngine.dll;c:\Program Files\Company\Product1 2022\CompRcProjectIO.dll;c:\Program Files\Company\Product1 2022\CompRcSpatialReference.dll;c:\Program Files\Company\Product1 2022\CompRcUtility.dll;c:\Program Files\Company\Product1 2022\CompRealityStudioBaseAPI.dll;c:\Program Files\Company\Product1 2022\CompRealityStudioFeatureExtraction.dll;c:\Program Files\Company\Product1 2022\CompRealityStudioHLAPI.dll;c:\Program Files\Company\Product1 2022\CompRealityStudioInternalAPI.dll;c:\Program Files\Company\Product1 2022\AdSpatialReference.dll;c:\Program Files\Company\Product1 2022\AdSpellEng.dll;c:\Program Files\Company\Product1 2022\AdSSOServices.dll;c:\Program Files\Company\Product1 2022\AdSubAware.exe;c:\Program Files\Company\Product1 2022\adui24.dll;c:\Program Files\Company\Product1 2022\AdUICore.dll;c:\Program Files\Company\Product1 2022\AdUiMgd.dll;c:\Program Files\Company\Product1 2022\AdUiPalettes.dll;c:\Program Files\Company\Product1 2022\AdWindows.dll;c:\Program Files\Company\Product1 2022\AecArchBase.dbx;c:\Program Files\Company\Product1 2022\AecAreaCalculationBase.dbx;c:\Program Files\Company\Product1 2022\AecBase.dbx;c:\Program Files\Company\Product1 2022\AecBaseEx.dbx;c:\Program Files\Company\Product1 2022\AecDACHMigratorDb.dbx;c:\Program Files\Company\Product1 2022\AecModeler.dbx;c:\Program Files\Company\Product1 2022\AecProjectBase.dbx;c:\Program Files\Company\Product1 2022\AecRenovationDb.dbx;c:\Program Files\Company\Product1 2022\AecResMgr.dll;c:\Program Files\Company\Product1 2022\AecResUI.dll;c:\Program Files\Company\Product1 2022\AecRoomBookConfig.xml;c:\Program Files\Company\Product1 2022\AecRoomBookDb.dbx;c:\Program Files\Company\Product1 2022\AecRoomBookStandards.xml;c:\Program Files\Company\Product1 2022\AecSchedule.dbx;c:\Program Files\Company\Product1 2022\AecScript.dll;c:\Program Files\Company\Product1 2022\AecSolidModeler.dbx;c:\Program Files\Company\Product1 2022\AecSpaceExConfig.xml;c:\Program Files\Company\Product1 2022\AecSpaceExDb.dbx;c:\Program Files\Company\Product1 2022\AecSystemTools.dll;c:\Program Files\Company\Product1 2022\AggregationAPI.dll;c:\Program Files\Company\Product1 2022\AIM_API.dll;c:\Program Files\Company\Product1 2022\AnalysisAppsDB.dll;c:\Program Files\Company\Product1 2022\AnalysisAppsDBAPI.dll;c:\Program Files\Company\Product1 2022\AnalysisAppsMFC.dll;c:\Program Files\Company\Product1 2022\AnalysisAppsUI.dll;c:\Program Files\Company\Product1 2022\AnalyticalInformationModel.dll;c:\Program Files\Company\Product1 2022\AnalyticalVolumes.dll;c:\Program Files\Company\Product1 2022\AnalyticalVolumesInterop.dll;c:\Program Files\Company\Product1 2022\anav.dll;c:\Program Files\Company\Product1 2022\ANN.dll;c:\Program Files\Company\Product1 2022\Antlr4.Runtime.dll;c:\Program Files\Company\Product1 2022\APIDB.dll;c:\Program Files\Company\Product1 2022\APIDBAPI.dll;c:\Program Files\Company\Product1 2022\APIInterop.dll;c:\Program Files\Company\Product1 2022\APIMFC.dll;c:\Program Files\Company\Product1 2022\APIUI.dll;c:\Program Files\Company\Product1 2022\APIUIAPI.dll;c:\Program Files\Company\Product1 2022\ArrayElemsDB.dll;c:\Program Files\Company\Product1 2022\ArrayElemsDBAPI.dll;c:\Program Files\Company\Product1 2022\ArrayElemsMFC.dll;c:\Program Files\Company\Product1 2022\ArrayElemsUI.dll;c:\Program Files\Company\Product1 2022\AsdkHlrApi24.dbx;c:\Program Files\Company\Product1 2022\ASMAHL227A.dll;c:\Program Files\Company\Product1 2022\ASMBASE227A.dll;c:\Program Files\Company\Product1 2022\ASMBLND227A.dll;c:\Program Files\Company\Product1 2022\ASMBOOL227A.dll;c:\Program Files\Company\Product1 2022\ASMCOVR227A.dll;c:\Program Files\Company\Product1 2022\ASMCSTR227A.dll;c:\Program Files\Company\Product1 2022\ASMCT227A.dll;c:\Program Files\Company\Product1 2022\ASMDATAX227A.dll;c:\Program Files\Company\Product1 2022\ASMDEFM227A.dll;c:\Program Files\Company\Product1 2022\ASMEULR227A.dll;c:\Program Files\Company\Product1 2022\ASMFCT227A.dll;c:\Program Files\Company\Product1 2022\ASMFREC227A.dll;c:\Program Files\Company\Product1 2022\ASMGA227A.dll;c:\Program Files\Company\Product1 2022\ASMHEAL227A.dll;c:\Program Files\Company\Product1 2022\ASMIMPORT227A.dll;c:\Program Files\Company\Product1 2022\ASMINTR227A.dll;c:\Program Files\Company\Product1 2022\ASMKERN227A.dll;c:\Program Files\Company\Product1 2022\ASMLAW227A.dll;c:\Program Files\Company\Product1 2022\ASMLOP227A.dll;c:\Program Files\Company\Product1 2022\ASMLOPT227A.dll;c:\Program Files\Company\Product1 2022\ASMNPCH227A.dll;c:\Program Files\Company\Product1 2022\ASMOFST227A.dll;c:\Program Files\Company\Product1 2022\ASMOPER227A.dll;c:\Program Files\Company\Product1 2022\ASMPID227A.dll;c:\Program Files\Company\Product1 2022\ASMRBASE227A.dll;c:\Program Files\Company\Product1 2022\ASMRBI227A.dll;c:\Program Files\Company\Product1 2022\ASMREM227A.dll;c:\Program Files\Company\Product1 2022\ASMSBAP227A.dll;c:\Program Files\Company\Product1 2022\ASMSBOOL227A.dll;c:\Program Files\Company\Product1 2022\ASMSHL227A.dll;c:\Program Files\Company\Product1 2022\ASMSKIN227A.dll;c:\Program Files\Company\Product1 2022\ASMSWP227A.dll;c:\Program Files\Company\Product1 2022\ASMTOPT227A.dll;c:\Program Files\Company\Product1 2022\ASMTWK227A.dll;c:\Program Files\Company\Product1 2022\ASMUFLD227A.dll;c:\Program Files\Company\Product1 2022\ASMWELD227A.dll;c:\Program Files\Company\Product1 2022\AssemblyDB.dll;c:\Program Files\Company\Product1 2022\AssemblyDBAPI.dll;c:\Program Files\Company\Product1 2022\AssemblyMFC.dll;c:\Program Files\Company\Product1 2022\AssemblyUI.dll;c:\Program Files\Company\Product1 2022\AsyncFriendlyStackTrace.DLL;c:\Program Files\Company\Product1 2022\ATFProduct1Consumer.dll;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerBroker.exe;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerBroker.exe.config;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerBroker.sig;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerRCEHost.exe;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerRCEHost.exe.config;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerRCEHost.sig;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerTranslator.dll;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerTranslator.sig;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerWCFInterface.dll;c:\Program Files\Company\Product1 2022\ATFProduct1ProducerWCFInterface.sig;c:\Program Files\Company\Product1 2022\atf_api.dll;c:\Program Files\Company\Product1 2022\atf_asm_interface.dll;c:\Program Files\Company\Product1 2022\atf_extension_data.dll;c:\Program Files\Company\Product1 2022\atf_parasolid_bridge.dll;c:\Program Files\Company\Product1 2022\atf_physical_material_extension_data.dll;c:\Program Files\Company\Product1 2022\atf_pmi3da_extension_data.dll;c:\Program Files\Company\Product1 2022\atf_processor.dll;c:\Program Files\Company\Product1 2022\atf_processor_extension_data.dll;c:\Program Files\Company\Product1 2022\atf_revit_producer.dll;c:\Program Files\Company\Product1 2022\atf_revit_producer.sig;c:\Program Files\Company\Product1 2022\atf_rhino_producer.dll;c:\Program Files\Company\Product1 2022\atf_sat_consumer.dll;c:\Program Files\Company\Product1 2022\atf_sat_producer.dll;c:\Program Files\Company\Product1 2022\atf_sketchup_extension_data.dll;c:\Program Files\Company\Product1 2022\atf_sketchup_producer.dll;c:\Program Files\Company\Product1 2022\atf_swx_producer.dll;c:\Program Files\Company\Product1 2022\atf_xml_consumer.dll;c:\Program Files\Company\Product1 2022\atf_xml_producer.dll;c:\Program Files\Company\Product1 2022\atf_xml_util.dll;c:\Program Files\Company\Product1 2022\atlast.dxt;c:\Program Files\Company\Product1 2022\atlst24.dll;c:\Program Files\Company\Product1 2022\AutoCam.dll;c:\Program Files\Company\Product1 2022\Company.AppDomainHelper.dll;c:\Program Files\Company\Product1 2022\Company.Bcg.DLL;c:\Program Files\Company\Product1 2022\Company.Bcg.Http.dll;c:\Program Files\Company\Product1 2022\Company.Bcg.Logging.dll;c:\Program Files\Company\Product1 2022\Company.Bcg.Net.dll;c:\Program Files\Company\Product1 2022\Company.C4R.Model.Client.dll;c:\Program Files\Company\Product1 2022\Company.C4R.Model.Common.DLL;c:\Program Files\Company\Product1 2022\Company.Extensions.dll;c:\Program Files\Company\Product1 2022\Company.Extensions.Json.dll;c:\Program Files\Company\Product1 2022\Company.Http.DevPortal.dll;c:\Program Files\Company\Product1 2022\Company.Http.dll;c:\Program Files\Company\Product1 2022\Company.Logging.dll;c:\Program Files\Company\Product1 2022\Company.Product1.Config.Client.dll;c:\Program Files\Company\Product1 2022\Company.Product1Server.Management.Client.dll;c:\Program Files\Company\Product1 2022\Company.Product1Server.Social.dll;c:\Program Files\Company\Product1 2022\Company.Product1Server.Storage.DLL;c:\Program Files\Company\Product1 2022\Company.UI.Themes.dll;c:\Program Files\Company\Product1 2022\Company.UI.Windows.dll;c:\Program Files\Company\Product1 2022\AutoMapper.dll;c:\Program Files\Company\Product1 2022\AWSSDK.Core.dll;c:\Program Files\Company\Product1 2022\AWSSDK.S3.dll;c:\Program Files\Company\Product1 2022\AWSSDK.SecurityToken.dll;c:\Program Files\Company\Product1 2022\BaseElementSchema.01.00.ecschema.xml;c:\Program Files\Company\Product1 2022\Bentley2.dll;c:\Program Files\Company\Product1 2022\BentleyGeom2.dll;c:\Program Files\Company\Product1 2022\bentleylogging-2.0.dll;c:\Program Files\Company\Product1 2022\BrandRVTRes.dll;c:\Program Files\Company\Product1 2022\BuildingComponent-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\BuildingSite-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\BuildingSystemsDB.dll;c:\Program Files\Company\Product1 2022\BuildingSystemsDBAPI.dll;c:\Program Files\Company\Product1 2022\BuildingSystemsMFC.dll;c:\Program Files\Company\Product1 2022\BuildingSystemsUI.dll;c:\Program Files\Company\Product1 2022\BuildingSystemsUIAPI.dll;c:\Program Files\Company\Product1 2022\C4RNET.dll;c:\Program Files\Company\Product1 2022\Castle.Core.dll;c:\Program Files\Company\Product1 2022\Castle.Windsor.dll;c:\Program Files\Company\Product1 2022\CCManager.dll;c:\Program Files\Company\Product1 2022\CCManager.dll.config;c:\Program Files\Company\Product1 2022\CEAUpdate.dll;c:\Program Files\Company\Product1 2022\CEFProduct1Utils.dll;c:\Program Files\Company\Product1 2022\ClimateData.dll;c:\Program Files\Company\Product1 2022\ClimateServer.dll;c:\Program Files\Company\Product1 2022\CollaborateFileNav.dll;c:\Program Files\Company\Product1 2022\ConceptualEnergyAnalysisInterop.dll;c:\Program Files\Company\Product1 2022\ConceptualEnergyAnalysisMFC.dll;c:\Program Files\Company\Product1 2022\Copyrights.rtf;c:\Program Files\Company\Product1 2022\CurtainGridFamilyDB.dll;c:\Program Files\Company\Product1 2022\CurtainGridFamilyDBAPI.dll;c:\Program Files\Company\Product1 2022\CurtainGridFamilyMFC.dll;c:\Program Files\Company\Product1 2022\CurtainGridFamilyUI.dll;c:\Program Files\Company\Product1 2022\d3dcompiler_47.dll;c:\Program Files\Company\Product1 2022\DADispatcherService.exe;c:\Program Files\Company\Product1 2022\dbghelp.dll;c:\Program Files\Company\Product1 2022\DBManagedServices.dll;c:\Program Files\Company\Product1 2022\dboleutl24.dll;c:\Program Files\Company\Product1 2022\dcu2d67.dll;c:\Program Files\Company\Product1 2022\dcu2dnet67.dll;c:\Program Files\Company\Product1 2022\DefaultUILayout.xml;c:\Program Files\Company\Product1 2022\DesktopMFC.dll;c:\Program Files\Company\Product1 2022\DesktopMFCAPI.dll;c:\Program Files\Company\Product1 2022\DetailDB.dll;c:\Program Files\Company\Product1 2022\DetailDBAPI.dll;c:\Program Files\Company\Product1 2022\DetailMFC.dll;c:\Program Files\Company\Product1 2022\DetailUI.dll;c:\Program Files\Company\Product1 2022\DetailUIAPI.dll;c:\Program Files\Company\Product1 2022\deu.dct;c:\Program Files\Company\Product1 2022\deu2.dct;c:\Program Files\Company\Product1 2022\deuo2.dct;c:\Program Files\Company\Product1 2022\DgnCore2.dll;c:\Program Files\Company\Product1 2022\DgnFileIO2.dll;c:\Program Files\Company\Product1 2022\DgnHandlers2.dll;c:\Program Files\Company\Product1 2022\DgnPlatformTools2.dll;c:\Program Files\Company\Product1 2022\DGNPro.dll;c:\Program Files\Company\Product1 2022\Diction.ary;c:\Program Files\Company\Product1 2022\DL150ACE.dll;c:\Program Files\Company\Product1 2022\DL150AdobeXMP.dll;c:\Program Files\Company\Product1 2022\DL150AGM.dll;c:\Program Files\Company\Product1 2022\DL150ARE.dll;c:\Program Files\Company\Product1 2022\DL150AXE8SharedExpat.dll;c:\Program Files\Company\Product1 2022\DL150BIB.dll;c:\Program Files\Company\Product1 2022\DL150BIBUtils.dll;c:\Program Files\Company\Product1 2022\DL150CoolType.dll;c:\Program Files\Company\Product1 2022\DL150JP2KLib.dll;c:\Program Files\Company\Product1 2022\DL150PDFL.dll;c:\Program Files\Company\Product1 2022\DL150PDFlattener.ppi;c:\Program Files\Company\Product1 2022\DL150pdfport.dll;c:\Program Files\Company\Product1 2022\DL150PDFProcessor.ppi;c:\Program Files\Company\Product1 2022\DL150pdfsettings.dll;c:\Program Files\Company\Product1 2022\DL150XPS2PDF.ppi;c:\Program Files\Company\Product1 2022\DotNetOpenAuth.dll;c:\Program Files\Company\Product1 2022\DotNetOpenAuth.xml;c:\Program Files\Company\Product1 2022\DPartDB.dll;c:\Program Files\Company\Product1 2022\DPartDBAPI.dll;c:\Program Files\Company\Product1 2022\DPartMFC.dll;c:\Program Files\Company\Product1 2022\DPartUI.dll;c:\Program Files\Company\Product1 2022\ECObjects3.dll;c:\Program Files\Company\Product1 2022\Ecotect.dll;c:\Program Files\Company\Product1 2022\EcotectAPI.dll;c:\Program Files\Company\Product1 2022\edmicpp500_2012.dll;c:\Program Files\Company\Product1 2022\edmikit500.dll;c:\Program Files\Company\Product1 2022\edm_libxml2.dll;c:\Program Files\Company\Product1 2022\ElementGroupDB.dll;c:\Program Files\Company\Product1 2022\ElementGroupDBAPI.dll;c:\Program Files\Company\Product1 2022\ElementGroupMFC.dll;c:\Program Files\Company\Product1 2022\ElementGroupUI.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisDB.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisDBAPI.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisInterop.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisMFC.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisUI.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisUtilities.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisUtilitiesAPI.dll;c:\Program Files\Company\Product1 2022\EnergyAnalysisUtilitiesDB.dll;c:\Program Files\Company\Product1 2022\eng.dct;c:\Program Files\Company\Product1 2022\eng2.dct;c:\Program Files\Company\Product1 2022\enu.dct;c:\Program Files\Company\Product1 2022\enu2.dct;c:\Program Files\Company\Product1 2022\esp.dct;c:\Program Files\Company\Product1 2022\esp2.dct;c:\Program Files\Company\Product1 2022\EssentialsDB.dll;c:\Program Files\Company\Product1 2022\EssentialsDBAPI.dll;c:\Program Files\Company\Product1 2022\EssentialsMFC.dll;c:\Program Files\Company\Product1 2022\EssentialsUI.dll;c:\Program Files\Company\Product1 2022\EssentialsUIAPI.dll;c:\Program Files\Company\Product1 2022\EXR.dll;c:\Program Files\Company\Product1 2022\ExternalResourceView.dll;c:\Program Files\Company\Product1 2022\EXTRACT.EXE;c:\Program Files\Company\Product1 2022\FabPats.dll;c:\Program Files\Company\Product1 2022\FamilyDB.dll;c:\Program Files\Company\Product1 2022\FamilyDBAPI.dll;c:\Program Files\Company\Product1 2022\FamilyMFC.dll;c:\Program Files\Company\Product1 2022\FamilyUI.dll;c:\Program Files\Company\Product1 2022\FeatureExtractionCore.dll;c:\Program Files\Company\Product1 2022\ForgeParameters.dll;c:\Program Files\Company\Product1 2022\ForgeUnits.dll;c:\Program Files\Company\Product1 2022\fra.dct;c:\Program Files\Company\Product1 2022\fra2.dct;c:\Program Files\Company\Product1 2022\freetype263.dll;c:\Program Files\Company\Product1 2022\gdiplus.dll;c:\Program Files\Company\Product1 2022\GemDriverN.dll;c:\Program Files\Company\Product1 2022\GeneratedResourceIds.inl;c:\Program Files\Company\Product1 2022\GeomUtil.dll;c:\Program Files\Company\Product1 2022\GeomUtilAPI.dll;c:\Program Files\Company\Product1 2022\Graphics.dll;c:\Program Files\Company\Product1 2022\GraphicsAPI.dll;c:\Program Files\Company\Product1 2022\GreenBuildingXML.xsd;c:\Program Files\Company\Product1 2022\GrphOGS3.dll;c:\Program Files\Company\Product1 2022\GrphProtein2.dll;c:\Program Files\Company\Product1 2022\HostObjDB.dll;c:\Program Files\Company\Product1 2022\HostObjDBAPI.dll;c:\Program Files\Company\Product1 2022\HostObjMFC.dll;c:\Program Files\Company\Product1 2022\HostObjUI.dll;c:\Program Files\Company\Product1 2022\ICEAResultsCtrl.dll;c:\Program Files\Company\Product1 2022\ICSharpCode.SharpZipLib.dll;c:\Program Files\Company\Product1 2022\icucnv40.dll;c:\Program Files\Company\Product1 2022\icudt40.dll;c:\Program Files\Company\Product1 2022\icudt64.dll;c:\Program Files\Company\Product1 2022\icuin64.dll;c:\Program Files\Company\Product1 2022\icuuc64.dll;c:\Program Files\Company\Product1 2022\Identity.ini;c:\Program Files\Company\Product1 2022\IFC Shared Parameters-Product1IFCBuiltIn-Type.txt;c:\Program Files\Company\Product1 2022\IFC Shared Parameters-Product1IFCBuiltIn-Type_ALL.txt;c:\Program Files\Company\Product1 2022\IFC Shared Parameters-Product1IFCBuiltIn.txt;c:\Program Files\Company\Product1 2022\IFC Shared Parameters-Product1IFCBuiltIn_ALL.txt;c:\Program Files\Company\Product1 2022\IFC Shared Parameters.txt;c:\Program Files\Company\Product1 2022\IFC.ico;c:\Program Files\Company\Product1 2022\IFCCertifiedEntitiesAndPSets.json;c:\Program Files\Company\Product1 2022\IFCXML.ico;c:\Program Files\Company\Product1 2022\IFCZIP.ico;c:\Program Files\Company\Product1 2022\Interface.dll;c:\Program Files\Company\Product1 2022\InterfaceAPI.dll;c:\Program Files\Company\Product1 2022\InterfaceUtil.dll;c:\Program Files\Company\Product1 2022\InterfaceUtilAPI.dll;c:\Program Files\Company\Product1 2022\IntfADT.dll;c:\Program Files\Company\Product1 2022\IntfASM.dll;c:\Program Files\Company\Product1 2022\IntfASMAdvanced.dll;c:\Program Files\Company\Product1 2022\IntfATF.dll;c:\Program Files\Company\Product1 2022\IntfATFAPI.dll;c:\Program Files\Company\Product1 2022\IntfDBX.dll;c:\Program Files\Company\Product1 2022\IntfDGN.dll;c:\Program Files\Company\Product1 2022\IntfDWF.dll;c:\Program Files\Company\Product1 2022\IntfDWG.dll;c:\Program Files\Company\Product1 2022\IntfFBX.dll;c:\Program Files\Company\Product1 2022\IntfIFC.dll;c:\Program Files\Company\Product1 2022\IntfIFCAPI.dll;c:\Program Files\Company\Product1 2022\IntfMechanical.dll;c:\Program Files\Company\Product1 2022\IntfOldDGN.dll;c:\Program Files\Company\Product1 2022\IntfPDF.dll;c:\Program Files\Company\Product1 2022\IntfPDFExport.dll;c:\Program Files\Company\Product1 2022\ita.dct;c:\Program Files\Company\Product1 2022\ita2.dct;c:\Program Files\Company\Product1 2022\itextsharp.dll;c:\Program Files\Company\Product1 2022\JobMonitor.dll;c:\Program Files\Company\Product1 2022\laszip3.dll;c:\Program Files\Company\Product1 2022\LAUtility.dll;c:\Program Files\Company\Product1 2022\LegendComponentDB.dll;c:\Program Files\Company\Product1 2022\LegendComponentDBAPI.dll;c:\Program Files\Company\Product1 2022\LegendComponentMFC.dll;c:\Program Files\Company\Product1 2022\LegendComponentUI.dll;c:\Program Files\Company\Product1 2022\libcrypto-Ad-1_1-x64.dll;c:\Program Files\Company\Product1 2022\libdalton.dll;c:\Program Files\Company\Product1 2022\libdaltonjson.dll;c:\Program Files\Company\Product1 2022\libeay32.dll;c:\Program Files\Company\Product1 2022\libEGL_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\libfbxsdk-adsk.dll;c:\Program Files\Company\Product1 2022\libGLESv2_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\libssl-Ad-1_1-x64.dll;c:\Program Files\Company\Product1 2022\License.ini;c:\Program Files\Company\Product1 2022\LocationSelectorCtrl.dll;c:\Program Files\Company\Product1 2022\LocationSelectorCtrlRes.dll;c:\Program Files\Company\Product1 2022\Log4CPlusU_Ad_1.dll;c:\Program Files\Company\Product1 2022\log4net.dll;c:\Program Files\Company\Product1 2022\log4net.xml;c:\Program Files\Company\Product1 2022\ManagedMC3.dll;c:\Program Files\Company\Product1 2022\MassingDB.dll;c:\Program Files\Company\Product1 2022\MassingDBAPI.dll;c:\Program Files\Company\Product1 2022\MassingMFC.dll;c:\Program Files\Company\Product1 2022\MassingUI.dll;c:\Program Files\Company\Product1 2022\MaterialDB.dll;c:\Program Files\Company\Product1 2022\MaterialDBAPI.dll;c:\Program Files\Company\Product1 2022\materialmapping.txt;c:\Program Files\Company\Product1 2022\MC3.dll;c:\Program Files\Company\Product1 2022\MessageLogger.dll;c:\Program Files\Company\Product1 2022\MessageLoggerDefault.config;c:\Program Files\Company\Product1 2022\MessageLoggerInterop.dll;c:\Program Files\Company\Product1 2022\Microsoft.Expression.Interactions.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Caching.Abstractions.DLL;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Caching.Memory.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Configuration.Abstractions.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Configuration.Binder.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Configuration.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.DependencyInjection.Abstractions.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.DependencyInjection.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Logging.Abstractions.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Logging.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Options.dll;c:\Program Files\Company\Product1 2022\Microsoft.Extensions.Primitives.DLL;c:\Program Files\Company\Product1 2022\Microsoft.Practices.TransientFaultHandling.Core.dll;c:\Program Files\Company\Product1 2022\Microsoft.Practices.Unity.Configuration.dll;c:\Program Files\Company\Product1 2022\Microsoft.Practices.Unity.dll;c:\Program Files\Company\Product1 2022\Microsoft.Windows.Gdiplus.manifest;c:\Program Files\Company\Product1 2022\modlr24.dll;c:\Program Files\Company\Product1 2022\NewtonSoft.Json.dll;c:\Program Files\Company\Product1 2022\Nito.AsyncEx.Coordination.dll;c:\Program Files\Company\Product1 2022\Nito.AsyncEx.Tasks.dll;c:\Program Files\Company\Product1 2022\Nito.Collections.Deque.dll;c:\Program Files\Company\Product1 2022\Nito.Disposables.dll;c:\Program Files\Company\Product1 2022\nld.dct;c:\Program Files\Company\Product1 2022\nld2.dct;c:\Program Files\Company\Product1 2022\NsArchive10.dll;c:\Program Files\Company\Product1 2022\NumberingDB.dll;c:\Program Files\Company\Product1 2022\NumberingDBAPI.dll;c:\Program Files\Company\Product1 2022\ODXSW_DLL.dll;c:\Program Files\Company\Product1 2022\og1100asu.dll;c:\Program Files\Company\Product1 2022\OGSArchive.dll;c:\Program Files\Company\Product1 2022\OGSAtilIntegration.dll;c:\Program Files\Company\Product1 2022\OGSDeviceDiag.dll;c:\Program Files\Company\Product1 2022\OGSDeviceDX10.dll;c:\Program Files\Company\Product1 2022\OGSDeviceDX11.dll;c:\Program Files\Company\Product1 2022\OGSDeviceDX9.dll;c:\Program Files\Company\Product1 2022\OGSDeviceNull.dll;c:\Program Files\Company\Product1 2022\OGSDeviceOGL4.dll;c:\Program Files\Company\Product1 2022\OGSDevices.dll;c:\Program Files\Company\Product1 2022\OGSFBXAssetTranslator.dll;c:\Program Files\Company\Product1 2022\OGSFragmentsLibrary.ogsf;c:\Program Files\Company\Product1 2022\OGSGDIFontDevice.dll;c:\Program Files\Company\Product1 2022\OGSGraphics.dll;c:\Program Files\Company\Product1 2022\OGSIOIntegration.dll;c:\Program Files\Company\Product1 2022\OGSLangHandlerWin.dll;c:\Program Files\Company\Product1 2022\OGSObjects.dll;c:\Program Files\Company\Product1 2022\OGSProtein.dll;c:\Program Files\Company\Product1 2022\OGSRapidRT.dll;c:\Program Files\Company\Product1 2022\OGSRapidRTShaderInterface.dll;c:\Program Files\Company\Product1 2022\OGSRapidRTShaders.dll;c:\Program Files\Company\Product1 2022\OGSSHFontDevice.dll;c:\Program Files\Company\Product1 2022\opennurbs.dll;c:\Program Files\Company\Product1 2022\ot1000asu.dll;c:\Program Files\Company\Product1 2022\PackageContentsParser.dll;c:\Program Files\Company\Product1 2022\PDFNetC.dll;c:\Program Files\Company\Product1 2022\PersistenceDB.dll;c:\Program Files\Company\Product1 2022\PersistenceDBAPI.dll;c:\Program Files\Company\Product1 2022\Picker.dll;c:\Program Files\Company\Product1 2022\PipeKFactors.xml;c:\Program Files\Company\Product1 2022\PlatformCore1.dll;c:\Program Files\Company\Product1 2022\PlatformRuntime1.dll;c:\Program Files\Company\Product1 2022\PointCloudAccess.dll;c:\Program Files\Company\Product1 2022\PointCloudAccessAPI.dll;c:\Program Files\Company\Product1 2022\Polly.DLL;c:\Program Files\Company\Product1 2022\ProdDep_UserDep.mc3;c:\Program Files\Company\Product1 2022\ProdDep_UserInd.mc3;c:\Program Files\Company\Product1 2022\ProdInd_UserDep.mc3;c:\Program Files\Company\Product1 2022\ProdInd_UserInd.mc3;c:\Program Files\Company\Product1 2022\PropertyFormatter.01.00.ecschema.xml;c:\Program Files\Company\Product1 2022\PropertySets_shared.dll;c:\Program Files\Company\Product1 2022\pskernel.dll;c:\Program Files\Company\Product1 2022\pub.dat;c:\Program Files\Company\Product1 2022\Qt5Core_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Gui_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5MultimediaWidgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Multimedia_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Network_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5OpenGL_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Positioning_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5PrintSupport_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5QML_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5QuickWidgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Quick_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Sensors_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5SQL_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5WebChannel_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5WebEngineCore_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5WebEngineWidgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5WebEngine_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Widgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5WinExtras_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5XmlPatterns_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\Qt5Xml_Ad_5_12.dll;c:\Program Files\Company\Product1 2022\QtSolutions_MFCMigrationFramework_Ad_2.dll;c:\Program Files\Company\Product1 2022\RealDWGHostApp.dll;c:\Program Files\Company\Product1 2022\RealityCaptureOGS.dll;c:\Program Files\Company\Product1 2022\RebarDB.dll;c:\Program Files\Company\Product1 2022\RebarDBAPI.dll;c:\Program Files\Company\Product1 2022\RebarMFC.dll;c:\Program Files\Company\Product1 2022\RebarMFCStartup.dll;c:\Program Files\Company\Product1 2022\RebarUI.dll;c:\Program Files\Company\Product1 2022\RebarUIStartup.dll;c:\Program Files\Company\Product1 2022\RebarUIStartUpAPI.dll;c:\Program Files\Company\Product1 2022\RenderSetting.xml;c:\Program Files\Company\Product1 2022\Product1.exe;c:\Program Files\Company\Product1 2022\Product1.exe.config;c:\Program Files\Company\Product1 2022\Product1.exe.manifest;c:\Program Files\Company\Product1 2022\Product1.ico;c:\Program Files\Company\Product1 2022\Product1.IFC.Common.dll;c:\Program Files\Company\Product1 2022\Product1.IFC.Export.dll;c:\Program Files\Company\Product1 2022\Product1.IFC.Import.dll;c:\Program Files\Company\Product1 2022\Product1AddInUtility.dll;c:\Program Files\Company\Product1 2022\Product1AddInUtility.xml;c:\Program Files\Company\Product1 2022\Product1API.dll;c:\Program Files\Company\Product1 2022\Product1API.xml;c:\Program Files\Company\Product1 2022\Product1APIBrowserUtils.dll;c:\Program Files\Company\Product1 2022\Product1APIFoundation.dll;c:\Program Files\Company\Product1 2022\Product1APIIFC.dll;c:\Program Files\Company\Product1 2022\Product1APIIFC.xml;c:\Program Files\Company\Product1 2022\Product1APILink.dll;c:\Program Files\Company\Product1 2022\Product1APIMacros.dll;c:\Program Files\Company\Product1 2022\Product1APIMacros.xml;c:\Program Files\Company\Product1 2022\Product1APIMacrosInterop.dll;c:\Program Files\Company\Product1 2022\Product1APIMacrosInteropAPI.dll;c:\Program Files\Company\Product1 2022\Product1APISteel.dll;c:\Program Files\Company\Product1 2022\Product1APIUI.dll;c:\Program Files\Company\Product1 2022\Product1APIUI.xml;c:\Program Files\Company\Product1 2022\Product1APIUILink.dll;c:\Program Files\Company\Product1 2022\Product1APIUIMacros.dll;c:\Program Files\Company\Product1 2022\Product1APIUIMacros.xml;c:\Program Files\Company\Product1 2022\Product1APIUIMacrosInterop.dll;c:\Program Files\Company\Product1 2022\Product1APIUIMacrosInteropAPI.dll;c:\Program Files\Company\Product1 2022\Product1AssemblyResolver.dll;c:\Program Files\Company\Product1 2022\Product1DB.dll;c:\Program Files\Company\Product1 2022\Product1DBAPI.dll;c:\Program Files\Company\Product1 2022\Product1LicenseAgreement.rtf;c:\Program Files\Company\Product1 2022\Product1MaterialUI3.dll;c:\Program Files\Company\Product1 2022\Product1MFC.dll;c:\Program Files\Company\Product1 2022\Product1MFCAPI.dll;c:\Program Files\Company\Product1 2022\Product1NET.dll;c:\Program Files\Company\Product1 2022\Product1RaaS.dll;c:\Program Files\Company\Product1 2022\Product1RaaS.dll.config;c:\Program Files\Company\Product1 2022\Product1ServerView.dll;c:\Program Files\Company\Product1 2022\Product1UI.dll;c:\Program Files\Company\Product1 2022\Product1UIAPI.dll;c:\Program Files\Company\Product1 2022\Product1Worker.exe;c:\Program Files\Company\Product1 2022\rmgrsubs2.dll;c:\Program Files\Company\Product1 2022\RoomAreaPlanDB.dll;c:\Program Files\Company\Product1 2022\RoomAreaPlanDBAPI.dll;c:\Program Files\Company\Product1 2022\RoomAreaPlanMFC.dll;c:\Program Files\Company\Product1 2022\RoomAreaPlanUI.dll;c:\Program Files\Company\Product1 2022\RPCNode.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.Client.Helper.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.ClientServer.DataContract.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.ClientServer.Helper.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.ClientServer.PermissionSource.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.ClientServer.Proxy.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.ClientServer.ServiceContract.Local.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Common.ClientServer.ServiceContract.Model.dll;c:\Program Files\Company\Product1 2022\RS.Enterprise.Utility.dll;c:\Program Files\Company\Product1 2022\RSCloudClient.dll;c:\Program Files\Company\Product1 2022\RSCloudClientInterop.dll;c:\Program Files\Company\Product1 2022\RSCloudClientProduct1Service.dll;c:\Program Files\Company\Product1 2022\RSEnterpriseClient.dll;c:\Program Files\Company\Product1 2022\RSEnterpriseClientInterop.dll;c:\Program Files\Company\Product1 2022\RSEnterpriseClientProduct1Service.dll;c:\Program Files\Company\Product1 2022\rti.dll;c:\Program Files\Company\Product1 2022\RunEnergySimulation.dll;c:\Program Files\Company\Product1 2022\RunEnergySimulationInterop.dll;c:\Program Files\Company\Product1 2022\RWUXThemeSU2015.dll;c:\Program Files\Company\Product1 2022\SculptingDB.dll;c:\Program Files\Company\Product1 2022\SculptingDBAPI.dll;c:\Program Files\Company\Product1 2022\SculptingMFC.dll;c:\Program Files\Company\Product1 2022\SculptingUI.dll;c:\Program Files\Company\Product1 2022\SDACommon.dll;c:\Program Files\Company\Product1 2022\SDF.dll;c:\Program Files\Company\Product1 2022\senddmp.exe;c:\Program Files\Company\Product1 2022\sfl400asu.dll;c:\Program Files\Company\Product1 2022\SHFontParser.dll;c:\Program Files\Company\Product1 2022\SiteDB.dll;c:\Program Files\Company\Product1 2022\SiteDBAPI.dll;c:\Program Files\Company\Product1 2022\SiteMFC.dll;c:\Program Files\Company\Product1 2022\SiteUI.dll;c:\Program Files\Company\Product1 2022\SketchUpAPI.dll;c:\Program Files\Company\Product1 2022\SketchupCommonPreferences.dll;c:\Program Files\Company\Product1 2022\ssleay32.dll;c:\Program Files\Company\Product1 2022\SSOClient.config;c:\Program Files\Company\Product1 2022\SSONET.dll;c:\Program Files\Company\Product1 2022\SSONETUI.dll;c:\Program Files\Company\Product1 2022\StairRampDB.dll;c:\Program Files\Company\Product1 2022\StairRampDBAPI.dll;c:\Program Files\Company\Product1 2022\StairRampMFC.dll;c:\Program Files\Company\Product1 2022\StairRampUI.dll;c:\Program Files\Company\Product1 2022\StructuralAnalysisDB.dll;c:\Program Files\Company\Product1 2022\StructuralAnalysisDBAPI.dll;c:\Program Files\Company\Product1 2022\StructuralAnalysisMFC.dll;c:\Program Files\Company\Product1 2022\StructuralAnalysisUI.dll;c:\Program Files\Company\Product1 2022\StructuralDB.dll;c:\Program Files\Company\Product1 2022\StructuralDBAPI.dll;c:\Program Files\Company\Product1 2022\StructuralMFC.dll;c:\Program Files\Company\Product1 2022\StructuralUI.dll;c:\Program Files\Company\Product1 2022\SubscriptionService.dll;c:\Program Files\Company\Product1 2022\SubscriptionWrapper.dll;c:\Program Files\Company\Product1 2022\System.AppContext.DLL;c:\Program Files\Company\Product1 2022\System.Buffers.dll;c:\Program Files\Company\Product1 2022\System.Collections.Immutable.dll;c:\Program Files\Company\Product1 2022\System.ComponentModel.Annotations.dll;c:\Program Files\Company\Product1 2022\System.Console.DLL;c:\Program Files\Company\Product1 2022\System.Diagnostics.DiagnosticSource.DLL;c:\Program Files\Company\Product1 2022\System.Diagnostics.Tracing.DLL;c:\Program Files\Company\Product1 2022\System.Globalization.Calendars.DLL;c:\Program Files\Company\Product1 2022\System.IO.Compression.DLL;c:\Program Files\Company\Product1 2022\System.IO.Compression.ZipFile.DLL;c:\Program Files\Company\Product1 2022\System.IO.DLL;c:\Program Files\Company\Product1 2022\System.IO.FileSystem.DLL;c:\Program Files\Company\Product1 2022\System.IO.FileSystem.Primitives.DLL;c:\Program Files\Company\Product1 2022\System.Linq.DLL;c:\Program Files\Company\Product1 2022\System.Linq.Expressions.DLL;c:\Program Files\Company\Product1 2022\System.Memory.dll;c:\Program Files\Company\Product1 2022\System.Net.Http.DLL;c:\Program Files\Company\Product1 2022\System.Net.Http.Formatting.dll;c:\Program Files\Company\Product1 2022\System.Numerics.Vectors.dll;c:\Program Files\Company\Product1 2022\System.Reflection.DLL;c:\Program Files\Company\Product1 2022\System.Runtime.CompilerServices.Unsafe.DLL;c:\Program Files\Company\Product1 2022\System.Runtime.DLL;c:\Program Files\Company\Product1 2022\System.Runtime.Extensions.DLL;c:\Program Files\Company\Product1 2022\System.Runtime.InteropServices.DLL;c:\Program Files\Company\Product1 2022\System.Security.Cryptography.Algorithms.DLL;c:\Program Files\Company\Product1 2022\System.Security.Cryptography.Encoding.DLL;c:\Program Files\Company\Product1 2022\System.Security.Cryptography.Primitives.DLL;c:\Program Files\Company\Product1 2022\System.Security.Cryptography.X509Certificates.DLL;c:\Program Files\Company\Product1 2022\System.Text.RegularExpressions.DLL;c:\Program Files\Company\Product1 2022\System.Web.Http.dll;c:\Program Files\Company\Product1 2022\System.Windows.Interactivity.dll;c:\Program Files\Company\Product1 2022\System.Xml.ReaderWriter.DLL;c:\Program Files\Company\Product1 2022\tbb.dll;c:\Program Files\Company\Product1 2022\tbbmalloc.dll;c:\Program Files\Company\Product1 2022\TextEngine.dll;c:\Program Files\Company\Product1 2022\tinyEXRLib.dll;c:\Program Files\Company\Product1 2022\tritonmesh.dll;c:\Program Files\Company\Product1 2022\tuff_transcoder.dll;c:\Program Files\Company\Product1 2022\tugt_transcoder.dll;c:\Program Files\Company\Product1 2022\UIFramework.dll;c:\Program Files\Company\Product1 2022\UIFrameworkInterop.dll;c:\Program Files\Company\Product1 2022\UIFrameworkRes.dll;c:\Program Files\Company\Product1 2022\UIFrameworkServices.dll;c:\Program Files\Company\Product1 2022\userdata.dll;c:\Program Files\Company\Product1 2022\UserInterfaceUtility.dll;c:\Program Files\Company\Product1 2022\Utility.dll;c:\Program Files\Company\Product1 2022\UtilityAPI.dll;c:\Program Files\Company\Product1 2022\vc14-re200l.dll;c:\Program Files\Company\Product1 2022\whitelist.xml;c:\Program Files\Company\Product1 2022\WorkflowBase-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2022\Xalan.Aec.dll;c:\Program Files\Company\Product1 2022\XalanMessages.Aec.dll;c:\Program Files\Company\Product1 2022\Xceed.Wpf.AvalonDock.dll;c:\Program Files\Company\Product1 2022\xerces-ad-c_3.dll;c:\Program Files\Company\Product1 2022\xirang2.dll;c:\Program Files\Company\Product1 2022\xirangall-16.dll;c:\Program Files\Company\Product1 2022\ZipArchive.dll; \ No newline at end of file diff --git a/test/core/libGPreloader/incomplete228List.csv b/test/core/libGPreloader/incomplete228List.csv deleted file mode 100644 index 521accad8c3..00000000000 --- a/test/core/libGPreloader/incomplete228List.csv +++ /dev/null @@ -1 +0,0 @@ -c:\Program Files\Company\Product1 2023\ac1st24.dll;c:\Program Files\Company\Product1 2023\acbr24.dbx;c:\Program Files\Company\Product1 2023\acdb24.dll;c:\Program Files\Company\Product1 2023\AcDbMgd.dll;c:\Program Files\Company\Product1 2023\acdbmgdbrep.dll;c:\Program Files\Company\Product1 2023\AcDgnIO.dbx;c:\Program Files\Company\Product1 2023\AcDgnLS.dbx;c:\Program Files\Company\Product1 2023\AcDgnLsTrans.dbx;c:\Program Files\Company\Product1 2023\AcDgnMsStr.dll;c:\Program Files\Company\Product1 2023\AcDs.dll;c:\Program Files\Company\Product1 2023\acge24.dll;c:\Program Files\Company\Product1 2023\AcGeoLocationObj.dbx;c:\Program Files\Company\Product1 2023\AcGeomentObj.dbx;c:\Program Files\Company\Product1 2023\acgex24.dll;c:\Program Files\Company\Product1 2023\AcGradient24.dll;c:\Program Files\Company\Product1 2023\acismobj24.dbx;c:\Program Files\Company\Product1 2023\acpal.dll;c:\Program Files\Company\Product1 2023\AcPersSubentNaming24.dll;c:\Program Files\Company\Product1 2023\AcSceneOE.dbx;c:\Program Files\Company\Product1 2023\AcShareViewPropsACA.dbx;c:\Program Files\Company\Product1 2023\AcTaskDialogs.dll;c:\Program Files\Company\Product1 2023\AcUt.dll;c:\Program Files\Company\Product1 2023\AdApplicationFrame.dll;c:\Program Files\Company\Product1 2023\AdCoreUnits-16.dll;c:\Program Files\Company\Product1 2023\AdCoreUnitsUI-16.dll;c:\Program Files\Company\Product1 2023\AddInJournalClient.dll;c:\Program Files\Company\Product1 2023\AddInJournalEngine.dll;c:\Program Files\Company\Product1 2023\AddInJournaling.dll;c:\Program Files\Company\Product1 2023\AddInManager.dll;c:\Program Files\Company\Product1 2023\AddInManagerUI.dll;c:\Program Files\Company\Product1 2023\AdImaging.dll;c:\Program Files\Company\Product1 2023\AdIntImgServices.dll;c:\Program Files\Company\Product1 2023\AdMaterialUI.dll;c:\Program Files\Company\Product1 2023\ADPClientService.exe;c:\Program Files\Company\Product1 2023\AdPreviewGenerator.exe;c:\Program Files\Company\Product1 2023\AdpSDKCore.dll;c:\Program Files\Company\Product1 2023\AdpSDKCSharpWrapper.dll;c:\Program Files\Company\Product1 2023\AdpSDKUI.dll;c:\Program Files\Company\Product1 2023\AdpSDKWrapper.dll;c:\Program Files\Company\Product1 2023\adp_application-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\adp_core-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\adp_core-6_1.dll;c:\Program Files\Company\Product1 2023\adp_data-6_1.dll;c:\Program Files\Company\Product1 2023\adp_service_opczip-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\adp_service_opczip-6_1.dll;c:\Program Files\Company\Product1 2023\adp_service_reporting-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\adp_toolkit-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\adp_toolkit-6_1.dll;c:\Program Files\Company\Product1 2023\adskassetapi_new-16.dll;c:\Program Files\Company\Product1 2023\CompHardwareCertificationReport.xml;c:\Program Files\Company\Product1 2023\CompLicensingSDK_3.dll;c:\Program Files\Company\Product1 2023\CompOAuth.dll;c:\Program Files\Company\Product1 2023\CompRcAdp.dll;c:\Program Files\Company\Product1 2023\CompRcAssetExtraction.dll;c:\Program Files\Company\Product1 2023\CompRcCommon.dll;c:\Program Files\Company\Product1 2023\CompRcConfig.dll;c:\Program Files\Company\Product1 2023\CompRcData.dll;c:\Program Files\Company\Product1 2023\CompRcDataAccess.dll;c:\Program Files\Company\Product1 2023\CompRcDevTools.dll;c:\Program Files\Company\Product1 2023\CompRcDispatch.dll;c:\Program Files\Company\Product1 2023\CompRcExport.dll;c:\Program Files\Company\Product1 2023\CompRcFileSystemUtility.dll;c:\Program Files\Company\Product1 2023\CompRcFilter.dll;c:\Program Files\Company\Product1 2023\CompRcFoundation.dll;c:\Program Files\Company\Product1 2023\CompRcImageIO.dll;c:\Program Files\Company\Product1 2023\CompRcImport.dll;c:\Program Files\Company\Product1 2023\CompRcPointCloudEngine.dll;c:\Program Files\Company\Product1 2023\CompRcProjectIO.dll;c:\Program Files\Company\Product1 2023\CompRcSpatialReference.dll;c:\Program Files\Company\Product1 2023\CompRcUtility.dll;c:\Program Files\Company\Product1 2023\CompRealityStudioBaseAPI.dll;c:\Program Files\Company\Product1 2023\CompRealityStudioFeatureExtraction.dll;c:\Program Files\Company\Product1 2023\CompRealityStudioHLAPI.dll;c:\Program Files\Company\Product1 2023\CompRealityStudioInternalAPI.dll;c:\Program Files\Company\Product1 2023\AdSpatialReference.dll;c:\Program Files\Company\Product1 2023\AdSpellEng.dll;c:\Program Files\Company\Product1 2023\AdSSOServices.dll;c:\Program Files\Company\Product1 2023\AdSubAware.exe;c:\Program Files\Company\Product1 2023\adui24.dll;c:\Program Files\Company\Product1 2023\AdUICore.dll;c:\Program Files\Company\Product1 2023\AdUiMgd.dll;c:\Program Files\Company\Product1 2023\AdUiPalettes.dll;c:\Program Files\Company\Product1 2023\AdWindows.dll;c:\Program Files\Company\Product1 2023\AecArchBase.dbx;c:\Program Files\Company\Product1 2023\AecAreaCalculationBase.dbx;c:\Program Files\Company\Product1 2023\AecBase.dbx;c:\Program Files\Company\Product1 2023\AecBaseEx.dbx;c:\Program Files\Company\Product1 2023\AecDACHMigratorDb.dbx;c:\Program Files\Company\Product1 2023\AecModeler.dbx;c:\Program Files\Company\Product1 2023\AecProjectBase.dbx;c:\Program Files\Company\Product1 2023\AecRenovationDb.dbx;c:\Program Files\Company\Product1 2023\AecResMgr.dll;c:\Program Files\Company\Product1 2023\AecResUI.dll;c:\Program Files\Company\Product1 2023\AecRoomBookConfig.xml;c:\Program Files\Company\Product1 2023\AecRoomBookDb.dbx;c:\Program Files\Company\Product1 2023\AecRoomBookStandards.xml;c:\Program Files\Company\Product1 2023\AecSchedule.dbx;c:\Program Files\Company\Product1 2023\AecScript.dll;c:\Program Files\Company\Product1 2023\AecSolidModeler.dbx;c:\Program Files\Company\Product1 2023\AecSpaceExConfig.xml;c:\Program Files\Company\Product1 2023\AecSpaceExDb.dbx;c:\Program Files\Company\Product1 2023\AecSystemTools.dll;c:\Program Files\Company\Product1 2023\AggregationAPI.dll;c:\Program Files\Company\Product1 2023\AIM_API.dll;c:\Program Files\Company\Product1 2023\AnalysisAppsDB.dll;c:\Program Files\Company\Product1 2023\AnalysisAppsDBAPI.dll;c:\Program Files\Company\Product1 2023\AnalysisAppsMFC.dll;c:\Program Files\Company\Product1 2023\AnalysisAppsUI.dll;c:\Program Files\Company\Product1 2023\AnalyticalInformationModel.dll;c:\Program Files\Company\Product1 2023\AnalyticalVolumes.dll;c:\Program Files\Company\Product1 2023\AnalyticalVolumesInterop.dll;c:\Program Files\Company\Product1 2023\anav.dll;c:\Program Files\Company\Product1 2023\ANN.dll;c:\Program Files\Company\Product1 2023\Antlr4.Runtime.dll;c:\Program Files\Company\Product1 2023\APIDB.dll;c:\Program Files\Company\Product1 2023\APIDBAPI.dll;c:\Program Files\Company\Product1 2023\APIInterop.dll;c:\Program Files\Company\Product1 2023\APIMFC.dll;c:\Program Files\Company\Product1 2023\APIUI.dll;c:\Program Files\Company\Product1 2023\APIUIAPI.dll;c:\Program Files\Company\Product1 2023\ArrayElemsDB.dll;c:\Program Files\Company\Product1 2023\ArrayElemsDBAPI.dll;c:\Program Files\Company\Product1 2023\ArrayElemsMFC.dll;c:\Program Files\Company\Product1 2023\ArrayElemsUI.dll;c:\Program Files\Company\Product1 2023\AsdkHlrApi24.dbx;c:\Program Files\Company\Product1 2023\ASMAHL228A.dll;c:\Program Files\Company\Product1 2023\ASMBASE228A.dll;c:\Program Files\Company\Product1 2023\ASMBLND228A.dll;c:\Program Files\Company\Product1 2023\ASMBOOL228A.dll;c:\Program Files\Company\Product1 2023\ASMCOVR228A.dll;c:\Program Files\Company\Product1 2023\ASMCSTR228A.dll;c:\Program Files\Company\Product1 2023\ASMCT228A.dll;c:\Program Files\Company\Product1 2023\ASMDATAX228A.dll;c:\Program Files\Company\Product1 2023\ASMDEFM228A.dll;c:\Program Files\Company\Product1 2023\ASMEULR228A.dll;c:\Program Files\Company\Product1 2023\ASMFCT228A.dll;c:\Program Files\Company\Product1 2023\ASMFREC228A.dll;c:\Program Files\Company\Product1 2023\ASMGA228A.dll;c:\Program Files\Company\Product1 2023\ASMHEAL228A.dll;c:\Program Files\Company\Product1 2023\ASMIMPORT228A.dll;c:\Program Files\Company\Product1 2023\ASMINTR228A.dll;c:\Program Files\Company\Product1 2023\ASMKERN228A.dll;c:\Program Files\Company\Product1 2023\ASMLAW228A.dll;c:\Program Files\Company\Product1 2023\ASMLOP228A.dll;c:\Program Files\Company\Product1 2023\ASMLOPT228A.dll;c:\Program Files\Company\Product1 2023\ASMNPCH228A.dll;c:\Program Files\Company\Product1 2023\ASMOFST228A.dll;c:\Program Files\Company\Product1 2023\ASMOPER228A.dll;c:\Program Files\Company\Product1 2023\ASMPID228A.dll;c:\Program Files\Company\Product1 2023\ASMRBASE228A.dll;c:\Program Files\Company\Product1 2023\ASMRBI228A.dll;c:\Program Files\Company\Product1 2023\ASMREM228A.dll;c:\Program Files\Company\Product1 2023\ASMSASM228A.dll;c:\Program Files\Company\Product1 2023\ASMSBAP228A.dll;c:\Program Files\Company\Product1 2023\ASMSBOOL228A.dll;c:\Program Files\Company\Product1 2023\ASMSHL228A.dll;c:\Program Files\Company\Product1 2023\ASMSKIN228A.dll;c:\Program Files\Company\Product1 2023\ASMSWP228A.dll;c:\Program Files\Company\Product1 2023\ASMTOPT228A.dll;c:\Program Files\Company\Product1 2023\ASMTWK228A.dll;c:\Program Files\Company\Product1 2023\ASMUFLD228A.dll;c:\Program Files\Company\Product1 2023\ASMWELD228A.dll;c:\Program Files\Company\Product1 2023\AssemblyDB.dll;c:\Program Files\Company\Product1 2023\AssemblyDBAPI.dll;c:\Program Files\Company\Product1 2023\AssemblyMFC.dll;c:\Program Files\Company\Product1 2023\AssemblyUI.dll;c:\Program Files\Company\Product1 2023\AsyncFriendlyStackTrace.DLL;c:\Program Files\Company\Product1 2023\ATFProduct1Consumer.dll;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerBroker.exe;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerBroker.exe.config;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerBroker.sig;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerRCEHost.exe;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerRCEHost.exe.config;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerRCEHost.sig;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerTranslator.dll;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerTranslator.sig;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerWCFInterface.dll;c:\Program Files\Company\Product1 2023\ATFProduct1ProducerWCFInterface.sig;c:\Program Files\Company\Product1 2023\atf_api.dll;c:\Program Files\Company\Product1 2023\atf_asm_interface.dll;c:\Program Files\Company\Product1 2023\atf_extension_data.dll;c:\Program Files\Company\Product1 2023\atf_parasolid_bridge.dll;c:\Program Files\Company\Product1 2023\atf_physical_material_extension_data.dll;c:\Program Files\Company\Product1 2023\atf_pmi3da_extension_data.dll;c:\Program Files\Company\Product1 2023\atf_processor.dll;c:\Program Files\Company\Product1 2023\atf_processor_extension_data.dll;c:\Program Files\Company\Product1 2023\atf_revit_producer.dll;c:\Program Files\Company\Product1 2023\atf_revit_producer.sig;c:\Program Files\Company\Product1 2023\atf_rhino_producer.dll;c:\Program Files\Company\Product1 2023\atf_sat_consumer.dll;c:\Program Files\Company\Product1 2023\atf_sat_producer.dll;c:\Program Files\Company\Product1 2023\atf_sketchup_extension_data.dll;c:\Program Files\Company\Product1 2023\atf_sketchup_producer.dll;c:\Program Files\Company\Product1 2023\atf_swx_producer.dll;c:\Program Files\Company\Product1 2023\atf_xml_consumer.dll;c:\Program Files\Company\Product1 2023\atf_xml_producer.dll;c:\Program Files\Company\Product1 2023\atf_xml_util.dll;c:\Program Files\Company\Product1 2023\atlast.dxt;c:\Program Files\Company\Product1 2023\atlst24.dll;c:\Program Files\Company\Product1 2023\AutoCam.dll;c:\Program Files\Company\Product1 2023\Company.AppDomainHelper.dll;c:\Program Files\Company\Product1 2023\Company.Bcg.DLL;c:\Program Files\Company\Product1 2023\Company.Bcg.Http.dll;c:\Program Files\Company\Product1 2023\Company.Bcg.Logging.dll;c:\Program Files\Company\Product1 2023\Company.Bcg.Net.dll;c:\Program Files\Company\Product1 2023\Company.C4R.Model.Client.dll;c:\Program Files\Company\Product1 2023\Company.C4R.Model.Common.DLL;c:\Program Files\Company\Product1 2023\Company.Extensions.dll;c:\Program Files\Company\Product1 2023\Company.Extensions.Json.dll;c:\Program Files\Company\Product1 2023\Company.Http.DevPortal.dll;c:\Program Files\Company\Product1 2023\Company.Http.dll;c:\Program Files\Company\Product1 2023\Company.Logging.dll;c:\Program Files\Company\Product1 2023\Company.Product1.Config.Client.dll;c:\Program Files\Company\Product1 2023\Company.Product1Server.Management.Client.dll;c:\Program Files\Company\Product1 2023\Company.Product1Server.Social.dll;c:\Program Files\Company\Product1 2023\Company.Product1Server.Storage.DLL;c:\Program Files\Company\Product1 2023\Company.UI.Themes.dll;c:\Program Files\Company\Product1 2023\Company.UI.Windows.dll;c:\Program Files\Company\Product1 2023\AutoMapper.dll;c:\Program Files\Company\Product1 2023\AWSSDK.Core.dll;c:\Program Files\Company\Product1 2023\AWSSDK.S3.dll;c:\Program Files\Company\Product1 2023\AWSSDK.SecurityToken.dll;c:\Program Files\Company\Product1 2023\BaseElementSchema.01.00.ecschema.xml;c:\Program Files\Company\Product1 2023\Bentley2.dll;c:\Program Files\Company\Product1 2023\BentleyGeom2.dll;c:\Program Files\Company\Product1 2023\bentleylogging-2.0.dll;c:\Program Files\Company\Product1 2023\BrandRVTRes.dll;c:\Program Files\Company\Product1 2023\BuildingComponent-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\BuildingSite-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\BuildingSystemsDB.dll;c:\Program Files\Company\Product1 2023\BuildingSystemsDBAPI.dll;c:\Program Files\Company\Product1 2023\BuildingSystemsMFC.dll;c:\Program Files\Company\Product1 2023\BuildingSystemsUI.dll;c:\Program Files\Company\Product1 2023\BuildingSystemsUIAPI.dll;c:\Program Files\Company\Product1 2023\C4RNET.dll;c:\Program Files\Company\Product1 2023\Castle.Core.dll;c:\Program Files\Company\Product1 2023\Castle.Windsor.dll;c:\Program Files\Company\Product1 2023\CCManager.dll;c:\Program Files\Company\Product1 2023\CCManager.dll.config;c:\Program Files\Company\Product1 2023\CEAUpdate.dll;c:\Program Files\Company\Product1 2023\CEFProduct1Utils.dll;c:\Program Files\Company\Product1 2023\ClimateData.dll;c:\Program Files\Company\Product1 2023\ClimateServer.dll;c:\Program Files\Company\Product1 2023\CollaborateFileNav.dll;c:\Program Files\Company\Product1 2023\ConceptualEnergyAnalysisInterop.dll;c:\Program Files\Company\Product1 2023\ConceptualEnergyAnalysisMFC.dll;c:\Program Files\Company\Product1 2023\Copyrights.rtf;c:\Program Files\Company\Product1 2023\CurtainGridFamilyDB.dll;c:\Program Files\Company\Product1 2023\CurtainGridFamilyDBAPI.dll;c:\Program Files\Company\Product1 2023\CurtainGridFamilyMFC.dll;c:\Program Files\Company\Product1 2023\CurtainGridFamilyUI.dll;c:\Program Files\Company\Product1 2023\d3dcompiler_47.dll;c:\Program Files\Company\Product1 2023\DADispatcherService.exe;c:\Program Files\Company\Product1 2023\dbghelp.dll;c:\Program Files\Company\Product1 2023\DBManagedServices.dll;c:\Program Files\Company\Product1 2023\dboleutl24.dll;c:\Program Files\Company\Product1 2023\dcu2d67.dll;c:\Program Files\Company\Product1 2023\dcu2dnet67.dll;c:\Program Files\Company\Product1 2023\DefaultUILayout.xml;c:\Program Files\Company\Product1 2023\DesktopMFC.dll;c:\Program Files\Company\Product1 2023\DesktopMFCAPI.dll;c:\Program Files\Company\Product1 2023\DetailDB.dll;c:\Program Files\Company\Product1 2023\DetailDBAPI.dll;c:\Program Files\Company\Product1 2023\DetailMFC.dll;c:\Program Files\Company\Product1 2023\DetailUI.dll;c:\Program Files\Company\Product1 2023\DetailUIAPI.dll;c:\Program Files\Company\Product1 2023\deu.dct;c:\Program Files\Company\Product1 2023\deu2.dct;c:\Program Files\Company\Product1 2023\deuo2.dct;c:\Program Files\Company\Product1 2023\DgnCore2.dll;c:\Program Files\Company\Product1 2023\DgnFileIO2.dll;c:\Program Files\Company\Product1 2023\DgnHandlers2.dll;c:\Program Files\Company\Product1 2023\DgnPlatformTools2.dll;c:\Program Files\Company\Product1 2023\DGNPro.dll;c:\Program Files\Company\Product1 2023\Diction.ary;c:\Program Files\Company\Product1 2023\DL150ACE.dll;c:\Program Files\Company\Product1 2023\DL150AdobeXMP.dll;c:\Program Files\Company\Product1 2023\DL150AGM.dll;c:\Program Files\Company\Product1 2023\DL150ARE.dll;c:\Program Files\Company\Product1 2023\DL150AXE8SharedExpat.dll;c:\Program Files\Company\Product1 2023\DL150BIB.dll;c:\Program Files\Company\Product1 2023\DL150BIBUtils.dll;c:\Program Files\Company\Product1 2023\DL150CoolType.dll;c:\Program Files\Company\Product1 2023\DL150JP2KLib.dll;c:\Program Files\Company\Product1 2023\DL150PDFL.dll;c:\Program Files\Company\Product1 2023\DL150PDFlattener.ppi;c:\Program Files\Company\Product1 2023\DL150pdfport.dll;c:\Program Files\Company\Product1 2023\DL150PDFProcessor.ppi;c:\Program Files\Company\Product1 2023\DL150pdfsettings.dll;c:\Program Files\Company\Product1 2023\DL150XPS2PDF.ppi;c:\Program Files\Company\Product1 2023\DotNetOpenAuth.dll;c:\Program Files\Company\Product1 2023\DotNetOpenAuth.xml;c:\Program Files\Company\Product1 2023\DPartDB.dll;c:\Program Files\Company\Product1 2023\DPartDBAPI.dll;c:\Program Files\Company\Product1 2023\DPartMFC.dll;c:\Program Files\Company\Product1 2023\DPartUI.dll;c:\Program Files\Company\Product1 2023\ECObjects3.dll;c:\Program Files\Company\Product1 2023\Ecotect.dll;c:\Program Files\Company\Product1 2023\EcotectAPI.dll;c:\Program Files\Company\Product1 2023\edmicpp500_2012.dll;c:\Program Files\Company\Product1 2023\edmikit500.dll;c:\Program Files\Company\Product1 2023\edm_libxml2.dll;c:\Program Files\Company\Product1 2023\ElementGroupDB.dll;c:\Program Files\Company\Product1 2023\ElementGroupDBAPI.dll;c:\Program Files\Company\Product1 2023\ElementGroupMFC.dll;c:\Program Files\Company\Product1 2023\ElementGroupUI.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisDB.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisDBAPI.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisInterop.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisMFC.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisUI.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisUtilities.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisUtilitiesAPI.dll;c:\Program Files\Company\Product1 2023\EnergyAnalysisUtilitiesDB.dll;c:\Program Files\Company\Product1 2023\eng.dct;c:\Program Files\Company\Product1 2023\eng2.dct;c:\Program Files\Company\Product1 2023\enu.dct;c:\Program Files\Company\Product1 2023\enu2.dct;c:\Program Files\Company\Product1 2023\esp.dct;c:\Program Files\Company\Product1 2023\esp2.dct;c:\Program Files\Company\Product1 2023\EssentialsDB.dll;c:\Program Files\Company\Product1 2023\EssentialsDBAPI.dll;c:\Program Files\Company\Product1 2023\EssentialsMFC.dll;c:\Program Files\Company\Product1 2023\EssentialsUI.dll;c:\Program Files\Company\Product1 2023\EssentialsUIAPI.dll;c:\Program Files\Company\Product1 2023\EXR.dll;c:\Program Files\Company\Product1 2023\ExternalResourceView.dll;c:\Program Files\Company\Product1 2023\EXTRACT.EXE;c:\Program Files\Company\Product1 2023\FabPats.dll;c:\Program Files\Company\Product1 2023\FamilyDB.dll;c:\Program Files\Company\Product1 2023\FamilyDBAPI.dll;c:\Program Files\Company\Product1 2023\FamilyMFC.dll;c:\Program Files\Company\Product1 2023\FamilyUI.dll;c:\Program Files\Company\Product1 2023\FeatureExtractionCore.dll;c:\Program Files\Company\Product1 2023\ForgeParameters.dll;c:\Program Files\Company\Product1 2023\ForgeUnits.dll;c:\Program Files\Company\Product1 2023\fra.dct;c:\Program Files\Company\Product1 2023\fra2.dct;c:\Program Files\Company\Product1 2023\freetype263.dll;c:\Program Files\Company\Product1 2023\gdiplus.dll;c:\Program Files\Company\Product1 2023\GemDriverN.dll;c:\Program Files\Company\Product1 2023\GeneratedResourceIds.inl;c:\Program Files\Company\Product1 2023\GeomUtil.dll;c:\Program Files\Company\Product1 2023\GeomUtilAPI.dll;c:\Program Files\Company\Product1 2023\Graphics.dll;c:\Program Files\Company\Product1 2023\GraphicsAPI.dll;c:\Program Files\Company\Product1 2023\GreenBuildingXML.xsd;c:\Program Files\Company\Product1 2023\GrphOGS3.dll;c:\Program Files\Company\Product1 2023\GrphProtein2.dll;c:\Program Files\Company\Product1 2023\HostObjDB.dll;c:\Program Files\Company\Product1 2023\HostObjDBAPI.dll;c:\Program Files\Company\Product1 2023\HostObjMFC.dll;c:\Program Files\Company\Product1 2023\HostObjUI.dll;c:\Program Files\Company\Product1 2023\ICEAResultsCtrl.dll;c:\Program Files\Company\Product1 2023\ICSharpCode.SharpZipLib.dll;c:\Program Files\Company\Product1 2023\icucnv40.dll;c:\Program Files\Company\Product1 2023\icudt40.dll;c:\Program Files\Company\Product1 2023\icudt64.dll;c:\Program Files\Company\Product1 2023\icuin64.dll;c:\Program Files\Company\Product1 2023\icuuc64.dll;c:\Program Files\Company\Product1 2023\Identity.ini;c:\Program Files\Company\Product1 2023\IFC Shared Parameters-Product1IFCBuiltIn-Type.txt;c:\Program Files\Company\Product1 2023\IFC Shared Parameters-Product1IFCBuiltIn-Type_ALL.txt;c:\Program Files\Company\Product1 2023\IFC Shared Parameters-Product1IFCBuiltIn.txt;c:\Program Files\Company\Product1 2023\IFC Shared Parameters-Product1IFCBuiltIn_ALL.txt;c:\Program Files\Company\Product1 2023\IFC Shared Parameters.txt;c:\Program Files\Company\Product1 2023\IFC.ico;c:\Program Files\Company\Product1 2023\IFCCertifiedEntitiesAndPSets.json;c:\Program Files\Company\Product1 2023\IFCXML.ico;c:\Program Files\Company\Product1 2023\IFCZIP.ico;c:\Program Files\Company\Product1 2023\Interface.dll;c:\Program Files\Company\Product1 2023\InterfaceAPI.dll;c:\Program Files\Company\Product1 2023\InterfaceUtil.dll;c:\Program Files\Company\Product1 2023\InterfaceUtilAPI.dll;c:\Program Files\Company\Product1 2023\IntfADT.dll;c:\Program Files\Company\Product1 2023\IntfASM.dll;c:\Program Files\Company\Product1 2023\IntfASMAdvanced.dll;c:\Program Files\Company\Product1 2023\IntfATF.dll;c:\Program Files\Company\Product1 2023\IntfATFAPI.dll;c:\Program Files\Company\Product1 2023\IntfDBX.dll;c:\Program Files\Company\Product1 2023\IntfDGN.dll;c:\Program Files\Company\Product1 2023\IntfDWF.dll;c:\Program Files\Company\Product1 2023\IntfDWG.dll;c:\Program Files\Company\Product1 2023\IntfFBX.dll;c:\Program Files\Company\Product1 2023\IntfIFC.dll;c:\Program Files\Company\Product1 2023\IntfIFCAPI.dll;c:\Program Files\Company\Product1 2023\IntfMechanical.dll;c:\Program Files\Company\Product1 2023\IntfOldDGN.dll;c:\Program Files\Company\Product1 2023\IntfPDF.dll;c:\Program Files\Company\Product1 2023\IntfPDFExport.dll;c:\Program Files\Company\Product1 2023\ita.dct;c:\Program Files\Company\Product1 2023\ita2.dct;c:\Program Files\Company\Product1 2023\itextsharp.dll;c:\Program Files\Company\Product1 2023\JobMonitor.dll;c:\Program Files\Company\Product1 2023\laszip3.dll;c:\Program Files\Company\Product1 2023\LAUtility.dll;c:\Program Files\Company\Product1 2023\LegendComponentDB.dll;c:\Program Files\Company\Product1 2023\LegendComponentDBAPI.dll;c:\Program Files\Company\Product1 2023\LegendComponentMFC.dll;c:\Program Files\Company\Product1 2023\LegendComponentUI.dll;c:\Program Files\Company\Product1 2023\libcrypto-Ad-1_1-x64.dll;c:\Program Files\Company\Product1 2023\libdalton.dll;c:\Program Files\Company\Product1 2023\libdaltonjson.dll;c:\Program Files\Company\Product1 2023\libeay32.dll;c:\Program Files\Company\Product1 2023\libEGL_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\libfbxsdk-adsk.dll;c:\Program Files\Company\Product1 2023\libGLESv2_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\libssl-Ad-1_1-x64.dll;c:\Program Files\Company\Product1 2023\License.ini;c:\Program Files\Company\Product1 2023\LocationSelectorCtrl.dll;c:\Program Files\Company\Product1 2023\LocationSelectorCtrlRes.dll;c:\Program Files\Company\Product1 2023\Log4CPlusU_Ad_1.dll;c:\Program Files\Company\Product1 2023\log4net.dll;c:\Program Files\Company\Product1 2023\log4net.xml;c:\Program Files\Company\Product1 2023\ManagedMC3.dll;c:\Program Files\Company\Product1 2023\MassingDB.dll;c:\Program Files\Company\Product1 2023\MassingDBAPI.dll;c:\Program Files\Company\Product1 2023\MassingMFC.dll;c:\Program Files\Company\Product1 2023\MassingUI.dll;c:\Program Files\Company\Product1 2023\MaterialDB.dll;c:\Program Files\Company\Product1 2023\MaterialDBAPI.dll;c:\Program Files\Company\Product1 2023\materialmapping.txt;c:\Program Files\Company\Product1 2023\MC3.dll;c:\Program Files\Company\Product1 2023\MessageLogger.dll;c:\Program Files\Company\Product1 2023\MessageLoggerDefault.config;c:\Program Files\Company\Product1 2023\MessageLoggerInterop.dll;c:\Program Files\Company\Product1 2023\Microsoft.Expression.Interactions.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Caching.Abstractions.DLL;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Caching.Memory.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Configuration.Abstractions.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Configuration.Binder.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Configuration.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.DependencyInjection.Abstractions.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.DependencyInjection.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Logging.Abstractions.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Logging.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Options.dll;c:\Program Files\Company\Product1 2023\Microsoft.Extensions.Primitives.DLL;c:\Program Files\Company\Product1 2023\Microsoft.Practices.TransientFaultHandling.Core.dll;c:\Program Files\Company\Product1 2023\Microsoft.Practices.Unity.Configuration.dll;c:\Program Files\Company\Product1 2023\Microsoft.Practices.Unity.dll;c:\Program Files\Company\Product1 2023\Microsoft.Windows.Gdiplus.manifest;c:\Program Files\Company\Product1 2023\modlr24.dll;c:\Program Files\Company\Product1 2023\NewtonSoft.Json.dll;c:\Program Files\Company\Product1 2023\Nito.AsyncEx.Coordination.dll;c:\Program Files\Company\Product1 2023\Nito.AsyncEx.Tasks.dll;c:\Program Files\Company\Product1 2023\Nito.Collections.Deque.dll;c:\Program Files\Company\Product1 2023\Nito.Disposables.dll;c:\Program Files\Company\Product1 2023\nld.dct;c:\Program Files\Company\Product1 2023\nld2.dct;c:\Program Files\Company\Product1 2023\NsArchive10.dll;c:\Program Files\Company\Product1 2023\NumberingDB.dll;c:\Program Files\Company\Product1 2023\NumberingDBAPI.dll;c:\Program Files\Company\Product1 2023\ODXSW_DLL.dll;c:\Program Files\Company\Product1 2023\og1100asu.dll;c:\Program Files\Company\Product1 2023\OGSArchive.dll;c:\Program Files\Company\Product1 2023\OGSAtilIntegration.dll;c:\Program Files\Company\Product1 2023\OGSDeviceDiag.dll;c:\Program Files\Company\Product1 2023\OGSDeviceDX10.dll;c:\Program Files\Company\Product1 2023\OGSDeviceDX11.dll;c:\Program Files\Company\Product1 2023\OGSDeviceDX9.dll;c:\Program Files\Company\Product1 2023\OGSDeviceNull.dll;c:\Program Files\Company\Product1 2023\OGSDeviceOGL4.dll;c:\Program Files\Company\Product1 2023\OGSDevices.dll;c:\Program Files\Company\Product1 2023\OGSFBXAssetTranslator.dll;c:\Program Files\Company\Product1 2023\OGSFragmentsLibrary.ogsf;c:\Program Files\Company\Product1 2023\OGSGDIFontDevice.dll;c:\Program Files\Company\Product1 2023\OGSGraphics.dll;c:\Program Files\Company\Product1 2023\OGSIOIntegration.dll;c:\Program Files\Company\Product1 2023\OGSLangHandlerWin.dll;c:\Program Files\Company\Product1 2023\OGSObjects.dll;c:\Program Files\Company\Product1 2023\OGSProtein.dll;c:\Program Files\Company\Product1 2023\OGSRapidRT.dll;c:\Program Files\Company\Product1 2023\OGSRapidRTShaderInterface.dll;c:\Program Files\Company\Product1 2023\OGSRapidRTShaders.dll;c:\Program Files\Company\Product1 2023\OGSSHFontDevice.dll;c:\Program Files\Company\Product1 2023\opennurbs.dll;c:\Program Files\Company\Product1 2023\ot1000asu.dll;c:\Program Files\Company\Product1 2023\PackageContentsParser.dll;c:\Program Files\Company\Product1 2023\PDFNetC.dll;c:\Program Files\Company\Product1 2023\PersistenceDB.dll;c:\Program Files\Company\Product1 2023\PersistenceDBAPI.dll;c:\Program Files\Company\Product1 2023\Picker.dll;c:\Program Files\Company\Product1 2023\PipeKFactors.xml;c:\Program Files\Company\Product1 2023\PlatformCore1.dll;c:\Program Files\Company\Product1 2023\PlatformRuntime1.dll;c:\Program Files\Company\Product1 2023\PointCloudAccess.dll;c:\Program Files\Company\Product1 2023\PointCloudAccessAPI.dll;c:\Program Files\Company\Product1 2023\Polly.DLL;c:\Program Files\Company\Product1 2023\ProdDep_UserDep.mc3;c:\Program Files\Company\Product1 2023\ProdDep_UserInd.mc3;c:\Program Files\Company\Product1 2023\ProdInd_UserDep.mc3;c:\Program Files\Company\Product1 2023\ProdInd_UserInd.mc3;c:\Program Files\Company\Product1 2023\PropertyFormatter.01.00.ecschema.xml;c:\Program Files\Company\Product1 2023\PropertySets_shared.dll;c:\Program Files\Company\Product1 2023\pskernel.dll;c:\Program Files\Company\Product1 2023\pub.dat;c:\Program Files\Company\Product1 2023\Qt5Core_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Gui_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5MultimediaWidgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Multimedia_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Network_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5OpenGL_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Positioning_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5PrintSupport_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5QML_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5QuickWidgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Quick_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Sensors_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5SQL_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5WebChannel_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5WebEngineCore_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5WebEngineWidgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5WebEngine_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Widgets_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5WinExtras_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5XmlPatterns_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\Qt5Xml_Ad_5_12.dll;c:\Program Files\Company\Product1 2023\QtSolutions_MFCMigrationFramework_Ad_2.dll;c:\Program Files\Company\Product1 2023\RealDWGHostApp.dll;c:\Program Files\Company\Product1 2023\RealityCaptureOGS.dll;c:\Program Files\Company\Product1 2023\RebarDB.dll;c:\Program Files\Company\Product1 2023\RebarDBAPI.dll;c:\Program Files\Company\Product1 2023\RebarMFC.dll;c:\Program Files\Company\Product1 2023\RebarMFCStartup.dll;c:\Program Files\Company\Product1 2023\RebarUI.dll;c:\Program Files\Company\Product1 2023\RebarUIStartup.dll;c:\Program Files\Company\Product1 2023\RebarUIStartUpAPI.dll;c:\Program Files\Company\Product1 2023\RenderSetting.xml;c:\Program Files\Company\Product1 2023\Product1.exe;c:\Program Files\Company\Product1 2023\Product1.exe.config;c:\Program Files\Company\Product1 2023\Product1.exe.manifest;c:\Program Files\Company\Product1 2023\Product1.ico;c:\Program Files\Company\Product1 2023\Product1.IFC.Common.dll;c:\Program Files\Company\Product1 2023\Product1.IFC.Export.dll;c:\Program Files\Company\Product1 2023\Product1.IFC.Import.dll;c:\Program Files\Company\Product1 2023\Product1AddInUtility.dll;c:\Program Files\Company\Product1 2023\Product1AddInUtility.xml;c:\Program Files\Company\Product1 2023\Product1API.dll;c:\Program Files\Company\Product1 2023\Product1API.xml;c:\Program Files\Company\Product1 2023\Product1APIBrowserUtils.dll;c:\Program Files\Company\Product1 2023\Product1APIFoundation.dll;c:\Program Files\Company\Product1 2023\Product1APIIFC.dll;c:\Program Files\Company\Product1 2023\Product1APIIFC.xml;c:\Program Files\Company\Product1 2023\Product1APILink.dll;c:\Program Files\Company\Product1 2023\Product1APIMacros.dll;c:\Program Files\Company\Product1 2023\Product1APIMacros.xml;c:\Program Files\Company\Product1 2023\Product1APIMacrosInterop.dll;c:\Program Files\Company\Product1 2023\Product1APIMacrosInteropAPI.dll;c:\Program Files\Company\Product1 2023\Product1APISteel.dll;c:\Program Files\Company\Product1 2023\Product1APIUI.dll;c:\Program Files\Company\Product1 2023\Product1APIUI.xml;c:\Program Files\Company\Product1 2023\Product1APIUILink.dll;c:\Program Files\Company\Product1 2023\Product1APIUIMacros.dll;c:\Program Files\Company\Product1 2023\Product1APIUIMacros.xml;c:\Program Files\Company\Product1 2023\Product1APIUIMacrosInterop.dll;c:\Program Files\Company\Product1 2023\Product1APIUIMacrosInteropAPI.dll;c:\Program Files\Company\Product1 2023\Product1AssemblyResolver.dll;c:\Program Files\Company\Product1 2023\Product1DB.dll;c:\Program Files\Company\Product1 2023\Product1DBAPI.dll;c:\Program Files\Company\Product1 2023\Product1LicenseAgreement.rtf;c:\Program Files\Company\Product1 2023\Product1MaterialUI3.dll;c:\Program Files\Company\Product1 2023\Product1MFC.dll;c:\Program Files\Company\Product1 2023\Product1MFCAPI.dll;c:\Program Files\Company\Product1 2023\Product1NET.dll;c:\Program Files\Company\Product1 2023\Product1RaaS.dll;c:\Program Files\Company\Product1 2023\Product1RaaS.dll.config;c:\Program Files\Company\Product1 2023\Product1ServerView.dll;c:\Program Files\Company\Product1 2023\Product1UI.dll;c:\Program Files\Company\Product1 2023\Product1UIAPI.dll;c:\Program Files\Company\Product1 2023\Product1Worker.exe;c:\Program Files\Company\Product1 2023\rmgrsubs2.dll;c:\Program Files\Company\Product1 2023\RoomAreaPlanDB.dll;c:\Program Files\Company\Product1 2023\RoomAreaPlanDBAPI.dll;c:\Program Files\Company\Product1 2023\RoomAreaPlanMFC.dll;c:\Program Files\Company\Product1 2023\RoomAreaPlanUI.dll;c:\Program Files\Company\Product1 2023\RPCNode.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.Client.Helper.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.ClientServer.DataContract.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.ClientServer.Helper.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.ClientServer.PermissionSource.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.ClientServer.Proxy.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.ClientServer.ServiceContract.Local.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Common.ClientServer.ServiceContract.Model.dll;c:\Program Files\Company\Product1 2023\RS.Enterprise.Utility.dll;c:\Program Files\Company\Product1 2023\RSCloudClient.dll;c:\Program Files\Company\Product1 2023\RSCloudClientInterop.dll;c:\Program Files\Company\Product1 2023\RSCloudClientProduct1Service.dll;c:\Program Files\Company\Product1 2023\RSEnterpriseClient.dll;c:\Program Files\Company\Product1 2023\RSEnterpriseClientInterop.dll;c:\Program Files\Company\Product1 2023\RSEnterpriseClientProduct1Service.dll;c:\Program Files\Company\Product1 2023\rti.dll;c:\Program Files\Company\Product1 2023\RunEnergySimulation.dll;c:\Program Files\Company\Product1 2023\RunEnergySimulationInterop.dll;c:\Program Files\Company\Product1 2023\RWUXThemeSU2015.dll;c:\Program Files\Company\Product1 2023\SculptingDB.dll;c:\Program Files\Company\Product1 2023\SculptingDBAPI.dll;c:\Program Files\Company\Product1 2023\SculptingMFC.dll;c:\Program Files\Company\Product1 2023\SculptingUI.dll;c:\Program Files\Company\Product1 2023\SDACommon.dll;c:\Program Files\Company\Product1 2023\SDF.dll;c:\Program Files\Company\Product1 2023\senddmp.exe;c:\Program Files\Company\Product1 2023\sfl400asu.dll;c:\Program Files\Company\Product1 2023\SHFontParser.dll;c:\Program Files\Company\Product1 2023\SiteDB.dll;c:\Program Files\Company\Product1 2023\SiteDBAPI.dll;c:\Program Files\Company\Product1 2023\SiteMFC.dll;c:\Program Files\Company\Product1 2023\SiteUI.dll;c:\Program Files\Company\Product1 2023\SketchUpAPI.dll;c:\Program Files\Company\Product1 2023\SketchupCommonPreferences.dll;c:\Program Files\Company\Product1 2023\ssleay32.dll;c:\Program Files\Company\Product1 2023\SSOClient.config;c:\Program Files\Company\Product1 2023\SSONET.dll;c:\Program Files\Company\Product1 2023\SSONETUI.dll;c:\Program Files\Company\Product1 2023\StairRampDB.dll;c:\Program Files\Company\Product1 2023\StairRampDBAPI.dll;c:\Program Files\Company\Product1 2023\StairRampMFC.dll;c:\Program Files\Company\Product1 2023\StairRampUI.dll;c:\Program Files\Company\Product1 2023\StructuralAnalysisDB.dll;c:\Program Files\Company\Product1 2023\StructuralAnalysisDBAPI.dll;c:\Program Files\Company\Product1 2023\StructuralAnalysisMFC.dll;c:\Program Files\Company\Product1 2023\StructuralAnalysisUI.dll;c:\Program Files\Company\Product1 2023\StructuralDB.dll;c:\Program Files\Company\Product1 2023\StructuralDBAPI.dll;c:\Program Files\Company\Product1 2023\StructuralMFC.dll;c:\Program Files\Company\Product1 2023\StructuralUI.dll;c:\Program Files\Company\Product1 2023\SubscriptionService.dll;c:\Program Files\Company\Product1 2023\SubscriptionWrapper.dll;c:\Program Files\Company\Product1 2023\System.AppContext.DLL;c:\Program Files\Company\Product1 2023\System.Buffers.dll;c:\Program Files\Company\Product1 2023\System.Collections.Immutable.dll;c:\Program Files\Company\Product1 2023\System.ComponentModel.Annotations.dll;c:\Program Files\Company\Product1 2023\System.Console.DLL;c:\Program Files\Company\Product1 2023\System.Diagnostics.DiagnosticSource.DLL;c:\Program Files\Company\Product1 2023\System.Diagnostics.Tracing.DLL;c:\Program Files\Company\Product1 2023\System.Globalization.Calendars.DLL;c:\Program Files\Company\Product1 2023\System.IO.Compression.DLL;c:\Program Files\Company\Product1 2023\System.IO.Compression.ZipFile.DLL;c:\Program Files\Company\Product1 2023\System.IO.DLL;c:\Program Files\Company\Product1 2023\System.IO.FileSystem.DLL;c:\Program Files\Company\Product1 2023\System.IO.FileSystem.Primitives.DLL;c:\Program Files\Company\Product1 2023\System.Linq.DLL;c:\Program Files\Company\Product1 2023\System.Linq.Expressions.DLL;c:\Program Files\Company\Product1 2023\System.Memory.dll;c:\Program Files\Company\Product1 2023\System.Net.Http.DLL;c:\Program Files\Company\Product1 2023\System.Net.Http.Formatting.dll;c:\Program Files\Company\Product1 2023\System.Numerics.Vectors.dll;c:\Program Files\Company\Product1 2023\System.Reflection.DLL;c:\Program Files\Company\Product1 2023\System.Runtime.CompilerServices.Unsafe.DLL;c:\Program Files\Company\Product1 2023\System.Runtime.DLL;c:\Program Files\Company\Product1 2023\System.Runtime.Extensions.DLL;c:\Program Files\Company\Product1 2023\System.Runtime.InteropServices.DLL;c:\Program Files\Company\Product1 2023\System.Security.Cryptography.Algorithms.DLL;c:\Program Files\Company\Product1 2023\System.Security.Cryptography.Encoding.DLL;c:\Program Files\Company\Product1 2023\System.Security.Cryptography.Primitives.DLL;c:\Program Files\Company\Product1 2023\System.Security.Cryptography.X509Certificates.DLL;c:\Program Files\Company\Product1 2023\System.Text.RegularExpressions.DLL;c:\Program Files\Company\Product1 2023\System.Web.Http.dll;c:\Program Files\Company\Product1 2023\System.Windows.Interactivity.dll;c:\Program Files\Company\Product1 2023\System.Xml.ReaderWriter.DLL;c:\Program Files\Company\Product1 2023\tbb.dll;c:\Program Files\Company\Product1 2023\tbbmalloc.dll;c:\Program Files\Company\Product1 2023\TextEngine.dll;c:\Program Files\Company\Product1 2023\tinyEXRLib.dll;c:\Program Files\Company\Product1 2023\tritonmesh.dll;c:\Program Files\Company\Product1 2023\tuff_transcoder.dll;c:\Program Files\Company\Product1 2023\tugt_transcoder.dll;c:\Program Files\Company\Product1 2023\UIFramework.dll;c:\Program Files\Company\Product1 2023\UIFrameworkInterop.dll;c:\Program Files\Company\Product1 2023\UIFrameworkRes.dll;c:\Program Files\Company\Product1 2023\UIFrameworkServices.dll;c:\Program Files\Company\Product1 2023\userdata.dll;c:\Program Files\Company\Product1 2023\UserInterfaceUtility.dll;c:\Program Files\Company\Product1 2023\Utility.dll;c:\Program Files\Company\Product1 2023\UtilityAPI.dll;c:\Program Files\Company\Product1 2023\vc14-re200l.dll;c:\Program Files\Company\Product1 2023\whitelist.xml;c:\Program Files\Company\Product1 2023\WorkflowBase-1_0-vc140-x64-wt.dll;c:\Program Files\Company\Product1 2023\Xalan.Aec.dll;c:\Program Files\Company\Product1 2023\XalanMessages.Aec.dll;c:\Program Files\Company\Product1 2023\Xceed.Wpf.AvalonDock.dll;c:\Program Files\Company\Product1 2023\xerces-ad-c_3.dll;c:\Program Files\Company\Product1 2023\xirang2.dll;c:\Program Files\Company\Product1 2023\xirangall-16.dll;c:\Program Files\Company\Product1 2023\ZipArchive.dll; \ No newline at end of file diff --git a/test/core/libGPreloader/incomplete230List.csv b/test/core/libGPreloader/incomplete230List.csv new file mode 100644 index 00000000000..0803b0bf41b Binary files /dev/null and b/test/core/libGPreloader/incomplete230List.csv differ diff --git a/test/core/units/malformed_unit_dropdowns.dyn b/test/core/units/malformed_unit_dropdowns.dyn index f4ff99239bf..3400521e3db 100644 --- a/test/core/units/malformed_unit_dropdowns.dyn +++ b/test/core/units/malformed_unit_dropdowns.dyn @@ -32,7 +32,7 @@ }, { "ConcreteType": "UnitsUI.Units, UnitsUI", - "SelectedIndex": 218, + "SelectedIndex": 221, "SelectedString": "Millimeters AAA", "NodeType": "ExtensionNode", "Id": "2cc49d25d3b447b281a81efd6173c6cf", diff --git a/tools/NuGet/template-net60-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec b/tools/NuGet/template-net60-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec index 6197aaf7df3..9ac88aa6887 100644 --- a/tools/NuGet/template-net60-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec +++ b/tools/NuGet/template-net60-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec @@ -17,6 +17,6 @@ - + diff --git a/tools/install/Extra/additional-files-to-sign.txt b/tools/install/Extra/additional-files-to-sign.txt index 608d5ab2c79..0519e476521 100644 --- a/tools/install/Extra/additional-files-to-sign.txt +++ b/tools/install/Extra/additional-files-to-sign.txt @@ -6,15 +6,6 @@ Greg.dll Analytics.Net.ADP.dll Analytics.NET.Core.dll -LibG.Interface.dll ProtoGeometry.customization.dll -ProtoGeometry.dll .\en-US\ProtoGeometry.resources.dll -.\libg_228_0_0\LibG.AsmPreloader.Managed.dll -.\libg_228_0_0\LibG.AsmPreloader.Unmanaged.dll -.\libg_228_0_0\LibG.dll -.\libg_228_0_0\LibG.Managed.dll -.\libg_228_0_0\LibG.ProtoInterface.dll -.\libg_228_0_0\LibGCore.dll -