richardsondev · richardsondev · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,13 +49,15 @@ jobs:
       run: dotnet build src/AggregateConfigBuildTask.sln --configuration Release -warnaserror -p:Version=${{ steps.get_version.outputs.VERSION }}
 
     - name: Run tests for AggregateConfigBuildTask solution
-      run: dotnet test src/AggregateConfigBuildTask.sln --configuration Release -warnaserror -p:Version=${{ steps.get_version.outputs.VERSION }}
+      run: dotnet test src/AggregateConfigBuildTask.sln --configuration Release -warnaserror -p:Version=${{ steps.get_version.outputs.VERSION }} -p:CollectCoverage=true
 
     - name: Upload NuGetPackage artifact
       uses: actions/upload-artifact@v4
       with:
         name: NuGetPackage
-        path: src/Task/bin/Release/AggregateConfigBuildTask.${{ steps.get_version.outputs.VERSION }}.nupkg
+        path: |
+          src/Task/bin/Release/AggregateConfigBuildTask.${{ steps.get_version.outputs.VERSION }}.nupkg
+          src/Task/bin/Release/AggregateConfigBuildTask.${{ steps.get_version.outputs.VERSION }}.snupkg
 
   integration_tests:
     needs: build
@@ -89,7 +91,7 @@ jobs:
       run: dotnet build test/IntegrationTests.sln --configuration Release -warnaserror -p:Version=${{ needs.build.outputs.VERSION }}
 
     - name: Run IntegrationTests
-      run: dotnet test test/IntegrationTests.sln --configuration Release -warnaserror -p:Version=${{ needs.build.outputs.VERSION }}
+      run: dotnet test test/IntegrationTests.sln --configuration Release -warnaserror -p:Version=${{ needs.build.outputs.VERSION }} -p:CollectCoverage=true
 
     - name: Upload integration results artifact
       uses: actions/upload-artifact@v4

