diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props index efaf33a260d..580774f221b 100644 --- a/src/Config/CS_SDK.props +++ b/src/Config/CS_SDK.props @@ -57,13 +57,7 @@ $(DefineConstants);_LINUX - net6.0-windows - true - true - - - - net6.0-windows + $(TargetFramework)-windows true true @@ -132,27 +126,12 @@ - + dll - - exe - - v4.8 - - - + - - - - - - $(FrameworkAssembliesPath)System.Drawing.dll - - - diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 9587b011125..58ebc55c3b6 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -1,4 +1,4 @@ - + @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -111,26 +111,26 @@ $(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -169,15 +169,15 @@ - + - + - + - + diff --git a/src/DynamoUtilities/DynamoUtilities.csproj b/src/DynamoUtilities/DynamoUtilities.csproj index 4f87ab6979a..7ee79695b53 100644 --- a/src/DynamoUtilities/DynamoUtilities.csproj +++ b/src/DynamoUtilities/DynamoUtilities.csproj @@ -12,10 +12,8 @@ DynamoUtilities true - + - - diff --git a/src/Engine/ProtoCore/ProtoCore.csproj b/src/Engine/ProtoCore/ProtoCore.csproj index 5507b96fe36..e1802768da4 100644 --- a/src/Engine/ProtoCore/ProtoCore.csproj +++ b/src/Engine/ProtoCore/ProtoCore.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Libraries/Analysis/Analysis.csproj b/src/Libraries/Analysis/Analysis.csproj index 87224915c60..4455b184bfe 100644 --- a/src/Libraries/Analysis/Analysis.csproj +++ b/src/Libraries/Analysis/Analysis.csproj @@ -62,7 +62,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/CoreNodeModels/CoreNodeModels.csproj b/src/Libraries/CoreNodeModels/CoreNodeModels.csproj index f0f868d4b8f..a77619d159c 100644 --- a/src/Libraries/CoreNodeModels/CoreNodeModels.csproj +++ b/src/Libraries/CoreNodeModels/CoreNodeModels.csproj @@ -85,7 +85,7 @@ - + diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj index de955956b7f..73a95cb3c8b 100644 --- a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj +++ b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj @@ -135,7 +135,7 @@ - + diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj index c5569245ff6..50f972b1c2e 100644 --- a/src/Libraries/CoreNodes/CoreNodes.csproj +++ b/src/Libraries/CoreNodes/CoreNodes.csproj @@ -85,7 +85,7 @@ - + diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj index c70f3437119..c66bda5be3a 100644 --- a/src/Libraries/DSOffice/DSOffice.csproj +++ b/src/Libraries/DSOffice/DSOffice.csproj @@ -42,7 +42,7 @@ DynamoCore False - + {ef879a10-041d-4c68-83e7-3192685f1bae} DynamoServices @@ -55,7 +55,7 @@ - + diff --git a/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj b/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj index dc2bc49ee30..1a58e9b98a9 100644 --- a/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj +++ b/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj @@ -12,7 +12,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + all true @@ -31,9 +31,7 @@ False True - - - + diff --git a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj index c3007ecb743..e671b013b01 100644 --- a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj +++ b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj @@ -15,7 +15,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + @@ -49,7 +49,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj index 360f8714ec6..f85ce46e588 100644 --- a/src/Libraries/DynamoUnits/UnitsCore.csproj +++ b/src/Libraries/DynamoUnits/UnitsCore.csproj @@ -13,16 +13,14 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + - - runtime;build - + @@ -39,13 +37,13 @@ Resources.en-US.resx - + - + diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index 3b4d843545a..d8998af4b2a 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -69,7 +69,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index c7fec28b8ce..39758013410 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -71,7 +71,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index a9615fb149f..387cdb40dd0 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -94,7 +94,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj index c9ae415e763..1f72f16b716 100644 --- a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj +++ b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj @@ -63,7 +63,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 5379ab2af2a..e4f3e5dc809 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -16,9 +16,7 @@ - - - + @@ -60,7 +58,7 @@ - + \ No newline at end of file diff --git a/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj b/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj index aafb4e6d946..91b9a6112f2 100644 --- a/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj +++ b/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj @@ -44,7 +44,7 @@ - + diff --git a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj index ad2edc6beeb..b41c9df41c8 100644 --- a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj +++ b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj @@ -66,7 +66,7 @@ - + \ No newline at end of file diff --git a/src/NodeServices/Validity.cs b/src/NodeServices/Validity.cs index 153f2a470c6..aa34b815ea8 100644 --- a/src/NodeServices/Validity.cs +++ b/src/NodeServices/Validity.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Runtime.Serialization; using System.IO; @@ -41,12 +41,6 @@ public NodeInternalException(string message) : base(message) public NodeInternalException(string message, Exception inner) : base(message, inner) { } - - protected NodeInternalException( - SerializationInfo info, - StreamingContext context) : base(info, context) - { - } } /// diff --git a/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj b/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj index dcf7be77ddc..ada6d546476 100644 --- a/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj +++ b/src/Tools/DynamoInstallDetective/DynamoInstallDetective.csproj @@ -9,7 +9,7 @@ DynamoInstallDetective DynamoInstallDetective - + diff --git a/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj b/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj index e74a8741034..7c375a0d8ab 100644 --- a/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj +++ b/src/Tools/DynamoShapeManager/DynamoShapeManager.csproj @@ -10,7 +10,7 @@ DynamoShapeManager true - + \ No newline at end of file diff --git a/src/Tools/Md2Html/Md2Html.csproj b/src/Tools/Md2Html/Md2Html.csproj index b75f8a2c210..93db771aa16 100644 --- a/src/Tools/Md2Html/Md2Html.csproj +++ b/src/Tools/Md2Html/Md2Html.csproj @@ -10,8 +10,6 @@ Md2Html $(OutputPath)\Md2Html\ bin\$(Platform)\$(Configuration)\ - - true false @@ -26,11 +24,11 @@ 0.22.0 - + - \ No newline at end of file + diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj index 69381971efa..4879875bcf5 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj +++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj index 57327c6406b..1ae113bca2e 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -18,7 +18,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/test/Engine/ProtoTest/ProtoTest.csproj b/test/Engine/ProtoTest/ProtoTest.csproj index 26e00ea2f5b..c04a1cfc9cf 100644 --- a/test/Engine/ProtoTest/ProtoTest.csproj +++ b/test/Engine/ProtoTest/ProtoTest.csproj @@ -23,7 +23,7 @@ - + diff --git a/test/Engine/ProtoTestFx/ProtoTestFx.csproj b/test/Engine/ProtoTestFx/ProtoTestFx.csproj index e8cbc7fbeec..a81774a5112 100644 --- a/test/Engine/ProtoTestFx/ProtoTestFx.csproj +++ b/test/Engine/ProtoTestFx/ProtoTestFx.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index c86e2c08b63..0dff2f73d13 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -12,11 +12,8 @@ - - - - - + + diff --git a/test/Libraries/CommandLineTests/CommandLineTests.csproj b/test/Libraries/CommandLineTests/CommandLineTests.csproj index 5d9052239a7..494fd6e5e37 100644 --- a/test/Libraries/CommandLineTests/CommandLineTests.csproj +++ b/test/Libraries/CommandLineTests/CommandLineTests.csproj @@ -15,8 +15,7 @@ - - + diff --git a/test/Libraries/CoreNodesTests/CoreNodesTests.csproj b/test/Libraries/CoreNodesTests/CoreNodesTests.csproj index 507d20c549f..c8cb290c4ad 100644 --- a/test/Libraries/CoreNodesTests/CoreNodesTests.csproj +++ b/test/Libraries/CoreNodesTests/CoreNodesTests.csproj @@ -17,9 +17,6 @@ - - - diff --git a/test/Libraries/DataBridgeTests/DataBridgeTests.csproj b/test/Libraries/DataBridgeTests/DataBridgeTests.csproj index 21585d2fe02..18c5a7dd11a 100644 --- a/test/Libraries/DataBridgeTests/DataBridgeTests.csproj +++ b/test/Libraries/DataBridgeTests/DataBridgeTests.csproj @@ -16,9 +16,6 @@ - - - diff --git a/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj b/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj index 4eeb7f5dd9d..665e0ca4b23 100644 --- a/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj +++ b/test/Libraries/DynamoMSOfficeTests/DynamoMSOfficeTests.csproj @@ -1,4 +1,7 @@ + + true + @@ -11,7 +14,7 @@ DynamoMSOfficeTests DynamoMSOfficeTests - + diff --git a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj index 71f3d07a9bb..27289c45177 100644 --- a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj +++ b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj @@ -1,4 +1,7 @@ + + true + diff --git a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj index 33c45f6447d..ef38eae803b 100644 --- a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj +++ b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj @@ -12,12 +12,9 @@ + + - - - - - {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9} diff --git a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj index fd947e98d58..73cfce41973 100644 --- a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj +++ b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj @@ -12,9 +12,6 @@ - - - diff --git a/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj b/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj index cd192e60362..ae309500180 100644 --- a/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj +++ b/test/Libraries/NodeServicesTest/DynamoServicesTests.csproj @@ -14,12 +14,9 @@ DynamoServicesTests DynamoServicesTests - - + - - diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 1a4b5329b29..0834509d899 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -24,10 +24,6 @@ all compile; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/test/Libraries/SystemTestServices/SystemTestServices.csproj b/test/Libraries/SystemTestServices/SystemTestServices.csproj index fde6c81c728..2ea550619b4 100644 --- a/test/Libraries/SystemTestServices/SystemTestServices.csproj +++ b/test/Libraries/SystemTestServices/SystemTestServices.csproj @@ -12,11 +12,8 @@ SystemTestServices SystemTestServices - - - diff --git a/test/Libraries/TestServices/TestServices.csproj b/test/Libraries/TestServices/TestServices.csproj index e72b3777a08..e7978075a5b 100644 --- a/test/Libraries/TestServices/TestServices.csproj +++ b/test/Libraries/TestServices/TestServices.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/Libraries/WorkflowTests/WorkflowTests.csproj b/test/Libraries/WorkflowTests/WorkflowTests.csproj index 5ddfba23e92..d7c49682326 100644 --- a/test/Libraries/WorkflowTests/WorkflowTests.csproj +++ b/test/Libraries/WorkflowTests/WorkflowTests.csproj @@ -15,9 +15,6 @@ - - - diff --git a/test/System/IntegrationTests/IntegrationTests.csproj b/test/System/IntegrationTests/IntegrationTests.csproj index 7685be1a6cf..9d9aff13b41 100644 --- a/test/System/IntegrationTests/IntegrationTests.csproj +++ b/test/System/IntegrationTests/IntegrationTests.csproj @@ -14,12 +14,9 @@ IntegrationTests IntegrationTests - - + - - diff --git a/test/TestUINodes/TestUINodes.csproj b/test/TestUINodes/TestUINodes.csproj index bcfc2e40876..f17a3ba6137 100644 --- a/test/TestUINodes/TestUINodes.csproj +++ b/test/TestUINodes/TestUINodes.csproj @@ -19,9 +19,6 @@ - - - none diff --git a/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj b/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj index 0867d9bbf84..d3a734c33f6 100644 --- a/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj +++ b/test/Tools/NodeDocumentationMarkdownGeneratorTests/NodeDocumentationMarkdownGeneratorTests.csproj @@ -14,9 +14,6 @@ - - -