Merge 1.x into 1.21-merge-1.x

mcneel · May 27, 2024 · 76cadec · 76cadec
2 parents 0618f54 + eb5575f
commit 76cadec
Show file tree

Hide file tree

Showing 157 changed files with 6,322 additions and 4,518 deletions.
diff --git a/docs/pages/_en/1.0/reference/release-notes.md b/docs/pages/_en/1.0/reference/release-notes.md
@@ -16,6 +16,18 @@ group: Deployment & Configs
 {% endcapture %}
 {% include ltr/release_header_next.html title="Upcoming Changes" note=rc_release_notes %}
 
+{% include ltr/release-header.html title="v1.22 RC2" version="v1.22.8906.14842" pre_release=true time="05/21/2024" %}
+
+- Misc Improvements
+
+
+{% include ltr/release-header.html title="v1.22 RC1" version="v1.22.8900.22517" pre_release=true time="05/19/2024" %}
+
+- Added suppport for Revit 2025.
+- Implemented casting from `View` to `ModelView` in Rhino 8.
+- Added 'View Work Plane' component.
+- Misc Improvements
+
 {% include ltr/release-header.html title="v1.21" version="v1.21.8904.29048" time="05/18/2024" %}
 
 - Added {% include ltr/comp.html uuid='504cb82c' %} component.

diff --git a/script/cibuild.msbuild b/script/cibuild.msbuild
@@ -3,21 +3,21 @@
   </Target>
 
   <Target Name="Compile">
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2018"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2019"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2020"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2021"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2022"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2023"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R7;Platform=2024"/>
-
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2018"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2019"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2020"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2021"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2022"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2023"/>
-    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release R8;Platform=2024"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2018-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2019-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2020-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2021-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2022-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2023-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2024-R7;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2018-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2019-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2020-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2021-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2022-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2023-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2024-R8;Platform=x64"/>
+    <MSBuild Projects="..\src\RhinoInside.Revit.sln" Targets="Restore;Build" Properties="Configuration=Release-2025-R8;Platform=x64"/>
   </Target>
 
   <Target Name="BuildInstaller">

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- product info -->
   <Import Project="Product.targets"/>
 
@@ -12,78 +12,79 @@
   <!-- only for csproj projects -->
   <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'">
     <SchemaVersion>2.0</SchemaVersion>
-    <LangVersion>7.3</LangVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <TargetFrameworkProfile />
-    <!-- target -->
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <TargetFramework>net48</TargetFramework>
+
+    <!-- Language -->
+    <LangVersion>8.0</LangVersion>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+
+    <!-- Target -->
     <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <!-- constants are provided for revit versions that are not supported anymore -->
+    <UseWpf>true</UseWpf>
+    <UseWindowsForms>true</UseWindowsForms>
+
+    <!-- Constants are provided for revit versions that are not supported anymore -->
     <DefineConstants></DefineConstants>
-    <!-- any unknown config is considered Debug -->
+
+    <!-- Any unknown config is considered Debug -->
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <!-- any unknown platform is considered AnyCPU -->
+    <!-- Any unknown platform is considered AnyCPU -->
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-  </PropertyGroup>
 
-  <!-- build configurations for each revit -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2017'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2017'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2018'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2018'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2019'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2019'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2020'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2020'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2021'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2021'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2022'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2022'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2023'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2023'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|2024'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|2024'"></PropertyGroup>
+    <!-- Warnings -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277;MSB3052</MSBuildWarningsAsMessages>
+
+    <!-- Code Analysis -->
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2017'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2017'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2018'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2018'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2019'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2019'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2020'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2020'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2021'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2021'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2022'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2022'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2023'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2023'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R7|2024'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R7|2024'"></PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2017'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2017'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2018'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2018'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2019'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2019'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2020'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2020'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2021'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2021'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2022'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2022'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2023'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2023'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug R8|2024'"></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release R8|2024'"></PropertyGroup>
+  <!-- Build configurations for each combination Revit-Rhino -->
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'">
+    <Configurations>
+      Debug-2017-R7;
+      Debug-2018-R7;
+      Debug-2019-R7;
+      Debug-2020-R7;
+      Debug-2021-R7;
+      Debug-2022-R7;
+      Debug-2023-R7;
+      Debug-2024-R7;
+      Debug-2017-R8;
+      Debug-2018-R8;
+      Debug-2019-R8;
+      Debug-2020-R8;
+      Debug-2021-R8;
+      Debug-2022-R8;
+      Debug-2023-R8;
+      Debug-2024-R8;
+      Debug-2025-R8;
+      Release-2017-R7;
+      Release-2018-R7;
+      Release-2019-R7;
+      Release-2020-R7;
+      Release-2021-R7;
+      Release-2022-R7;
+      Release-2023-R7;
+      Release-2024-R7;
+      Release-2017-R8;
+      Release-2018-R8;
+      Release-2019-R8;
+      Release-2020-R8;
+      Release-2021-R8;
+      Release-2022-R8;
+      Release-2023-R8;
+      Release-2024-R8;
+      Release-2025-R8;
+    </Configurations>
+    <MSBuildProjectExtensionsPath>obj\$(Configuration)</MSBuildProjectExtensionsPath>
+  </PropertyGroup>
 
   <!-- dbg vs release build configurations -->
   <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
     <DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