diff --git a/README.md b/README.md
@@ -25,10 +25,7 @@ dotnet add package AggregateConfigBuildTask
 Alternatively, add the following line to your `.csproj` file:
 
 ```xml
-<PackageReference Include="AggregateConfigBuildTask" Version="{latest}">
-  <PrivateAssets>all</PrivateAssets>
-  <ExcludeAssets>native;contentFiles;analyzers;runtime</ExcludeAssets>
-</PackageReference>
+<PackageReference Include="AggregateConfigBuildTask" Version="{latest}" />
 ```
 
 `{latest}` can be found [here](https://www.nuget.org/packages/AggregateConfigBuildTask#versions-body-tab).

diff --git a/src/AggregateConfigBuildTask.sln b/src/AggregateConfigBuildTask.sln
@@ -12,6 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{29D0AE56-C184-4741-824F-521198552928}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Global

diff --git a/src/Contracts/Contracts.csproj b/src/Contracts/Contracts.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
 </Project>
diff --git a/src/Contracts/InputOutputEnums.cs b/src/Contracts/InputOutputEnums.cs
@@ -1,4 +1,4 @@
-namespace AggregateConfig.Contracts
+namespace AggregateConfigBuildTask.Contracts
 {
     public enum OutputTypeEnum
     {

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,30 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <!-- Build packages-->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.4" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+  </ItemGroup>
+  <!-- Runtime packages -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" PrivateAssets="all" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" PrivateAssets="all" />
+    <PackageVersion Include="YamlDotNet" Version="16.1.0" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageVersion Include="YamlDotNet.System.Text.Json" Version="1.5.0" PrivateAssets="all" />
+  </ItemGroup>
+  <!-- Test packages -->
+  <ItemGroup>
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
+  <!-- Global packages -->
+  <ItemGroup>
+    <GlobalPackageReference Include="ReferenceTrimmer" Version="3.3.6" />
+  </ItemGroup>
+</Project>
diff --git a/src/Task/AggregateConfig.cs b/src/Task/AggregateConfig.cs
@@ -1,17 +1,15 @@
-using AggregateConfig.Contracts;
-using AggregateConfig.FileHandlers;
-using AggregateConfigBuildTask;
+using AggregateConfigBuildTask.Contracts;
+using AggregateConfigBuildTask.FileHandlers;
 using Microsoft.Build.Framework;
 using System;
 using System.IO;
-using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text.Json;
 using Task = Microsoft.Build.Utilities.Task;
 
 [assembly: InternalsVisibleTo("AggregateConfig.Tests.UnitTests")]
 
-namespace AggregateConfig
+namespace AggregateConfigBuildTask
 {
     public class AggregateConfig : Task
     {
@@ -46,8 +44,7 @@ public override bool Execute()
         {
             try
             {
-                bool hasError = false;
-                JsonElement? finalResult = null;
+                EmitHeader();
 
                 OutputFile = Path.GetFullPath(OutputFile);
 
@@ -74,48 +71,7 @@ public override bool Execute()
                     fileSystem.CreateDirectory(directoryPath);
                 }
 
-                var expectedExtensions = FileHandlerFactory.GetExpectedFileExtensions(inputType);
-                var files = fileSystem.GetFiles(InputDirectory, "*.*")
-                    .Where(file => expectedExtensions.Contains(Path.GetExtension(file).ToLower()))
-                    .ToList();
-
-                foreach (var file in files)
-                {
-                    Log.LogMessage(MessageImportance.High, "- Found file {0}", file);
-
-                    IInputReader outputWriter;
-                    try
-                    {
-                        outputWriter = FileHandlerFactory.GetInputReader(fileSystem, inputType);
-                    }
-                    catch (ArgumentException ex)
-                    {
-                        hasError = true;
-                        Log.LogError("No reader found for file {0}: {1} Stacktrace: {2}", file, ex.Message, ex.StackTrace);
-                        continue;
-                    }
-
-                    JsonElement fileData;
-                    try
-                    {
-                        fileData = outputWriter.ReadInput(file);
-                    }
-                    catch (Exception ex)
-                    {
-                        hasError = true;
-                        Log.LogError("Could not parse {0}: {1}", file, ex.Message);
-                        Log.LogErrorFromException(ex, true, true, file);
-                        continue;
-                    }
-
-                    // Merge the deserialized object into the final result
-                    finalResult = ObjectManager.MergeObjects(finalResult, fileData, file, AddSourceProperty);
-                }
-
-                if (hasError)
-                {
-                    return false;
-                }
+                var finalResult = ObjectManager.MergeFileObjects(InputDirectory, inputType, AddSourceProperty, fileSystem, Log).GetAwaiter().GetResult();
 
                 if (finalResult == null)
                 {
@@ -124,11 +80,7 @@ public override bool Execute()
                 }
 
                 var additionalPropertiesDictionary = JsonHelper.ParseAdditionalProperties(AdditionalProperties);
-                if (!ObjectManager.InjectAdditionalProperties(ref finalResult, additionalPropertiesDictionary))
-                {
-                    Log.LogError("Additional properties could not be injected since the top-level is not a JSON object.");
-                    return false;
-                }
+                finalResult = ObjectManager.InjectAdditionalProperties(finalResult, additionalPropertiesDictionary, Log).GetAwaiter().GetResult();
 
                 var writer = FileHandlerFactory.GetOutputWriter(fileSystem, outputType);
                 writer.WriteOutput(finalResult, OutputFile);
@@ -138,10 +90,20 @@ public override bool Execute()
             }
             catch (Exception ex)
             {
-                Log.LogError("An unknown exception occured: {0}", ex.Message);
+                Log.LogError("An unknown exception occurred: {0}", ex.Message);
                 Log.LogErrorFromException(ex, true, true, null);
                 return false;
             }
         }
+
+        private void EmitHeader()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var informationalVersion = assembly
+                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
+                .InformationalVersion;
+
+            Log.LogMessage($"AggregateConfig Version: {informationalVersion}");
+        }
     }
 }
diff --git a/src/Task/AggregateConfigBuildTask.csproj b/src/Task/AggregateConfigBuildTask.csproj
@@ -4,6 +4,15 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <Deterministic>true</Deterministic>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <SourceLinkCreate>true</SourceLinkCreate>
+        <NoWarn>NU5100</NoWarn>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -20,6 +29,10 @@
         <PackageReleaseNotes>https://github.com/richardsondev/AggregateConfigBuildTask/releases/tag/v$(Version)</PackageReleaseNotes>
         <PackageReadmeFile>docs/README.md</PackageReadmeFile>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <NoPackageAnalysis>true</NoPackageAnalysis>
+        <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
     </PropertyGroup>
 
     <ItemGroup>
@@ -28,28 +41,28 @@
 
     <!-- Build time packages-->
     <ItemGroup>
-        <PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" PrivateAssets="all" />
-        <PackageReference Include="ReferenceTrimmer" Version="3.3.6" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
     </ItemGroup>
 
     <!-- Runtime packages -->
     <ItemGroup>
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" PrivateAssets="all" />
-        <PackageReference Include="System.Text.Json" Version="8.0.4" PrivateAssets="all" />
-        <PackageReference Include="YamlDotNet" Version="16.1.0" PrivateAssets="all" GeneratePathProperty="true" />
-        <PackageReference Include="YamlDotNet.System.Text.Json" Version="1.5.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" PrivateAssets="all" />
+        <PackageReference Include="System.Text.Json" PrivateAssets="all" />
+        <PackageReference Include="YamlDotNet" PrivateAssets="all" GeneratePathProperty="true" />
+        <PackageReference Include="YamlDotNet.System.Text.Json" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="$(OutputPath)/Contracts.dll" Pack="true" PackagePath="/lib/netstandard2.0/" />
-        <None Include="$(OutputPath)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="/lib/netstandard2.0/" />
-        <None Include="$(OutputPath)/System.Text.Json.dll" Pack="true" PackagePath="/lib/netstandard2.0/" />
-        <None Include="$(OutputPath)/YamlDotNet.dll" Pack="true" PackagePath="/lib/netstandard2.0/" />
+        <None Include="$(OutputPath)/Contracts.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
+        <None Include="$(OutputPath)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
+        <None Include="$(OutputPath)/System.Text.Json.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
+        <None Include="$(OutputPath)/YamlDotNet.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
         <None Include="$(PkgYamlDotNet)/LICENSE.txt" Pack="true" PackagePath="/licenses/YamlDotNet">
             <Link>licenses/YamlDotNet/LICENSE.txt</Link>
         </None>
-        <None Include="$(OutputPath)/YamlDotNet.System.Text.Json.dll" Pack="true" PackagePath="/lib/netstandard2.0/" />
+        <None Include="$(OutputPath)/YamlDotNet.System.Text.Json.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
         <None Include="build/AggregateConfigBuildTask.targets" Pack="true" PackagePath="/build/AggregateConfigBuildTask.targets" />
         <None Include="../../LICENSE" Pack="true" PackagePath="/licenses/">
             <Link>licenses/LICENSE</Link>

diff --git a/src/Task/FileHandlers/ArmParametersFileHandler.cs b/src/Task/FileHandlers/ArmParametersFileHandler.cs
@@ -2,20 +2,21 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 
-namespace AggregateConfig.FileHandlers
+namespace AggregateConfigBuildTask.FileHandlers
 {
     public class ArmParametersFileHandler : IOutputWriter, IInputReader
     {
-        IFileSystem fileSystem;
+        readonly IFileSystem fileSystem;
 
         internal ArmParametersFileHandler(IFileSystem fileSystem)
         {
             this.fileSystem = fileSystem;
         }
 
         /// <inheritdoc/>
-        public JsonElement ReadInput(string inputPath)
+        public ValueTask<JsonElement> ReadInput(string inputPath)
         {
             using (var stream = fileSystem.OpenRead(inputPath))
             {
@@ -40,10 +41,10 @@ public JsonElement ReadInput(string inputPath)
                         }
 
                         var modifiedJson = modifiedParameters.ToJsonString();
-                        return JsonSerializer.Deserialize<JsonElement>(modifiedJson);
+                        return new ValueTask<JsonElement>(Task.FromResult(JsonSerializer.Deserialize<JsonElement>(modifiedJson)));
                     }
 
-                    return jsonDoc.RootElement.Clone();
+                    return new ValueTask<JsonElement>(Task.FromResult(jsonDoc.RootElement.Clone()));
                 }
             }
         }

