Merge pull request #96 from OctopusDeploy/fix-code-format-settings

Fix code format settings
OctopusDeploy · Apr 6, 2022 · d6bfa79 · d6bfa79
2 parents e39e9c3 + d6942ca
commit d6bfa79
Show file tree

Hide file tree

Showing 55 changed files with 885 additions and 524 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -37,34 +37,34 @@ jobs:
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <packageSources>
-    <add key="Octopus Dependencies" value="https://f.feedz.io/octopus-deploy/dependencies/nuget" />
-    <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
-    <add key="GitHub" value="https://nuget.pkg.github.com/OctopusDeploy/index.json" />
-  </packageSources>
+    <packageSources>
+        <add key="Octopus Dependencies" value="https://f.feedz.io/octopus-deploy/dependencies/nuget"/>
+        <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json"/>
+        <add key="GitHub" value="https://nuget.pkg.github.com/OctopusDeploy/index.json"/>
+    </packageSources>
 </configuration>
diff --git a/build/Build.cs b/build/Build.cs
@@ -29,12 +29,13 @@ class Build : NukeBuild, IExtensionBuild
 
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     public Enumeration Config => Configuration.Release;
+
+    public string NuspecFilePath => "../../build/Octopus.Server.Extensibility.JiraIntegration.nuspec";
+
     /// Support plugins are available for:
     /// - JetBrains ReSharper        https://nuke.build/resharper
     /// - JetBrains Rider            https://nuke.build/rider
     /// - Microsoft VisualStudio     https://nuke.build/visualstudio
     /// - Microsoft VSCode           https://nuke.build/vscode
     public static int Main() => Execute<Build>(x => ((IExtensionBuild)x).Default);
-
-    public string NuspecFilePath => "../../build/Octopus.Server.Extensibility.JiraIntegration.nuspec";
-}
+}
diff --git a/build/Configuration.cs b/build/Configuration.cs
@@ -1,14 +1,15 @@
+using System;
 using System.ComponentModel;
 using Nuke.Common.Tooling;
 
 [TypeConverter(typeof(TypeConverter<Configuration>))]
 public class Configuration : Enumeration
 {
-    public static Configuration Debug = new Configuration { Value = nameof(Debug) };
-    public static Configuration Release = new Configuration { Value = nameof(Release) };
+    public static Configuration Debug = new()
+        { Value = nameof(Debug) };
 
-    public static implicit operator string(Configuration configuration)
-    {
-        return configuration.Value;
-    }
+    public static Configuration Release = new()
+        { Value = nameof(Release) };
+
+    public static implicit operator string(Configuration configuration) => configuration.Value;
 }
diff --git a/build/Octopus.Server.Extensibility.JiraIntegration.nuspec b/build/Octopus.Server.Extensibility.JiraIntegration.nuspec
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" xmlns:octopus="http://octopus.org">
-  <metadata>
-    <id>Octopus.Server.Extensibility.JiraIntegration</id>
-    <title>Octopus Server Extensibility Issue Tracker - Jira Integration</title>
-    <version>$version$</version>
-    <authors>Octopus Deploy</authors>
-    <owners>Octopus Deploy Pty. Ltd.</owners>
-    <summary>Octopus Deploy Jira Integration issue tracker.</summary>
-    <description>
-      Implements the Jira Integration issue tracker.
-    </description>
-    <language>en-US</language>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/OctopusDeploy/JiraIntegration/blob/main/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/OctopusDeploy/JiraIntegration</projectUrl>
-    <repository type="git" url="https://github.com/OctopusDeploy/JiraIntegration" />
-    <iconUrl>https://i.octopusdeploy.com/resources/Avatar3_360.png</iconUrl>
-    <tags>automation deployment</tags>
-    <developmentDependency>true</developmentDependency>
-  </metadata>
-  <files>
-    <file src="..\source\Server\bin\Release\net5.0\*.dll" target="tools" />
-  </files>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>Octopus.Server.Extensibility.JiraIntegration</id>
+        <title>Octopus Server Extensibility Issue Tracker - Jira Integration</title>
+        <version>$version$</version>
+        <authors>Octopus Deploy</authors>
+        <owners>Octopus Deploy Pty. Ltd.</owners>
+        <summary>Octopus Deploy Jira Integration issue tracker.</summary>
+        <description>
+            Implements the Jira Integration issue tracker.
+        </description>
+        <language>en-US</language>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <licenseUrl>https://github.com/OctopusDeploy/JiraIntegration/blob/main/LICENSE.txt</licenseUrl>
+        <projectUrl>https://github.com/OctopusDeploy/JiraIntegration</projectUrl>
+        <repository type="git" url="https://github.com/OctopusDeploy/JiraIntegration"/>
+        <iconUrl>https://i.octopusdeploy.com/resources/Avatar3_360.png</iconUrl>
+        <tags>automation deployment</tags>
+        <developmentDependency>true</developmentDependency>
+    </metadata>
+    <files>
+        <file src="..\source\Server\bin\Release\net5.0\*.dll" target="tools"/>
+    </files>
 </package>
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace></RootNamespace>
-    <NoWarn>CS0649;CS0169</NoWarn>
-    <NukeRootDirectory>..</NukeRootDirectory>
-    <NukeScriptDirectory>..</NukeScriptDirectory>
-    <NukeTelemetryVersion>1</NukeTelemetryVersion>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+        <RootNamespace></RootNamespace>
+        <NoWarn>CS0649;CS0169</NoWarn>
+        <NukeRootDirectory>..</NukeRootDirectory>
+        <NukeScriptDirectory>..</NukeScriptDirectory>
+        <NukeTelemetryVersion>1</NukeTelemetryVersion>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageDownload Include="OctoVersion.Tool" Version="[0.2.645]" />
-    <PackageReference Include="Nuke.Common" Version="5.3.0" />
-    <PackageDownload Include="JetBrains.ReSharper.GlobalTools" Version="[2021.2.0]" />
-    <PackageReference Include="Octopus.NukeBuildComponents" Version="0.1.29" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageDownload Include="OctoVersion.Tool" Version="[0.2.645]"/>
+        <PackageReference Include="Nuke.Common" Version="5.3.0"/>
+        <PackageDownload Include="JetBrains.ReSharper.GlobalTools" Version="[2021.2.0]"/>
+        <PackageReference Include="Octopus.NukeBuildComponents" Version="0.1.29"/>
+    </ItemGroup>
 
 </Project>
