Create net7.0-windows version for Revit 2025

ricaun-io · Nov 19, 2023 · 3b644e6 · 3b644e6
1 parent 5cf2ab5
commit 3b644e6
Show file tree

Hide file tree

Showing 7 changed files with 189 additions and 50 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -22,7 +22,7 @@ jobs:
       - name: NuGet Setup
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
       - name: "NuGet Add Source Organization"
         run: if ("${{ secrets.ORGANIZATION_SOURCE_PACKAGE_PASSWORD }}" -ne "") { dotnet nuget add source --username ${{ secrets.ORGANIZATION_SOURCE_PACKAGE_USERNAME }} --password ${{ secrets.ORGANIZATION_SOURCE_PACKAGE_PASSWORD }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{github.repository_owner}}/index.json" }
 

diff --git a/Build/.nuke/build.schema.json b/Build/.nuke/build.schema.json
@@ -0,0 +1,142 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$ref": "#/definitions/build",
+  "title": "Build Schema",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "Continue": {
+          "type": "boolean",
+          "description": "Indicates to continue a previously failed build attempt"
+        },
+        "Folder": {
+          "type": "string"
+        },
+        "GitHubToken": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
+        "Help": {
+          "type": "boolean",
+          "description": "Shows the help text for this build assembly"
+        },
+        "Host": {
+          "type": "string",
+          "description": "Host for execution. Default is 'automatic'",
+          "enum": [
+            "AppVeyor",
+            "AzurePipelines",
+            "Bamboo",
+            "Bitbucket",
+            "Bitrise",
+            "GitHubActions",
+            "GitLab",
+            "Jenkins",
+            "Rider",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
+          ]
+        },
+        "MainName": {
+          "type": "string"
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "NugetApiKey": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
+        "NugetApiUrl": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
+        "Plan": {
+          "type": "boolean",
+          "description": "Shows the execution plan (HTML)"
+        },
+        "Profile": {
+          "type": "array",
+          "description": "Defines the profiles to load",
+          "items": {
+            "type": "string"
+          }
+        },
+        "ReleaseFolder": {
+          "type": "string"
+        },
+        "ReleaseNameVersion": {
+          "type": "boolean"
+        },
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "SignFile": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
+        "SignPassword": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
+        "Skip": {
+          "type": "array",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Build",
+              "Clean",
+              "Compile",
+              "GitRelease",
+              "Pack",
+              "Release",
+              "Sign"
+            ]
+          }
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded"
+        },
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Build",
+              "Clean",
+              "Compile",
+              "GitRelease",
+              "Pack",
+              "Release",
+              "Sign"
+            ]
+          }
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>.</NukeRootDirectory>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] / 2023-11-18
+### Features
+- Create `net7.0-windows` version for Revit 2025
+
 ## [0.1.2] / 2023-02-22
 ### Features
 - `RevitBusyService` - start busy
@@ -23,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 [vNext]: ../../compare/1.0.0...HEAD
 [1.0.0]: ../../compare/1.0.0
+[0.2.0]: ../../compare/0.1.2...0.2.0
 [0.1.2]: ../../compare/0.1.1...0.1.2
 [0.1.1]: ../../compare/0.1.0...0.1.1
 [0.1.0]: ../../compare/0.1.0
diff --git a/Revit.Busy.Example/Revit.Busy.Example.csproj b/Revit.Busy.Example/Revit.Busy.Example.csproj
@@ -6,7 +6,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <UseWPF>true</UseWPF>
     <LangVersion>latest</LangVersion>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <Configurations>Debug; Release</Configurations>
   </PropertyGroup>
@@ -69,6 +69,23 @@
     </Otherwise>
   </Choose>
 
+  <!-- RevitVersion -->
+  <PropertyGroup>
+    <TargetFrameworks>net46;net7.0-windows</TargetFrameworks>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="$(TargetFramework.StartsWith('net4'))">
+      <PropertyGroup>
+        <RevitVersion>2017</RevitVersion>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <RevitVersion>2025</RevitVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <!-- Release -->
   <PropertyGroup Condition="!$(Configuration.Contains('Debug'))">
     <Optimize>true</Optimize>
