From 507f16e1b9b973716aeeb182eb7aaff8f7c21424 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 6 Jul 2026 15:40:20 +0200 Subject: [PATCH 01/18] Remove AutoRest core generator, options, and NPM installer --- .../Installer/NpmInstallerTests.cs | 44 ------ .../AutoRest/AutoRestArgumentProvider.cs | 80 ----------- .../AutoRest/AutoRestCSharpCodeGenerator.cs | 133 ------------------ .../Generators/AutoRest/AutoRestConstants.cs | 19 --- .../Installer/INpmInstaller.cs | 9 -- .../Installer/NpmInstaller.cs | 30 ---- src/Core/ApiClientCodeGen.Core/NpmHelper.cs | 46 ------ .../AutoRest/DefaultAutoRestOptions.cs | 15 -- .../Options/AutoRest/IAutoRestOptions.cs | 15 -- .../Options/AutoRest/SyncMethodOptions.cs | 12 -- 10 files changed, 403 deletions(-) delete mode 100644 src/Core/ApiClientCodeGen.Core.Tests/Installer/NpmInstallerTests.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestArgumentProvider.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestCSharpCodeGenerator.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestConstants.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Installer/INpmInstaller.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Installer/NpmInstaller.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/NpmHelper.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Options/AutoRest/DefaultAutoRestOptions.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Options/AutoRest/IAutoRestOptions.cs delete mode 100644 src/Core/ApiClientCodeGen.Core/Options/AutoRest/SyncMethodOptions.cs diff --git a/src/Core/ApiClientCodeGen.Core.Tests/Installer/NpmInstallerTests.cs b/src/Core/ApiClientCodeGen.Core.Tests/Installer/NpmInstallerTests.cs deleted file mode 100644 index 07a95abc4a..0000000000 --- a/src/Core/ApiClientCodeGen.Core.Tests/Installer/NpmInstallerTests.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Threading.Tasks; -using ApiClientCodeGen.Tests.Common.Infrastructure; -using AutoFixture.Xunit2; -using Rapicgen.Core.Generators; -using Rapicgen.Core.Installer; -using FluentAssertions; -using Moq; -using Xunit; - -namespace ApiClientCodeGen.Core.Tests.Installer -{ - public class NpmInstallerTests - { - [Fact] - public void Implements_Interface() - => typeof(NpmInstaller) - .Should() - .Implement(); - - [Fact] - public void Requires_ProcessLauncher() - => new Action(() => new NpmInstaller(null)) - .Should() - .ThrowExactly(); - - - [Theory, AutoMoqData] - public void InstallNpmPackage_Invokes_Process_Start( - [Frozen] IProcessLauncher processLauncher, - NpmInstaller sut, - string packageName) - { - sut.InstallNpmPackage(packageName); - - Mock.Get(processLauncher) - .Verify( - c => c.Start( - It.IsAny(), - $"install -g {packageName}", - null)); - } - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestArgumentProvider.cs b/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestArgumentProvider.cs deleted file mode 100644 index 8849e955f5..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestArgumentProvider.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.IO; -using Rapicgen.Core.Options.AutoRest; - -namespace Rapicgen.Core.Generators.AutoRest -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public interface IAutoRestArgumentProvider - { - string GetArguments(string outputFolder, string swaggerFile, string defaultNamespace); - string GetLegacyArguments(string outputFile, string swaggerFile, string defaultNamespace); - } - - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public class AutoRestArgumentProvider : IAutoRestArgumentProvider - { - private readonly IAutoRestOptions options; - - public AutoRestArgumentProvider(IAutoRestOptions options) - { - this.options = options; - } - - public string GetArguments( - string outputFolder, - string swaggerFile, - string defaultNamespace) - { - return AppendCommonArguments( - swaggerFile, - "--use:@autorest/csharp@3.0.0-beta.20210504.2 " + - $"--input-file=\"{swaggerFile}\" " + - $"--output-folder=\"{outputFolder}\" " + - $"--namespace=\"{defaultNamespace}\" "); - } - - public string GetLegacyArguments( - string outputFile, - string swaggerFile, - string defaultNamespace) - { - return AppendCommonArguments( - swaggerFile, - "--csharp " + - $"--input-file=\"{swaggerFile}\" " + - $"--output-file=\"{outputFile}\" " + - $"--namespace=\"{defaultNamespace}\" "); - } - - private string AppendCommonArguments( - string swaggerFile, - string arguments) - { - arguments += "--verbose --debug "; - - if (options.AddCredentials) - arguments += "--add-credentials "; - - arguments += $"--client-side-validation=\"{options.ClientSideValidation}\" "; - arguments += $"--sync-methods=\"{options.SyncMethods}\" "; - - if (options.UseDateTimeOffset) - arguments += "--use-datetimeoffset "; - - if (options.UseInternalConstructors) - arguments += " --use-internal-constructors "; - - if (!options.OverrideClientName) - return arguments; - - var file = new FileInfo(swaggerFile); - var name = file.Name - .Replace(" ", string.Empty) - .Replace(file.Extension, string.Empty); - - arguments += $" --override-client-name=\"{name}\""; - return arguments; - } - } -} diff --git a/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestCSharpCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestCSharpCodeGenerator.cs deleted file mode 100644 index b155c5858e..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestCSharpCodeGenerator.cs +++ /dev/null @@ -1,133 +0,0 @@ -using System; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using Rapicgen.Core.External; -using Rapicgen.Core.Generators.NSwag; -using Rapicgen.Core.Installer; -using Rapicgen.Core.Options.AutoRest; -using Rapicgen.Core.Options.General; - -namespace Rapicgen.Core.Generators.AutoRest -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public class AutoRestCSharpCodeGenerator : ICodeGenerator - { - private readonly IProcessLauncher processLauncher; - private readonly IOpenApiDocumentFactory documentFactory; - private readonly IDependencyInstaller dependencyInstaller; - private readonly IAutoRestArgumentProvider argumentProvider; - private static readonly object SyncLock = new(); - - public string SwaggerFile { get; } - public string DefaultNamespace { get; } - -#pragma warning disable CS0618 // Type or member is obsolete - public AutoRestCSharpCodeGenerator( - string swaggerFile, - string defaultNamespace, - IAutoRestOptions options, - IProcessLauncher processLauncher, - IOpenApiDocumentFactory documentFactory, - IDependencyInstaller dependencyInstaller, - IAutoRestArgumentProvider? argumentProvider = null) - { - SwaggerFile = swaggerFile; - DefaultNamespace = defaultNamespace; - this.processLauncher = processLauncher; - this.documentFactory = documentFactory ?? throw new ArgumentNullException(nameof(documentFactory)); - this.dependencyInstaller = dependencyInstaller ?? throw new ArgumentNullException(nameof(dependencyInstaller)); - this.argumentProvider = argumentProvider ?? new AutoRestArgumentProvider(options); - } -#pragma warning restore CS0618 // Type or member is obsolete - - public string GenerateCode(IProgressReporter? pGenerateProgress) - { - lock (SyncLock) - return OnGenerateCode(pGenerateProgress); - } - -#pragma warning disable CS0618 // Type or member is obsolete - [SuppressMessage( - "Usage", - "VSTHRD002:Avoid problematic synchronous waits", - Justification = "This is code is called from an old pre-TPL interface")] - private string OnGenerateCode(IProgressReporter? pGenerateProgress) - { - try - { - pGenerateProgress?.Progress(10); - - var command = PathProvider.GetAutoRestPath(); - pGenerateProgress?.Progress(30); - - dependencyInstaller.InstallAutoRest(); - pGenerateProgress?.Progress(50); - - var document = documentFactory.GetDocumentAsync(SwaggerFile).GetAwaiter().GetResult(); - if (!string.IsNullOrEmpty(document.OpenApi) && - Version.TryParse(document.OpenApi, out var openApiVersion) && - openApiVersion > Version.Parse("3.0.0")) - { - var outputFolder = Path.Combine( - Path.GetDirectoryName(SwaggerFile) ?? throw new InvalidOperationException(), - Guid.NewGuid().ToString("N"), - "TempApiClient"); - - if (!Directory.Exists(outputFolder)) - Directory.CreateDirectory(outputFolder); - - var arguments = argumentProvider.GetArguments( - outputFolder, - SwaggerFile, - DefaultNamespace); - - new ToolRunner(processLauncher).Run( - ExternalTools.AutoRest, command, arguments, Path.GetDirectoryName(SwaggerFile)); - - pGenerateProgress?.Progress(80); - - return GeneratedCode - .PrefixAutogeneratedCodeHeader( - CSharpFileMerger.MergeFilesAndDeleteSource(outputFolder), - ExternalTools.AutoRest.DisplayName, - ExternalTools.AutoRest.VersionLabel); - } - else - { - var outputFile = FileHelper.CreateRandomFile(); - var arguments = argumentProvider.GetLegacyArguments( - outputFile, - SwaggerFile, - DefaultNamespace); - - try - { - new ToolRunner(processLauncher).Run( - ExternalTools.AutoRest, command, arguments, Path.GetDirectoryName(SwaggerFile)); - } - catch (ProcessLaunchException) - { - arguments = arguments.Replace("--version=", "--version "); - new ToolRunner(processLauncher).Run( - ExternalTools.AutoRest, command, arguments, Path.GetDirectoryName(SwaggerFile)); - } - finally - { - pGenerateProgress?.Progress(80); - } - - return GeneratedCode - .PrefixAutogeneratedCodeHeader( - FileHelper.ReadThenDelete(outputFile), - "AutoRest", - "v2.0.4417"); - } - } - finally - { - pGenerateProgress?.Progress(90); - } - } -#pragma warning restore CS0618 // Type or member is obsolete - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestConstants.cs b/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestConstants.cs deleted file mode 100644 index f83789c6db..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Generators/AutoRest/AutoRestConstants.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Rapicgen.Core.Generators.AutoRest -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public static class AutoRestConstants - { - public static IReadOnlyDictionary PropertyGroups { get; } - = new Dictionary - { - {"IncludeGeneratorSharedCode", bool.TrueString}, - { - "RestoreAdditionalProjectSources", - "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-tools/index.json" - } - }; - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Installer/INpmInstaller.cs b/src/Core/ApiClientCodeGen.Core/Installer/INpmInstaller.cs deleted file mode 100644 index c1223f4439..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Installer/INpmInstaller.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; - -namespace Rapicgen.Core.Installer -{ - public interface INpmInstaller - { - void InstallNpmPackage(string packageName); - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Installer/NpmInstaller.cs b/src/Core/ApiClientCodeGen.Core/Installer/NpmInstaller.cs deleted file mode 100644 index 0251303563..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Installer/NpmInstaller.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Diagnostics; -using Rapicgen.Core.External; -using Rapicgen.Core.Generators; -using Rapicgen.Core.Logging; -using Rapicgen.Core.Options.General; - -namespace Rapicgen.Core.Installer -{ - public class NpmInstaller : INpmInstaller - { - private readonly IProcessLauncher processLauncher; - - public NpmInstaller(IProcessLauncher processLauncher) - { - this.processLauncher = processLauncher ?? throw new ArgumentNullException(nameof(processLauncher)); - } - - public void InstallNpmPackage(string packageName) - { - Logger.Instance.WriteLine($"Attempting to install {packageName} through NPM"); - - using var context = new DependencyContext($"npm install -g {packageName}"); - processLauncher.Start(PathProvider.GetNpmPath(), $"install -g {packageName}"); - context.Succeeded(); - - Logger.Instance.WriteLine($"{packageName} installed successfully through NPM"); - } - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/NpmHelper.cs b/src/Core/ApiClientCodeGen.Core/NpmHelper.cs deleted file mode 100644 index 83a7f20531..0000000000 --- a/src/Core/ApiClientCodeGen.Core/NpmHelper.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using Rapicgen.Core.External; -using Rapicgen.Core.Generators; -using Rapicgen.Core.Logging; -using Rapicgen.Core.Options.General; - -namespace Rapicgen.Core -{ - public static class NpmHelper - { - public static string GetNpmPath(bool withoutPath = false) - => PathProvider.GetNpmPath(withoutPath: withoutPath); - - public static string GetPrefixPath() - => TryGetNpmPrefixPathFromNpmConfig() ?? - Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - "npm"); - - public static string? TryGetNpmPrefixPathFromNpmConfig(IProcessLauncher? processLauncher = null) - { - try - { - var npm = GetNpmPath(); - string prefix = null!; - - using var context = new DependencyContext("npm config get prefix"); - (processLauncher ?? new ProcessLauncher()).Start( - npm, - "config get prefix", - o => prefix += o, - e => Logger.Instance.WriteLine(e)); - context.Succeeded(); - return prefix; - } - catch (Exception e) - { - Logger.Instance.TrackError(e); - Trace.TraceError(e.ToString()); - return null; - } - } - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Options/AutoRest/DefaultAutoRestOptions.cs b/src/Core/ApiClientCodeGen.Core/Options/AutoRest/DefaultAutoRestOptions.cs deleted file mode 100644 index 67ac2ea4fc..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Options/AutoRest/DefaultAutoRestOptions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace Rapicgen.Core.Options.AutoRest -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public class DefaultAutoRestOptions : IAutoRestOptions - { - public bool AddCredentials { get; } - public bool OverrideClientName { get; } - public bool UseInternalConstructors { get; } - public SyncMethodOptions SyncMethods { get; } - public bool UseDateTimeOffset { get; } - public bool ClientSideValidation { get; } = true; - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Options/AutoRest/IAutoRestOptions.cs b/src/Core/ApiClientCodeGen.Core/Options/AutoRest/IAutoRestOptions.cs deleted file mode 100644 index af4b698aa6..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Options/AutoRest/IAutoRestOptions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace Rapicgen.Core.Options.AutoRest -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public interface IAutoRestOptions - { - bool AddCredentials { get; } - bool OverrideClientName { get; } - bool UseInternalConstructors { get; } - SyncMethodOptions SyncMethods { get; } - bool UseDateTimeOffset { get; } - bool ClientSideValidation { get; } - } -} \ No newline at end of file diff --git a/src/Core/ApiClientCodeGen.Core/Options/AutoRest/SyncMethodOptions.cs b/src/Core/ApiClientCodeGen.Core/Options/AutoRest/SyncMethodOptions.cs deleted file mode 100644 index 5d6ee5261a..0000000000 --- a/src/Core/ApiClientCodeGen.Core/Options/AutoRest/SyncMethodOptions.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Rapicgen.Core.Options.AutoRest -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public enum SyncMethodOptions - { - Essential, - All, - None - } -} \ No newline at end of file From f3868d1cd8cc5414d710e6cb86d8c0e91e08854c Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 6 Jul 2026 15:40:29 +0200 Subject: [PATCH 02/18] Remove AutoRest from enum, dependency installer, package dependencies, and paths --- .../External/PathProvider.cs | 33 +------------------ .../ApiClientCodeGen.Core/ExternalTool.cs | 2 -- .../Installer/DependencyInstaller.cs | 17 ---------- .../Installer/IDependencyInstaller.cs | 3 -- .../NuGet/PackageDependencies.cs | 15 --------- .../NuGet/PackageDependencyListProvider.cs | 20 ----------- .../Options/General/DefaultGeneralOptions.cs | 1 - .../Options/General/IGeneralOptions.cs | 1 - .../SupportedCodeGenerator.cs | 6 ---- 9 files changed, 1 insertion(+), 97 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core/External/PathProvider.cs b/src/Core/ApiClientCodeGen.Core/External/PathProvider.cs index 8aa065ea0c..df9cda2470 100644 --- a/src/Core/ApiClientCodeGen.Core/External/PathProvider.cs +++ b/src/Core/ApiClientCodeGen.Core/External/PathProvider.cs @@ -43,27 +43,6 @@ public static string GetIncludedJavaPath() } } - public static string GetNpmPath( - string? programFiles = null, - string? programFiles64 = null, - bool withoutPath = false) - { - if (Environment.OSVersion.Platform is PlatformID.MacOSX or PlatformID.Unix || withoutPath) - return "npm"; - - if (string.IsNullOrWhiteSpace(programFiles)) - programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles); - - if (string.IsNullOrWhiteSpace(programFiles64)) - programFiles64 = programFiles!.Replace(" (x86)", string.Empty); - - var npmCommand = Path.Combine(programFiles, "nodejs\\npm.cmd"); - if (!File.Exists(npmCommand)) - npmCommand = Path.Combine(programFiles64, "nodejs\\npm.cmd"); - - return File.Exists(npmCommand) ? npmCommand : string.Empty; - } - public static string GetNSwagStudioPath() => Path.Combine( Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), @@ -77,23 +56,13 @@ public static string GetNSwagPath(bool withoutPath = false) return GetDotNetGlobalToolPath("nswag"); } - public static string GetAutoRestPath(bool withoutPath = false) - { - if (Environment.OSVersion.Platform is PlatformID.MacOSX or PlatformID.Unix || withoutPath) - return "autorest"; - - return Path.Combine( - NpmHelper.GetPrefixPath(), - "autorest.cmd"); - } - public static string GetSwaggerCodegenPath() => Path.Combine( Path.GetTempPath(), "swagger-codegen-cli.jar"); public static string GetOpenApiGeneratorPath( - OpenApiSupportedVersion version = default) + OpenApiSupportedVersion version = default) => Path.Combine( Path.GetTempPath(), $"openapi-generator-cli-{version.GetDescription()}.jar"); diff --git a/src/Core/ApiClientCodeGen.Core/ExternalTool.cs b/src/Core/ApiClientCodeGen.Core/ExternalTool.cs index 5773eeaf1f..e839a8eddf 100644 --- a/src/Core/ApiClientCodeGen.Core/ExternalTool.cs +++ b/src/Core/ApiClientCodeGen.Core/ExternalTool.cs @@ -31,8 +31,6 @@ public static class ExternalTools public static readonly ExternalTool SwaggerCodegen = new("Swagger Codegen CLI", "3.0.34"); - public static readonly ExternalTool AutoRest = new("AutoRest", "3.0.0-beta.20210504.2", "autorest"); - /// /// OpenAPI Generator's default version is the latest entry in . /// An individual generation may select an older version; this represents the default shown to users. diff --git a/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs b/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs index 26ee81b070..faed381c89 100644 --- a/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs +++ b/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs @@ -10,34 +10,17 @@ namespace Rapicgen.Core.Installer { public class DependencyInstaller : IDependencyInstaller { - private readonly INpmInstaller npm; private readonly IFileDownloader downloader; private readonly IProcessLauncher processLauncher; public DependencyInstaller( - INpmInstaller npm, IFileDownloader downloader, IProcessLauncher processLauncher) { - this.npm = npm ?? throw new ArgumentNullException(nameof(npm)); this.downloader = downloader ?? throw new ArgumentNullException(nameof(downloader)); this.processLauncher = processLauncher; } - /// - /// Installs AutoRest code generator via NPM. - /// - /// - /// AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. - /// AutoRest support will be removed from this tool in a future major version. - /// Use NSwag, Refitter, or Kiota instead. - /// - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public void InstallAutoRest() - { - npm.InstallNpmPackage(ExternalTools.AutoRest.PackageId!); - } - public void InstallNSwag() { var command = "nswag"; diff --git a/src/Core/ApiClientCodeGen.Core/Installer/IDependencyInstaller.cs b/src/Core/ApiClientCodeGen.Core/Installer/IDependencyInstaller.cs index fb8def552a..f19131d470 100644 --- a/src/Core/ApiClientCodeGen.Core/Installer/IDependencyInstaller.cs +++ b/src/Core/ApiClientCodeGen.Core/Installer/IDependencyInstaller.cs @@ -1,12 +1,9 @@ -using System; using Rapicgen.Core.Options.OpenApiGenerator; namespace Rapicgen.Core.Installer { public interface IDependencyInstaller { - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - void InstallAutoRest(); void InstallNSwag(); string InstallOpenApiGenerator(OpenApiSupportedVersion version = default); string InstallSwaggerCodegen(); diff --git a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs index 53d7077fd9..80a9f75013 100644 --- a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs +++ b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs @@ -10,11 +10,6 @@ public static class PackageDependencies "13.0.3", false); - public static readonly PackageDependency MicrosoftRestClientRuntime = - new PackageDependency( - "Microsoft.Rest.ClientRuntime", - "2.3.24"); - public static readonly PackageDependency RestSharp = new PackageDependency( "RestSharp", @@ -58,16 +53,6 @@ public static class PackageDependencies "Polly", "8.6.6"); - public static readonly PackageDependency AutoRestCSharp = - new PackageDependency( - "Microsoft.Azure.AutoRest.CSharp", - "3.0.0-beta.20210218.1"); - - public static readonly PackageDependency AzureCore = - new PackageDependency( - "Azure.Core", - "1.57.0"); - public static readonly PackageDependency AzureIdentity = new PackageDependency( "Azure.Identity", diff --git a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencyListProvider.cs b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencyListProvider.cs index e13ab1580d..5eda21e947 100644 --- a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencyListProvider.cs +++ b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencyListProvider.cs @@ -42,26 +42,6 @@ public IEnumerable GetDependencies( }); break; - case SupportedCodeGenerator.AutoRest: - list.AddRange( - new[] - { - PackageDependencies.MicrosoftRestClientRuntime, - PackageDependencies.NewtonsoftJson, - }); - break; - - case SupportedCodeGenerator.AutoRestV3: - list.AddRange( - new[] - { - PackageDependencies.MicrosoftRestClientRuntime, - PackageDependencies.NewtonsoftJson, - PackageDependencies.AutoRestCSharp, - PackageDependencies.AzureCore, - }); - break; - case SupportedCodeGenerator.Swagger: list.AddRange( new[] diff --git a/src/Core/ApiClientCodeGen.Core/Options/General/DefaultGeneralOptions.cs b/src/Core/ApiClientCodeGen.Core/Options/General/DefaultGeneralOptions.cs index b6961ff168..1b8e4fc302 100644 --- a/src/Core/ApiClientCodeGen.Core/Options/General/DefaultGeneralOptions.cs +++ b/src/Core/ApiClientCodeGen.Core/Options/General/DefaultGeneralOptions.cs @@ -5,7 +5,6 @@ namespace Rapicgen.Core.Options.General public class DefaultGeneralOptions : IGeneralOptions { public string JavaPath => PathProvider.GetInstalledJavaPath(); - public string NpmPath => PathProvider.GetNpmPath(); public string NSwagPath => PathProvider.GetNSwagPath(); public string SwaggerCodegenPath => PathProvider.GetSwaggerCodegenPath(); public string OpenApiGeneratorPath => PathProvider.GetOpenApiGeneratorPath(); diff --git a/src/Core/ApiClientCodeGen.Core/Options/General/IGeneralOptions.cs b/src/Core/ApiClientCodeGen.Core/Options/General/IGeneralOptions.cs index c7e243fb39..ca12af97ff 100644 --- a/src/Core/ApiClientCodeGen.Core/Options/General/IGeneralOptions.cs +++ b/src/Core/ApiClientCodeGen.Core/Options/General/IGeneralOptions.cs @@ -3,7 +3,6 @@ public interface IGeneralOptions { string JavaPath { get; } - string NpmPath { get; } string NSwagPath { get; } string SwaggerCodegenPath { get; } string OpenApiGeneratorPath { get; } diff --git a/src/Core/ApiClientCodeGen.Core/SupportedCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/SupportedCodeGenerator.cs index fdd634f9ff..f6b6ea8575 100644 --- a/src/Core/ApiClientCodeGen.Core/SupportedCodeGenerator.cs +++ b/src/Core/ApiClientCodeGen.Core/SupportedCodeGenerator.cs @@ -1,14 +1,8 @@ -using System; - namespace Rapicgen.Core { public enum SupportedCodeGenerator { NSwag = 0, - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - AutoRest = 1, - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - AutoRestV3 = 2, Swagger = 3, OpenApi = 4, NSwagStudio = 5, From 10137fcd3f5077ef06a5ba5fc86c62227ec9e6d1 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 6 Jul 2026 15:42:02 +0200 Subject: [PATCH 03/18] Remove AutoRest CLI command and tests --- .../AutoRestCodeGeneratorFactoryTests.cs | 9 -- .../Command/AutoRestCommandTests.cs | 9 -- .../Command/CliHelpTests.cs | 127 ------------------ .../SupportedCodeGeneratorNameTests.cs | 16 +-- .../CSharp/AutoRestCodeGeneratorFactory.cs | 42 ------ .../Commands/CSharp/AutoRestCommand.cs | 61 --------- src/CLI/ApiClientCodeGen.CLI/Program.cs | 13 -- 7 files changed, 3 insertions(+), 274 deletions(-) delete mode 100644 src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCodeGeneratorFactoryTests.cs delete mode 100644 src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCommandTests.cs delete mode 100644 src/CLI/ApiClientCodeGen.CLI.Tests/Command/CliHelpTests.cs delete mode 100644 src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCodeGeneratorFactory.cs delete mode 100644 src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCommand.cs diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCodeGeneratorFactoryTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCodeGeneratorFactoryTests.cs deleted file mode 100644 index 86a04853b4..0000000000 --- a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCodeGeneratorFactoryTests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ApiClientCodeGen.Tests.Common; -using Xunit; - -namespace Rapicgen.CLI.Tests.Command -{ - public class AutoRestCodeGeneratorFactoryTests : AutoRestDeprecatedTestClass - { - } -} \ No newline at end of file diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCommandTests.cs deleted file mode 100644 index 2f10be6e66..0000000000 --- a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCommandTests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ApiClientCodeGen.Tests.Common; -using Xunit; - -namespace Rapicgen.CLI.Tests.Command -{ - public class AutoRestCommandTests : AutoRestDeprecatedTestClass - { - } -} \ No newline at end of file diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/CliHelpTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/CliHelpTests.cs deleted file mode 100644 index f1e08a93f3..0000000000 --- a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/CliHelpTests.cs +++ /dev/null @@ -1,127 +0,0 @@ -using System; -using System.IO; -using FluentAssertions; -using Xunit; - -namespace Rapicgen.CLI.Tests.Command -{ - /// - /// Tests for CLI help output and deprecation messaging. - /// Validates that AutoRest deprecation notices are properly displayed to users. - /// - [Trait("Category", "Integration")] - public class CliHelpTests - { - /// - /// Validates that the AutoRest command description in Program.cs contains the canonical deprecated label. - /// This is the string shown when users run 'rapicgen csharp --help'. - /// - [Fact] - public void AutoRest_Help_Description_Contains_Deprecated_Label() - { - // Arrange - The canonical description from Program.cs line 44 - const string expectedDescription = "AutoRest (Deprecated - v3.0.0-beta.20210504.2)"; - - // Act - Read the Program.cs file to verify the actual registered description - // Navigate from test assembly location to CLI project - var testDirectory = AppContext.BaseDirectory; - var cliProjectPath = Path.GetFullPath(Path.Combine(testDirectory, "..", "..", "..", "..", "ApiClientCodeGen.CLI", "Program.cs")); - - if (!File.Exists(cliProjectPath)) - { - throw new InvalidOperationException($"Program.cs file not found at: {cliProjectPath}"); - } - - var programContent = File.ReadAllText(cliProjectPath); - - // Assert - Verify the canonical deprecated label is present - programContent.Should().Contain(expectedDescription, - "the CLI help must show the deprecated label to warn users"); - } - - /// - /// Validates that the AutoRestCommand emits a runtime deprecation warning. - /// This is the warning shown when users actually execute 'rapicgen csharp autorest'. - /// - [Fact] - public void AutoRest_Command_Contains_Runtime_Warning() - { - // Arrange - The canonical runtime warning message - const string expectedWarning = "WARNING: AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead."; - - // Act - Read the AutoRestCommand.cs file to verify the runtime warning - var testDirectory = AppContext.BaseDirectory; - var commandPath = Path.GetFullPath(Path.Combine(testDirectory, "..", "..", "..", "..", "ApiClientCodeGen.CLI", "Commands", "CSharp", "AutoRestCommand.cs")); - - var commandContent = File.ReadAllText(commandPath); - - // Assert - Verify the runtime warning is emitted - commandContent.Should().Contain(expectedWarning, - "the command must emit a deprecation warning on every execution"); - - // Verify it contains Console.Error.WriteLine for stderr output - commandContent.Should().Contain("Console.Error.WriteLine", - "warnings should be written to stderr, not stdout"); - - // Verify warning prefix - commandContent.Should().Contain("WARNING:", - "deprecation messages must be clearly marked as warnings"); - } - - /// - /// Validates that the AutoRestCommand class has the [Obsolete] attribute. - /// This provides compile-time warnings to NuGet package consumers. - /// - [Fact] - public void AutoRest_Command_Has_Obsolete_Attribute() - { - // Arrange - The expected Obsolete attribute message - const string expectedObsoleteMessage = "AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead."; - - // Act - Read the AutoRestCommand.cs file to verify the [Obsolete] attribute - var testDirectory = AppContext.BaseDirectory; - var commandPath = Path.GetFullPath(Path.Combine(testDirectory, "..", "..", "..", "..", "ApiClientCodeGen.CLI", "Commands", "CSharp", "AutoRestCommand.cs")); - - var commandContent = File.ReadAllText(commandPath); - - // Assert - Verify the [Obsolete] attribute is present - commandContent.Should().Contain("[Obsolete(", - "the command class must be marked with [Obsolete] for compile-time warnings"); - - commandContent.Should().Contain(expectedObsoleteMessage, - "the [Obsolete] attribute must contain the canonical deprecation message"); - - // Verify it's set as non-error (false parameter) - commandContent.Should().Contain("false)]", - "the [Obsolete] attribute should be a warning, not an error, during Phase 1"); - } - - /// - /// Validates that the CLI Program.cs suppresses CS0618 warnings when using AutoRest types. - /// This is necessary because AutoRest types are marked [Obsolete] but still need to be registered. - /// - [Fact] - public void Program_Suppresses_Obsolete_Warnings_For_AutoRest_DI_Registration() - { - // Arrange - var testDirectory = AppContext.BaseDirectory; - var programPath = Path.GetFullPath(Path.Combine(testDirectory, "..", "..", "..", "..", "ApiClientCodeGen.CLI", "Program.cs")); - - var programContent = File.ReadAllText(programPath); - - // Assert - Verify CS0618 is suppressed around AutoRest service registration - programContent.Should().Contain("#pragma warning disable CS0618", - "Program.cs must suppress obsolete warnings when registering deprecated AutoRest services"); - - programContent.Should().Contain("#pragma warning restore CS0618", - "suppression should be scoped to minimize warning suppression"); - - // Verify AutoRest DI registrations are present - programContent.Should().Contain("IAutoRestOptions", - "AutoRest options must still be registered during deprecation period"); - - programContent.Should().Contain("IAutoRestCodeGeneratorFactory", - "AutoRest factory must still be registered during deprecation period"); - } - } -} diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Extensions/SupportedCodeGeneratorNameTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Extensions/SupportedCodeGeneratorNameTests.cs index ed47047cb0..40ac723769 100644 --- a/src/CLI/ApiClientCodeGen.CLI.Tests/Extensions/SupportedCodeGeneratorNameTests.cs +++ b/src/CLI/ApiClientCodeGen.CLI.Tests/Extensions/SupportedCodeGeneratorNameTests.cs @@ -7,15 +7,6 @@ namespace Rapicgen.CLI.Tests.Extensions { public class SupportedCodeGeneratorNameTests { - #pragma warning disable CS0618 // Type or member is obsolete - These tests intentionally validate deprecated AutoRest during deprecation period - [Fact] - public void GetName_AutoRest() - => SupportedCodeGenerator.AutoRest - .GetName() - .Should() - .Be(SupportedCodeGenerator.AutoRest.ToString()); - #pragma warning restore CS0618 - [Fact] public void GetName_NSwag() => SupportedCodeGenerator.NSwag @@ -42,7 +33,6 @@ public void GetName_OpenApi() => SupportedCodeGenerator.OpenApi .GetName() .Should() - .Be("OpenAPI Generator"); - } - #pragma warning restore CS0618 -} \ No newline at end of file + .Be("OpenAPI Generator"); + } + } \ No newline at end of file diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCodeGeneratorFactory.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCodeGeneratorFactory.cs deleted file mode 100644 index 136e3e869f..0000000000 --- a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCodeGeneratorFactory.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using Rapicgen.Core.Generators; -using Rapicgen.Core.Generators.AutoRest; -using Rapicgen.Core.Generators.NSwag; -using Rapicgen.Core.Installer; -using Rapicgen.Core.Options.AutoRest; - -namespace Rapicgen.CLI.Commands.CSharp -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public interface IAutoRestCodeGeneratorFactory - { - ICodeGenerator Create( - string swaggerFile, - string defaultNamespace, - IAutoRestOptions options, - IProcessLauncher processLauncher, - IOpenApiDocumentFactory documentFactory, - IDependencyInstaller dependencyInstaller); - } - - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public class AutoRestCodeGeneratorFactory : IAutoRestCodeGeneratorFactory - { -#pragma warning disable CS0618 // Type or member is obsolete - public ICodeGenerator Create( - string swaggerFile, - string defaultNamespace, - IAutoRestOptions options, - IProcessLauncher processLauncher, - IOpenApiDocumentFactory documentFactory, - IDependencyInstaller dependencyInstaller) - => new AutoRestCSharpCodeGenerator( - swaggerFile, - defaultNamespace, - options, - processLauncher, - documentFactory, - dependencyInstaller); -#pragma warning restore CS0618 // Type or member is obsolete - } -} \ No newline at end of file diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCommand.cs deleted file mode 100644 index b47cb8d9cd..0000000000 --- a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/AutoRestCommand.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Threading; -using Spectre.Console.Cli; -using Rapicgen.Core; -using Rapicgen.Core.Generators; -using Rapicgen.Core.Generators.NSwag; -using Rapicgen.Core.Installer; -using Rapicgen.Core.Logging; -using Rapicgen.Core.Options.AutoRest; - -namespace Rapicgen.CLI.Commands.CSharp -{ - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public class AutoRestCommand : CodeGeneratorCommand - { - private readonly IAutoRestOptions options; - private readonly IProcessLauncher processLauncher; - private readonly IAutoRestCodeGeneratorFactory factory; - private readonly IOpenApiDocumentFactory documentFactory; - private readonly IDependencyInstaller dependencyInstaller; - - [Obsolete("AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead.", false)] - public class AutoRestSettings : CodeGeneratorCommand.Settings - { - } - - public AutoRestCommand( - IConsoleOutput console, - IAutoRestOptions options, - IProcessLauncher processLauncher, - IProgressReporter? progressReporter, - IAutoRestCodeGeneratorFactory factory, - IOpenApiDocumentFactory documentFactory, - IDependencyInstaller dependencyInstaller) : base(console, progressReporter) - { - this.options = options ?? throw new ArgumentNullException(nameof(options)); - this.processLauncher = processLauncher ?? throw new ArgumentNullException(nameof(processLauncher)); - this.factory = factory ?? throw new ArgumentNullException(nameof(factory)); - this.documentFactory = documentFactory ?? throw new ArgumentNullException(nameof(documentFactory)); - this.dependencyInstaller = - dependencyInstaller ?? throw new ArgumentNullException(nameof(dependencyInstaller)); - } - - protected override int Execute(CommandContext context, AutoRestSettings settings, CancellationToken cancellationToken) - { - // Emit deprecation warning to stderr - Console.Error.WriteLine("WARNING: AutoRest is deprecated by Microsoft and will be retired on July 1, 2026. AutoRest support will be removed from this tool in a future major version. Use NSwag, Refitter, or Kiota instead."); - - return base.Execute(context, settings, cancellationToken); - } - - public override ICodeGenerator CreateGenerator(AutoRestSettings settings) - => factory.Create( - settings.SwaggerFile, - settings.DefaultNamespace, - options, - processLauncher, - documentFactory, - dependencyInstaller); - } -} \ No newline at end of file diff --git a/src/CLI/ApiClientCodeGen.CLI/Program.cs b/src/CLI/ApiClientCodeGen.CLI/Program.cs index e66e151ec0..06d7cb6eef 100644 --- a/src/CLI/ApiClientCodeGen.CLI/Program.cs +++ b/src/CLI/ApiClientCodeGen.CLI/Program.cs @@ -1,6 +1,5 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Threading.Tasks; using Rapicgen.CLI.Commands; using Rapicgen.Core; using Rapicgen.Core.Exceptions; @@ -8,7 +7,6 @@ using Rapicgen.Core.Generators.NSwag; using Rapicgen.Core.Installer; using Rapicgen.Core.Logging; -using Rapicgen.Core.Options.AutoRest; using Rapicgen.Core.Options.General; using Rapicgen.Core.Options.OpenApiGenerator; using Microsoft.Extensions.DependencyInjection; @@ -40,10 +38,6 @@ public static int Main(string[] args) { cs.SetDescription("Generate C# API clients using various generators"); - cs.AddCommand("autorest") - .WithDescription("AutoRest (Deprecated - v3.0.0-beta.20210504.2)") - .WithExample(new[] { "autorest", "petstore.json", "GeneratedCode", "Output.cs" }); - cs.AddCommand("kiota") .WithDescription($"Microsoft Kiota ({ExternalTools.Kiota.VersionLabel})") .WithExample(new[] { "kiota", "petstore.json", "GeneratedCode", "Output.cs" }); @@ -93,9 +87,6 @@ private static void ConfigureServices(IServiceCollection services) services.AddLogging(b => b.AddDebug()); services.AddSingleton(); services.AddSingleton(); -#pragma warning disable CS0618 // Type or member is obsolete - services.AddSingleton(); -#pragma warning restore CS0618 // Type or member is obsolete services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); @@ -105,15 +96,11 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); -#pragma warning disable CS0618 // Type or member is obsolete - services.AddSingleton(); -#pragma warning restore CS0618 // Type or member is obsolete services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); } From 4e7bf365d053d2b03993faf277b68de9217384e5 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 6 Jul 2026 15:48:23 +0200 Subject: [PATCH 04/18] Remove AutoRest from VSIX shared project, command tables, and manifests --- .../VSCommandTable.vsct | 30 ++----- .../source.extension.vsixmanifest | 2 +- .../ApiClientCodeGen.VSIX.Shared.projitems | 9 --- .../AddNew/NewAutoRestClientCommand.cs | 51 ------------ .../Commands/AddNew/NewRestClientCommand.cs | 1 - .../AutoRestCodeGeneratorCustomToolSetter.cs | 59 -------------- .../Commands/Kiota/KiotaCommand.cs | 1 - .../NSwagStudio/NSwagStudioCommand.cs | 1 - .../Commands/Refitter/RefitterCommand.cs | 1 - .../AutoRest/AutoRestCSharpCodeGenerator.cs | 33 -------- .../AutoRest/AutoRestCodeGenerator.cs | 17 ---- .../AutoRestVisualBasicCodeGenerator.cs | 34 -------- .../SupportedCodeGeneratorExtensions.cs | 7 -- .../Generators/CodeGeneratorFactory.cs | 15 +--- .../Options/AutoRest/AutoRestOptions.cs | 54 ------------- .../Options/AutoRest/AutoRestOptionsPage.cs | 48 ----------- .../Options/General/CustomPathOptions.cs | 4 - .../Options/General/GeneralOptionPage.cs | 6 -- .../ApiClientCodeGen.VSIX.Shared/VsPackage.cs | 10 --- .../GeneralOptionsPageCustom.Designer.cs | 81 +++++-------------- .../Windows/GeneralOptionsPageCustom.cs | 7 -- .../ApiClientCodeGen.VSIX/VSCommandTable.vsct | 30 ++----- .../source.extension.vsixmanifest | 2 +- src/VSIX/publish-manifest-vs2019.json | 2 +- src/VSIX/publish-manifest-vs2022.json | 2 +- src/VSIX/publish-manifest-vs2026.json | 2 +- 26 files changed, 39 insertions(+), 470 deletions(-) delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/Commands/AddNew/NewAutoRestClientCommand.cs delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/Commands/CustomTool/AutoRestCodeGeneratorCustomToolSetter.cs delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/CustomTool/AutoRest/AutoRestCSharpCodeGenerator.cs delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/CustomTool/AutoRest/AutoRestCodeGenerator.cs delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/CustomTool/AutoRest/AutoRestVisualBasicCodeGenerator.cs delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/Options/AutoRest/AutoRestOptions.cs delete mode 100644 src/VSIX/ApiClientCodeGen.VSIX.Shared/Options/AutoRest/AutoRestOptionsPage.cs diff --git a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct index fd9acc95c2..b8b731cf3f 100644 --- a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct +++ b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct @@ -52,12 +52,7 @@ Generate with Swagger (v3.0.34 - Outdated) - - - - - - - -