Update Develop to Oss.da

Build/.nuke/build.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
   "$ref": "#/definitions/build",
+  "title": "Build Schema",
   "definitions": {
     "build": {
       "type": "object",
@@ -51,6 +51,9 @@
         "MainName": {
           "type": "string"
         },
+        "MiddleVersions": {
+          "type": "boolean"
+        },
         "Name": {
           "type": "string"
         },
@@ -79,12 +82,18 @@
         "ProjectNameFolder": {
           "type": "boolean"
         },
+        "ProjectRemoveTargetFrameworkFolder": {
+          "type": "boolean"
+        },
         "ProjectVersionFolder": {
           "type": "boolean"
         },
         "ReleaseBundle": {
           "type": "boolean"
         },
+        "ReleaseFolder": {
+          "type": "string"
+        },
         "ReleaseNameVersion": {
           "type": "boolean"
         },
@@ -158,4 +167,4 @@
       }
     }
   }
-}
+}

CHANGELOG.md

@@ -4,6 +4,9 @@ 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).
 
+## [1.1.0] / 2024-02-15
+- Add `UI.Valid` class to check if Revit UI is available.
+
 ## [1.0.1] / 2023-01-09
 ### Fixed
 - Fix `DBApplication` misspell
@@ -12,5 +15,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - First Release
 
 [vNext]: ../../compare/1.0.0...HEAD
+[1.1.0]: ../../compare/1.0.0...1.1.0
 [1.0.1]: ../../compare/1.0.0...1.0.1
 [1.0.0]: ../../compare/1.0.0

DesignAutomationConsole/DesignAutomationConsole.csproj

@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ricaun.Autodesk.Forge.Oss.DesignAutomation" Version="*" />
+  </ItemGroup>
+  <!--
+  <ItemGroup>
+    <PackageReference Include="ricaun.Autodesk.Forge.Oss" Version="*" />
+    <PackageReference Include="Autodesk.Forge.DesignAutomation" Version="*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ricaun.Forge.DesignAutomation\ricaun.Forge.DesignAutomation.csproj" />
+  </ItemGroup>
+  -->
+
+  <ItemGroup>
+    <None Update="Bundle\RevitAddin.DA.Tester.bundle.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Bundle\RevitAddin.DA.Tester.DB.bundle.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Bundle\RevitAddin.DA.Tester.UI.bundle.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <!-- Fody -->
+  <ItemGroup>
+    <PackageReference Include="Costura.Fody" Version="5.*" IncludeAssets="build; compile" PrivateAssets="all" />
+  </ItemGroup>
+  <PropertyGroup>
+    <WeaverConfiguration>
+      <Weavers>
+        <Costura CreateTemporaryAssemblies="true" />
+      </Weavers>
+    </WeaverConfiguration>
+    <WeaverConfiguration Condition="$(Configuration.Contains('Debug'))">
+      <Weavers>
+        <Costura IncludeAssemblies="" />
+        <Costura CreateTemporaryAssemblies="true" />
+      </Weavers>
+    </WeaverConfiguration>
+  </PropertyGroup>
+
+</Project>

DesignAutomationConsole/Models/InputModel.cs

@@ -0,0 +1,14 @@
+using Autodesk.Forge.Oss.DesignAutomation.Extensions;
+
+namespace DesignAutomationConsole.Models
+{
+    public class InputModel
+    {
+        public string Text { get; set; }
+
+        public override string ToString()
+        {
+            return this.ToJson();
+        }
+    }
+}

DesignAutomationConsole/Models/OutputModel.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace DesignAutomationConsole.Models
+{
+    public class OutputModel
+    {
+        public string VersionName { get; set; }
+        public string VersionBuild { get; set; }
+        public DateTime TimeStart { get; set; } = DateTime.UtcNow;
+        public string Text { get; set; }
+    }
+}

DesignAutomationConsole/Models/ParameterOptions.cs

