From 5906c998575fa3548986a8ce62ab9adbc12b6754 Mon Sep 17 00:00:00 2001 From: t-tellro Date: Wed, 28 Oct 2020 18:29:53 -0600 Subject: [PATCH 01/11] Revert "First version with migration from packages.config to package reference (#11186)" This reverts commit c7a5e493d3de3cf11005c7ec3525e75f58265657. --- .github/workflows/dynamoMSbuild.yml | 3 +- .github/workflows/dynamo_mono_build.yml | 7 +- src/Config/CS.props | 4 +- src/Config/Cleanup.targets | 10 - src/Config/GregReference.props | 7 - src/Config/LibGMainReference.props | 7 - src/Config/LibGSupportedReference.props | 16 -- .../DocumentationBrowserViewExtension.csproj | 4 - .../DynamoApplications.csproj | 10 +- src/DynamoApplications/packages.config | 4 + src/DynamoCore/DynamoCore.csproj | 59 ++--- src/DynamoCore/packages.config | 9 + src/DynamoCoreWpf/DynamoCoreWpf.csproj | 109 ++++++---- src/DynamoCoreWpf/packages.config | 20 ++ src/DynamoCrypto/DynamoCrypto.csproj | 9 +- src/DynamoCrypto/packages.config | 4 + .../DynamoManipulation.csproj | 9 +- src/DynamoManipulation/packages.config | 4 + src/DynamoPackages/DynamoPackages.csproj | 23 +- src/DynamoPackages/packages.config | 6 + src/DynamoSandbox/DynamoSandbox.csproj | 2 +- src/DynamoUtilities/DynamoUtilities.csproj | 22 +- src/DynamoUtilities/packages.config | 4 + src/DynamoWPFCLI/DynamoWPFCLI.csproj | 10 +- src/DynamoWPFCLI/packages.config | 4 + src/Libraries/Analysis/Analysis.csproj | 9 +- src/Libraries/Analysis/packages.config | 4 + .../CoreNodeModels/CoreNodeModels.csproj | 19 +- src/Libraries/CoreNodeModels/packages.config | 5 + .../CoreNodeModelsWpf.csproj | 12 +- .../CoreNodeModelsWpf/packages.config | 4 + src/Libraries/CoreNodes/CoreNodes.csproj | 25 ++- src/Libraries/CoreNodes/packages.config | 5 + src/Libraries/DSCPython/DSCPython.csproj | 16 +- src/Libraries/DSCPython/packages.config | 5 + .../DSIronPython/DSIronPython.csproj | 55 +++-- src/Libraries/DSIronPython/packages.config | 8 + src/Libraries/DSOffice/DSOffice.csproj | 12 +- src/Libraries/DSOffice/packages.config | 4 + .../DesignScriptBuiltin.csproj | 11 +- .../DesignScriptBuiltin/packages.config | 4 + .../GeometryColor/GeometryColor.csproj | 9 +- src/Libraries/GeometryColor/packages.config | 4 + src/Libraries/GeometryUI/GeometryUI.csproj | 16 +- src/Libraries/GeometryUI/packages.config | 5 + .../GeometryUIWpf/GeometryUIWpf.csproj | 9 +- src/Libraries/GeometryUIWpf/packages.config | 4 + .../PythonNodeModels/PythonNodeModels.csproj | 18 +- .../PythonNodeModels/packages.config | 5 + .../PythonNodeModelsWpf.csproj | 65 +++--- .../PythonNodeModelsWpf/packages.config | 8 + src/Libraries/Tesellation/Tessellation.csproj | 23 +- src/Libraries/Tesellation/packages.config | 6 + src/Libraries/UnitsUI/UnitsUI.csproj | 9 +- src/Libraries/UnitsUI/packages.config | 4 + .../Watch3DNodeModels.csproj | 9 +- .../Watch3DNodeModels/packages.config | 4 + .../Watch3DNodeModelsWpf.csproj | 76 ++++--- .../Watch3DNodeModelsWpf/packages.config | 14 ++ .../LibraryViewExtension.csproj | 58 ++--- src/LibraryViewExtension/packages.config | 10 + .../LibraryViewExtensionMSWebBrowser.csproj | 7 +- .../packages.config | 4 + src/NodeServices/DynamoServices.csproj | 2 +- src/Notifications/Notifications.csproj | 12 +- src/Notifications/packages.config | 4 + .../PythonMigrationViewExtension.csproj | 29 +-- .../packages.config | 7 + src/Tools/SignDynamo/SignDynamo.csproj | 9 +- src/Tools/SignDynamo/packages.config | 4 + .../XmlDocumentationsUtility.csproj | 9 +- .../XmlDocumentationsUtility/packages.config | 4 + .../WpfVisualizationTests.csproj | 85 ++++---- src/VisualizationTests/packages.config | 16 ++ .../WorkspaceDependencyViewExtension.csproj | 12 +- .../packages.config | 4 + src/build.xml | 12 +- test/DynamoCoreTests/DynamoCoreTests.csproj | 39 ++-- test/DynamoCoreTests/packages.config | 7 + .../DynamoCoreWpfTests.csproj | 110 ++++++---- test/DynamoCoreWpfTests/packages.config | 19 ++ test/Engine/ProtoTest/ProtoTest.csproj | 94 +++++--- test/Engine/ProtoTest/ProtoTestMono.csproj | 202 ++++++++++++++++++ test/Engine/ProtoTest/packages.config | 4 + test/Engine/ProtoTestFx/ProtoTestFx.csproj | 99 ++++++--- .../Engine/ProtoTestFx/ProtoTestFxMono.csproj | 126 +++++++++++ test/Engine/ProtoTestFx/packages.config | 5 + .../AnalysisTests/AnalysisTests.csproj | 15 +- test/Libraries/AnalysisTests/packages.config | 5 + .../CommandLineTests/CommandLineTests.csproj | 17 +- .../CommandLineTests/packages.config | 5 + .../CoreNodesTests/CoreNodesTests.csproj | 22 +- test/Libraries/CoreNodesTests/packages.config | 5 + .../DataBridgeTests/DataBridgeTests.csproj | 7 +- .../Libraries/DataBridgeTests/packages.config | 4 + .../DynamoMSOfficeTests.csproj | 10 +- .../DynamoMSOfficeTests/packages.config | 4 + .../DynamoPythonTests.csproj | 54 +++-- .../DynamoPythonTests/packages.config | 9 + .../DynamoUtilitiesTests.csproj | 17 +- .../DynamoUtilitiesTests/packages.config | 5 + .../GeometryColorTests.csproj | 15 +- .../GeometryColorTests/packages.config | 5 + .../DynamoServicesTests.csproj | 10 +- .../NodeServicesTest/packages.config | 4 + .../PackageManagerTests.csproj | 37 ++-- .../PackageManagerTests/packages.config | 8 + .../SystemTestServices.csproj | 10 +- .../SystemTestServices/packages.config | 4 + .../TestServices/TestServices.csproj | 17 +- test/Libraries/TestServices/packages.config | 5 + .../WorkflowTests/WorkflowTests.csproj | 15 +- test/Libraries/WorkflowTests/packages.config | 5 + .../IntegrationTests/IntegrationTests.csproj | 10 +- test/System/IntegrationTests/packages.config | 4 + test/TestUINodes/TestUINodes.csproj | 11 +- test/TestUINodes/packages.config | 4 + .../ViewExtensionLibraryTests.csproj | 92 ++++---- .../ViewExtensionLibraryTests/packages.config | 11 + 119 files changed, 1559 insertions(+), 732 deletions(-) delete mode 100644 src/Config/GregReference.props delete mode 100644 src/Config/LibGMainReference.props delete mode 100644 src/Config/LibGSupportedReference.props create mode 100644 src/DynamoApplications/packages.config create mode 100644 src/DynamoCore/packages.config create mode 100644 src/DynamoCoreWpf/packages.config create mode 100644 src/DynamoCrypto/packages.config create mode 100644 src/DynamoManipulation/packages.config create mode 100644 src/DynamoPackages/packages.config create mode 100644 src/DynamoUtilities/packages.config create mode 100644 src/DynamoWPFCLI/packages.config create mode 100644 src/Libraries/Analysis/packages.config create mode 100644 src/Libraries/CoreNodeModels/packages.config create mode 100644 src/Libraries/CoreNodeModelsWpf/packages.config create mode 100644 src/Libraries/CoreNodes/packages.config create mode 100644 src/Libraries/DSCPython/packages.config create mode 100644 src/Libraries/DSIronPython/packages.config create mode 100644 src/Libraries/DSOffice/packages.config create mode 100644 src/Libraries/DesignScriptBuiltin/packages.config create mode 100644 src/Libraries/GeometryColor/packages.config create mode 100644 src/Libraries/GeometryUI/packages.config create mode 100644 src/Libraries/GeometryUIWpf/packages.config create mode 100644 src/Libraries/PythonNodeModels/packages.config create mode 100644 src/Libraries/PythonNodeModelsWpf/packages.config create mode 100644 src/Libraries/Tesellation/packages.config create mode 100644 src/Libraries/UnitsUI/packages.config create mode 100644 src/Libraries/Watch3DNodeModels/packages.config create mode 100644 src/Libraries/Watch3DNodeModelsWpf/packages.config create mode 100644 src/LibraryViewExtension/packages.config create mode 100644 src/LibraryViewExtensionMSWebBrowser/packages.config create mode 100644 src/Notifications/packages.config create mode 100644 src/PythonMigrationViewExtension/packages.config create mode 100644 src/Tools/SignDynamo/packages.config create mode 100644 src/Tools/XmlDocumentationsUtility/packages.config create mode 100644 src/VisualizationTests/packages.config create mode 100644 src/WorkspaceDependencyViewExtension/packages.config create mode 100644 test/DynamoCoreTests/packages.config create mode 100644 test/DynamoCoreWpfTests/packages.config create mode 100644 test/Engine/ProtoTest/ProtoTestMono.csproj create mode 100644 test/Engine/ProtoTest/packages.config create mode 100644 test/Engine/ProtoTestFx/ProtoTestFxMono.csproj create mode 100644 test/Engine/ProtoTestFx/packages.config create mode 100644 test/Libraries/AnalysisTests/packages.config create mode 100644 test/Libraries/CommandLineTests/packages.config create mode 100644 test/Libraries/CoreNodesTests/packages.config create mode 100644 test/Libraries/DataBridgeTests/packages.config create mode 100644 test/Libraries/DynamoMSOfficeTests/packages.config create mode 100644 test/Libraries/DynamoPythonTests/packages.config create mode 100644 test/Libraries/DynamoUtilitiesTests/packages.config create mode 100644 test/Libraries/GeometryColorTests/packages.config create mode 100644 test/Libraries/NodeServicesTest/packages.config create mode 100644 test/Libraries/PackageManagerTests/packages.config create mode 100644 test/Libraries/SystemTestServices/packages.config create mode 100644 test/Libraries/TestServices/packages.config create mode 100644 test/Libraries/WorkflowTests/packages.config create mode 100644 test/System/IntegrationTests/packages.config create mode 100644 test/TestUINodes/packages.config create mode 100644 test/ViewExtensionLibraryTests/packages.config diff --git a/.github/workflows/dynamoMSbuild.yml b/.github/workflows/dynamoMSbuild.yml index f6bd8f1bae6..3fdaea46611 100644 --- a/.github/workflows/dynamoMSbuild.yml +++ b/.github/workflows/dynamoMSbuild.yml @@ -18,8 +18,7 @@ jobs: run: | echo "***Continue with the build, Good luck developer!***" cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\" - .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /t:Restore - .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /t:Build + .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln # look for Dynamo - name: Navigate to Dynamo Folder run: | diff --git a/.github/workflows/dynamo_mono_build.yml b/.github/workflows/dynamo_mono_build.yml index 58a0e3db470..d5d415604c4 100644 --- a/.github/workflows/dynamo_mono_build.yml +++ b/.github/workflows/dynamo_mono_build.yml @@ -13,17 +13,14 @@ jobs: - name: Setup Nuget.exe to use on VM uses: nuget/setup-nuget@v1 - with: - nuget-version: latest - name: Nuget Restore on DynamoMono solution run: nuget restore $GITHUB_WORKSPACE/src/Dynamo.Mono.sln - - name: Build Dynamo with mono msbuild + - name: Build Dynamo with mono xbuild run: | echo "***Continue with the build, Good luck mono developer!***" - msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Restore - msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Build + xbuild /p:Configuration=Release $GITHUB_WORKSPACE/src/Dynamo.Mono.sln # look for Dynamo - name: Navigate to Dynamo Folder run: | diff --git a/src/Config/CS.props b/src/Config/CS.props index b6639350fd0..49af2d44848 100644 --- a/src/Config/CS.props +++ b/src/Config/CS.props @@ -1,7 +1,7 @@ - + - 16.0 + 10.0 v4.8 512 $(SolutionDir)..\bin\$(Platform)\$(Configuration) diff --git a/src/Config/Cleanup.targets b/src/Config/Cleanup.targets index 9d7489945bb..061c97b17ae 100644 --- a/src/Config/Cleanup.targets +++ b/src/Config/Cleanup.targets @@ -8,16 +8,6 @@ - - - - - - - - - - diff --git a/src/Config/GregReference.props b/src/Config/GregReference.props deleted file mode 100644 index e333e8cc4ca..00000000000 --- a/src/Config/GregReference.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - * - - - \ No newline at end of file diff --git a/src/Config/LibGMainReference.props b/src/Config/LibGMainReference.props deleted file mode 100644 index e0adfc49ccb..00000000000 --- a/src/Config/LibGMainReference.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - * - - - \ No newline at end of file diff --git a/src/Config/LibGSupportedReference.props b/src/Config/LibGSupportedReference.props deleted file mode 100644 index 4e0b80a5084..00000000000 --- a/src/Config/LibGSupportedReference.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - * - all - compile - all - - - * - all - compile - all - - - \ No newline at end of file diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj index 6f79a56d558..cc5060f3746 100644 --- a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj +++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj @@ -86,10 +86,6 @@ {47533B7C-0E1A-44A4-8511-B438645F052A} DynamoPackages - - {ef879a10-041d-4c68-83e7-3192685f1bae} - DynamoServices - diff --git a/src/DynamoApplications/DynamoApplications.csproj b/src/DynamoApplications/DynamoApplications.csproj index 03d06b8b588..79e5c6b98fb 100644 --- a/src/DynamoApplications/DynamoApplications.csproj +++ b/src/DynamoApplications/DynamoApplications.csproj @@ -1,9 +1,8 @@  - + - Debug AnyCPU @@ -37,6 +36,9 @@ false + + ..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll + @@ -91,9 +93,7 @@ - - 0.2.1 - + - + - - - - - Debug AnyCPU + 9.0.21022 + 2.0 {7858FA8C-475F-4B8E-B468-1F8200778CF8} Library Properties @@ -35,6 +32,12 @@ limitations under the License. v4.8 512 4 + + + + + 3.5 + None @@ -79,10 +82,26 @@ limitations under the License. ..\..\extern\Analytics.NET\Analytics.NET.Google.dll + + ..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll + True + + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + + + ..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + - + + 3.5 + @@ -297,6 +316,7 @@ limitations under the License. Designer + SettingsSingleFileGenerator Settings.Designer.cs @@ -359,14 +379,6 @@ limitations under the License. - - - 8.0.3 - - - 105.2.3 - - @@ -382,15 +394,15 @@ limitations under the License. - $(PkgDynamoVisualProgramming_LibG_227_0_0)\tools\net48\libg_locale + $(SolutionDir)\packages\DynamoVisualProgramming.LibG_227_0_0*\tools\net48\libg_locale - - - - - - + + + + + + @@ -413,7 +425,6 @@ limitations under the License. - @@ -452,4 +463,4 @@ limitations under the License. - + \ No newline at end of file diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config new file mode 100644 index 00000000000..6b8669954b9 --- /dev/null +++ b/src/DynamoCore/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 9a5bd8705c2..4fa090706f1 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -1,11 +1,9 @@  - + - - Debug @@ -43,11 +41,70 @@ false + + ..\packages\Cyotek.Drawing.BitmapFont.1.3.4\lib\net47\Cyotek.Drawing.BitmapFont.dll + + + ..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll + + + True + ..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll + + + ..\packages\HelixToolkit.2.11.0\lib\netstandard1.1\HelixToolkit.dll + + + ..\packages\HelixToolkit.Wpf.2.11.0\lib\net45\HelixToolkit.Wpf.dll + + + ..\packages\HelixToolkit.Wpf.SharpDX.2.11.0\lib\net45\HelixToolkit.Wpf.SharpDX.dll + + + ..\packages\AvalonEdit.4.3.1.9430\lib\Net40\ICSharpCode.AvalonEdit.dll + False + ..\..\extern\prism\Microsoft.Practices.Prism.dll + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + + + ..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + False + + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + + ..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll + + + ..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll + True + + + + ..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll + True + + + + ..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll + + + ..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll + + + ..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll + + + ..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll + @@ -431,6 +488,7 @@ Designer + Always @@ -1256,50 +1314,7 @@ - - - 4.3.1.9430 - - - 4.7.0.9 - - - 2.11.0 - - - 2.11.0 - - - 2.11.0 - - - 8.0.3 - - - 105.2.3 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - + diff --git a/src/DynamoCoreWpf/packages.config b/src/DynamoCoreWpf/packages.config new file mode 100644 index 00000000000..bb3feedb839 --- /dev/null +++ b/src/DynamoCoreWpf/packages.config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/DynamoCrypto/DynamoCrypto.csproj b/src/DynamoCrypto/DynamoCrypto.csproj index 3a2f1f674cd..a471851aa1e 100644 --- a/src/DynamoCrypto/DynamoCrypto.csproj +++ b/src/DynamoCrypto/DynamoCrypto.csproj @@ -37,6 +37,9 @@ false + + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + @@ -57,15 +60,11 @@ PreserveNewest + - - - 2.6.3 - - - + \ No newline at end of file diff --git a/src/DynamoUtilities/packages.config b/src/DynamoUtilities/packages.config new file mode 100644 index 00000000000..133876089ac --- /dev/null +++ b/src/DynamoUtilities/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/DynamoWPFCLI/DynamoWPFCLI.csproj b/src/DynamoWPFCLI/DynamoWPFCLI.csproj index 532eaaaf195..dc8a8ab49f4 100644 --- a/src/DynamoWPFCLI/DynamoWPFCLI.csproj +++ b/src/DynamoWPFCLI/DynamoWPFCLI.csproj @@ -41,6 +41,10 @@ ..\..\extern\prism\Microsoft.Practices.Prism.dll + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + False + @@ -59,6 +63,7 @@ + @@ -99,11 +104,6 @@ False - - - 8.0.3 - - + + ..\..\packages\Microsoft.CodeCoverage.16.2.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll + False ..\..\..\extern\Python\Python.Included.dll @@ -92,6 +93,9 @@ False + + + @@ -99,13 +103,5 @@ Resources.Designer.cs - - - 16.2.0 - - - 4.3.0 - - \ No newline at end of file diff --git a/src/Libraries/DSCPython/packages.config b/src/Libraries/DSCPython/packages.config new file mode 100644 index 00000000000..9d725e15609 --- /dev/null +++ b/src/Libraries/DSCPython/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Libraries/DSIronPython/DSIronPython.csproj b/src/Libraries/DSIronPython/DSIronPython.csproj index 71ccaaf0fe1..72c526d3528 100644 --- a/src/Libraries/DSIronPython/DSIronPython.csproj +++ b/src/Libraries/DSIronPython/DSIronPython.csproj @@ -1,10 +1,9 @@  - + - Debug AnyCPU @@ -16,8 +15,6 @@ v4.8 512 - - true @@ -39,7 +36,38 @@ false + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.dll + True + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Modules.dll + True + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.SQLite.dll + True + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Wpf.dll + True + + + False + ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Dynamic.dll + + + ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.dll + True + + + ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.Metadata.dll + True + + + ..\..\packages\Microsoft.CodeCoverage.16.2.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll + @@ -80,27 +108,12 @@ - - 4.3.1.9430 - all - - - 1.2.2 - - - 2.7.9 - - - 2.7.9 - - - 16.2.0 - + - + diff --git a/src/Libraries/DSIronPython/packages.config b/src/Libraries/DSIronPython/packages.config new file mode 100644 index 00000000000..d017c664b1d --- /dev/null +++ b/src/Libraries/DSIronPython/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj index 8b25467bfce..64ecd04226b 100644 --- a/src/Libraries/DSOffice/DSOffice.csproj +++ b/src/Libraries/DSOffice/DSOffice.csproj @@ -1,9 +1,8 @@  - + - Debug AnyCPU @@ -38,6 +37,11 @@ false + + ..\..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll + False + False + @@ -105,9 +109,7 @@ - - 15.0.4795.1000 - + diff --git a/src/Libraries/DSOffice/packages.config b/src/Libraries/DSOffice/packages.config new file mode 100644 index 00000000000..80d21131384 --- /dev/null +++ b/src/Libraries/DSOffice/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj index 7cabc37721c..71fa9aaa7c0 100644 --- a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj +++ b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj @@ -37,6 +37,9 @@ + + ..\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + @@ -59,6 +62,9 @@ DesignScriptBuiltin.resx + + + {ef879a10-041d-4c68-83e7-3192685f1bae} @@ -76,11 +82,6 @@ Designer - - - 1.4.0 - - diff --git a/src/Libraries/DesignScriptBuiltin/packages.config b/src/Libraries/DesignScriptBuiltin/packages.config new file mode 100644 index 00000000000..39e9c89ea90 --- /dev/null +++ b/src/Libraries/DesignScriptBuiltin/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index bfbb7e4a0be..41558e8fa0a 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -1,11 +1,9 @@  - + - - Debug AnyCPU @@ -40,6 +38,10 @@ ..\..\..\bin\AnyCPU\Release\en-US\GeometryColor.xml + + ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + False + @@ -97,6 +99,7 @@ + diff --git a/src/Libraries/GeometryColor/packages.config b/src/Libraries/GeometryColor/packages.config new file mode 100644 index 00000000000..c770c7cb5ee --- /dev/null +++ b/src/Libraries/GeometryColor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index aa36cda4322..5eba761f549 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -1,10 +1,8 @@  - + - - Debug AnyCPU @@ -37,6 +35,14 @@ false + + ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + False + + + ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + False + @@ -99,9 +105,7 @@ - - 8.0.3 - + diff --git a/src/Libraries/GeometryUI/packages.config b/src/Libraries/GeometryUI/packages.config new file mode 100644 index 00000000000..b1c3e3f8e27 --- /dev/null +++ b/src/Libraries/GeometryUI/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index fdaaba707da..591aef73fd0 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -1,10 +1,8 @@  - + - - Debug AnyCPU @@ -41,6 +39,10 @@ + + ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + False + @@ -125,6 +127,7 @@ + diff --git a/src/Libraries/GeometryUIWpf/packages.config b/src/Libraries/GeometryUIWpf/packages.config new file mode 100644 index 00000000000..c770c7cb5ee --- /dev/null +++ b/src/Libraries/GeometryUIWpf/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj index 24554bdf007..6b1b1dd2240 100644 --- a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj +++ b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj @@ -1,9 +1,8 @@  - + - Debug AnyCPU @@ -36,6 +35,10 @@ false + + ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + False + @@ -92,17 +95,10 @@ - + - - 8.0.3 - compile - - - 4.3.0 - compile - + diff --git a/src/Libraries/PythonNodeModels/packages.config b/src/Libraries/PythonNodeModels/packages.config new file mode 100644 index 00000000000..ec8f0f8024b --- /dev/null +++ b/src/Libraries/PythonNodeModels/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj index 38783acc50e..b23662fa86f 100644 --- a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj +++ b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj @@ -1,9 +1,8 @@  - + - Debug AnyCPU @@ -36,10 +35,47 @@ false + + ..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll + False + + + ..\..\packages\AvalonEdit.4.3.1.9430\lib\Net40\ICSharpCode.AvalonEdit.dll + False + False + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.dll + False + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Modules.dll + False + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.SQLite.dll + False + + + ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Wpf.dll + False + + + ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Dynamic.dll + False + ..\..\..\extern\prism\Microsoft.Practices.Prism.dll False + + ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.dll + False + + + ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.Metadata.dll + False + False @@ -127,6 +163,9 @@ MSBuild:Compile + + + @@ -148,27 +187,5 @@ - - - 4.3.1.9430 - compile - - - 1.2.2 - compile - - - 4.7.0.9 - compile - - - 2.7.9 - compile - - - 4.3.0 - compile - - \ No newline at end of file diff --git a/src/Libraries/PythonNodeModelsWpf/packages.config b/src/Libraries/PythonNodeModelsWpf/packages.config new file mode 100644 index 00000000000..8ec0811e135 --- /dev/null +++ b/src/Libraries/PythonNodeModelsWpf/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 08479cacc13..6657a8ab9a4 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -1,10 +1,8 @@  - + - - Debug AnyCPU @@ -39,6 +37,17 @@ false + + ..\..\packages\MIConvexHull.1.1.17.0411\lib\netstandard1.0\MIConvexHull.NET Standard.dll + True + + + ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + False + + + ..\..\packages\StarMath.2.0.14.1114\lib\portable-net45+sl5+wp8+win8\StarMath.dll + @@ -62,6 +71,7 @@ + @@ -76,12 +86,7 @@ - - 1.1.17.411 - - - 2.0.14.1114 - + diff --git a/src/Libraries/Tesellation/packages.config b/src/Libraries/Tesellation/packages.config new file mode 100644 index 00000000000..93e246b3f56 --- /dev/null +++ b/src/Libraries/Tesellation/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Libraries/UnitsUI/UnitsUI.csproj b/src/Libraries/UnitsUI/UnitsUI.csproj index 33f02898849..1e544e6945e 100644 --- a/src/Libraries/UnitsUI/UnitsUI.csproj +++ b/src/Libraries/UnitsUI/UnitsUI.csproj @@ -36,6 +36,10 @@ false + + ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + False + @@ -109,10 +113,7 @@ - - 8.0.3 - compile - + diff --git a/src/Libraries/UnitsUI/packages.config b/src/Libraries/UnitsUI/packages.config new file mode 100644 index 00000000000..91e87f701da --- /dev/null +++ b/src/Libraries/UnitsUI/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj index 0b5514a4ee0..064b4a8c715 100644 --- a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj +++ b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj @@ -34,6 +34,10 @@ 4 + + ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + False + @@ -94,10 +98,7 @@ - - 8.0.3 - compile - + diff --git a/src/Libraries/Watch3DNodeModels/packages.config b/src/Libraries/Watch3DNodeModels/packages.config new file mode 100644 index 00000000000..91e87f701da --- /dev/null +++ b/src/Libraries/Watch3DNodeModels/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj index d79000f79fa..b7e62e15111 100644 --- a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj +++ b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj @@ -1,10 +1,9 @@  - + - Debug AnyCPU @@ -41,12 +40,53 @@ false + + ..\..\packages\Cyotek.Drawing.BitmapFont.1.3.4\lib\net47\Cyotek.Drawing.BitmapFont.dll + + + ..\..\packages\HelixToolkit.2.11.0\lib\netstandard1.1\HelixToolkit.dll + + + ..\..\packages\HelixToolkit.Wpf.2.11.0\lib\net45\HelixToolkit.Wpf.dll + + + ..\..\packages\HelixToolkit.Wpf.SharpDX.2.11.0\lib\net45\HelixToolkit.Wpf.SharpDX.dll + ..\..\..\extern\prism\Microsoft.Practices.Prism.dll False + + ..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll + + + $(SharpDXPackageBinDir)\SharpDX.D3DCompiler.dll + False + + + ..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll + + + $(SharpDXPackageBinDir)\SharpDX.Direct2D1.dll + False + + + ..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll + + + ..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll + + + ..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll + + + ..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll + + + ..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll + $(SharpDXPackageBinDir)\SharpDX.Toolkit.dll @@ -127,37 +167,11 @@ - - + - - 1.3.4 - - - 2.11.0 - - - 2.11.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - - - 4.2.0 - + + diff --git a/src/Libraries/Watch3DNodeModelsWpf/packages.config b/src/Libraries/Watch3DNodeModelsWpf/packages.config new file mode 100644 index 00000000000..1c55776589a --- /dev/null +++ b/src/Libraries/Watch3DNodeModelsWpf/packages.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj index 364f0229c48..80fdbd6d696 100644 --- a/src/LibraryViewExtension/LibraryViewExtension.csproj +++ b/src/LibraryViewExtension/LibraryViewExtension.csproj @@ -1,13 +1,11 @@  - + + + + + - - - - - - Debug x64 @@ -38,15 +36,23 @@ prompt 4 - - x64 - + + ..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll + True + ..\..\extern\prism\Microsoft.Practices.Prism.dll + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + @@ -213,24 +219,7 @@ - - 3.3325.1758 - - - 3.3325.1758 - - - 65.0.1 - - - 65.0.1 - - - 8.0.3 - - - 105.2.3 - + + + \ No newline at end of file diff --git a/test/Engine/ProtoTest/packages.config b/test/Engine/ProtoTest/packages.config new file mode 100644 index 00000000000..681983d4969 --- /dev/null +++ b/test/Engine/ProtoTest/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/test/Engine/ProtoTestFx/ProtoTestFx.csproj b/test/Engine/ProtoTestFx/ProtoTestFx.csproj index 7c5db86ebb4..9e14bbb6672 100644 --- a/test/Engine/ProtoTestFx/ProtoTestFx.csproj +++ b/test/Engine/ProtoTestFx/ProtoTestFx.csproj @@ -1,45 +1,82 @@  - - - - - + Debug - AnyCPU + x64 + 8.0.30703 + 2.0 {2235F7CA-AB25-4177-92BC-4B574D2D5DF6} Library Properties ProtoTestFx ProtoTestFx v4.8 + + 512 - 4 + true + + + + + + true + DEBUG;TRACE + full + x64 + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules + false + false + + + TRACE + true + pdbonly + x64 + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules + false - None + + - + true + DEBUG;TRACE full - false - $(OutputPath) + x86 + true + GlobalSuppressions.cs prompt - 4 - AnyCPU - false + MinimumRecommendedRules.ruleset + ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false - false - - full + + TRACE true - $(OutputPath) + pdbonly + x86 + true + GlobalSuppressions.cs prompt - 4 - true + MinimumRecommendedRules.ruleset + ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false - false false @@ -47,7 +84,20 @@ ProtoTestFx.snk + + false + + + false + + + ..\..\..\src\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + + + ..\..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll + @@ -94,12 +144,7 @@ - - 8.0.3 - - - 2.6.3 - + + + \ No newline at end of file diff --git a/test/Engine/ProtoTestFx/packages.config b/test/Engine/ProtoTestFx/packages.config new file mode 100644 index 00000000000..092fe7d8ada --- /dev/null +++ b/test/Engine/ProtoTestFx/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index eef740d09d7..1f480f08567 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -1,11 +1,9 @@  - + - - Debug AnyCPU @@ -38,6 +36,13 @@ false + + ..\..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll + + + ..\..\..\src\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll + False + @@ -91,9 +96,7 @@ - - 2.6.3 - + + - - - - - - - - - - - + --> \ No newline at end of file diff --git a/test/ViewExtensionLibraryTests/packages.config b/test/ViewExtensionLibraryTests/packages.config new file mode 100644 index 00000000000..2d890bc1303 --- /dev/null +++ b/test/ViewExtensionLibraryTests/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From d97623846ffe47565090cb791f63348070d229f9 Mon Sep 17 00:00:00 2001 From: t-tellro Date: Wed, 28 Oct 2020 18:39:40 -0600 Subject: [PATCH 02/11] Revert "Revert "First version with migration from packages.config to package reference (#11186)"" This reverts commit 5906c998575fa3548986a8ce62ab9adbc12b6754. --- .github/workflows/dynamoMSbuild.yml | 3 +- .github/workflows/dynamo_mono_build.yml | 7 +- src/Config/CS.props | 4 +- src/Config/Cleanup.targets | 10 + src/Config/GregReference.props | 7 + src/Config/LibGMainReference.props | 7 + src/Config/LibGSupportedReference.props | 16 ++ .../DocumentationBrowserViewExtension.csproj | 4 + .../DynamoApplications.csproj | 10 +- src/DynamoApplications/packages.config | 4 - src/DynamoCore/DynamoCore.csproj | 59 +++-- src/DynamoCore/packages.config | 9 - src/DynamoCoreWpf/DynamoCoreWpf.csproj | 109 ++++------ src/DynamoCoreWpf/packages.config | 20 -- src/DynamoCrypto/DynamoCrypto.csproj | 9 +- src/DynamoCrypto/packages.config | 4 - .../DynamoManipulation.csproj | 9 +- src/DynamoManipulation/packages.config | 4 - src/DynamoPackages/DynamoPackages.csproj | 23 +- src/DynamoPackages/packages.config | 6 - src/DynamoSandbox/DynamoSandbox.csproj | 2 +- src/DynamoUtilities/DynamoUtilities.csproj | 22 +- src/DynamoUtilities/packages.config | 4 - src/DynamoWPFCLI/DynamoWPFCLI.csproj | 10 +- src/DynamoWPFCLI/packages.config | 4 - src/Libraries/Analysis/Analysis.csproj | 9 +- src/Libraries/Analysis/packages.config | 4 - .../CoreNodeModels/CoreNodeModels.csproj | 19 +- src/Libraries/CoreNodeModels/packages.config | 5 - .../CoreNodeModelsWpf.csproj | 12 +- .../CoreNodeModelsWpf/packages.config | 4 - src/Libraries/CoreNodes/CoreNodes.csproj | 25 +-- src/Libraries/CoreNodes/packages.config | 5 - src/Libraries/DSCPython/DSCPython.csproj | 16 +- src/Libraries/DSCPython/packages.config | 5 - .../DSIronPython/DSIronPython.csproj | 55 ++--- src/Libraries/DSIronPython/packages.config | 8 - src/Libraries/DSOffice/DSOffice.csproj | 12 +- src/Libraries/DSOffice/packages.config | 4 - .../DesignScriptBuiltin.csproj | 11 +- .../DesignScriptBuiltin/packages.config | 4 - .../GeometryColor/GeometryColor.csproj | 9 +- src/Libraries/GeometryColor/packages.config | 4 - src/Libraries/GeometryUI/GeometryUI.csproj | 16 +- src/Libraries/GeometryUI/packages.config | 5 - .../GeometryUIWpf/GeometryUIWpf.csproj | 9 +- src/Libraries/GeometryUIWpf/packages.config | 4 - .../PythonNodeModels/PythonNodeModels.csproj | 18 +- .../PythonNodeModels/packages.config | 5 - .../PythonNodeModelsWpf.csproj | 65 +++--- .../PythonNodeModelsWpf/packages.config | 8 - src/Libraries/Tesellation/Tessellation.csproj | 23 +- src/Libraries/Tesellation/packages.config | 6 - src/Libraries/UnitsUI/UnitsUI.csproj | 9 +- src/Libraries/UnitsUI/packages.config | 4 - .../Watch3DNodeModels.csproj | 9 +- .../Watch3DNodeModels/packages.config | 4 - .../Watch3DNodeModelsWpf.csproj | 76 +++---- .../Watch3DNodeModelsWpf/packages.config | 14 -- .../LibraryViewExtension.csproj | 58 +++-- src/LibraryViewExtension/packages.config | 10 - .../LibraryViewExtensionMSWebBrowser.csproj | 7 +- .../packages.config | 4 - src/NodeServices/DynamoServices.csproj | 2 +- src/Notifications/Notifications.csproj | 12 +- src/Notifications/packages.config | 4 - .../PythonMigrationViewExtension.csproj | 29 ++- .../packages.config | 7 - src/Tools/SignDynamo/SignDynamo.csproj | 9 +- src/Tools/SignDynamo/packages.config | 4 - .../XmlDocumentationsUtility.csproj | 9 +- .../XmlDocumentationsUtility/packages.config | 4 - .../WpfVisualizationTests.csproj | 85 ++++---- src/VisualizationTests/packages.config | 16 -- .../WorkspaceDependencyViewExtension.csproj | 12 +- .../packages.config | 4 - src/build.xml | 12 +- test/DynamoCoreTests/DynamoCoreTests.csproj | 39 ++-- test/DynamoCoreTests/packages.config | 7 - .../DynamoCoreWpfTests.csproj | 110 ++++------ test/DynamoCoreWpfTests/packages.config | 19 -- test/Engine/ProtoTest/ProtoTest.csproj | 94 +++----- test/Engine/ProtoTest/ProtoTestMono.csproj | 202 ------------------ test/Engine/ProtoTest/packages.config | 4 - test/Engine/ProtoTestFx/ProtoTestFx.csproj | 99 +++------ .../Engine/ProtoTestFx/ProtoTestFxMono.csproj | 126 ----------- test/Engine/ProtoTestFx/packages.config | 5 - .../AnalysisTests/AnalysisTests.csproj | 15 +- test/Libraries/AnalysisTests/packages.config | 5 - .../CommandLineTests/CommandLineTests.csproj | 17 +- .../CommandLineTests/packages.config | 5 - .../CoreNodesTests/CoreNodesTests.csproj | 22 +- test/Libraries/CoreNodesTests/packages.config | 5 - .../DataBridgeTests/DataBridgeTests.csproj | 7 +- .../Libraries/DataBridgeTests/packages.config | 4 - .../DynamoMSOfficeTests.csproj | 10 +- .../DynamoMSOfficeTests/packages.config | 4 - .../DynamoPythonTests.csproj | 54 ++--- .../DynamoPythonTests/packages.config | 9 - .../DynamoUtilitiesTests.csproj | 17 +- .../DynamoUtilitiesTests/packages.config | 5 - .../GeometryColorTests.csproj | 15 +- .../GeometryColorTests/packages.config | 5 - .../DynamoServicesTests.csproj | 10 +- .../NodeServicesTest/packages.config | 4 - .../PackageManagerTests.csproj | 37 ++-- .../PackageManagerTests/packages.config | 8 - .../SystemTestServices.csproj | 10 +- .../SystemTestServices/packages.config | 4 - .../TestServices/TestServices.csproj | 17 +- test/Libraries/TestServices/packages.config | 5 - .../WorkflowTests/WorkflowTests.csproj | 15 +- test/Libraries/WorkflowTests/packages.config | 5 - .../IntegrationTests/IntegrationTests.csproj | 10 +- test/System/IntegrationTests/packages.config | 4 - test/TestUINodes/TestUINodes.csproj | 11 +- test/TestUINodes/packages.config | 4 - .../ViewExtensionLibraryTests.csproj | 92 ++++---- .../ViewExtensionLibraryTests/packages.config | 11 - 119 files changed, 732 insertions(+), 1559 deletions(-) create mode 100644 src/Config/GregReference.props create mode 100644 src/Config/LibGMainReference.props create mode 100644 src/Config/LibGSupportedReference.props delete mode 100644 src/DynamoApplications/packages.config delete mode 100644 src/DynamoCore/packages.config delete mode 100644 src/DynamoCoreWpf/packages.config delete mode 100644 src/DynamoCrypto/packages.config delete mode 100644 src/DynamoManipulation/packages.config delete mode 100644 src/DynamoPackages/packages.config delete mode 100644 src/DynamoUtilities/packages.config delete mode 100644 src/DynamoWPFCLI/packages.config delete mode 100644 src/Libraries/Analysis/packages.config delete mode 100644 src/Libraries/CoreNodeModels/packages.config delete mode 100644 src/Libraries/CoreNodeModelsWpf/packages.config delete mode 100644 src/Libraries/CoreNodes/packages.config delete mode 100644 src/Libraries/DSCPython/packages.config delete mode 100644 src/Libraries/DSIronPython/packages.config delete mode 100644 src/Libraries/DSOffice/packages.config delete mode 100644 src/Libraries/DesignScriptBuiltin/packages.config delete mode 100644 src/Libraries/GeometryColor/packages.config delete mode 100644 src/Libraries/GeometryUI/packages.config delete mode 100644 src/Libraries/GeometryUIWpf/packages.config delete mode 100644 src/Libraries/PythonNodeModels/packages.config delete mode 100644 src/Libraries/PythonNodeModelsWpf/packages.config delete mode 100644 src/Libraries/Tesellation/packages.config delete mode 100644 src/Libraries/UnitsUI/packages.config delete mode 100644 src/Libraries/Watch3DNodeModels/packages.config delete mode 100644 src/Libraries/Watch3DNodeModelsWpf/packages.config delete mode 100644 src/LibraryViewExtension/packages.config delete mode 100644 src/LibraryViewExtensionMSWebBrowser/packages.config delete mode 100644 src/Notifications/packages.config delete mode 100644 src/PythonMigrationViewExtension/packages.config delete mode 100644 src/Tools/SignDynamo/packages.config delete mode 100644 src/Tools/XmlDocumentationsUtility/packages.config delete mode 100644 src/VisualizationTests/packages.config delete mode 100644 src/WorkspaceDependencyViewExtension/packages.config delete mode 100644 test/DynamoCoreTests/packages.config delete mode 100644 test/DynamoCoreWpfTests/packages.config delete mode 100644 test/Engine/ProtoTest/ProtoTestMono.csproj delete mode 100644 test/Engine/ProtoTest/packages.config delete mode 100644 test/Engine/ProtoTestFx/ProtoTestFxMono.csproj delete mode 100644 test/Engine/ProtoTestFx/packages.config delete mode 100644 test/Libraries/AnalysisTests/packages.config delete mode 100644 test/Libraries/CommandLineTests/packages.config delete mode 100644 test/Libraries/CoreNodesTests/packages.config delete mode 100644 test/Libraries/DataBridgeTests/packages.config delete mode 100644 test/Libraries/DynamoMSOfficeTests/packages.config delete mode 100644 test/Libraries/DynamoPythonTests/packages.config delete mode 100644 test/Libraries/DynamoUtilitiesTests/packages.config delete mode 100644 test/Libraries/GeometryColorTests/packages.config delete mode 100644 test/Libraries/NodeServicesTest/packages.config delete mode 100644 test/Libraries/PackageManagerTests/packages.config delete mode 100644 test/Libraries/SystemTestServices/packages.config delete mode 100644 test/Libraries/TestServices/packages.config delete mode 100644 test/Libraries/WorkflowTests/packages.config delete mode 100644 test/System/IntegrationTests/packages.config delete mode 100644 test/TestUINodes/packages.config delete mode 100644 test/ViewExtensionLibraryTests/packages.config diff --git a/.github/workflows/dynamoMSbuild.yml b/.github/workflows/dynamoMSbuild.yml index 3fdaea46611..f6bd8f1bae6 100644 --- a/.github/workflows/dynamoMSbuild.yml +++ b/.github/workflows/dynamoMSbuild.yml @@ -18,7 +18,8 @@ jobs: run: | echo "***Continue with the build, Good luck developer!***" cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\" - .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln + .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /t:Restore + .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /t:Build # look for Dynamo - name: Navigate to Dynamo Folder run: | diff --git a/.github/workflows/dynamo_mono_build.yml b/.github/workflows/dynamo_mono_build.yml index d5d415604c4..58a0e3db470 100644 --- a/.github/workflows/dynamo_mono_build.yml +++ b/.github/workflows/dynamo_mono_build.yml @@ -13,14 +13,17 @@ jobs: - name: Setup Nuget.exe to use on VM uses: nuget/setup-nuget@v1 + with: + nuget-version: latest - name: Nuget Restore on DynamoMono solution run: nuget restore $GITHUB_WORKSPACE/src/Dynamo.Mono.sln - - name: Build Dynamo with mono xbuild + - name: Build Dynamo with mono msbuild run: | echo "***Continue with the build, Good luck mono developer!***" - xbuild /p:Configuration=Release $GITHUB_WORKSPACE/src/Dynamo.Mono.sln + msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Restore + msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Build # look for Dynamo - name: Navigate to Dynamo Folder run: | diff --git a/src/Config/CS.props b/src/Config/CS.props index 49af2d44848..b6639350fd0 100644 --- a/src/Config/CS.props +++ b/src/Config/CS.props @@ -1,7 +1,7 @@ - + - 10.0 + 16.0 v4.8 512 $(SolutionDir)..\bin\$(Platform)\$(Configuration) diff --git a/src/Config/Cleanup.targets b/src/Config/Cleanup.targets index 061c97b17ae..9d7489945bb 100644 --- a/src/Config/Cleanup.targets +++ b/src/Config/Cleanup.targets @@ -8,6 +8,16 @@ + + + + + + + + + + diff --git a/src/Config/GregReference.props b/src/Config/GregReference.props new file mode 100644 index 00000000000..e333e8cc4ca --- /dev/null +++ b/src/Config/GregReference.props @@ -0,0 +1,7 @@ + + + + * + + + \ No newline at end of file diff --git a/src/Config/LibGMainReference.props b/src/Config/LibGMainReference.props new file mode 100644 index 00000000000..e0adfc49ccb --- /dev/null +++ b/src/Config/LibGMainReference.props @@ -0,0 +1,7 @@ + + + + * + + + \ No newline at end of file diff --git a/src/Config/LibGSupportedReference.props b/src/Config/LibGSupportedReference.props new file mode 100644 index 00000000000..4e0b80a5084 --- /dev/null +++ b/src/Config/LibGSupportedReference.props @@ -0,0 +1,16 @@ + + + + * + all + compile + all + + + * + all + compile + all + + + \ No newline at end of file diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj index cc5060f3746..6f79a56d558 100644 --- a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj +++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj @@ -86,6 +86,10 @@ {47533B7C-0E1A-44A4-8511-B438645F052A} DynamoPackages + + {ef879a10-041d-4c68-83e7-3192685f1bae} + DynamoServices + diff --git a/src/DynamoApplications/DynamoApplications.csproj b/src/DynamoApplications/DynamoApplications.csproj index 79e5c6b98fb..03d06b8b588 100644 --- a/src/DynamoApplications/DynamoApplications.csproj +++ b/src/DynamoApplications/DynamoApplications.csproj @@ -1,8 +1,9 @@  - + + Debug AnyCPU @@ -36,9 +37,6 @@ false - - ..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll - @@ -93,7 +91,9 @@ - + + 0.2.1 + - + + + + + + Debug AnyCPU - 9.0.21022 - 2.0 {7858FA8C-475F-4B8E-B468-1F8200778CF8} Library Properties @@ -32,12 +35,6 @@ limitations under the License. v4.8 512 4 - - - - - 3.5 - None @@ -82,26 +79,10 @@ limitations under the License. ..\..\extern\Analytics.NET\Analytics.NET.Google.dll - - ..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - - - 3.5 - + @@ -316,7 +297,6 @@ limitations under the License. Designer - SettingsSingleFileGenerator Settings.Designer.cs @@ -379,6 +359,14 @@ limitations under the License. + + + 8.0.3 + + + 105.2.3 + + @@ -394,15 +382,15 @@ limitations under the License. - $(SolutionDir)\packages\DynamoVisualProgramming.LibG_227_0_0*\tools\net48\libg_locale + $(PkgDynamoVisualProgramming_LibG_227_0_0)\tools\net48\libg_locale - - - - - - + + + + + + @@ -425,6 +413,7 @@ limitations under the License. + @@ -463,4 +452,4 @@ limitations under the License. - \ No newline at end of file + diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config deleted file mode 100644 index 6b8669954b9..00000000000 --- a/src/DynamoCore/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 4fa090706f1..9a5bd8705c2 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -1,9 +1,11 @@  - + + + Debug @@ -41,70 +43,11 @@ false - - ..\packages\Cyotek.Drawing.BitmapFont.1.3.4\lib\net47\Cyotek.Drawing.BitmapFont.dll - - - ..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll - - - True - ..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll - - - ..\packages\HelixToolkit.2.11.0\lib\netstandard1.1\HelixToolkit.dll - - - ..\packages\HelixToolkit.Wpf.2.11.0\lib\net45\HelixToolkit.Wpf.dll - - - ..\packages\HelixToolkit.Wpf.SharpDX.2.11.0\lib\net45\HelixToolkit.Wpf.SharpDX.dll - - - ..\packages\AvalonEdit.4.3.1.9430\lib\Net40\ICSharpCode.AvalonEdit.dll - False - ..\..\extern\prism\Microsoft.Practices.Prism.dll - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - False - - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - - - ..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - - ..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - True - - - - ..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - True - - - - ..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - - ..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - - ..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - - ..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll - @@ -488,7 +431,6 @@ Designer - Always @@ -1314,7 +1256,50 @@ - + + + 4.3.1.9430 + + + 4.7.0.9 + + + 2.11.0 + + + 2.11.0 + + + 2.11.0 + + + 8.0.3 + + + 105.2.3 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + diff --git a/src/DynamoCoreWpf/packages.config b/src/DynamoCoreWpf/packages.config deleted file mode 100644 index bb3feedb839..00000000000 --- a/src/DynamoCoreWpf/packages.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/DynamoCrypto/DynamoCrypto.csproj b/src/DynamoCrypto/DynamoCrypto.csproj index a471851aa1e..3a2f1f674cd 100644 --- a/src/DynamoCrypto/DynamoCrypto.csproj +++ b/src/DynamoCrypto/DynamoCrypto.csproj @@ -37,9 +37,6 @@ false - - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - @@ -60,11 +57,15 @@ PreserveNewest - + + + 2.6.3 + + - \ No newline at end of file + diff --git a/src/DynamoUtilities/packages.config b/src/DynamoUtilities/packages.config deleted file mode 100644 index 133876089ac..00000000000 --- a/src/DynamoUtilities/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/DynamoWPFCLI/DynamoWPFCLI.csproj b/src/DynamoWPFCLI/DynamoWPFCLI.csproj index dc8a8ab49f4..532eaaaf195 100644 --- a/src/DynamoWPFCLI/DynamoWPFCLI.csproj +++ b/src/DynamoWPFCLI/DynamoWPFCLI.csproj @@ -41,10 +41,6 @@ ..\..\extern\prism\Microsoft.Practices.Prism.dll - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - False - @@ -63,7 +59,6 @@ - @@ -104,6 +99,11 @@ False + + + 8.0.3 + + - - ..\..\packages\Microsoft.CodeCoverage.16.2.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll - False ..\..\..\extern\Python\Python.Included.dll @@ -93,9 +92,6 @@ False - - - @@ -103,5 +99,13 @@ Resources.Designer.cs + + + 16.2.0 + + + 4.3.0 + + \ No newline at end of file diff --git a/src/Libraries/DSCPython/packages.config b/src/Libraries/DSCPython/packages.config deleted file mode 100644 index 9d725e15609..00000000000 --- a/src/Libraries/DSCPython/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Libraries/DSIronPython/DSIronPython.csproj b/src/Libraries/DSIronPython/DSIronPython.csproj index 72c526d3528..71ccaaf0fe1 100644 --- a/src/Libraries/DSIronPython/DSIronPython.csproj +++ b/src/Libraries/DSIronPython/DSIronPython.csproj @@ -1,9 +1,10 @@  - + + Debug AnyCPU @@ -15,6 +16,8 @@ v4.8 512 + + true @@ -36,38 +39,7 @@ false - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.dll - True - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Modules.dll - True - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.SQLite.dll - True - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Wpf.dll - True - - - False - ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Dynamic.dll - - - ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.dll - True - - - ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.Metadata.dll - True - - - ..\..\packages\Microsoft.CodeCoverage.16.2.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll - @@ -108,12 +80,27 @@ - + + 4.3.1.9430 + all + + + 1.2.2 + + + 2.7.9 + + + 2.7.9 + + + 16.2.0 + - + diff --git a/src/Libraries/DSIronPython/packages.config b/src/Libraries/DSIronPython/packages.config deleted file mode 100644 index d017c664b1d..00000000000 --- a/src/Libraries/DSIronPython/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj index 64ecd04226b..8b25467bfce 100644 --- a/src/Libraries/DSOffice/DSOffice.csproj +++ b/src/Libraries/DSOffice/DSOffice.csproj @@ -1,8 +1,9 @@  - + + Debug AnyCPU @@ -37,11 +38,6 @@ false - - ..\..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll - False - False - @@ -109,7 +105,9 @@ - + + 15.0.4795.1000 + diff --git a/src/Libraries/DSOffice/packages.config b/src/Libraries/DSOffice/packages.config deleted file mode 100644 index 80d21131384..00000000000 --- a/src/Libraries/DSOffice/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj index 71fa9aaa7c0..7cabc37721c 100644 --- a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj +++ b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj @@ -37,9 +37,6 @@ - - ..\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - @@ -62,9 +59,6 @@ DesignScriptBuiltin.resx - - - {ef879a10-041d-4c68-83e7-3192685f1bae} @@ -82,6 +76,11 @@ Designer + + + 1.4.0 + + diff --git a/src/Libraries/DesignScriptBuiltin/packages.config b/src/Libraries/DesignScriptBuiltin/packages.config deleted file mode 100644 index 39e9c89ea90..00000000000 --- a/src/Libraries/DesignScriptBuiltin/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index 41558e8fa0a..bfbb7e4a0be 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -1,9 +1,11 @@  - + + + Debug AnyCPU @@ -38,10 +40,6 @@ ..\..\..\bin\AnyCPU\Release\en-US\GeometryColor.xml - - ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - False - @@ -99,7 +97,6 @@ - diff --git a/src/Libraries/GeometryColor/packages.config b/src/Libraries/GeometryColor/packages.config deleted file mode 100644 index c770c7cb5ee..00000000000 --- a/src/Libraries/GeometryColor/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index 5eba761f549..aa36cda4322 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -1,8 +1,10 @@  - + + + Debug AnyCPU @@ -35,14 +37,6 @@ false - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - False - - - ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - False - @@ -105,7 +99,9 @@ - + + 8.0.3 + diff --git a/src/Libraries/GeometryUI/packages.config b/src/Libraries/GeometryUI/packages.config deleted file mode 100644 index b1c3e3f8e27..00000000000 --- a/src/Libraries/GeometryUI/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index 591aef73fd0..fdaaba707da 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -1,8 +1,10 @@  - + + + Debug AnyCPU @@ -39,10 +41,6 @@ - - ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - False - @@ -127,7 +125,6 @@ - diff --git a/src/Libraries/GeometryUIWpf/packages.config b/src/Libraries/GeometryUIWpf/packages.config deleted file mode 100644 index c770c7cb5ee..00000000000 --- a/src/Libraries/GeometryUIWpf/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj index 6b1b1dd2240..24554bdf007 100644 --- a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj +++ b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj @@ -1,8 +1,9 @@  - + + Debug AnyCPU @@ -35,10 +36,6 @@ false - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - False - @@ -95,10 +92,17 @@ - + - + + 8.0.3 + compile + + + 4.3.0 + compile + diff --git a/src/Libraries/PythonNodeModels/packages.config b/src/Libraries/PythonNodeModels/packages.config deleted file mode 100644 index ec8f0f8024b..00000000000 --- a/src/Libraries/PythonNodeModels/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj index b23662fa86f..38783acc50e 100644 --- a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj +++ b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj @@ -1,8 +1,9 @@  - + + Debug AnyCPU @@ -35,47 +36,10 @@ false - - ..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll - False - - - ..\..\packages\AvalonEdit.4.3.1.9430\lib\Net40\ICSharpCode.AvalonEdit.dll - False - False - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.dll - False - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Modules.dll - False - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.SQLite.dll - False - - - ..\..\packages\IronPython.2.7.9\lib\net45\IronPython.Wpf.dll - False - - - ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Dynamic.dll - False - ..\..\..\extern\prism\Microsoft.Practices.Prism.dll False - - ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.dll - False - - - ..\..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.Metadata.dll - False - False @@ -163,9 +127,6 @@ MSBuild:Compile - - - @@ -187,5 +148,27 @@ + + + 4.3.1.9430 + compile + + + 1.2.2 + compile + + + 4.7.0.9 + compile + + + 2.7.9 + compile + + + 4.3.0 + compile + + \ No newline at end of file diff --git a/src/Libraries/PythonNodeModelsWpf/packages.config b/src/Libraries/PythonNodeModelsWpf/packages.config deleted file mode 100644 index 8ec0811e135..00000000000 --- a/src/Libraries/PythonNodeModelsWpf/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 6657a8ab9a4..08479cacc13 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -1,8 +1,10 @@  - + + + Debug AnyCPU @@ -37,17 +39,6 @@ false - - ..\..\packages\MIConvexHull.1.1.17.0411\lib\netstandard1.0\MIConvexHull.NET Standard.dll - True - - - ..\..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - False - - - ..\..\packages\StarMath.2.0.14.1114\lib\portable-net45+sl5+wp8+win8\StarMath.dll - @@ -71,7 +62,6 @@ - @@ -86,7 +76,12 @@ - + + 1.1.17.411 + + + 2.0.14.1114 + diff --git a/src/Libraries/Tesellation/packages.config b/src/Libraries/Tesellation/packages.config deleted file mode 100644 index 93e246b3f56..00000000000 --- a/src/Libraries/Tesellation/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Libraries/UnitsUI/UnitsUI.csproj b/src/Libraries/UnitsUI/UnitsUI.csproj index 1e544e6945e..33f02898849 100644 --- a/src/Libraries/UnitsUI/UnitsUI.csproj +++ b/src/Libraries/UnitsUI/UnitsUI.csproj @@ -36,10 +36,6 @@ false - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - False - @@ -113,7 +109,10 @@ - + + 8.0.3 + compile + diff --git a/src/Libraries/UnitsUI/packages.config b/src/Libraries/UnitsUI/packages.config deleted file mode 100644 index 91e87f701da..00000000000 --- a/src/Libraries/UnitsUI/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj index 064b4a8c715..0b5514a4ee0 100644 --- a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj +++ b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj @@ -34,10 +34,6 @@ 4 - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - False - @@ -98,7 +94,10 @@ - + + 8.0.3 + compile + diff --git a/src/Libraries/Watch3DNodeModels/packages.config b/src/Libraries/Watch3DNodeModels/packages.config deleted file mode 100644 index 91e87f701da..00000000000 --- a/src/Libraries/Watch3DNodeModels/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj index b7e62e15111..d79000f79fa 100644 --- a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj +++ b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj @@ -1,9 +1,10 @@  - + + Debug AnyCPU @@ -40,53 +41,12 @@ false - - ..\..\packages\Cyotek.Drawing.BitmapFont.1.3.4\lib\net47\Cyotek.Drawing.BitmapFont.dll - - - ..\..\packages\HelixToolkit.2.11.0\lib\netstandard1.1\HelixToolkit.dll - - - ..\..\packages\HelixToolkit.Wpf.2.11.0\lib\net45\HelixToolkit.Wpf.dll - - - ..\..\packages\HelixToolkit.Wpf.SharpDX.2.11.0\lib\net45\HelixToolkit.Wpf.SharpDX.dll - ..\..\..\extern\prism\Microsoft.Practices.Prism.dll False - - ..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - - $(SharpDXPackageBinDir)\SharpDX.D3DCompiler.dll - False - - - ..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - - $(SharpDXPackageBinDir)\SharpDX.Direct2D1.dll - False - - - ..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - - ..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - - ..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - - ..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - - ..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll - $(SharpDXPackageBinDir)\SharpDX.Toolkit.dll @@ -166,13 +126,39 @@ Resources.en-US.Designer.cs - - - + + + 1.3.4 + + + 2.11.0 + + + 2.11.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + + 4.2.0 + + diff --git a/src/Libraries/Watch3DNodeModelsWpf/packages.config b/src/Libraries/Watch3DNodeModelsWpf/packages.config deleted file mode 100644 index 1c55776589a..00000000000 --- a/src/Libraries/Watch3DNodeModelsWpf/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj index 80fdbd6d696..364f0229c48 100644 --- a/src/LibraryViewExtension/LibraryViewExtension.csproj +++ b/src/LibraryViewExtension/LibraryViewExtension.csproj @@ -1,11 +1,13 @@  - - - - - + + + + + + + Debug x64 @@ -36,23 +38,15 @@ prompt 4 + + x64 + - - ..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll - True - ..\..\extern\prism\Microsoft.Practices.Prism.dll - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - @@ -219,7 +213,24 @@ - + + 3.3325.1758 + + + 3.3325.1758 + + + 65.0.1 + + + 65.0.1 + + + 8.0.3 + + + 105.2.3 + - - \ No newline at end of file diff --git a/test/Engine/ProtoTest/packages.config b/test/Engine/ProtoTest/packages.config deleted file mode 100644 index 681983d4969..00000000000 --- a/test/Engine/ProtoTest/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/test/Engine/ProtoTestFx/ProtoTestFx.csproj b/test/Engine/ProtoTestFx/ProtoTestFx.csproj index 9e14bbb6672..7c5db86ebb4 100644 --- a/test/Engine/ProtoTestFx/ProtoTestFx.csproj +++ b/test/Engine/ProtoTestFx/ProtoTestFx.csproj @@ -1,82 +1,45 @@  - + + + + + Debug - x64 - 8.0.30703 - 2.0 + AnyCPU {2235F7CA-AB25-4177-92BC-4B574D2D5DF6} Library Properties ProtoTestFx ProtoTestFx v4.8 - - 512 - true - - - - - - true - DEBUG;TRACE - full - x64 - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false - - - TRACE - true - pdbonly - x64 - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules - false + 4 - - + None - + true - DEBUG;TRACE full - x86 - true - GlobalSuppressions.cs + false + $(OutputPath) prompt - MinimumRecommendedRules.ruleset - ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + 4 + AnyCPU + false false + false - - TRACE + + full true - pdbonly - x86 - true - GlobalSuppressions.cs + $(OutputPath) prompt - MinimumRecommendedRules.ruleset - ;C:\VS2010\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\VS2010\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + 4 + true false + false false @@ -84,20 +47,7 @@ ProtoTestFx.snk - - false - - - false - - - ..\..\..\src\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll - @@ -144,7 +94,12 @@ - + + 8.0.3 + + + 2.6.3 + - - \ No newline at end of file diff --git a/test/Engine/ProtoTestFx/packages.config b/test/Engine/ProtoTestFx/packages.config deleted file mode 100644 index 092fe7d8ada..00000000000 --- a/test/Engine/ProtoTestFx/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index 1f480f08567..eef740d09d7 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -1,9 +1,11 @@  - + + + Debug AnyCPU @@ -36,13 +38,6 @@ false - - ..\..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - ..\..\..\src\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.2745\lib\net48\ProtoGeometry.dll - False - @@ -96,7 +91,9 @@ - + + 2.6.3 + + + + + + + + + + + + - --> \ No newline at end of file diff --git a/test/ViewExtensionLibraryTests/packages.config b/test/ViewExtensionLibraryTests/packages.config deleted file mode 100644 index 2d890bc1303..00000000000 --- a/test/ViewExtensionLibraryTests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file From 4f69c4eac36b98b645d48f35e31521903287c0fc Mon Sep 17 00:00:00 2001 From: t-tellro Date: Fri, 5 Feb 2021 14:32:12 -0600 Subject: [PATCH 03/11] Issues Type Predicter GitHub Action I added a new workflow (issue_type_predicte.yaml) that is using the ML.NET model for predicting the issue type (source repo), so If a new issue is created in the Dynamo repo this workflow will run and will predict if is a Wishlist issue or not. If is a Wishlist issue it will be labeled as "Wishlist" and then another workflow will move the issue to the DynamoWishlist repo. If the issue is incomplete or is not valid the label "NotMLEvaluated" will be added to the issue. Also I added two scripts more, one will return the issue body in a json string and the other one will clan the issue body removing sections not used like "Dynamo Version" or "Stack Trace" --- .github/scripts/get_issue_json_body.ps1 | 14 ++++ .github/scripts/issue_body_cleaner.ps1 | 38 +++++++++ .github/workflows/issue_type_predicter.yaml | 89 +++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 .github/scripts/get_issue_json_body.ps1 create mode 100644 .github/scripts/issue_body_cleaner.ps1 create mode 100644 .github/workflows/issue_type_predicter.yaml diff --git a/.github/scripts/get_issue_json_body.ps1 b/.github/scripts/get_issue_json_body.ps1 new file mode 100644 index 00000000000..871d6d12618 --- /dev/null +++ b/.github/scripts/get_issue_json_body.ps1 @@ -0,0 +1,14 @@ +param([int]$issueNumber, [string]$issueTitle, [string]$issueDescription) + +$json_object = @{ + Number = $issueNumber + Title = $issueTitle + Description = $issueDescription + } + +$json_string = ConvertTo-Json -Compress $json_object + +$json_string = $json_string -replace '"', '\"' + +Write-Output $json_string + diff --git a/.github/scripts/issue_body_cleaner.ps1 b/.github/scripts/issue_body_cleaner.ps1 new file mode 100644 index 00000000000..69633b2b8c1 --- /dev/null +++ b/.github/scripts/issue_body_cleaner.ps1 @@ -0,0 +1,38 @@ +param([string]$issueContent) + +#Loads the requiered functions +. .\.github\scripts\issue_parser.ps1 + +function RemoveSpecialCharacters($InputString) +{ + $InputString = $InputString -replace '!\[.*\]\(.*\)', '' + $InputString = $InputString -replace 'https?:\/\/.*?(\s|$)', '' + + $InputString = $InputString.Replace('`','') + $InputString = $InputString.Replace("**_","") + $InputString = $InputString.Replace("bumpy","") + $InputString = $InputString.Replace('**_','') + $InputString = $InputString.Replace('_**','') + $InputString = $InputString.Replace('**','') + $InputString = $InputString.Replace('#','') + $InputString = $InputString.Replace('\r\n',' ') + $InputString = $InputString.Replace('\n',' ') + $InputString = $InputString.Replace('\"','') + $InputString = $InputString.Replace('[','') + $InputString = $InputString.Replace(']','') + $InputString = $InputString.Replace('(Fill in here)','') + return $InputString +} + +$TitleFilters = @("Dynamo version".ToLower(), + "Operating system".ToLower(), + "Stack Trace".ToLower()) +#Parse the template and issue +$parsed_issue_content = Get_Parsed_Issue $issueContent $TitleFilters + + +$parsed_issue_content | ForEach-Object { + $content = $_['Content'] + $content = RemoveSpecialCharacters($content) + Write-Output $content +} \ No newline at end of file diff --git a/.github/workflows/issue_type_predicter.yaml b/.github/workflows/issue_type_predicter.yaml new file mode 100644 index 00000000000..f15f4c01f7e --- /dev/null +++ b/.github/workflows/issue_type_predicter.yaml @@ -0,0 +1,89 @@ +name: Issue Predicter +on: + issues: + types: [opened,edited] +jobs: + issuePredicterType: + name: Issue Predicter + runs-on: ubuntu-latest + env: + #The 'analysis_response' variable is used to store the script response on step one, + #and then checked on step two to know if adding the label and comment is necessary. + #The initial 'undefined' value will be overridden when the script runs. + analysis_response: undefined + #The 'parsed_issue_body' variable is used to store the parsed issue body (after removing some sections of the body like Stack Trace) + parsed_issue_body: undefined + #The 'issue_json_string' variable is used to store in a json string (parsed info of the issue body) + issue_json_string: undefined + #The 'is_wish_list' variable is used to store the value returned by the IssuesTypePredicter project + is_wish_list: undefined + #template file name + template: "ISSUE_TEMPLATE.md" + #amount of sections from the template that can be missing information for the issue to still be considered complete + acceptable_missing_info: 1 + steps: + #Removes conflicting characters before using the issue content as a script parameter + - uses: actions/checkout@v2 + - name: Remove conflicting chars + uses: frabert/replace-string-action@v1.2 + id: remove_quotations + with: + pattern: "\"" + string: ${{ github.event.issue.body }} + replace-with: '-' + + #Checks for missing information inside the issue content + - name: Check Information + id: check-info + run: | + ls -la + echo "analysis_response=$(pwsh .\\.github\\scripts\\issue_analyzer.ps1 "${{ env.template }}" "${{ steps.remove_quotations.outputs.replaced }}" "${{ env.acceptable_missing_info }}" )" >> $GITHUB_ENV + + #Remove sections in the issue body like "Dynamo version", "Stack Trace" because won't be used to predict the issue type + - name: Clean Issue Body + if: env.analysis_response == 'Valid' + id: clean-issue-body + run: | + echo "parsed_issue_body="$(pwsh .\\.github\\scripts\\issue_body_cleaner.ps1 "${{ steps.remove_quotations.outputs.replaced }}" )"" >> $GITHUB_ENV + + #The IssuesTypePredicter program receives as a parameter a json string with the issue content, then It's creating the json string in this section based in the issue body + - name: Create Issue JSON String + if: env.analysis_response == 'Valid' + id: create-issue-json + run: | + mkdir IssuesTypePredicter + echo "issue_json_string="$(pwsh .\\.github\\scripts\\get_issue_json_body.ps1 "${{ github.event.issue.number }}" "${{ github.event.issue.title }}" "${{env.parsed_issue_body}}" )"" >> $GITHUB_ENV + + #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@v2 + with: + repository: DynamoDS/IssuesTypePredicter + path: IssuesTypePredicter + + #Builds the solution IssuesTypePredicter.sln (this contains two VS2019 ML.NET projects) + - name: Build Issues Type Predicter + if: env.analysis_response == 'Valid' + run: | + dotnet build ./IssuesTypePredicter/IssuesTypePredicter.sln --configuration Release + cp ./IssuesTypePredicter/IssuesTypePredicterML.ConsoleApp/bin/Release/netcoreapp3.1/MLModel.zip . + + #Execute the IssuesTypePredicter program and pass as a parameter the json string (which contains the issue info) + - name: Run Issues Type Predicter + if: env.analysis_response == 'Valid' + run: | + echo "is_wish_list="$(dotnet run -p ./IssuesTypePredicter/IssuesTypePredicterML.ConsoleApp/IssuesTypePredicterML.ConsoleApp.csproj -v q "${{env.issue_json_string}}")"" >> $GITHUB_ENV + + #If the is_wish_list variable contains 1 means that is a wishlist issue and label the issue with the word "Wishlist" + - name: Label Wishlist + if: contains(env.is_wish_list,'IsWishlist:1') && env.analysis_response == 'Valid' + run: | + curl -v -u admin:${{ secrets.GITHUB_TOKEN }} -d '{"labels": ["Wishlist"]}' ${{ github.event.issue.url }}/labels + + #When the issue is missing important information (don't follow the template structure) the issue will be labeled as "NotMLEvaluated" + - name: Label NotMLEvaluated + if: env.analysis_response != 'Valid' || env.issue_json_string == '' + run: | + curl -v -u admin:${{ secrets.GITHUB_TOKEN }} -d '{"labels": ["NotMLEvaluated"]}' ${{ github.event.issue.url }}/labels + From 5a3bd35e19a65444bf1a429d37c4f629dd47d171 Mon Sep 17 00:00:00 2001 From: t-tellro Date: Mon, 8 Feb 2021 17:47:53 -0600 Subject: [PATCH 04/11] Fix for the GitHub token When testing the issue predicter workflow the issues labeled as Wishlist were not moved to the DynamoWishlist repo due that the "Move Issue by labels" workflow failed. There was a problem with the PAT used to label the issue, I was using the wrong one (no triggers actions). --- .github/workflows/issue_type_predicter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issue_type_predicter.yaml b/.github/workflows/issue_type_predicter.yaml index f15f4c01f7e..0fb313a4eb2 100644 --- a/.github/workflows/issue_type_predicter.yaml +++ b/.github/workflows/issue_type_predicter.yaml @@ -79,11 +79,11 @@ jobs: - name: Label Wishlist if: contains(env.is_wish_list,'IsWishlist:1') && env.analysis_response == 'Valid' run: | - curl -v -u admin:${{ secrets.GITHUB_TOKEN }} -d '{"labels": ["Wishlist"]}' ${{ github.event.issue.url }}/labels + curl -v -u admin:${{ secrets.DYNAMOBOTTOKEN }} -d '{"labels": ["Wishlist"]}' ${{ github.event.issue.url }}/labels #When the issue is missing important information (don't follow the template structure) the issue will be labeled as "NotMLEvaluated" - name: Label NotMLEvaluated if: env.analysis_response != 'Valid' || env.issue_json_string == '' run: | - curl -v -u admin:${{ secrets.GITHUB_TOKEN }} -d '{"labels": ["NotMLEvaluated"]}' ${{ github.event.issue.url }}/labels + curl -v -u admin:${{ secrets.DYNAMOBOTTOKEN }} -d '{"labels": ["NotMLEvaluated"]}' ${{ github.event.issue.url }}/labels From 989ad647bb7a170d5572138f0fed1ff19d267646 Mon Sep 17 00:00:00 2001 From: t-tellro Date: Wed, 3 Mar 2021 16:26:44 -0600 Subject: [PATCH 05/11] DYN-3513 - new modal dialog for preferences I added a new View(xaml) for the Preferences window also I added several entries in the Resources so they can be used in the PreferencesView.xaml. This changes only will satisfy the next requirements: - The modal dialog should come with Preferences Title - The modal dialog should come with Save Changes button - The modal dialog should come with split lines - Dynamo will be blocked until user exit that dialog --- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 8 + .../Properties/Resources.Designer.cs | 36 ++ .../Properties/Resources.en-US.resx | 13 + src/DynamoCoreWpf/Properties/Resources.resx | 13 + .../Views/Menu/PreferencesView.xaml | 308 ++++++++++++++++++ .../Views/Menu/PreferencesView.xaml.cs | 41 +++ 6 files changed, 419 insertions(+) create mode 100644 src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml create mode 100644 src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index fc33d3f0535..d889ab42f7f 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -338,6 +338,9 @@ + + PreferencesView.xaml + PreviewCompactView.xaml @@ -436,6 +439,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -1320,6 +1327,7 @@ + diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 49f2e77653f..f59aea4ac7f 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -4367,6 +4367,42 @@ public static string PortViewContextMenuUserDefaultValue { } } + /// + /// Looks up a localized string similar to Features. + /// + public static string PreferencesViewFeaturesTab { + get { + return ResourceManager.GetString("PreferencesViewFeaturesTab", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to General. + /// + public static string PreferencesViewGeneralTab { + get { + return ResourceManager.GetString("PreferencesViewGeneralTab", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Preferences. + /// + public static string PreferencesViewTitle { + get { + return ResourceManager.GetString("PreferencesViewTitle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Visual Settings. + /// + public static string PreferencesViewVisualSettingsTab { + get { + return ResourceManager.GetString("PreferencesViewVisualSettingsTab", resourceCulture); + } + } + /// /// Looks up a localized string similar to A preset by this name already exists, do you wish to overwrite?. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index bb89cbfdc80..6244e7bee6f 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -2284,4 +2284,17 @@ Uninstall the following packages: {0}? Select Node Libraries + + Preferences + Dynamo | Preferences + + + Features + + + General + + + Visual Settings + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index cda076f21e9..ccd35093bf6 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -2286,4 +2286,17 @@ Uninstall the following packages: {0}? Select Node Libraries + + Preferences + Dynamo | Preferences + + + Features + + + General + + + Visual Settings + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml new file mode 100644 index 00000000000..05407560565 --- /dev/null +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs new file mode 100644 index 00000000000..67fdcb8d290 --- /dev/null +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs @@ -0,0 +1,41 @@ +using System.Windows; +using System.Windows.Input; +using Dynamo.ViewModels; + +namespace Dynamo.Wpf.Views +{ + /// + /// Interaction logic for PreferencesView.xaml + /// + public partial class PreferencesWindow : Window + { + + public PreferencesWindow(DynamoViewModel dynamoViewModel) + { + InitializeComponent(); + DataContext = dynamoViewModel; + + //For doing this window modal + this.Owner = Application.Current.MainWindow; + } + + private void SaveChanges_Click(object sender, RoutedEventArgs e) + { + + } + + private void CloseButton_Click(object sender, RoutedEventArgs e) + { + this.Close(); + } + + private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e) + { + + if (e.ChangedButton == MouseButton.Left) + { + this.DragMove(); + } + } + } +} \ No newline at end of file From 9bb71e84ed5b7827a6d1892fea2f63edfaf539c5 Mon Sep 17 00:00:00 2001 From: t-tellro Date: Wed, 3 Mar 2021 18:05:03 -0600 Subject: [PATCH 06/11] DYN-3513 - new modal dialog for preferences Updated the TabControl and TabItem because the Background property was set incorrectly in some places. --- .../AssemblySharedInfo.cs | 4 +- .../Views/Menu/PreferencesView.xaml | 104 ++++++++---------- .../Views/Menu/PreferencesView.xaml.cs | 9 +- 3 files changed, 52 insertions(+), 65 deletions(-) diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs index 22b398239f8..1c7044a07cb 100644 --- a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs +++ b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs @@ -45,7 +45,7 @@ // to distinguish one build from another. AssemblyFileVersion is specified // in AssemblyVersionInfo.cs so that it can be easily incremented by the // automated build process. -[assembly: AssemblyVersion("2.11.0.3355")] +[assembly: AssemblyVersion("2.12.0.4277")] // By default, the "Product version" shown in the file properties window is @@ -64,4 +64,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("2.11.0.3355")] +[assembly: AssemblyFileVersion("2.12.0.4277")] diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml index 05407560565..c6cde643b34 100644 --- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -132,56 +132,45 @@ - - - + + + + + + + + + + + + + + + + + + diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml index caaf365adcb..b30b04b7e5c 100644 --- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -1,4 +1,6 @@ - + + - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -273,7 +101,9 @@ - + + From eb0d517fb2dd151c02a9c68afc082913668a6371 Mon Sep 17 00:00:00 2001 From: t-tellro Date: Mon, 8 Mar 2021 11:12:56 -0600 Subject: [PATCH 11/11] DYN-3513 - Fixing code review comments I removed one line in the csproj file because is not needed. --- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 56f9ab1d547..5dd4962e69e 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -1327,7 +1327,6 @@ -