Skip to content

Commit ca9528f

Browse files
OctobobOctobob
committed
Run ReSharper code cleanup
1 parent 3383bf9 commit ca9528f

30 files changed

+3212
-3228
lines changed

‎build/Build.cs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,24 @@
2222
[ShutdownDotNetAfterServerBuild]
2323
class Build : NukeBuild
2424
{
25-
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
26-
public Configuration Configuration => IsLocalBuild ? Configuration.Debug : Configuration.Release;
25+
[Parameter(
26+
"Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")]
27+
readonly bool AutoDetectBranch = IsLocalBuild;
2728

28-
[Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch.", Name = "OCTOVERSION_CurrentBranch")]
29+
[Parameter(
30+
"Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch.",
31+
Name = "OCTOVERSION_CurrentBranch")]
2932
readonly string BranchName;
30-
[Parameter("Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")]
31-
readonly bool AutoDetectBranch = IsLocalBuild;
32-
[OctoVersion(UpdateBuildNumber = true, BranchParameter = nameof(BranchName), AutoDetectBranchParameter = nameof(AutoDetectBranch), Framework = "net8.0")]
33+
34+
[OctoVersion(UpdateBuildNumber = true, BranchParameter = nameof(BranchName),
35+
AutoDetectBranchParameter = nameof(AutoDetectBranch), Framework = "net8.0")]
3336
readonly OctoVersionInfo OctoVersionInfo;
3437

3538
[Solution] readonly Solution Solution;
3639

40+
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
41+
public Configuration Configuration => IsLocalBuild ? Configuration.Debug : Configuration.Release;
42+
3743
AbsolutePath SourceDirectory => RootDirectory / "source";
3844
AbsolutePath TestsDirectory => RootDirectory / "tests";
3945
AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
@@ -48,13 +54,15 @@ class Build : NukeBuild
4854
EnsureCleanDirectory(ArtifactsDirectory);
4955
EnsureCleanDirectory(PublishDirectory);
5056
});
57+
5158
Target Restore => _ => _
5259
.DependsOn(Clean)
5360
.Executes(() =>
5461
{
5562
DotNetRestore(s => s
5663
.SetProjectFile(Solution));
5764
});
65+
5866
Target Compile => _ => _
5967
.DependsOn(Restore)
6068
.Executes(() =>
@@ -65,6 +73,7 @@ class Build : NukeBuild
6573
.SetVersion(OctoVersionInfo.FullSemVer)
6674
.EnableNoRestore());
6775
});
76+
6877
Target Test => _ => _
6978
.DependsOn(Compile)
7079
.Executes(() =>
@@ -93,7 +102,8 @@ class Build : NukeBuild
93102
.AddProperty("Version", OctoVersionInfo.FullSemVer)
94103
);
95104

96-
TeamCity.Instance?.PublishArtifacts(ArtifactsDirectory / $"Octopus.CoreParsers.Hcl.{OctoVersionInfo.FullSemVer}.nupkg");
105+
TeamCity.Instance?.PublishArtifacts(ArtifactsDirectory /
106+
$"Octopus.CoreParsers.Hcl.{OctoVersionInfo.FullSemVer}.nupkg");
97107
});
98108

99109
Target CopyToLocalPackages => _ => _

‎build/_build.csproj.DotSettings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
1717
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
1818
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
19+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
20+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
1921
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
2022
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
2123
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -24,4 +26,5 @@
2426
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
2527
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
2628
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
27-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
29+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
30+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)