From b9cbe5165585d7d5e2ad789d6484bc3145e03a66 Mon Sep 17 00:00:00 2001
From: Alan Rynne <alan@speckle.systems>
Date: Wed, 8 May 2024 17:06:00 +0200
Subject: [PATCH] test: GitVersion this thing!

---
 .config/dotnet-tools.json                            |  6 ++++++
 .github/workflows/dotnet.yml                         |  6 +++---
 DUI3-DX/Connectors/Directory.Build.targets           |  7 ++++---
 .../ToHost/Raw/ArcToHostConverter.cs                 |  1 -
 Directory.Build.props                                | 12 +++++++-----
 Directory.Build.targets                              |  4 ++--
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 3b0ca23774..f008a35d5a 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -25,6 +25,12 @@
       "commands": [
         "husky"
       ]
+    },
+    "gitversion.tool": {
+      "version": "5.12.0",
+      "commands": [
+        "dotnet-gitversion"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 0326522af9..9ec734d550 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -5,7 +5,7 @@ name: .NET
 
 on:
   push:
-    branches: ["dui3/alpha", "dui3/ci/*"]
+    branches: ["dui3/ci/*"]
   pull_request:
     branches: ["dui3/alpha"]
 
@@ -18,7 +18,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.x.x
+          global-json-file: ./global.json
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
       # - name: Restore tools
@@ -32,5 +32,5 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: DUI3 Connectors
+          name: dui3-connector-build-artifacts
           path: dist/zip/*.zip
diff --git a/DUI3-DX/Connectors/Directory.Build.targets b/DUI3-DX/Connectors/Directory.Build.targets
index db972adbb8..25890e3950 100644
--- a/DUI3-DX/Connectors/Directory.Build.targets
+++ b/DUI3-DX/Connectors/Directory.Build.targets
@@ -13,8 +13,9 @@
       <OutputZipDirectory>$(RepositoryRoot)/dist/zip</OutputZipDirectory>
       <OutputZipFile>$(ConnectorSlug)-$(ConnectorVersion)-$(Version).zip</OutputZipFile>
     </PropertyGroup>
-    
-    <RemoveDir Directories="$(OutputDirectory)"/>
+
+    <RemoveDir Directories="$(OutputDirectory)" ContinueOnError="true" />
+    <RemoveDir Directories="$(OutputZipDirectory)" ContinueOnError="true"/>
     <MakeDir Directories="$(OutputDirectory)"/>
     <MakeDir Directories="$(OutputZipDirectory)"/>
 
@@ -24,7 +25,7 @@
     
     <Copy SourceFiles="@(DllFiles)" DestinationFolder="$(OutputDirectory)/%(RecursiveDir)"/>
     
-    <ZipDirectory SourceDirectory="$(OutputDirectory)" DestinationFile="$(OutputZipDirectory)/$(OutputZipFile)"/>
+    <ZipDirectory SourceDirectory="$(OutputDirectory)" DestinationFile="$(OutputZipDirectory)/$(OutputZipFile)" Overwrite="true"/>
     
   </Target>
 </Project>
diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToHost/Raw/ArcToHostConverter.cs b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToHost/Raw/ArcToHostConverter.cs
index fea3bdc469..291395ee9e 100644
--- a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToHost/Raw/ArcToHostConverter.cs
+++ b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToHost/Raw/ArcToHostConverter.cs
@@ -1,5 +1,4 @@
 using Speckle.Converters.Common.Objects;
-using Speckle;
 
 namespace Speckle.Converters.Rhino7.ToHost.Raw;
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 186b4c439e..1633475efe 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,7 +19,7 @@
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 
     <!-- False if running on CI, will prevent copying of files to local folders -->
-    <IsDesktopBuild Condition="'$(IsDesktopBuild)' == ''">true</IsDesktopBuild>
+    <IsDesktopBuild Condition="'$(IsDesktopBuild)' == ''">false</IsDesktopBuild>
     
     <!-- Code quality -->
     <EnableNetAnalyzers>true</EnableNetAnalyzers>
@@ -106,9 +106,7 @@
 
   <PropertyGroup Label="Package Config">
     <!-- Version info -->
-    <Version Condition="$(Version) == ''">2.0.999-local</Version>
-    <FileVersion Condition="$(FileVersion) == ''">2.0.999.0000</FileVersion>
-    <AssemblyVersion Condition="$(AssemblyVersion) == ''">$(FileVersion)</AssemblyVersion>
+
     
     <!-- Package info -->
     <PackageVersion Condition="$(PackageVersion) == ''">$(Version)</PackageVersion>
@@ -127,7 +125,11 @@
     <!-- Expose the repository root to all projects -->
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
   </PropertyGroup>
-
+  
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" Version="5.6.10*" PrivateAssets="All"/>
+  </ItemGroup>
+  
   <ItemGroup>
     <!-- This file contains the configuration for some analyzer warnings, such as cyclomatic
     complexity threshold -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index bfe533e029..3dc983de18 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -44,9 +44,9 @@
   <!--
   Reports the current build version number in the build logs.
   -->
-  <Target Name="ReportBuildVersion" BeforeTargets="BeforeBuild">
+  <Target Name="ReportBuildVersion" AfterTargets="Build">
     <Message
-      Text="Building $(MSBuildProjectName).csproj with version $(Version) and file version $(FileVersion)"
+      Text="Built $(MSBuildProjectName).csproj with version $(Version) and file version $(FileVersion)"
       Importance="high"/>
   </Target>