diff --git a/source/Client/Client.csproj b/source/Client/Client.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
-    <RootNamespace>Octopus.Client.Extensibility.JiraIntegration</RootNamespace>
-    <AssemblyName>Octopus.Client.Extensibility.JiraIntegration</AssemblyName>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <Authors>Octopus Deploy</Authors>
-    <Company>Octopus Deploy Pty. Ltd.</Company>
-    <Product>Octopus Deploy Client Extensibility - Jira</Product>
-    <Description>Octopus Deploy Client Extensibility for the Jira Integration and Service Desk</Description>
-    <PackageId>Octopus.Client.Extensibility.JiraIntegration</PackageId>
-    <PackageIconUrl>https://i.octopusdeploy.com/resources/Avatar3_360.png</PackageIconUrl>
-    <PackageLicenseUrl>https://github.com/OctopusDeploy/JiraIntegration/blob/master/LICENSE.txt</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/OctopusDeploy/JiraIntegration</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/OctopusDeploy/JiraIntegration</RepositoryUrl>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Octopus.Server.Client" Version="11.2.3319" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+        <RootNamespace>Octopus.Client.Extensibility.JiraIntegration</RootNamespace>
+        <AssemblyName>Octopus.Client.Extensibility.JiraIntegration</AssemblyName>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <Authors>Octopus Deploy</Authors>
+        <Company>Octopus Deploy Pty. Ltd.</Company>
+        <Product>Octopus Deploy Client Extensibility - Jira</Product>
+        <Description>Octopus Deploy Client Extensibility for the Jira Integration and Service Desk</Description>
+        <PackageId>Octopus.Client.Extensibility.JiraIntegration</PackageId>
+        <PackageIconUrl>https://i.octopusdeploy.com/resources/Avatar3_360.png</PackageIconUrl>
+        <PackageLicenseUrl>https://github.com/OctopusDeploy/JiraIntegration/blob/master/LICENSE.txt</PackageLicenseUrl>
+        <PackageProjectUrl>https://github.com/OctopusDeploy/JiraIntegration</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/OctopusDeploy/JiraIntegration</RepositoryUrl>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Octopus.Server.Client" Version="11.2.3319"/>
+    </ItemGroup>
 </Project>
diff --git a/source/Client/JiraConfigurationResource.cs b/source/Client/JiraConfigurationResource.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using Octopus.Client.Extensibility.Attributes;
 using Octopus.Client.Extensibility.Extensions.Infrastructure.Configuration;
 using Octopus.Client.Model;
@@ -43,7 +44,7 @@ public class ReleaseNoteOptionsResource
         [Description(UsernameDescription)]
         [Writeable]
         public string Username { get; set; }
-        
+
         [DisplayName("Jira Password")]
         [Description(PasswordDescription)]
         [Writeable]
@@ -54,4 +55,4 @@ public class ReleaseNoteOptionsResource
         [Writeable]
         public string ReleaseNotePrefix { get; set; }
     }
-}
+}