Refactoring

ellizio · Jun 27, 2024 · bb22df7 · bb22df7
1 parent 7d226fb
commit bb22df7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/src/Kiota.Autogen.Swagger/Kiota.Autogen.Swagger.csproj b/src/Kiota.Autogen.Swagger/Kiota.Autogen.Swagger.csproj
@@ -13,7 +13,6 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.10.4" PrivateAssets="All" />
       <PackageReference Include="System.Text.Json" Version="8.0.3" PrivateAssets="All" />
-<!--      <PackageReference Include="YamlDotNet" Version="15.3.0" />-->
     </ItemGroup>
 
 </Project>
diff --git a/src/Kiota.Autogen.Swagger/Tasks/DeterminePackageVersionTask.cs b/src/Kiota.Autogen.Swagger/Tasks/DeterminePackageVersionTask.cs
@@ -78,7 +78,9 @@ private class Framework
         {
             [JsonPropertyName("framework")]
             public string Version { get; set; } = default!;
+
             public IEnumerable<Package>? TopLevelPackages { get; set; }
+
             public IEnumerable<Package>? TransitivePackages { get; set; }
         }
 

diff --git a/src/Kiota.Autogen.Swagger/Tasks/ParseSettingsTask.cs b/src/Kiota.Autogen.Swagger/Tasks/ParseSettingsTask.cs
@@ -8,18 +8,13 @@ namespace Kiota.Autogen.Swagger.Tasks
 {
     public class ParseSettingsTask : Task
     {
-        private const string SettingsJsonFile = "settings.json";
+        private const string SettingsJsonFile = "gensettings.json";
 
         [Output] public ITaskItem[] Settings { get; set; } = default!;
 
         public override bool Execute()
         {
-            IReadOnlyCollection<Setting> settings;
-
-            if (File.Exists(SettingsJsonFile))
-                settings = DeserializeJson();
-            else
-                return false;
+            var settings = Deserialize();
 
             var output = new List<ITaskItem>(settings.Count);
             foreach (var setting in settings)
@@ -36,7 +31,7 @@ public override bool Execute()
             return true;
         }
 
-        private static IReadOnlyCollection<Setting> DeserializeJson()
+        private static IReadOnlyCollection<Setting> Deserialize()
         {
             using var sr = new FileStream(SettingsJsonFile, FileMode.Open);
             return JsonSerializer.Deserialize<List<Setting>>(sr, new JsonSerializerOptions { PropertyNameCaseInsensitive = true })!;

diff --git a/src/Kiota.Autogen.Swagger/build/Kiota.Autogen.Swagger.targets b/src/Kiota.Autogen.Swagger/build/Kiota.Autogen.Swagger.targets
@@ -9,6 +9,7 @@
 
     <Target Name="Validate" BeforeTargets="DetermineProject">
         <Error Text="Multiple frameworks currently not supported" Condition="$(TargetFrameworks) != ''" />
+        <Error Text="gensettings.json not found" Condition="!Exists('gensettings.json')" />
     </Target>
 
     <Target Name="DetermineProject" BeforeTargets="DetermineSwagger">
@@ -49,14 +50,4 @@
         </ItemGroup>
     </Target>
 
-<!--    <Target Name="Clean" BeforeTargets="BeforeClean;BeforeBuild;BeforeRebuild;Validate">-->
-<!--        <ItemGroup>-->
-<!--            <CleanDirectories Include="**/" />-->
-<!--            <CleanFiles Include="*.json"-->
-<!--                        Exclude="settings.json" />-->
-<!--        </ItemGroup>-->
-<!--        -->
-<!--        <RemoveDir Directories="@(CleanDirectories)" />-->
-<!--        <Delete Files="@(CleanFiles)" />-->
-<!--    </Target>-->
 </Project>