formatting and packages

f2calv · Nov 20, 2024 · d4652aa · d4652aa
1 parent 6f041c6
commit d4652aa
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 29 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <RootNamespace>CasCap</RootNamespace>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>13.0</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
     <!--nullable we enable on a per project basis-->
     <!--<Nullable>enable</Nullable>-->
     <UserSecretsId>b08b24aa-70ab-4ecd-aef9-cce6d49054ec</UserSecretsId>
-    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,38 @@
+
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+
+    <PackageVersion Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.39" />
+    <PackageVersion Include="CasCap.Common.Extensions" Version="4.2.2" />
+    <PackageVersion Include="CasCap.Common.Net" Version="4.2.2" />
+    <PackageVersion Include="CasCap.Common.Testing" Version="4.2.2" />
+    <PackageVersion Include="ConsoleTables" Version="2.6.2" />
+    <PackageVersion Include="Figgle" Version="0.5.1" />
+    <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
+    <PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Services.Release.Client" Version="19.225.1" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="ShellProgressBar" Version="5.2.0" />
+    <PackageVersion Include="YamlDotNet" Version="16.2.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
+    <PackageVersion Include="semver" Version="3.0.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+
+  </ItemGroup>
+</Project>
diff --git a/src/CasCap.Apis.AzureDevOps.Tests/CasCap.Apis.AzureDevOps.Tests.csproj b/src/CasCap.Apis.AzureDevOps.Tests/CasCap.Apis.AzureDevOps.Tests.csproj
@@ -9,22 +9,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CasCap.Common.Testing" Version="4.2.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="CasCap.Common.Testing" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+    <PackageReference Include="coverlet.msbuild">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/CasCap.Apis.AzureDevOps.Tests/Tests/ApiServiceTests.cs b/src/CasCap.Apis.AzureDevOps.Tests/Tests/ApiServiceTests.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using Xunit;
 using Xunit.Abstractions;
+
 namespace CasCap.Apis.AzureDevOps.Tests;
 
 public class ApiServiceTests : TestBase

diff --git a/src/CasCap.Apis.AzureDevOps.Tests/Tests/TestBase.cs b/src/CasCap.Apis.AzureDevOps.Tests/Tests/TestBase.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
+
 namespace CasCap.Apis.AzureDevOps.Tests;
 
 public abstract class TestBase

diff --git a/src/CasCap.Apis.AzureDevOps/CasCap.Apis.AzureDevOps.csproj b/src/CasCap.Apis.AzureDevOps/CasCap.Apis.AzureDevOps.csproj
@@ -12,16 +12,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.39" />
-    <PackageReference Include="CasCap.Common.Extensions" Version="4.2.2" />
-    <PackageReference Include="CasCap.Common.Net" Version="4.2.2" />
-    <PackageReference Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
-    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Services.Release.Client" Version="19.225.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="semver" Version="3.0.0" />
-    <PackageReference Include="YamlDotNet" Version="16.2.0" />
+    <PackageReference Include="AzurePipelinesToGitHubActionsConverter.Core" />
+    <PackageReference Include="CasCap.Common.Extensions" />
+    <PackageReference Include="CasCap.Common.Net" />
+    <PackageReference Include="Microsoft.TeamFoundation.DistributedTask.WebApi" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" />
+    <PackageReference Include="Microsoft.VisualStudio.Services.Client" />
+    <PackageReference Include="Microsoft.VisualStudio.Services.Release.Client" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="semver" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CasCap.Apis.AzureDevOps/Models/Yaml/Pipeline.cs b/src/CasCap.Apis.AzureDevOps/Models/Yaml/Pipeline.cs
@@ -1,6 +1,7 @@
 using AzurePipelinesToGitHubActionsConverter.Core.AzurePipelines;
 using CasCap.Utilities;
 using YamlDotNet.Serialization;
+
 namespace CasCap.Models;
 
 public class Pipeline

