Fix MSBuild task so that the generated code is included in the compilation

README.md

@@ -429,13 +429,18 @@ To use the package, install `Refitter.MSBuild`
 The MSBuild package includes a custom `.target` file which executes the `RefitterGenerateTask` custom task and looks something like this:
 
 ```xml
-<Target Name="Refitter" BeforeTargets="BeforeBuild">
+<UsingTask TaskName="RefitterGenerateTask" 
+           AssemblyFile="$(MSBuildThisFileDirectory)Refitter.MSBuild.dll" 
+           Condition="Exists('$(MSBuildThisFileDirectory)Refitter.MSBuild.dll')" />
+<Target Name="RefitterGenerate" BeforeTargets="BeforeCompile">
     <RefitterGenerateTask ProjectFileDirectory="$(MSBuildProjectDirectory)"
-                          DisableLogging="$(RefitterNoLogging)"/>
+                          DisableLogging="$(RefitterNoLogging)">
+        <Output TaskParameter="GeneratedFiles" ItemName="RefitterGeneratedFiles" />
+    </RefitterGenerateTask>
     <ItemGroup>
-        <Compile Include="**/*.cs" />
+        <Compile Include="@(RefitterGeneratedFiles)" />
     </ItemGroup>
-  </Target>
+</Target>
 ```
 
 The `RefitterGenerateTask` task will scan the project folder for `.refitter` files and executes them all. By default, telemetry collection is enabled, and to opt-out of it you must specify `<RefitterNoLogging>true</RefitterNoLogging>` in the `.csproj` `<PropertyGroup>`

src/Refitter.MSBuild/README.md