@@ -0,0 +1,45 @@
+using Autodesk.Forge.Oss.DesignAutomation.Attributes;
+
+namespace DesignAutomationConsole.Models
+{
+    public class ParameterOptions
+    {
+        [ParameterInput("input.json",
+            Description = "Input file.",
+            Required = true)]
+        public InputModel Input { get; set; } = new InputModel();
+
+        [ParameterOutput("output.json",
+            Description = "Output file.")]
+        public OutputModel Output { get; set; }
+
+        //[ParameterWorkItemTimeSec]
+        //public int TimeSec { get; set; } = 60;
+
+        //public string Engine { get; set; }
+        //[ParameterActivityLanguage]
+        //public string Language { get; set; } = "DEU";
+    }
+
+    public class ParameterOptionsDownload
+    {
+        [ParameterInput("input.json",
+            Required = true)]
+        public InputModel Input { get; set; }
+
+        [ParameterOutput("output.json", DownloadFile = true)]
+        public string Output { get; set; }
+    }
+
+    public class ParameterOptionsFile
+    {
+        [ParameterInput("input.json",
+            Description = "Input file.",
+            Required = true)]
+        public string Input { get; set; }
+
+        [ParameterOutput("output.json",
+            Description = "Output file.")]
+        public OutputModel Output { get; set; }
+    }
+}

DesignAutomationConsole/Program.cs

@@ -0,0 +1,80 @@
+using Autodesk.Forge.DesignAutomation.Model;
+using Autodesk.Forge.Oss.DesignAutomation;
+using Autodesk.Forge.Oss.DesignAutomation.Extensions;
+using Autodesk.Forge.Oss.DesignAutomation.Services;
+using DesignAutomationConsole.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace DesignAutomationConsole
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            Console.WriteLine("...");
+
+            //var ForgeConfiguration = new ForgeConfiguration()
+            //{
+            //    ClientId = Environment.GetEnvironmentVariable("FORGE_RICAUN_CLIENT_ID"),
+            //    ClientSecret = Environment.GetEnvironmentVariable("FORGE_RICAUN_CLIENT_SECRET")
+            //};
+
+            await DA_RevitAddin_DA_Tester();
+        }
+
+        private static async Task DA_RevitAddin_DA_Tester()
+        {
+            const string RequestUri =
+                "https://github.com/ricaun-io/RevitAddin.DA.Tester/releases/latest/download/RevitAddin.DA.Tester.bundle.zip";
+
+            var appName = "RevitAddin_DA_Tester";
+
+            IDesignAutomationService designAutomationService = new RevitDesignAutomationService(appName)
+            {
+                EngineVersions = new[] {
+                    //"2019",
+                    //"2020",
+                    "2021",
+                    //"2022",
+                    //"2023",
+                    //"2024",
+                },
+                EnableConsoleLogger = true,
+                //EnableParameterConsoleLogger = true,
+                EnableReportConsoleLogger = true,
+            };
+
+            //Console.WriteLine($"Nickname: {designAutomationService.GetNickname()}");
+            //await designAutomationService.Initialize($".\\Bundle\\RevitAddin.DA.Tester.DB.bundle.zip");
+            await designAutomationService.Initialize($".\\Bundle\\RevitAddin.DA.Tester.bundle.zip");
+
+            //await designAutomationService.Initialize(await RequestService.Instance.GetFileAsync(RequestUri));
+
+            var engineVersions = designAutomationService.CoreEngineVersions();
+
+            var options = new List<ParameterOptions>();
+            var tasks = new List<Task>();
+            foreach (var engineVersion in engineVersions)
+            {
+                var option = new ParameterOptions()
+                {
+                    Input = new InputModel() { Text = engineVersion }
+                };
+                options.Add(option);
+                var daTask = designAutomationService.Run<ParameterOptions>(option, engineVersion);
+                tasks.Add(daTask);
+            }
+
+            await Task.WhenAll(tasks);
+
+            foreach (var option in options)
+            {
+                Console.WriteLine(option.ToJson());
+            }
+
+            await designAutomationService.Delete();
+        }
+    }
+}

README.md

@@ -1,6 +1,6 @@
 # RevitAddin.DA.Tester
 
