update

DynamoDS · Nov 19, 2024 · fad443a · fad443a
1 parent 05db21f
commit fad443a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git 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/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
@@ -32,9 +32,9 @@
   <ItemGroup Label="Common dependencies">
     <PackageReference Include="Autodesk.IDSDK" Version="1.2.4" />
     <PackageReference Include="Greg" Version="3.0.2.6533" />
-    <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.6876" GeneratePathProperty="true" />
-    <PackageReference Include="DynamoVisualProgramming.LibG_231_0_0" Version="3.4.0.3231" Condition=" '$(Configuration)' == 'Release' " GeneratePathProperty="true"/>
-    <PackageReference Include="DynamoVisualProgramming.LibG_231_0_0_debug" Version="3.4.0.3231" Condition=" '$(Configuration)' == 'Debug' " GeneratePathProperty="true"/>
+    <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.6876" GeneratePathProperty="true" ExcludeAssets="all"/>
+    <PackageReference Include="DynamoVisualProgramming.LibG_231_0_0" Version="3.4.0.3231" Condition=" '$(Configuration)' == 'Release' " GeneratePathProperty="true" ExcludeAssets="runtime"/>
+    <PackageReference Include="DynamoVisualProgramming.LibG_231_0_0_debug" Version="3.4.0.3231" Condition=" '$(Configuration)' == 'Debug' " GeneratePathProperty="true" ExcludeAssets="runtime"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
     <PackageReference Include="RestSharp" Version="112.0.0" CopyXML="true" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />

diff --git a/src/build.xml b/src/build.xml
@@ -6,23 +6,24 @@
     <Solution>Dynamo.All.sln</Solution>
     <Platform>Any CPU</Platform>
     <DotNet>net8.0</DotNet>
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <NuGetPath>$(MSBuildProjectDirectory)\..\tools\Nuget\NuGet.exe</NuGetPath>
  </PropertyGroup>
 
 <ItemGroup>
     <ProjectToBuild Include="$(Solution)" >
-        <Properties>Configuration=Release;Platform=$(Platform);DotNet=$(DotNet);WarningLevel=0</Properties>
+        <Properties>Configuration=$(Configuration);Platform=$(Platform);DotNet=$(DotNet);WarningLevel=0</Properties>
     </ProjectToBuild>
 </ItemGroup>
 
 <Target Name="Build" DependsOnTargets="RestorePackages">
-    <MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/>
+    <MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild" Properties="Configuration=$(Configuration)"/>
 </Target>
 
 <Target Name="RestorePackages">
   <Exec Condition="!Exists($(NuGetPath))" Command="powershell.exe -ExecutionPolicy ByPass -Command Invoke-WebRequest -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $(NuGetPath)" />
-  <Exec Command="dotnet restore $(Solution) --runtime=$(RuntimeIdentifier) -p:DotNet=$(DotNet)"/>
+  <Exec Command="dotnet restore $(Solution) --runtime=$(RuntimeIdentifier) -p:DotNet=$(DotNet) -p:Configuration=$(Configuration)"/>
 </Target>
 
 </Project>