diff --git a/src/CasCap.Apis.AzureDevOps/Models/Yaml/StageAzDO.cs b/src/CasCap.Apis.AzureDevOps/Models/Yaml/StageAzDO.cs
@@ -1,4 +1,5 @@
 using AzurePipelinesToGitHubActionsConverter.Core.AzurePipelines;
+
 namespace CasCap.Models;
 
 public class StageAzDO// : Stage //we can't inherit from Stage here as it will mess up the order of the properties when YAMLised.

diff --git a/src/CasCap.Apis.AzureDevOps/Models/Yaml/Template.cs b/src/CasCap.Apis.AzureDevOps/Models/Yaml/Template.cs
@@ -1,5 +1,6 @@
 using Microsoft.TeamFoundation.DistributedTask.WebApi;
 using YamlDotNet.Serialization;
+
 namespace CasCap.Models;
 
 public class Template : Pipeline

diff --git a/src/CasCap.Apis.AzureDevOps/Models/Yaml/TriggerAzDO.cs b/src/CasCap.Apis.AzureDevOps/Models/Yaml/TriggerAzDO.cs
@@ -1,4 +1,5 @@
 using AzurePipelinesToGitHubActionsConverter.Core.AzurePipelines;
+
 namespace CasCap.Models;
 
 public class TriggerAzDO : Trigger

diff --git a/src/CasCap.Apis.AzureDevOps/Services/ApiService.cs b/src/CasCap.Apis.AzureDevOps/Services/ApiService.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using System.Net.Http.Headers;
 using System.Text;
+
 namespace CasCap.Services;
 
 public interface IApiService

diff --git a/src/CasCap.Apis.AzureDevOps/Utilities/LiteralMultilineEventEmitter.cs b/src/CasCap.Apis.AzureDevOps/Utilities/LiteralMultilineEventEmitter.cs
@@ -1,6 +1,7 @@
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.EventEmitters;
+
 namespace CasCap.Utilities;
 
 public class LiteralMultilineEventEmitter : ChainedEventEmitter

diff --git a/src/CasCap.Apis.AzureDevOps/Utilities/YamlPipelineGenerator.cs b/src/CasCap.Apis.AzureDevOps/Utilities/YamlPipelineGenerator.cs
@@ -9,6 +9,7 @@
 using System.Collections.Concurrent;
 using System.Text;
 using System.Text.RegularExpressions;
+
 namespace CasCap.Utilities;
 
 public class YamlPipelineGenerator

diff --git a/src/CasCap.DevOpsYamlizrCli/CasCap.DevOpsYamlizrCli.csproj b/src/CasCap.DevOpsYamlizrCli/CasCap.DevOpsYamlizrCli.csproj
@@ -14,13 +14,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConsoleTables" Version="2.6.2" />
-    <PackageReference Include="Figgle" Version="0.5.1" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-    <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageReference Include="ShellProgressBar" Version="5.2.0" />
+    <PackageReference Include="ConsoleTables" />
+    <PackageReference Include="Figgle" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
+    <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="ShellProgressBar" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CasCap.DevOpsYamlizrCli/Commands/CommandBase.cs b/src/CasCap.DevOpsYamlizrCli/Commands/CommandBase.cs
@@ -10,6 +10,7 @@
 using Microsoft.VisualStudio.Services.WebApi;
 using ShellProgressBar;
 using System.Diagnostics;
+
 namespace CasCap.Commands;
 
 /// <summary>

diff --git a/src/CasCap.DevOpsYamlizrCli/Commands/GenerateCommand.cs b/src/CasCap.DevOpsYamlizrCli/Commands/GenerateCommand.cs
@@ -11,6 +11,7 @@
 using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
+
 namespace CasCap.Commands;
 
 [Command(Description = "Generate Azure DevOps YAML pipelines from classic definitions.")]

diff --git a/src/CasCap.DevOpsYamlizrCli/Program.cs b/src/CasCap.DevOpsYamlizrCli/Program.cs
@@ -2,6 +2,7 @@
 using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+
 namespace CasCap;
 
 [Command("yamlizr")]