-[![Revit +2018](https://img.shields.io/badge/Revit-2018+-blue.svg)](../..)
+[![Revit +2019](https://img.shields.io/badge/Revit-2019+-blue.svg)](../..)
 [![Visual Studio 2022](https://img.shields.io/badge/Visual%20Studio-2022-blue)](../..)
 [![Nuke](https://img.shields.io/badge/Nuke-Build-blue)](https://nuke.build/)
 [![License MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)

RevitAddin.DA.Tester.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{CEE7DFBF-1830-47FB-8DB8-546D2C2079D0}") = "RevitAddin.DA.Tester", "RevitAddin.DA.Tester\RevitAddin.DA.Tester.csproj", "{7C324916-9F8D-43B0-B226-DA67D2504393}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevitAddin.DA.Tester", "RevitAddin.DA.Tester\RevitAddin.DA.Tester.csproj", "{7C324916-9F8D-43B0-B226-DA67D2504393}"
 EndProject
-Project("{CEE7DFBF-1830-47FB-8DB8-546D2C2079D0}") = "Build", "Build\Build.csproj", "{99BC4B5A-3BB9-464B-AA8E-4A377FB77D04}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "Build\Build.csproj", "{99BC4B5A-3BB9-464B-AA8E-4A377FB77D04}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{64A2F0FA-4270-45D5-B9DB-3561832ADA42}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{64
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesignAutomationConsole", "DesignAutomationConsole\DesignAutomationConsole.csproj", "{7F41BE81-4EFB-4FAC-8563-B5EDAEA9F44B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,8 +28,15 @@ Global
 		{7C324916-9F8D-43B0-B226-DA67D2504393}.Release|Any CPU.Build.0 = Release|Any CPU
 		{99BC4B5A-3BB9-464B-AA8E-4A377FB77D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{99BC4B5A-3BB9-464B-AA8E-4A377FB77D04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F41BE81-4EFB-4FAC-8563-B5EDAEA9F44B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F41BE81-4EFB-4FAC-8563-B5EDAEA9F44B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F41BE81-4EFB-4FAC-8563-B5EDAEA9F44B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F41BE81-4EFB-4FAC-8563-B5EDAEA9F44B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A62BD73A-4469-4188-B25B-3958364DC778}
+	EndGlobalSection
 EndGlobal

RevitAddin.DA.Tester/Revit/App.cs

@@ -26,6 +26,8 @@ public ExternalDBApplicationResult OnShutdown(ControlledApplication application)
 
         private void DesignAutomationBridge_DesignAutomationReadyEvent(object sender, DesignAutomationReadyEventArgs e)
         {
+            DesignAutomationBridge.DesignAutomationReadyEvent -= DesignAutomationBridge_DesignAutomationReadyEvent;
+
             var data = e.DesignAutomationData;
             e.Succeeded = DesignAutomationController.Execute(data.RevitApp, data.FilePath, data.RevitDoc);
         }

RevitAddin.DA.Tester/Revit/UI/AppUI.cs

@@ -1,6 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using ricaun.Revit.UI;
+using ricaun.Revit.UI.Drawing;
 using System;
 
 namespace RevitAddin.DA.Tester.Revit.UI

RevitAddin.DA.Tester/RevitAddin.DA.Tester.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -91,7 +91,7 @@
 
   <PropertyGroup>
     <PackageId>RevitAddin.DA.Tester</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.1.0</Version>
     <ProjectGuid>{7C324916-9F8D-43B0-B226-DA67D2504393}</ProjectGuid>
   </PropertyGroup>
 
@@ -134,7 +134,9 @@
 
   <ItemGroup>
     <PackageReference Include="Autodesk.Forge.DesignAutomation.Revit" Version="$(RevitVersion).*" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.*" IncludeAssets="build; compile" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.*" IncludeAssets="build; compile" PrivateAssets="All">
+      <NoWarn>NU1903</NoWarn>
+    </PackageReference>
     <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*" IncludeAssets="build; compile" PrivateAssets="All" />
   </ItemGroup>
 

RevitAddin.DA.Tester/Services/CommandUI.cs

@@ -0,0 +1,21 @@
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+using System;
+
+namespace RevitAddin.DA.Tester.Services
+{
+    [Transaction(TransactionMode.Manual)]
+    public class CommandUI : IExternalCommand
+    {
+        public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elementSet)
+        {
+            UIApplication uiapp = commandData.Application;
+
+            Console.WriteLine($"UI: {UI.IsValid()}");
+
+            return Result.Succeeded;
+        }
+    }
+
+}

RevitAddin.DA.Tester/Services/DesignAutomationController.cs

@@ -23,6 +23,9 @@ public static bool Execute(Application application, string filePath = null, Docu
             Console.WriteLine($"Output:\t{outputModel}");
             Console.WriteLine("----------------------------------------");
 
+            Console.WriteLine($"UI: {UI.IsValid()}");
+            Console.WriteLine("----------------------------------------");
+
             return true;
         }
     }