@@ -1,17 +1,22 @@
-## MSBuild Tasks for Refitter
+# MSBuild Tasks for Refitter
 
 Refitter is available as custom MSBuild tasks that includes the Refitter CLI executable for generating a REST API Client using the [Refit](https://github.com/reactiveui/refit) library. Refitter can generate the Refit interface from OpenAPI specifications. Refitter could format the generated Refit interface to be managed by [Apizr](https://www.apizr.net) (v6+) and generate some registration helpers too.
 
 The MSBuild package includes a custom `.target` file which executes the `RefitterGenerateTask` custom task and looks something like this:
 
 ```xml
-<Target Name="Refitter" BeforeTargets="BeforeBuild">
+<UsingTask TaskName="RefitterGenerateTask" 
+           AssemblyFile="$(MSBuildThisFileDirectory)Refitter.MSBuild.dll" 
+           Condition="Exists('$(MSBuildThisFileDirectory)Refitter.MSBuild.dll')" />
+<Target Name="RefitterGenerate" BeforeTargets="BeforeCompile">
     <RefitterGenerateTask ProjectFileDirectory="$(MSBuildProjectDirectory)"
-                          DisableLogging="$(RefitterNoLogging)"/>
+                          DisableLogging="$(RefitterNoLogging)">
+        <Output TaskParameter="GeneratedFiles" ItemName="RefitterGeneratedFiles" />
+    </RefitterGenerateTask>
     <ItemGroup>
-        <Compile Include="**/*.cs" />
+        <Compile Include="@(RefitterGeneratedFiles)" />
     </ItemGroup>
-  </Target>
+</Target>
 ```
 
 The `RefitterGenerateTask` task will scan the project folder for `.refitter` files and executes them all. By default, telemetry collection is enabled, and to opt-out of it you must specify `<RefitterNoLogging>true</RefitterNoLogging>` in the `.csproj` `<PropertyGroup>`

src/Refitter.MSBuild/Refitter.MSBuild.targets

@@ -1,10 +1,16 @@
 <Project>
 
-    <Target Name="Refitter" BeforeTargets="BeforeBuild">
+    <UsingTask TaskName="RefitterGenerateTask" 
+               AssemblyFile="$(MSBuildThisFileDirectory)Refitter.MSBuild.dll" 
+               Condition="Exists('$(MSBuildThisFileDirectory)Refitter.MSBuild.dll')" />
+
+    <Target Name="RefitterGenerate" BeforeTargets="BeforeCompile">
         <RefitterGenerateTask ProjectFileDirectory="$(MSBuildProjectDirectory)"
-                              DisableLogging="$(RefitterNoLogging)"/>
+                              DisableLogging="$(RefitterNoLogging)">
+            <Output TaskParameter="GeneratedFiles" ItemName="RefitterGeneratedFiles" />
+        </RefitterGenerateTask>
         <ItemGroup>
-            <Compile Include="**/*.cs" />
+            <Compile Include="@(RefitterGeneratedFiles)" />
         </ItemGroup>
     </Target>
 

src/Refitter.MSBuild/RefitterGenerateTask.cs

@@ -1,5 +1,7 @@
 using System.Diagnostics;
 using System.Reflection;
+using System.Text.RegularExpressions;
+using Microsoft.Build.Framework;
 using MSBuildTask = Microsoft.Build.Utilities.Task;
 
 namespace Refitter.MSBuild;
@@ -10,6 +12,9 @@ public class RefitterGenerateTask : MSBuildTask
 
     public bool DisableLogging { get; set; }
 
+    [Output]
+    public ITaskItem[] GeneratedFiles { get; set; }
+
     public override bool Execute()
     {
         TryLogCommandLine($"Starting {nameof(RefitterGenerateTask)}");
@@ -22,40 +27,75 @@ public override bool Execute()
 
         TryLogCommandLine($"Found {files.Length} .refitter files...");
 
+        var generatedFiles = new List<string>();
+
         foreach (var file in files)
         {
             TryLogCommandLine($"Processing {file}");
-            TryExecuteRefitter(file);
+            var generated = TryExecuteRefitter(file);
+            if (generated != null)
+            {
+                generatedFiles.AddRange(generated);
+            }
         }
 
+        GeneratedFiles = generatedFiles.Select(f => new Microsoft.Build.Utilities.TaskItem(f)).ToArray();
+        TryLogCommandLine($"Generated {GeneratedFiles.Length} files");
+
         return true;
     }
 
-    private void TryExecuteRefitter(string file)
+    private List<string>? TryExecuteRefitter(string file)
     {
         try
         {
-            StartProcess(file);
+            return StartProcess(file);
         }
         catch (Exception e)
         {
             TryLogErrorFromException(e);
+            return null;
         }
     }
 
-    private void StartProcess(string file)
+    private List<string> StartProcess(string file)
     {
+        // First, determine what files will be generated by parsing the .refitter file
+        var expectedFiles = GetExpectedGeneratedFiles(file);
+
         var assembly = Assembly.GetExecutingAssembly();
         var packageFolder = Path.GetDirectoryName(assembly.Location);
         var seperator = Path.DirectorySeparatorChar;
+
+        // Try multiple possible locations for the Refitter CLI
         var refitterDll = $"{packageFolder}{seperator}..{seperator}refitter.dll";
+
+        // For development scenarios, try relative to the MSBuild project location
+        if (!File.Exists(refitterDll))
+        {
+            refitterDll = $"{packageFolder}{seperator}..{seperator}..{seperator}..{seperator}Refitter{seperator}bin{seperator}Debug{seperator}net8.0{seperator}refitter.dll";
+        }
+
+        // If still not found, try in the current project directory
+        if (!File.Exists(refitterDll))
+        {
+            refitterDll = Path.Combine(ProjectFileDirectory!, "..", "..", "src", "Refitter", "bin", "Debug", "net8.0", "refitter.dll");
+        }
 
         var args = $"{refitterDll} --settings-file {file}";
         if (DisableLogging)
         {
             args += " --no-logging";
         }
 
+        if (!File.Exists(refitterDll))
+        {
+            TryLogError($"Refitter CLI not found at: {refitterDll}");
+            TryLogError($"Assembly location: {assembly.Location}");
+            TryLogError($"Package folder: {packageFolder}");
+            return new List<string>();
+        }
+
         TryLogCommandLine($"Starting dotnet {args}");
 
         using var process = new Process
@@ -79,6 +119,84 @@ private void StartProcess(string file)
         process.BeginErrorReadLine();
         process.BeginOutputReadLine();
         process.WaitForExit();
+
+        // Return the list of files that should have been generated
+        return expectedFiles.Where(File.Exists).ToList();
+    }
+
+    private List<string> GetExpectedGeneratedFiles(string refitterFilePath)
+    {
+        try
+        {
+            var refitterFileDirectory = Path.GetDirectoryName(refitterFilePath) ?? string.Empty;
+            var refitterContent = File.ReadAllText(refitterFilePath);
+
+            // Parse JSON properties using simple regex patterns
+            var outputFolder = ExtractJsonStringValue(refitterContent, "outputFolder");
+            var outputFilename = ExtractJsonStringValue(refitterContent, "outputFilename");
+            var generateMultipleFiles = ExtractJsonBoolValue(refitterContent, "generateMultipleFiles");
+            var contractsOutputFolder = ExtractJsonStringValue(refitterContent, "contractsOutputFolder");
+            var hasDependencyInjectionSettings = refitterContent.Contains("\"dependencyInjectionSettings\"");
+
+            // If contractsOutputFolder is specified, automatically enable multiple files
+            if (!string.IsNullOrWhiteSpace(contractsOutputFolder))
+            {
+                generateMultipleFiles = true;
+            }
+
+            // Default output filename based on .refitter filename if not specified
+            if (string.IsNullOrWhiteSpace(outputFilename))
+            {
+                var refitterFileName = Path.GetFileNameWithoutExtension(refitterFilePath);
+                outputFilename = $"{refitterFileName}.cs";
+            }
+
+            var generatedFiles = new List<string>();
+
+            if (generateMultipleFiles)
+            {
+                // Multiple files mode
+                var baseOutputFolder = !string.IsNullOrWhiteSpace(outputFolder) ? outputFolder : "./Generated";
+                var interfaceOutputPath = Path.GetFullPath(Path.Combine(refitterFileDirectory, baseOutputFolder, "RefitInterfaces.cs"));
+                var contractsOutputPath = Path.GetFullPath(Path.Combine(refitterFileDirectory, 
+                    !string.IsNullOrWhiteSpace(contractsOutputFolder) ? contractsOutputFolder : baseOutputFolder, 
+                    "Contracts.cs"));
+                var diOutputPath = Path.GetFullPath(Path.Combine(refitterFileDirectory, baseOutputFolder, "DependencyInjection.cs"));
+
+                generatedFiles.Add(interfaceOutputPath);
+                generatedFiles.Add(contractsOutputPath);
+
+                // DependencyInjection.cs is only generated if dependencyInjectionSettings are specified
+                if (hasDependencyInjectionSettings)
+                {
+                    generatedFiles.Add(diOutputPath);
+                }
+            }
+            else
+            {
+                // Single file mode
+                string outputPath;
+                if (!string.IsNullOrWhiteSpace(outputFolder))
+                {
+                    // outputFolder is specified
+                    outputPath = Path.GetFullPath(Path.Combine(refitterFileDirectory, outputFolder, outputFilename));
+                }
+                else
+                {
+                    // No outputFolder specified - generate in current directory (default behavior)
+                    outputPath = Path.GetFullPath(Path.Combine(refitterFileDirectory, outputFilename));
+                }
+                generatedFiles.Add(outputPath);
+            }
+
+            TryLogCommandLine($"Expected generated files: {string.Join(", ", generatedFiles)}");
+            return generatedFiles;
+        }
+        catch (Exception ex)
+        {
+            TryLogError($"Error parsing .refitter file {refitterFilePath}: {ex.Message}");
+            return new List<string>();
+        }
     }
 
     private void TryLogErrorFromException(Exception e)
@@ -116,4 +234,22 @@ private void TryLogError(string text)
             // ignore
         }
     }