@@ -92,13 +93,24 @@
 
   <PropertyGroup Condition="$(Configuration.Contains('Release'))">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
     <Optimize>true</Optimize>
     <ConfigurationType>Release</ConfigurationType>
   </PropertyGroup>
 
+  <Target Name="Trace-BuildDate" BeforeTargets="ResolveReferences">
+    <Message Importance="high" Text="Deterministic = $(Deterministic)"/>
+    <Message Importance="high" Text="BuildDate = $(BuildDate)"/>
+    <Message Importance="high" Text="BuildVersion = $(BuildVersion)"/>
+    <Message Importance="high" Text="RevisionVersion = $(RevisionVersion)"/>
+  </Target>
+
+  <Target Name="Trace-TargetFramework" BeforeTargets="ResolveReferences">
+    <Message Importance="high" Text="TargetFramework = $(TargetFramework)"/>
+  </Target>
+
   <!-- shared references -->
-  <ItemGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'">
+  <ItemGroup Condition="'$(MSBuildProjectExtension)'=='.csproj' And $(TargetFramework.Contains('net481'))">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -113,4 +125,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
+  <Target Name="Remove-ProjectExtensions" AfterTargets="Clean" Condition="'$(MSBuildProjectExtension)'=='.csproj'">
+    <RemoveDir Directories="$(MSBuildProjectExtensionsPath)" />
+  </Target>
+
 </Project>
diff --git a/src/Product.targets b/src/Product.targets
@@ -13,17 +13,26 @@ If `ReleaseVersion` contains "wip" the product expires.
   <PropertyGroup>
     <ProductName>Rhino.Inside</ProductName>
     <ProductCompany>Robert McNeel &amp; Associates</ProductCompany>
-    <ProductCopyright>2019-2023 Robert McNeel &amp; Associates.</ProductCopyright>
+    <ProductCopyright>2019-2024 Robert McNeel &amp; Associates.</ProductCopyright>
     <ProductReleaseVersion></ProductReleaseVersion>
     <ProductMetaVersion></ProductMetaVersion>
     <ProductMajorVersion>1</ProductMajorVersion>
-    <ProductMinorVersion>21</ProductMinorVersion>
+    <ProductMinorVersion>23</ProductMinorVersion>
     <!--
     <ProductBuildVersion></ProductBuildVersion>
     <ProductRevisionVersion></ProductRevisionVersion>
     -->
   </PropertyGroup>
+
   <PropertyGroup>
+    <BuildDate Condition="$(BuildDate) == ''">$([System.DateTime]::Now.ToString("o"))</BuildDate>
+
+    <RevisionVersion Condition="$(ProductRevisionVersion) != ''">$(ProductRevisionVersion)</RevisionVersion>
+    <BuildVersion Condition="$(ProductBuildVersion) == ''">$([System.DateTime]::Parse($(BuildDate)).Date.Subtract($([System.DateTime]::Parse('2000-01-01'))).TotalDays)</BuildVersion>
+
+    <BuildVersion Condition="$(ProductBuildVersion) != ''">$(ProductBuildVersion)</BuildVersion>
+    <RevisionVersion Condition="$(ProductRevisionVersion) == ''">$([System.Convert]::ToUInt16($([MSBuild]::Divide($([System.DateTime]::Parse($(BuildDate)).TimeOfDay.TotalSeconds), 2))))</RevisionVersion>
+
     <!-- RiRHexaVersion = $"({~(ProductMajorVersion << 8 | ProductMinorVersion):X}" -->
     <RiRBitwiseVersion>$([MSBuild]::BitwiseNot($([MSBuild]::BitwiseOr($([MSBuild]::Multiply($(ProductMajorVersion), 256)), $(ProductMinorVersion)))))</RiRBitwiseVersion>
     <RiRHexaVersion>$([System.Convert]::ToInt16($(RiRBitwiseVersion)).ToString("X"))</RiRHexaVersion>
@@ -35,4 +44,25 @@ If `ReleaseVersion` contains "wip" the product expires.
     <RiRAddinFileName>RhinoInside.Revit.addin</RiRAddinFileName>
   </PropertyGroup>
 
+  <!-- Default values for AssemblyInfo.cs -->
+  <PropertyGroup>
+    <Deterministic>False</Deterministic>
+
+    <Product>$(ProductName)</Product>
+    <Company>$(ProductCompany)</Company>
+    <Copyright>© $(ProductCopyright)</Copyright>
+
+    <AssemblyVersion>$(ProductMajorVersion).$(ProductMinorVersion).$(BuildVersion).$(RevisionVersion)</AssemblyVersion>
+    <FileVersion>$(ProductMajorVersion).$(ProductMinorVersion).$(BuildVersion).$(RevisionVersion)</FileVersion>
+
+    <InformationalVersion>$(ProductMajorVersion).$(ProductMinorVersion).$(BuildVersion)$(ProductReleaseVersion)</InformationalVersion>
+    <InformationalVersion Condition="$(ProductReleaseVersion) != ''">$(InformationalVersion)-$(ProductReleaseVersion)</InformationalVersion>
+    <InformationalVersion Condition="$(ProductMetaVersion) != ''">$(InformationalVersion)+$(ProductMetaVersion)</InformationalVersion>
+
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://www.rhino3d.com/inside/revit/$(ProductMajorVersion).0/</PackageProjectUrl>
+
+    <RepositoryUrl>https://github.com/mcneel/rhino.inside-revit</RepositoryUrl>
+  </PropertyGroup>
+
 </Project>