fix conflict .net8

chuongmep · Dec 9, 2023 · 3792d8c · 3792d8c
1 parent 321f9ca
commit 3792d8c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/OpenMEPCad/OpenMEPCad.csproj b/OpenMEPCad/OpenMEPCad.csproj
@@ -101,7 +101,7 @@
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishTrimmed>true</PublishTrimmed>
+<!--        <PublishTrimmed>true</PublishTrimmed>-->
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>

diff --git a/OpenMEPCivil/OpenMEPCivil.csproj b/OpenMEPCivil/OpenMEPCivil.csproj
@@ -100,7 +100,7 @@
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishTrimmed>true</PublishTrimmed>
+<!--        <PublishTrimmed>true</PublishTrimmed>-->
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>

diff --git a/OpenMEPRevit/OpenMEPRevit.csproj b/OpenMEPRevit/OpenMEPRevit.csproj
@@ -108,7 +108,7 @@
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishTrimmed>true</PublishTrimmed>
+<!--        <PublishTrimmed>true</PublishTrimmed>-->
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>

diff --git a/OpenMEPSandbox/OpenMEPSandbox.csproj b/OpenMEPSandbox/OpenMEPSandbox.csproj
@@ -101,7 +101,7 @@
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishTrimmed>true</PublishTrimmed>
+<!--        <PublishTrimmed>true</PublishTrimmed>-->
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>

diff --git a/OpenMEPUI/OpenMEPUI.csproj b/OpenMEPUI/OpenMEPUI.csproj
@@ -101,7 +101,7 @@
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishTrimmed>true</PublishTrimmed>
+<!--        <PublishTrimmed>true</PublishTrimmed>-->
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>

diff --git a/OpenMEPViewExtension/OpenMEPViewExtension.csproj b/OpenMEPViewExtension/OpenMEPViewExtension.csproj
@@ -99,7 +99,7 @@
         <DynVersion>$(DynamoVersion)</DynVersion>
         <BuildOutput>$(DynamoOutput)</BuildOutput>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishTrimmed>true</PublishTrimmed>
+<!--        <PublishTrimmed>true</PublishTrimmed>-->
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>dynamo</PackageTags>

diff --git a/build/Build.cs b/build/Build.cs
@@ -7,6 +7,7 @@
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
+using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.Git;
 using Nuke.Common.Tools.GitHub;
 using Nuke.Common.Tools.GitVersion;
@@ -17,7 +18,7 @@
 using Serilog;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
-
+using static Nuke.Common.Tools.DotNet.DotNetTasks;
 class Build : NukeBuild
 {
     /// Support plugins are available for:
@@ -93,13 +94,18 @@ class Build : NukeBuild
             var configurations = Solution.GetConfigurations(BuildConfiguration);
             configurations.ForEach(configuration =>
             {
-                MSBuild(s => s
-                    .SetTargets("Rebuild")
-                    .SetProcessToolPath(MsBuildPath.Value)
+                DotNetTasks.DotNetBuild(s => s
                     .SetConfiguration(configuration)
-                    .SetVerbosity(MSBuildVerbosity.Minimal)
-                    .DisableNodeReuse()
-                    .EnableRestore());
+                    // .SetFramework("net6.0")
+                    .SetVersion(GitVersion.NuGetVersionV2)
+                    .SetVerbosity(DotNetVerbosity.Minimal));
+                // MSBuild(s => s
+                //     .SetTargets("Rebuild")
+                //     .SetProcessToolPath(MsBuildPath.Value)
+                //     .SetConfiguration(configuration)
+                //     .SetVerbosity(MSBuildVerbosity.Minimal)
+                //     .DisableNodeReuse()
+                //     .EnableRestore());
             });
         });
 

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -12,7 +12,7 @@
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="7.0.2" />
+    <PackageReference Include="Nuke.Common" Version="7.0.6" />
     <PackageReference Include="vswhere" Version="2.*" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.8.1]" />
   </ItemGroup>