+
+    private static string? ExtractJsonStringValue(string json, string propertyName)
+    {
+        // Simple regex to extract string values from JSON
+        // Pattern: "propertyName": "value" or "propertyName":"value"
+        var pattern = $@"""{Regex.Escape(propertyName)}""\s*:\s*""([^""]*)""";
+        var match = Regex.Match(json, pattern, RegexOptions.IgnoreCase);
+        return match.Success ? match.Groups[1].Value : null;
+    }
+
+    private static bool ExtractJsonBoolValue(string json, string propertyName)
+    {
+        // Simple regex to extract boolean values from JSON
+        // Pattern: "propertyName": true or "propertyName":false
+        var pattern = $@"""{Regex.Escape(propertyName)}""\s*:\s*(true|false)";
+        var match = Regex.Match(json, pattern, RegexOptions.IgnoreCase);
+        return match.Success && string.Equals(match.Groups[1].Value, "true", StringComparison.OrdinalIgnoreCase);
+    }
 }

test/MSBuild/build.ps1

@@ -1,18 +1,17 @@
 Remove-Item bin -Force -Recurse
 Remove-Item obj -Force -Recurse
 dotnet build-server shutdown
-nuget locals global-packages -clear
-Remove-Item ./refitter.msbuild -Recurse -Force
+dotnet nuget locals global-packages --clear
 Remove-Item Refitter.MSBuild.*.nupkg -Force
 Remove-Item Petstore.cs
 dotnet restore ../../src/Refitter.sln
 dotnet clean -c release ../../src/Refitter.sln
 dotnet build -c release ../../src/Refitter/Refitter.csproj
 dotnet build -c release ../../src/Refitter.MSBuild/Refitter.MSBuild.csproj
 dotnet pack -c release ../../src/Refitter.MSBuild/Refitter.MSBuild.csproj -o .
-nuget add .\Refitter.MSBuild.1.0.0.nupkg -source .
+dotnet add package .\Refitter.MSBuild.1.0.0.nupkg --source .
 dotnet restore
-dotnet add package Refitter.MSBuild -s .
-dotnet build -v d -filelogger
+dotnet add package Refitter.MSBuild --source .
+dotnet run -v d -filelogger
 dotnet remove package Refitter.MSBuild
 Remove-Item Refitter.MSBuild.*.nupkg -Force