build fix

Mutagen-Modding · Dec 13, 2024 · 2532e37 · 2532e37
1 parent 6e82e64
commit 2532e37
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Spriggit.Core/CurrentVersionsProvider.cs b/Spriggit.Core/CurrentVersionsProvider.cs
@@ -9,6 +9,6 @@ public class CurrentVersionsProvider
     public CurrentVersionsProvider()
     {
         var vers = AssemblyVersions.For<CurrentVersionsProvider>();
-        SpriggitVersion = vers.ProductVersion?.TrimEnd(".0").TrimEnd(".0");
+        SpriggitVersion = vers.ProductVersion?.TrimStringFromEnd(".0").TrimStringFromEnd(".0");
     }
 }
diff --git a/Spriggit.Engine/CliEntryPoint.cs b/Spriggit.Engine/CliEntryPoint.cs
@@ -53,7 +53,7 @@ public async Task Serialize(
         IWorkDropoff? workDropoff, IFileSystem? fileSystem, ICreateStream? streamCreator, SpriggitSource meta,
         CancellationToken cancel)
     {
-        var args = $"serialize -i \"{modPath.Path.Path}\" -o \"{outputDir.Path}\" -g {release} -p {_package.Id} -v {_package.Version.ToString().TrimEnd(".0")}{GetDataPathParam(dataPath)}";
+        var args = $"serialize -i \"{modPath.Path.Path}\" -o \"{outputDir.Path}\" -g {release} -p {_package.Id} -v {_package.Version.ToString().TrimStringFromEnd(".0")}{GetDataPathParam(dataPath)}";
         _logger.Information("Running CLI Entry point serialize with Args: {Args}", args);
         using var processWrapper = _processFactory.Create(
             new ProcessStartInfo(_pathToExe)
@@ -82,7 +82,7 @@ public async Task Deserialize(string inputPath, string outputPath, DirectoryPath
         IWorkDropoff? workDropoff,
         IFileSystem? fileSystem, ICreateStream? streamCreator, CancellationToken cancel)
     {
-        var args = $"deserialize -i \"{inputPath}\" -o \"{outputPath}\" -p {_package.Id} -v {_package.Version.ToString().TrimEnd(".0")}{GetDataPathParam(dataPath)}";
+        var args = $"deserialize -i \"{inputPath}\" -o \"{outputPath}\" -p {_package.Id} -v {_package.Version.ToString().TrimStringFromEnd(".0")}{GetDataPathParam(dataPath)}";
         _logger.Information("Running CLI Entry point deserialize with Args: {Args}", args);
         using var processWrapper = _processFactory.Create(
             new ProcessStartInfo(_pathToExe)

diff --git a/Spriggit.Engine/DotNetToolEntryPoint.cs b/Spriggit.Engine/DotNetToolEntryPoint.cs
@@ -59,7 +59,7 @@ public async Task Serialize(ModPath modPath, DirectoryPath outputDir, DirectoryP
     {
         var exePath = GetExePath();
 
-        var args = $"serialize -i \"{modPath.Path.Path}\" -o \"{outputDir.Path}\" -g {release} -p {_package.Version.ToString().TrimEnd(".0")}{GetDataPathParam(dataPath)}";
+        var args = $"serialize -i \"{modPath.Path.Path}\" -o \"{outputDir.Path}\" -g {release} -p {_package.Version.ToString().TrimStringFromEnd(".0")}{GetDataPathParam(dataPath)}";
         _logger.Information("Running DotNet Entry point serialize with Args: {Args}", args);
         using var processWrapper = _processFactory.Create(
             new ProcessStartInfo(exePath)
@@ -88,7 +88,7 @@ public async Task Deserialize(string inputPath, string outputPath, DirectoryPath
     {
         var exePath = GetExePath();
 
-        var args = $"deserialize -i \"{inputPath}\" -o \"{outputPath}\" -p {_package.Id} -v {_package.Version.ToString().TrimEnd(".0")}{GetDataPathParam(dataPath)}";
+        var args = $"deserialize -i \"{inputPath}\" -o \"{outputPath}\" -p {_package.Id} -v {_package.Version.ToString().TrimStringFromEnd(".0")}{GetDataPathParam(dataPath)}";
         _logger.Information("Running CLI Entry point deserialize with Args: {Args}", args);
         using var processWrapper = _processFactory.Create(
             new ProcessStartInfo(exePath)

diff --git a/Spriggit.Engine/Services/Singletons/ConstructCliEndpoint.cs b/Spriggit.Engine/Services/Singletons/ConstructCliEndpoint.cs
@@ -35,7 +35,7 @@ private bool IsSameCliVersion(NuGetVersion version)
             assemblyVersion = assemblyVersion.Substring(0, indexOfPlus);
         }
 
-        return assemblyVersion.TrimEnd(".0").Equals(version.ToString().TrimEnd(".0"));
+        return assemblyVersion.TrimStringFromEnd(".0").Equals(version.ToString().TrimStringFromEnd(".0"));
     }
 
     public async Task<CliEntryPoint?> ConstructFor(

diff --git a/Spriggit.Engine/Services/Singletons/PrepareCliFolder.cs b/Spriggit.Engine/Services/Singletons/PrepareCliFolder.cs
@@ -11,7 +11,7 @@ public async Task Prepare(NuGetVersion version, CancellationToken cancel, Direct
     {
         using var tmp = TempFolder.Factory();
         var path = Path.Combine(tmp.Dir, "SpriggitCLI.zip");
-        var url = $"https://github.com/Mutagen-Modding/Spriggit/releases/download/{version.ToString().TrimEnd(".0")}/SpriggitCLI.zip";
+        var url = $"https://github.com/Mutagen-Modding/Spriggit/releases/download/{version.ToString().TrimStringFromEnd(".0")}/SpriggitCLI.zip";
         await DownloadFileAsync(
             url,
             Path.Combine(tmp.Dir, "SpriggitCLI.zip"),