V2025.11.2

Author: nlogozzo

Nickvision.FlatpakGenerator/FlatpakSourcesGenerator.cs

@@ -25,7 +25,7 @@ static FlatpakSourcesGenerator()
         };
     }
 
-    public async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)
+    public static async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)
     {
         using var process = new Process
         {
@@ -68,7 +68,7 @@ public async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)
         return false;
     }
 
-    public async Task<List<NugetSource>> GenerateSourcesAsync(string input, int dotnetVersion, string? temp, bool selfContained, bool runAsUser)
+    public static async Task<List<NugetSource>> GenerateSourcesAsync(string input, int dotnetVersion, string? temp, bool selfContained, bool runAsUser)
     {
         input = input.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         temp = Path.Combine(temp?.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) ?? Directory.GetCurrentDirectory(), "nuget-temp");
@@ -169,7 +169,22 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input, int dotn
         return sources;
     }
 
-    private async Task<NugetSource?> GetExtraSourceAsync(string name)
+    public static async Task WriteSourcesFileAsync(List<NugetSource> sources, string? output)
+    {
+        output = output?.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
+        if (string.IsNullOrEmpty(output))
+        {
+            output = "nuget-sources.json";
+        }
+        else if (!string.IsNullOrEmpty(output) && Path.GetExtension(output) != ".json")
+        {
+            output += ".json";
+        }
+        await File.WriteAllTextAsync(output, JsonSerializer.Serialize(sources, JsonSerializerOptions));
+        Console.WriteLine($"[Info] Sources file written to {Path.GetFullPath(output)}");
+    }
+
+    private static async Task<NugetSource?> GetExtraSourceAsync(string name)
     {
         name = name.ToLower();
         var catalog = await HttpClient.GetFromJsonAsync<NugetCatalog>($"https://api.nuget.org/v3/registration5-semver1/{name}/index.json", JsonSerializerOptions);
@@ -202,19 +217,4 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input, int dotn
             DestinationFileName = filename
         };
     }
-
-    public async Task WriteSourcesFileAsync(List<NugetSource> sources, string? output)
-    {
-        output = output?.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
-        if (string.IsNullOrEmpty(output))
-        {
-            output = "nuget-sources.json";
-        }
-        else if (!string.IsNullOrEmpty(output) && Path.GetExtension(output) != ".json")
-        {
-            output += ".json";
-        }
-        await File.WriteAllTextAsync(output, JsonSerializer.Serialize(sources, JsonSerializerOptions));
-        Console.WriteLine($"[Info] Sources file written to {Path.GetFullPath(output)}");
-    }
 }

Nickvision.FlatpakGenerator/Nickvision.FlatpakGenerator.csproj

@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageId>Nickvision.FlatpakGenerator</PackageId>
-        <Version>2025.11.1</Version>
+        <Version>2025.11.2</Version>
         <Company>Nickvision</Company>
         <Authors>Nickvision</Authors>
         <Description>A tool to generate Flatpak sources file for .NET projects</Description>
@@ -22,13 +22,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
+      <PackageReference Include="System.CommandLine" Version="2.0.0" />
     </ItemGroup>
 
     <ItemGroup>
       <None Include="..\resources\logo.png">
         <Pack>True</Pack>
-        <PackagePath/>
+        <PackagePath />
         <Link>logo.png</Link>
       </None>
     </ItemGroup>

Nickvision.FlatpakGenerator/Program.cs

@@ -6,18 +6,11 @@ namespace Nickvision.FlatpakGenerator;
 
 public class Program
 {
-    private static readonly FlatpakSourcesGenerator _generator;
-
-    static Program()
-    {
-        _generator = new FlatpakSourcesGenerator();
-    }
-
     public static async Task<int> Main(string[] args)
     {
-        if (Environment.OSVersion.Platform != PlatformID.Unix)
+        if (!OperatingSystem.IsLinux())
         {
-            Console.Error.WriteLine("This tool can only be run on Linux.");
+            Console.Error.WriteLine("This tool can only run on Linux.");
             return 1;
         }
         var rootCommand = new RootCommand("A tool to generate Flatpak sources file for .NET projects");
@@ -103,13 +96,13 @@ public static async Task<int> Main(string[] args)
         };
         checkCommand.SetAction(async x =>
         {
-            await _generator.CheckRuntimeAsync("org.freedesktop.Sdk//24.08", x.GetValue<bool>("--run-as-user"));
-            await _generator.CheckRuntimeAsync($"org.freedesktop.Sdk.Extension.dotnet{x.GetRequiredValue<int>("--dotnet")}//24.08", x.GetValue<bool>("--run-as-user"));
+            await FlatpakSourcesGenerator.CheckRuntimeAsync("org.freedesktop.Sdk//24.08", x.GetValue<bool>("--run-as-user"));
+            await FlatpakSourcesGenerator.CheckRuntimeAsync($"org.freedesktop.Sdk.Extension.dotnet{x.GetRequiredValue<int>("--dotnet")}//24.08", x.GetValue<bool>("--run-as-user"));
         });
         generateCommand.SetAction(async x =>
         {
-            var sources = await _generator.GenerateSourcesAsync(x.GetRequiredValue<string>("--input"), x.GetRequiredValue<int>("--dotnet"), x.GetValue<string>("--temp"), x.GetValue<bool>("--self-contained"), x.GetValue<bool>("--run-as-user"));
-            await _generator.WriteSourcesFileAsync(sources, x.GetValue<string>("--output"));
+            var sources = await FlatpakSourcesGenerator.GenerateSourcesAsync(x.GetRequiredValue<string>("--input"), x.GetRequiredValue<int>("--dotnet"), x.GetValue<string>("--temp"), x.GetValue<bool>("--self-contained"), x.GetValue<bool>("--run-as-user"));
+            await FlatpakSourcesGenerator.WriteSourcesFileAsync(sources, x.GetValue<string>("--output"));
         });
         rootCommand.Subcommands.Add(checkCommand);
         rootCommand.Subcommands.Add(generateCommand);