build: removing uneeded tools

build: removed references to Nerdbank.GitVersioning
refactor: code cleanup
2024-03-10 13:22:44 -05:00 · 2024-03-10 13:22:24 -05:00 · 2024-03-10 13:19:56 -05:00 · 2024-03-10 13:19:31 -05:00
26 changed files with 14 additions and 37 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@ -2,10 +2,6 @@
  "version": 1,
  "isRoot": true,
  "tools": {
-    "gitversion.tool": {
-      "version": "5.12.0",
-      "commands": ["dotnet-gitversion"]
-    },
    "dotnet-reportgenerator-globaltool": {
      "version": "5.1.24",
      "commands": ["reportgenerator"]
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@ -21,7 +21,7 @@ jobs:
      - name: Check out repository code
        uses: actions/checkout@v3
        with:
-          fetch-depth: 0 # GitVersion has trouble calculating without full history.
+          fetch-depth: 100 # Should be deep enough to pick up version changes.

      # Break apart downloading all the requirements into a separate step for timing purposes.
      - run: nix develop --command echo prefetch flake
--- a/1
+++ b/1
@ -78,6 +78,7 @@ release-setup: restore-tools restore-packages
    fi

 # Sets the version for all the packages based on conventional commits
+
 # and semantic releases.
 release-version:
    #!/usr/bin/env bash
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-      <PrivateAssets>all</PrivateAssets>
-      <Version>3.6.133</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
--- a/src/MfGames.Nitride.Calendar/MfGames.Nitride.Calendar.csproj
+++ b/src/MfGames.Nitride.Calendar/MfGames.Nitride.Calendar.csproj
@ -37,7 +37,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Zio" Version="0.16.2"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <!-- Include the source generator -->
--- a/src/MfGames.Nitride.Exec/MfGames.Nitride.Exec.csproj
+++ b/src/MfGames.Nitride.Exec/MfGames.Nitride.Exec.csproj
@ -35,7 +35,6 @@
    </PackageReference>
    <PackageReference Include="Serilog" Version="3.0.1"/>
    <PackageReference Include="Zio" Version="0.16.2"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.Feeds/MfGames.Nitride.Feeds.csproj
+++ b/src/MfGames.Nitride.Feeds/MfGames.Nitride.Feeds.csproj
@ -36,7 +36,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Zio" Version="0.16.2"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <!-- Include the source generator -->
--- a/src/MfGames.Nitride.Gemtext/MfGames.Nitride.Gemtext.csproj
+++ b/src/MfGames.Nitride.Gemtext/MfGames.Nitride.Gemtext.csproj
@ -44,7 +44,6 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

 </Project>
--- a/src/MfGames.Nitride.Generators/MfGames.Nitride.Generators.csproj
+++ b/src/MfGames.Nitride.Generators/MfGames.Nitride.Generators.csproj
@ -31,7 +31,6 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

 </Project>
--- a/src/MfGames.Nitride.Handlebars/MfGames.Nitride.Handlebars.csproj
+++ b/src/MfGames.Nitride.Handlebars/MfGames.Nitride.Handlebars.csproj
@ -32,7 +32,6 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.Html/MfGames.Nitride.Html.csproj
+++ b/src/MfGames.Nitride.Html/MfGames.Nitride.Html.csproj
@ -45,7 +45,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Zio" Version="0.16.2" />
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.IO/MfGames.Nitride.IO.csproj
+++ b/src/MfGames.Nitride.IO/MfGames.Nitride.IO.csproj
@ -34,7 +34,6 @@
    </PackageReference>
    <PackageReference Include="Serilog" Version="3.0.1"/>
    <PackageReference Include="Zio" Version="0.16.2"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.Json/MfGames.Nitride.Json.csproj
+++ b/src/MfGames.Nitride.Json/MfGames.Nitride.Json.csproj
@ -33,7 +33,6 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <!-- Include the source generator -->
--- a/src/MfGames.Nitride.Markdown/MfGames.Nitride.Markdown.csproj
+++ b/src/MfGames.Nitride.Markdown/MfGames.Nitride.Markdown.csproj
@ -38,7 +38,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Zio" Version="0.16.2"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <!-- Include the source generator -->
--- a/src/MfGames.Nitride.Slugs/MfGames.Nitride.Slugs.csproj
+++ b/src/MfGames.Nitride.Slugs/MfGames.Nitride.Slugs.csproj
@ -29,7 +29,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Slugify.Core" Version="4.0.1"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.SpectreConsole/MfGames.Nitride.SpectreConsole.csproj
+++ b/src/MfGames.Nitride.SpectreConsole/MfGames.Nitride.SpectreConsole.csproj
@ -21,7 +21,6 @@
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="Spectre.Console" Version="0.47.0"/>
-        <PackageReference Remove="Nerdbank.GitVersioning" />
    </ItemGroup>


--- a/src/MfGames.Nitride.Temporal.Schedules/MfGames.Nitride.Temporal.Schedules.csproj
+++ b/src/MfGames.Nitride.Temporal.Schedules/MfGames.Nitride.Temporal.Schedules.csproj
@ -33,7 +33,6 @@
    <PackageReference Include="Serilog" Version="3.0.1"/>
    <PackageReference Include="TimeSpanParserUtil" Version="1.2.0"/>
    <PackageReference Include="YamlDotNet" Version="13.3.1" />
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.Temporal/MfGames.Nitride.Temporal.csproj
+++ b/src/MfGames.Nitride.Temporal/MfGames.Nitride.Temporal.csproj
@ -35,7 +35,6 @@
    <PackageReference Include="Serilog" Version="3.0.1"/>
    <PackageReference Include="TimeSpanParserUtil" Version="1.2.0"/>
    <PackageReference Include="Zio" Version="0.16.2"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.Nitride.Yaml/MfGames.Nitride.Yaml.csproj
+++ b/src/MfGames.Nitride.Yaml/MfGames.Nitride.Yaml.csproj
@ -33,7 +33,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="YamlDotNet" Version="13.3.1" />
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <!-- Include the source generator -->
--- a/src/MfGames.Nitride/MfGames.Nitride.csproj
+++ b/src/MfGames.Nitride/MfGames.Nitride.csproj
@ -47,7 +47,6 @@
    <PackageReference Include="Stateless" Version="5.13.0"/>
    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
    <PackageReference Include="System.Linq.Async" Version="6.0.1"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <!-- Include the source generator -->
--- a/src/MfGames.Serilog.SpectreExpressions/MfGames.Serilog.SpectreExpressions.csproj
+++ b/src/MfGames.Serilog.SpectreExpressions/MfGames.Serilog.SpectreExpressions.csproj
@ -32,7 +32,6 @@
    <PackageReference Include="Serilog.Expressions" Version="3.4.1"/>
    <PackageReference Include="SerilogAnalyzer" Version="0.15.0"/>
    <PackageReference Include="Spectre.Console" Version="0.47.0"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

 </Project>
--- a/src/MfGames.TestSetup/MfGames.TestSetup.csproj
+++ b/src/MfGames.TestSetup/MfGames.TestSetup.csproj
@ -38,7 +38,6 @@
    <PackageReference Include="Serilog.Sinks.Xunit" Version="3.0.5"/>
    <PackageReference Include="SerilogAnalyzer" Version="0.15.0"/>
    <PackageReference Include="xunit" Version="2.5.0"/>
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.TestSetup/TestContext.cs
+++ b/src/MfGames.TestSetup/TestContext.cs
@ -14,6 +14,8 @@ public class TestContext : IDisposable

    private ILogger? logger;

+    private AutofacServiceProvider? serviceProvider;
+
    public IContainer Container
    {
        get =>
@ -31,7 +33,13 @@ public class TestContext : IDisposable
    /// <summary>
    /// Gets the service provider for resolving services.
    /// </summary>
-    public AutofacServiceProvider ServiceProvider { get; private set; }
+    public AutofacServiceProvider ServiceProvider
+    {
+        get =>
+            this.serviceProvider
+            ?? throw new NullReferenceException("ConfigureContainer has not been called.");
+        private set => this.serviceProvider = value;
+    }

    public void ConfigureContainer()
    {
@ -50,8 +58,8 @@ public class TestContext : IDisposable

        this.ConfigureContainer(builder);

-        this.Container = builder.Build();
-        this.ServiceProvider = new AutofacServiceProvider(this.Container);
+        this.container = builder.Build();
+        this.serviceProvider = new AutofacServiceProvider(this.Container);
    }

    /// <inheritdoc />
--- a/src/MfGames.ToolBuilder.Tables/MfGames.ToolBuilder.Tables.csproj
+++ b/src/MfGames.ToolBuilder.Tables/MfGames.ToolBuilder.Tables.csproj
@ -44,7 +44,6 @@
    <PackageReference Include="SerilogAnalyzer" Version="0.15.0"/>
    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
    <PackageReference Include="YamlDotNet" Version="13.3.1" />
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.ToolBuilder/MfGames.ToolBuilder.csproj
+++ b/src/MfGames.ToolBuilder/MfGames.ToolBuilder.csproj
@ -54,7 +54,6 @@
    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
-    <PackageReference Remove="Nerdbank.GitVersioning" />
  </ItemGroup>

  <ItemGroup>
--- a/src/MfGames.ToolBuilder/ToolBoxBuilder.cs
+++ b/src/MfGames.ToolBuilder/ToolBoxBuilder.cs
@ -61,6 +61,7 @@ public class ToolBoxBuilder
        //
        // We also don't need most of the default features.
        var serviceProviderFactory = new AutofacServiceProviderFactory();
+
        this.hostBuilder = new HostBuilder()
            .UseDefaultServiceProvider(this.ConfigureDefaultServiceProvider)
            .UseConsoleLifetime()
Author	SHA1	Message	Date
D. Moonfire	742c9da9b4	build: removing uneeded tools Some checks failed deploy / deploy (push) Has been cancelled Details	2024-03-10 13:22:44 -05:00
D. Moonfire	c682c8b9fb	build: removed references to Nerdbank.GitVersioning	2024-03-10 13:22:24 -05:00
D. Moonfire	1f8f80bd79	refactor: code cleanup	2024-03-10 13:19:56 -05:00
D. Moonfire	5a225c82c8	refactor: MfGames.TestSetup: made service provider nullable internally	2024-03-10 13:19:31 -05:00