Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/dotnet-meai/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
#endif

// --quiet does not report sponsor tier on every run.
await ((IServiceProvider)registrar).GetRequiredService<Devlooped.Sponsors.CheckCommand>().ExecuteAsync(
await ((IServiceProvider)registrar).GetRequiredService<CheckCommand>().ExecuteAsync(
new CommandContext(["--quiet"], RemainingArguments.Empty, "check", null),
new Devlooped.Sponsors.CheckCommand.CheckSettings { Quiet = true });
new CheckCommand.CheckSettings { Quiet = true });

return result;

Expand Down
5 changes: 3 additions & 2 deletions src/dotnet-meai/Sponsors/CheckCommand.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using System.ComponentModel;
using Devlooped.Sponsors;
using DotNetConfig;
using Microsoft.Extensions.DependencyInjection;
using Spectre.Console;
using Spectre.Console.Cli;
using static Devlooped.Sponsors.CheckCommand;
using static Devlooped.Extensions.AI.CheckCommand;
using static ThisAssembly.Strings;

namespace Devlooped.Sponsors;
namespace Devlooped.Extensions.AI;

[Description("Checks the current sponsorship status with [lime]devlooped[/], entirely offline")]
[Service]
Expand Down
135 changes: 0 additions & 135 deletions src/dotnet-meai/Sponsors/Sponsors.Designer.cs

This file was deleted.

5 changes: 3 additions & 2 deletions src/dotnet-meai/Sponsors/SponsorsAppExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using DotNetConfig;
using Devlooped.Sponsors;
using DotNetConfig;
using Spectre.Console.Cli;

namespace Devlooped.Sponsors;
namespace Devlooped.Extensions.AI;

static class SponsorsAppExtensions
{
Expand Down
3 changes: 2 additions & 1 deletion src/dotnet-meai/Sponsors/SyncCommand.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
using System.ComponentModel;
using Devlooped.Sponsors;
using DotNetConfig;
using Microsoft.Extensions.DependencyInjection;
using Spectre.Console.Cli;

namespace Devlooped.Sponsors;
namespace Devlooped.Extensions.AI;

[Description("Synchronizes your sponsorship manifest for [lime]devlooped[/]")]
[Service]
public class DevloopedSyncCommand(Config config, IGraphQueryClient client, IGitHubAppAuthenticator authenticator, IHttpClientFactory httpFactory)
: SyncCommand<DevloopedSyncCommand.DevloopedSyncSettings>(config, client, authenticator, httpFactory)

Check warning on line 12 in src/dotnet-meai/Sponsors/SyncCommand.cs

View workflow job for this annotation

GitHub Actions / build-ubuntu-latest

Parameter 'Config config' is captured into the state of the enclosing type and its value is also passed to the base constructor. The value might be captured by the base class as well.

Check warning on line 12 in src/dotnet-meai/Sponsors/SyncCommand.cs

View workflow job for this annotation

GitHub Actions / build-ubuntu-latest

Parameter 'Config config' is captured into the state of the enclosing type and its value is also passed to the base constructor. The value might be captured by the base class as well.
{
public class DevloopedSyncSettings : SyncSettings, ISponsorableSettings
{
Expand Down
3 changes: 2 additions & 1 deletion src/dotnet-meai/Sponsors/ViewCommand.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using System.ComponentModel;
using Devlooped.Sponsors;
using DotNetConfig;
using Spectre.Console.Cli;

namespace Devlooped.Sponsors;
namespace Devlooped.Extensions.AI;

[Description("Validates and displays your sponsor manifest for [lime]devlooped[/], if present")]
class DevloopedViewCommand(Config config, IHttpClientFactory http) : ViewCommand<DevloopedViewCommand.DevloopedViewSettings>(http)
Expand Down
40 changes: 13 additions & 27 deletions src/dotnet-meai/dotnet-meai.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<ImplicitUsings>true</ImplicitUsings>
<PackageId>dotnet-meai</PackageId>
<Description>A Microsoft.Extension.AI-powered CLI</Description>
<Product>dotnet-meai</Product>
Expand All @@ -15,16 +16,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NuGet.Protocol" Version="6.13.2" />
<PackageReference Include="NuGet.Protocol" Version="6.14.0" />
<PackageReference Include="NuGetizer" Version="1.2.4" PrivateAssets="all" />
<PackageReference Include="Devlooped.Extensions.DependencyInjection" Version="2.1.0-rc.5" PrivateAssets="all" />
<PackageReference Include="Devlooped.Sponsors.Commands" Version="42.42.1585-main" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.0.0" />
<PackageReference Include="Devlooped.Extensions.DependencyInjection" Version="2.1.0" PrivateAssets="all" />
<PackageReference Include="Devlooped.Sponsors.Commands" Version="42.42.1709-main" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.6.0" />
<PackageReference Include="Devlooped.CredentialManager" Version="2.6.1" />
<PackageReference Include="DotNetConfig" Version="1.2.0" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
Expand All @@ -35,9 +36,9 @@
<PackageReference Include="ThisAssembly.Metadata" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Project" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Strings" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.6.0-preview.1.25310.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
</ItemGroup>

<ItemGroup>
Expand All @@ -49,21 +50,6 @@
<ProjectProperty Include="SLEET_FEED_URL" />
</ItemGroup>

<ItemGroup>
<Compile Update="Sponsors\Sponsors.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Sponsors.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Sponsors\Sponsors.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Sponsors.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<Target Name="DownloadDevloopedJwk" BeforeTargets="GetAssemblyAttributes" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk">
<Exec Command="curl --silent --output $(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk https://sponsorlink.devlooped.com/jwk" />
</Target>
Expand Down
Loading