Skip to content

Commit

Permalink
file scoped namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
joaope committed Dec 1, 2023
1 parent cee0d42 commit 316fa00
Show file tree
Hide file tree
Showing 69 changed files with 2,252 additions and 2,321 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,73 @@
using System.Collections.ObjectModel;
using System.Linq;

namespace LocalAppVeyor.Engine.Configuration
namespace LocalAppVeyor.Engine.Configuration;

public class AllowedJobFailureConditions
{
public class AllowedJobFailureConditions
{
public string OperatingSystem { get; }
public string OperatingSystem { get; }

public string Configuration { get; }

public string Configuration { get; }
public string Platform { get; }

public string Platform { get; }
public string TestCategory { get; }

public string TestCategory { get; }
public ReadOnlyCollection<Variable> Variables { get; }

public ReadOnlyCollection<Variable> Variables { get; }
public AllowedJobFailureConditions(
string operatingSystem,
string configuration,
string platform,
string testCategory,
IEnumerable<Variable> variables)
{
OperatingSystem = operatingSystem;
Configuration = configuration;
Platform = platform;
TestCategory = testCategory;
Variables = new ReadOnlyCollection<Variable>(variables?.ToList() ?? new List<Variable>());
}

public AllowedJobFailureConditions(
string operatingSystem,
string configuration,
string platform,
string testCategory,
IEnumerable<Variable> variables)
public bool AreConditionsMetForJob(MatrixJob job)
{
if (job == null)
{
OperatingSystem = operatingSystem;
Configuration = configuration;
Platform = platform;
TestCategory = testCategory;
Variables = new ReadOnlyCollection<Variable>(variables?.ToList() ?? new List<Variable>());
return false;
}

public bool AreConditionsMetForJob(MatrixJob job)
if (!string.IsNullOrEmpty(OperatingSystem))
{
if (job == null)
if (OperatingSystem != job.OperatingSystem)
{
return false;
}
}

if (!string.IsNullOrEmpty(OperatingSystem))
{
if (OperatingSystem != job.OperatingSystem)
{
return false;
}
}

if (!string.IsNullOrEmpty(Configuration))
if (!string.IsNullOrEmpty(Configuration))
{
if (Configuration != job.Configuration)
{
if (Configuration != job.Configuration)
{
return false;
}
return false;
}
}

if (!string.IsNullOrEmpty(Platform))
if (!string.IsNullOrEmpty(Platform))
{
if (Platform != job.Platform)
{
if (Platform != job.Platform)
{
return false;
}
return false;
}
}

if (Variables.Count > 0)
if (Variables.Count > 0)
{
if (!Variables.All(v => job.Variables.Contains(v)))
{
if (!Variables.All(v => job.Variables.Contains(v)))
{
return false;
}
return false;
}

return true;
}

return true;
}
}
61 changes: 30 additions & 31 deletions src/LocalAppVeyor.Engine/Configuration/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
namespace LocalAppVeyor.Engine.Configuration
namespace LocalAppVeyor.Engine.Configuration;

public class AssemblyInfo
{
public class AssemblyInfo
{
public bool Patch { get; }
public bool Patch { get; }

public ExpandableString File { get; }
public ExpandableString File { get; }

public ExpandableString AssemblyVersion { get; }
public ExpandableString AssemblyVersion { get; }

public ExpandableString AssemblyFileVersion { get; }
public ExpandableString AssemblyFileVersion { get; }

public ExpandableString AssemblyInformationalVersion { get; }
public ExpandableString AssemblyInformationalVersion { get; }

public AssemblyInfo()
: this(
false,
null,
null,
null,
null)
{
}
public AssemblyInfo()
: this(
false,
null,
null,
null,
null)
{
}

public AssemblyInfo(
bool patch,
ExpandableString file,
ExpandableString assemblyVersion,
ExpandableString assemblyFileVersion,
ExpandableString assemblyInformationalVersion)
{
Patch = patch;
File = file;
AssemblyVersion = assemblyVersion;
AssemblyFileVersion = assemblyFileVersion;
AssemblyInformationalVersion = assemblyInformationalVersion;
}
public AssemblyInfo(
bool patch,
ExpandableString file,
ExpandableString assemblyVersion,
ExpandableString assemblyFileVersion,
ExpandableString assemblyInformationalVersion)
{
Patch = patch;
File = file;
AssemblyVersion = assemblyVersion;
AssemblyFileVersion = assemblyFileVersion;
AssemblyInformationalVersion = assemblyInformationalVersion;
}
}
}
45 changes: 22 additions & 23 deletions src/LocalAppVeyor.Engine/Configuration/Build.cs
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
namespace LocalAppVeyor.Engine.Configuration
namespace LocalAppVeyor.Engine.Configuration;

public class Build
{
public class Build
{
public bool IsAutomaticBuildOff { get; }
public bool IsAutomaticBuildOff { get; }

public bool IsParallel { get; }
public bool IsParallel { get; }

public ExpandableString SolutionFile { get; }
public ExpandableString SolutionFile { get; }

public BuildVerbosity Verbosity { get; }
public BuildVerbosity Verbosity { get; }

public Build()
: this(true, false, null, BuildVerbosity.Normal)
{
}
public Build()
: this(true, false, null, BuildVerbosity.Normal)
{
}

public Build(
bool isAutomaticBuildOff,
bool isParallel,
ExpandableString solutionFile,
BuildVerbosity verbosity)
{
IsAutomaticBuildOff = isAutomaticBuildOff;
IsParallel = isParallel;
SolutionFile = solutionFile;
Verbosity = verbosity;
}
public Build(
bool isAutomaticBuildOff,
bool isParallel,
ExpandableString solutionFile,
BuildVerbosity verbosity)
{
IsAutomaticBuildOff = isAutomaticBuildOff;
IsParallel = isParallel;
SolutionFile = solutionFile;
Verbosity = verbosity;
}
}
}
Loading

0 comments on commit 316fa00

Please sign in to comment.