IDP-818 - Handling running swashbuckle cli with a sdk greater than net7.0

.github/workflows/ci.yaml

@@ -15,8 +15,6 @@ jobs:
           fetch-depth: 0
 
       - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: "6.0.x"
 
       - run: ./Build.ps1
         shell: pwsh

.github/workflows/publish.yml

@@ -16,8 +16,6 @@ jobs:
           fetch-depth: 0
 
       - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: "6.0.x"
 
       - run: ./Build.ps1
         shell: pwsh

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "6.0.418",
+      "version": "8.0.101",
       "rollForward": "latestMinor",
       "allowPrerelease": false
     }

src/Directory.Build.props

@@ -6,11 +6,11 @@
     <PackageProjectUrl>https://github.com/gsoft-inc/wl-openapi-msbuild</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <LangVersion>10</LangVersion>
+    <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Description>TODO.</Description>
-    <AnalysisLevel>6.0-all</AnalysisLevel>
+    <AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/WebApiDebugger/WebApiDebugger.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
@@ -13,6 +13,7 @@
 
   <PropertyGroup>
     <OpenApiDebuggingEnabled>true</OpenApiDebuggingEnabled>
+    <OpenApiDevelopmentMode>CodeFirst</OpenApiDevelopmentMode>
   </PropertyGroup>
 
   <ItemGroup>

src/Workleap.OpenApi.MSBuild.Tests/Workleap.OpenApi.MSBuild.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>

src/Workleap.OpenApi.MSBuild/ILoggerWrapper.cs

@@ -2,7 +2,7 @@
 
 namespace Workleap.OpenApi.MSBuild;
 
-public interface ILoggerWrapper
+internal interface ILoggerWrapper
 {
     void LogWarning(string message, params object[] messageArgs);
 

src/Workleap.OpenApi.MSBuild/IProcessWrapper.cs

@@ -2,7 +2,7 @@
 
 namespace Workleap.OpenApi.MSBuild;
 
-public interface IProcessWrapper
+internal interface IProcessWrapper
 {
-    public Task<BufferedCommandResult> RunProcessAsync(string filename, string[] arguments, CancellationToken cancellationToken);
+    public Task<BufferedCommandResult> RunProcessAsync(string filename, string[] arguments, CancellationToken cancellationToken, Dictionary<string, string?>? envVars = null);
 }

src/Workleap.OpenApi.MSBuild/ISpectralManager.cs

@@ -1,6 +1,6 @@
 namespace Workleap.OpenApi.MSBuild;
 
-public interface ISpectralManager
+internal interface ISpectralManager
 {
     public Task InstallSpectralAsync(CancellationToken cancellationToken);
 

src/Workleap.OpenApi.MSBuild/ISwaggerManager.cs

@@ -1,6 +1,6 @@
 namespace Workleap.OpenApi.MSBuild;
 
-public interface ISwaggerManager
+internal interface ISwaggerManager
 {
     Task<IEnumerable<string>> RunSwaggerAsync(string[] openApiSwaggerDocumentNames, CancellationToken cancellationToken);
 

src/Workleap.OpenApi.MSBuild/ProcessWrapper.cs

@@ -6,18 +6,20 @@ namespace Workleap.OpenApi.MSBuild;
 internal sealed class ProcessWrapper : IProcessWrapper
 {
     private readonly string _workingDirectory;
+    private static readonly Dictionary<string, string?> DefaultEnvVars = new();
 
     public ProcessWrapper(string workingDirectory)
     {
         this._workingDirectory = workingDirectory;
     }
 
-    public async Task<BufferedCommandResult> RunProcessAsync(string filename, string[] arguments, CancellationToken cancellationToken)
+    public async Task<BufferedCommandResult> RunProcessAsync(string filename, string[] arguments, CancellationToken cancellationToken, Dictionary<string, string?>? envVars = null)
     {
         var result = await Cli.Wrap(filename)
             .WithWorkingDirectory(this._workingDirectory)
             .WithValidation(CommandResultValidation.None)
             .WithArguments(arguments)
+            .WithEnvironmentVariables(envVars ?? DefaultEnvVars)
             .ExecuteBufferedAsync(cancellationToken);
 
         return result;

src/Workleap.OpenApi.MSBuild/SwaggerManager.cs

@@ -45,11 +45,14 @@ public async Task InstallSwaggerCliAsync(CancellationToken cancellationToken)
         {
             return;
         }
-        
+
         var retryCount = 0;
         while (retryCount < 2)
         {
-            var result = await this._processWrapper.RunProcessAsync("dotnet", new[] { "tool", "update", "Swashbuckle.AspNetCore.Cli", "--ignore-failed-sources", "--tool-path", this._swaggerDirectory, "--configfile", Path.Combine(this._openApiToolsDirectoryPath, "nuget.config"), "--version", SwaggerVersion }, cancellationToken);
+            var result = await this._processWrapper.RunProcessAsync(
+                "dotnet",
+                ["tool", "update", "Swashbuckle.AspNetCore.Cli", "--ignore-failed-sources", "--tool-path", this._swaggerDirectory, "--configfile", Path.Combine(this._openApiToolsDirectoryPath, "nuget.config"), "--version", SwaggerVersion],
+                cancellationToken);
 
             if (result.ExitCode != 0 && retryCount != 1)
             {
@@ -72,7 +75,8 @@ public async Task InstallSwaggerCliAsync(CancellationToken cancellationToken)
 
     public async Task<string> GenerateOpenApiSpecAsync(string swaggerExePath, string outputOpenApiSpecPath, string documentName, CancellationToken cancellationToken)
     {
-        var result = await this._processWrapper.RunProcessAsync(swaggerExePath, new[] { "tofile", "--output", outputOpenApiSpecPath, "--yaml", this._openApiWebApiAssemblyPath, documentName }, cancellationToken: cancellationToken);
+        var envVars = new Dictionary<string, string?>() { { "DOTNET_ROLL_FORWARD", "LatestMajor" } };
+        var result = await this._processWrapper.RunProcessAsync(swaggerExePath, ["tofile", "--output", outputOpenApiSpecPath, "--yaml", this._openApiWebApiAssemblyPath, documentName], cancellationToken: cancellationToken, envVars: envVars);
         this._loggerWrapper.LogMessage(result.StandardOutput, MessageImportance.High);
 
         if (result.ExitCode != 0)

src/tests/WebApi.MsBuild.SystemTest.CodeFirst/WebApi.MsBuild.SystemTest.CodeFirst.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>false</IsPackable>
@@ -17,5 +16,4 @@
     <ItemGroup>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     </ItemGroup>
-
 </Project>

src/tests/WebApi.MsBuild.SystemTest.ContractFirst/WebApi.MsBuild.SystemTest.ContractFirst.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>false</IsPackable>