From 6d822962ac6f0d06da671023d14b8ba541ffb542 Mon Sep 17 00:00:00 2001 From: pinzart90 <46732933+pinzart90@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:04:14 -0500 Subject: [PATCH] add a debug version of libg package (#15667) Co-authored-by: aparajit-pratap --- .github/workflows/build_dynamo_core.yml | 6 ++-- .../AssemblySharedInfo.cs | 4 +-- src/DynamoCore/DynamoCore.csproj | 32 +++++++++++-------- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 2 +- .../DynamoManipulation.csproj | 2 +- src/Libraries/Analysis/Analysis.csproj | 2 +- src/Libraries/CoreNodes/CoreNodes.csproj | 2 +- .../GeometryColor/GeometryColor.csproj | 2 +- src/Libraries/GeometryUI/GeometryUI.csproj | 2 +- .../GeometryUIWpf/GeometryUIWpf.csproj | 2 +- src/Libraries/Tesellation/Tessellation.csproj | 2 +- .../NodeDocumentationMarkdownGenerator.csproj | 4 +-- src/build.xml | 7 ++-- .../AnalysisTests/AnalysisTests.csproj | 2 +- .../DynamoPythonTests.csproj | 2 +- .../GeometryColorTests.csproj | 2 +- .../TestServices/TestServices.csproj | 2 +- .../WorkflowTests/WorkflowTests.csproj | 2 +- 18 files changed, 43 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build_dynamo_core.yml b/.github/workflows/build_dynamo_core.yml index ca79b80a6ee..bc4838e4369 100644 --- a/.github/workflows/build_dynamo_core.yml +++ b/.github/workflows/build_dynamo_core.yml @@ -26,7 +26,7 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Install dependencies for windows runtime run: | - dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release --runtime=win-x64 + dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln -p:Configuration=Release --runtime=win-x64 - name: Build DynamoCore with MSBuild for Windows run: | msbuild ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release @@ -56,7 +56,7 @@ jobs: - name: Setup msbuild uses: microsoft/setup-msbuild@v2 - name: Install dependencies for linux runtime - run: dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln -p:Platform=NET_Linux --runtime=linux-x64 + run: dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln -p:Configuration=Release -p:Platform=NET_Linux --runtime=linux-x64 - name: Build DynamoCore with MSBuild for Linux run: msbuild ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release /p:Platform=NET_Linux - name: Look for DynamoCLI @@ -82,7 +82,7 @@ jobs: - name: Disable problem matcher run: echo "::remove-matcher owner=csc::" - name: Install dependencies for linux runtime - run: dotnet restore ${{ github.workspace }}/Dynamo/src/DynamoCore.sln -p:Platform=NET_Linux --runtime=linux-x64 + run: dotnet restore ${{ github.workspace }}/Dynamo/src/DynamoCore.sln -p:Configuration=Release -p:Platform=NET_Linux --runtime=linux-x64 - name: Build DynamoCore with dotnet for Linux run: dotnet build ${{ github.workspace }}/Dynamo/src/DynamoCore.sln -c Release /p:Platform=NET_Linux - name: Look for DynamoCLI.exe diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs index 463f0dc932f..5f8fc463f66 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("3.5.0.6740")] +[assembly: AssemblyVersion("3.5.0.6885")] // 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("3.5.0.6740")] +[assembly: AssemblyFileVersion("3.5.0.6885")] diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 76e74049197..066852a77a5 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -32,8 +32,9 @@ - - + + + @@ -113,16 +114,21 @@ - $(PkgDynamoVisualProgramming_LibG_231_0_0)\tools\libg_locale + libg_231_0_0 + libg_230_0_0 + $(PkgDynamoVisualProgramming_LibG_231_0_0) + $(PkgDynamoVisualProgramming_LibG_231_0_0_debug) + $(PkgDynamoVisualProgramming_LibG_230_0_0) + $(LibGMainPackagePath)\tools\libg_locale - - - - - - - + + + + + + + @@ -154,10 +160,10 @@ - + - - + + diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 7073f688fcf..f015eb10abe 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -186,7 +186,7 @@ - + diff --git a/src/DynamoManipulation/DynamoManipulation.csproj b/src/DynamoManipulation/DynamoManipulation.csproj index ed687aebe66..e8f3d407f85 100644 --- a/src/DynamoManipulation/DynamoManipulation.csproj +++ b/src/DynamoManipulation/DynamoManipulation.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/Libraries/Analysis/Analysis.csproj b/src/Libraries/Analysis/Analysis.csproj index 2541a2f5094..a9189785549 100644 --- a/src/Libraries/Analysis/Analysis.csproj +++ b/src/Libraries/Analysis/Analysis.csproj @@ -18,7 +18,7 @@ - + {7858fa8c-475f-4b8e-b468-1f8200778cf8} DynamoCore diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj index 0b042e71a8e..223751e0342 100644 --- a/src/Libraries/CoreNodes/CoreNodes.csproj +++ b/src/Libraries/CoreNodes/CoreNodes.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index ecc8e7d411d..4061e095be1 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index 000ff1854fb..438e98e3518 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index f4a60fdc933..6f59bff65f7 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 8629a99000a..351559b3d5b 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj index 2a08bc92c81..eb807071d97 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj +++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/src/build.xml b/src/build.xml index ee0ce629f4f..72d1e562b4f 100644 --- a/src/build.xml +++ b/src/build.xml @@ -6,23 +6,24 @@ Dynamo.All.sln Any CPU net8.0 + Release win-x64 $(MSBuildProjectDirectory)\..\tools\Nuget\NuGet.exe - Configuration=Release;Platform=$(Platform);DotNet=$(DotNet);WarningLevel=0 + Configuration=$(Configuration);Platform=$(Platform);DotNet=$(DotNet);WarningLevel=0 - + - + diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index 90b78f80f57..711ad1ddb83 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -10,7 +10,7 @@ AnalysisTests - + diff --git a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj index fd061cad808..9e61a9b0c11 100644 --- a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj +++ b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj index 4b221a30ca4..9f728a91f64 100644 --- a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj +++ b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj @@ -10,7 +10,7 @@ DisplayTests - + diff --git a/test/Libraries/TestServices/TestServices.csproj b/test/Libraries/TestServices/TestServices.csproj index 6f3c13b57f2..e6ff1a1f18c 100644 --- a/test/Libraries/TestServices/TestServices.csproj +++ b/test/Libraries/TestServices/TestServices.csproj @@ -10,7 +10,7 @@ TestServices - + diff --git a/test/Libraries/WorkflowTests/WorkflowTests.csproj b/test/Libraries/WorkflowTests/WorkflowTests.csproj index c0c5348e12b..f613593c6b4 100644 --- a/test/Libraries/WorkflowTests/WorkflowTests.csproj +++ b/test/Libraries/WorkflowTests/WorkflowTests.csproj @@ -14,7 +14,7 @@ - +