Merge pull request #6 from ricaun-io/develop

Release 0.3.1
ricaun-io · Apr 13, 2024 · b5c67b1 · b5c67b1
2 parents 1eca5fb + 68407c4
commit b5c67b1
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 249 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -25,6 +25,7 @@ jobs:
           dotnet-version: | 
             6.0.x
             7.0.x
+            8.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
@@ -152,6 +152,9 @@
         "TestLocalResults": {
           "type": "boolean"
         },
+        "UnlistNuget": {
+          "type": "boolean"
+        },
         "Verbosity": {
           "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",

diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>.</NukeRootDirectory>
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ricaun.Nuke.PackageBuilder" Version="*" />
+    <PackageReference Include="ricaun.Nuke" Version="*" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="..\.github\workflows\*.yml" LinkBase="ci" />
     <None Include=".github\**\*"/>
     <None Include=".nuke\*"/>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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.3.1] / 2024-01-09 - 2024-04-13
+### Features
+- Support Revit 2025
+### Tests
+- Test in Revit 2025 / 2024
+
 ## [0.3.0] / 2023-10-24 - 2023-11-01
 ### Shape
 - Rename `indexes` to `indices`.
@@ -53,6 +59,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Create Project `ricaun.Revit.DB`
 
 [vNext]: ../../compare/0.1.0...HEAD
+[0.3.1]: ../../compare/0.3.0...0.3.1
 [0.3.0]: ../../compare/0.2.0...0.3.0
 [0.2.0]: ../../compare/0.1.0...0.2.0
 [0.1.0]: ../../compare/0.1.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,8 @@
 <Project>
 	<PropertyGroup>
-		<Version>0.3.0</Version>
-    <RevitVersionTests>2021</RevitVersionTests>
+		<Version>0.3.1</Version>
+    <RevitVersionTests>2024</RevitVersionTests>
+    <RevitVersionCoreTests>2025</RevitVersionCoreTests>
     <RevitForceOpenClose>true</RevitForceOpenClose>
 	</PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Build](https://github.com/ricaun-io/ricaun.Revit.DB/actions/workflows/Build.yml/badge.svg)](https://github.com/ricaun-io/ricaun.Revit.DB/actions)
 [![Release](https://img.shields.io/nuget/v/ricaun.Revit.DB?logo=nuget&label=release&color=blue)](https://www.nuget.org/packages/ricaun.Revit.DB)
 
-[![ricaun.Revit.DB](assets/ricaun.Revit.DB.png)](https://github.com/ricaun-io/ricaun.Revit.DB)
+[![ricaun.Revit.DB](https://raw.githubusercontent.com/ricaun/test-assets/main/assets/ricaun.Revit.DB.png)](https://github.com/ricaun-io/ricaun.Revit.DB)
 
 Package with some libraries for Revit API like [Quaternion](ricaun.Revit.DB.Quaternion) and [Shape](ricaun.Revit.DB.Shape).
 

diff --git a/ricaun.Revit.DB.Quaternion.Tests/ricaun.Revit.DB.Quaternion.Tests.csproj b/ricaun.Revit.DB.Quaternion.Tests/ricaun.Revit.DB.Quaternion.Tests.csproj
@@ -6,65 +6,32 @@
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>Latest</LangVersion>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <!-- RevitVersion -->
+  <PropertyGroup>
+    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Net Core -->
+  <PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
   <Choose>
-    <When Condition="$(Configuration.Contains('2017'))">
-      <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'))">
+    <When Condition="$(TargetFramework.StartsWith('net4'))">
       <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>
-    <When Condition="$(Configuration.Contains('2024'))">
-      <PropertyGroup>
-        <RevitVersion>2024</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
+        <RevitVersion>$(RevitVersionTests)</RevitVersion>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <RevitVersion>$(RevitVersionTests)</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
+        <RevitVersion>$(RevitVersionCoreTests)</RevitVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -92,6 +59,7 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="ricaun.RevitTest.TestAdapter" Version="*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" Condition="!$(TargetFramework.StartsWith('net4'))"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ricaun.Revit.DB.Quaternion/ricaun.Revit.DB.Quaternion.csproj b/ricaun.Revit.DB.Quaternion/ricaun.Revit.DB.Quaternion.csproj
@@ -6,73 +6,39 @@
     <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;net8.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>
-    <When Condition="$(Configuration.Contains('2024'))">
-      <PropertyGroup>
-        <RevitVersion>2024</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <RevitVersion>2017</RevitVersion>
-        <TargetFramework>net46</TargetFramework>
+        <RevitVersion>2025</RevitVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
+  <!-- Net Core -->
+  <PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
   <!-- 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>
@@ -165,7 +131,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*" IncludeAssets="build; compile" PrivateAssets="All" />
+    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*-*" IncludeAssets="build; compile" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="!$(Configuration.Contains('Debug'))">

diff --git a/ricaun.Revit.DB.Shape.Tests/ricaun.Revit.DB.Shape.Tests.csproj b/ricaun.Revit.DB.Shape.Tests/ricaun.Revit.DB.Shape.Tests.csproj
@@ -6,65 +6,32 @@
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>Latest</LangVersion>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <!-- RevitVersion -->
+  <PropertyGroup>
+    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Net Core -->
+  <PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
   <Choose>
-    <When Condition="$(Configuration.Contains('2017'))">
-      <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'))">
+    <When Condition="$(TargetFramework.StartsWith('net4'))">
       <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>
-    <When Condition="$(Configuration.Contains('2024'))">
-      <PropertyGroup>
-        <RevitVersion>2024</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
+        <RevitVersion>$(RevitVersionTests)</RevitVersion>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <RevitVersion>$(RevitVersionTests)</RevitVersion>
-        <TargetFramework>net48</TargetFramework>
+        <RevitVersion>$(RevitVersionCoreTests)</RevitVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -92,6 +59,7 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="ricaun.RevitTest.TestAdapter" Version="*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" Condition="!$(TargetFramework.StartsWith('net4'))"/>
   </ItemGroup>
 
   <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ jobs: @@
               dotnet-version: |
 .0.x
 .0.x
+.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" }
@@ Expand Down @@