diff --git a/src/Task/FileHandlers/FileHandlerFactory.cs b/src/Task/FileHandlers/FileHandlerFactory.cs
@@ -1,8 +1,8 @@
-using AggregateConfig.Contracts;
+using AggregateConfigBuildTask.Contracts;
 using System;
 using System.Collections.Generic;
 
-namespace AggregateConfig.FileHandlers
+namespace AggregateConfigBuildTask.FileHandlers
 {
     public static class FileHandlerFactory
     {

diff --git a/src/Task/FileHandlers/IInputReader.cs b/src/Task/FileHandlers/IInputReader.cs
@@ -1,9 +1,10 @@
 using System.Text.Json;
+using System.Threading.Tasks;
 
-namespace AggregateConfig.FileHandlers
+namespace AggregateConfigBuildTask.FileHandlers
 {
     public interface IInputReader
     {
-        JsonElement ReadInput(string inputPath);
+        ValueTask<JsonElement> ReadInput(string inputPath);
     }
 }
diff --git a/src/Task/FileHandlers/IOutputWriter.cs b/src/Task/FileHandlers/IOutputWriter.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 
-namespace AggregateConfig.FileHandlers
+namespace AggregateConfigBuildTask.FileHandlers
 {
     public interface IOutputWriter
     {

diff --git a/src/Task/FileHandlers/JsonFileHandler.cs b/src/Task/FileHandlers/JsonFileHandler.cs
@@ -1,22 +1,23 @@
 using System.Text.Json;
+using System.Threading.Tasks;
 
-namespace AggregateConfig.FileHandlers
+namespace AggregateConfigBuildTask.FileHandlers
 {
     public class JsonFileHandler : IOutputWriter, IInputReader
     {
-        IFileSystem fileSystem;
+        readonly IFileSystem fileSystem;
 
         internal JsonFileHandler(IFileSystem fileSystem)
         {
             this.fileSystem = fileSystem;
         }
 
         /// <inheritdoc/>
-        public JsonElement ReadInput(string inputPath)
+        public ValueTask<JsonElement> ReadInput(string inputPath)
         {
             using (var json = fileSystem.OpenRead(inputPath))
             {
-                return JsonSerializer.Deserialize<JsonElement>(json);
+                return JsonSerializer.DeserializeAsync<JsonElement>(json);
             }
         }