diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a27178416..e11cd177d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,10 +3,16 @@ "isRoot": true, "tools": { "csharpier": { - "version": "0.28.2", + "version": "0.23.0", "commands": [ "dotnet-csharpier" ] + }, + "gitversion.tool": { + "version": "5.12.0", + "commands": [ + "dotnet-gitversion" + ] } } } \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9444fbb66..71e032252 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,6 @@ jobs: with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - restore-keys: | - ${{ runner.os }}-nuget- - name: ⚒️ Run GitVersion run: ./build.ps1 build-server-version diff --git a/.gitignore b/.gitignore index 490cf9591..1244430f5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ tools .DS_Store *.snupkg coverage.xml +output/ \ No newline at end of file diff --git a/Build/Consts.cs b/Build/Consts.cs index 5d3f91de5..1862d7332 100644 --- a/Build/Consts.cs +++ b/Build/Consts.cs @@ -1,21 +1,19 @@ -using System.Collections.Generic; - -namespace Build; +namespace Build; public static class Consts { - public static readonly string[] Solutions = { "DUI3-DX.slnf" }; - public static readonly string[] TestProjects = System.Array.Empty(); + public static readonly string[] Solutions = ["Speckle.Connectors.sln" ]; + public static readonly string[] TestProjects = []; public static readonly InstallerProject[] InstallerManifests = { new( "arcgis", - new InstallerAsset[] { new("DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3", "net6.0-windows") } + new InstallerAsset[] { new("Connectors/ArcGIS/Speckle.Connectors.ArcGIS3", "net6.0-windows") } ), - new("rhino", new InstallerAsset[] { new("DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7", "net48") }), - new("revit", new InstallerAsset[] { new("DUI3-DX/Connectors/Revit/Speckle.Connectors.Revit2023", "net48") }), - new("autocad", new InstallerAsset[] { new("DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48") }) + new("rhino", new InstallerAsset[] { new("Connectors/Rhino/Speckle.Connectors.Rhino7", "net48") }), + new("revit", new InstallerAsset[] { new("Connectors/Revit/Speckle.Connectors.Revit2023", "net48") }), + new("autocad", new InstallerAsset[] { new("Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48") }) }; } diff --git a/Build/Program.cs b/Build/Program.cs index 610115c62..099d265d3 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; using System.IO.Compression; using Build; using GlobExpressions; @@ -107,10 +104,7 @@ void RemoveDirectory(string d) var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild"; var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0"; Console.WriteLine($"Version: {version} & {fileVersion}"); - Run( - "dotnet", - $"build {s} -c Release --no-restore -p:IsDesktopBuild=false -p:Version={version} -p:FileVersion={fileVersion} -v:m" - ); + Run("dotnet", $"build {s} -c Release --no-restore -p:Version={version} -p:FileVersion={fileVersion} -v:m"); } ); @@ -127,7 +121,7 @@ IEnumerable GetFiles(string d) foreach (var file in GetFiles($"**/{t}.csproj")) { - Run("dotnet", $"test {file} -c Release --no-build --no-restore --verbosity=normal"); + Run("dotnet", $"test {file} -c Release --no-build --no-restore --verbosity=normal /p:AltCover=true"); } } ); diff --git a/Directory.Packages.props b/Directory.Packages.props index adc16484e..1927c16b8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,5 +1,6 @@ +