@@ -121,7 +138,7 @@
     <Copyright>Copyright © $(CopyrightYears) $(Company)</Copyright>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <PackageReference Include="ricaun.Revit.UI" Version="*" />
     <PackageReference Include="ricaun.Revit.Mvvm" Version="*" />
   </ItemGroup>

diff --git a/Revit.Busy.Example/Revit/App.cs b/Revit.Busy.Example/Revit/App.cs
@@ -1,8 +1,9 @@
+#if NETFRAMEWORK
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using ricaun.Revit.UI;
+using Revit.Busy;
 using System;
-
 namespace Revit.Busy.Example.Revit
 {
     [AppLoader]
@@ -50,4 +51,5 @@ private static void UpdateLargeImageBusy(RibbonItem ribbonItem, RevitBusyService
                 ribbonItem.SetLargeImage(LargeImageNoBusy);
         }
     }
-}
+}
+#endif
diff --git a/Revit.Busy/Revit.Busy.csproj b/Revit.Busy/Revit.Busy.csproj
@@ -6,69 +6,34 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <UseWPF>true</UseWPF>
     <LangVersion>latest</LangVersion>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <Configurations>
       Debug; Release;
     </Configurations>
   </PropertyGroup>
 
   <!-- RevitVersion -->
+  <PropertyGroup>
+    <TargetFrameworks>net46;net7.0-windows</TargetFrameworks>
+  </PropertyGroup>
   <Choose>
-    <When Condition="$(Configuration.Contains('2017'))">
+    <When Condition="$(TargetFramework.StartsWith('net4'))">
       <PropertyGroup>
         <RevitVersion>2017</RevitVersion>
-        <TargetFramework>net46</TargetFramework>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(Configuration.Contains('2018'))">
-      <PropertyGroup>
-        <RevitVersion>2018</RevitVersion>
-        <TargetFramework>net46</TargetFramework>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(Configuration.Contains('2019'))">
-      <PropertyGroup>
-        <RevitVersion>2019</RevitVersion>
-        <TargetFramework>net47</TargetFramework>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(Configuration.Contains('2020'))">
-      <PropertyGroup>
-        <RevitVersion>2020</RevitVersion>
-        <TargetFramework>net47</TargetFramework>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(Configuration.Contains('2021'))">
-      <PropertyGroup>
-        <RevitVersion>2021</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(Configuration.Contains('2022'))">
-      <PropertyGroup>
-        <RevitVersion>2022</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(Configuration.Contains('2023'))">
-      <PropertyGroup>
-        <RevitVersion>2023</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <RevitVersion>2017</RevitVersion>
-        <TargetFramework>net46</TargetFramework>
+        <RevitVersion>2025</RevitVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
   <!-- Release -->
   <PropertyGroup Condition="!$(Configuration.Contains('Debug'))">
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\$(RevitVersion)</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>REVIT$(RevitVersion)</DefineConstants>
     <NoWarn>MSB3052</NoWarn>
     <DebugType>None</DebugType>
@@ -91,7 +56,7 @@
 
   <PropertyGroup>
     <PackageId>Revit.Busy</PackageId>
-    <Version>0.1.2</Version>
+    <Version>0.2.0</Version>
     <ProjectGuid>{3BAB660A-FADA-4AF0-BE2E-23B7FC5067FC}</ProjectGuid>
   </PropertyGroup>
 
@@ -164,7 +129,15 @@
     <Page Remove="Revit\**" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(Configuration.Contains('Debug'))">
+
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
+    <Compile Remove="Revit\**" />
+    <EmbeddedResource Remove="Revit\**" />
+    <None Remove="Revit\**" />
+    <Page Remove="Revit\**" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(Configuration.Contains('Debug')) and $(TargetFramework.StartsWith('net4'))">
     <PackageReference Include="ricaun.Revit.UI" Version="*" />
     <PackageReference Include="ricaun.Revit.Mvvm" Version="*" />
   </ItemGroup>