From c88b7a7a0ba4317fe21c2ba4ff10ce3839f1d1dd Mon Sep 17 00:00:00 2001 From: Chrison Simtian Date: Sun, 31 May 2026 22:09:00 +1200 Subject: [PATCH 1/4] =?UTF-8?q?tooling:=20add=20OnionRewriter=20(dry-run)?= =?UTF-8?q?=20=E2=80=94=20scopes=20the=20Application=20ring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Roslyn syntax tool for the ADR-0006 namespace moves: rewrites namespace decls in the source project + qualified refs to moved types, and fixes usings by type identity. Dry-run quantifies the Application ring: 91 moved types across ~392 files. Finding: syntactic reference-resolution is not precise enough for a clean apply — simple-name collisions across namespaces (e.g. lower layers like ProjectModel matching a moved type's name) cause spurious usings and risk CS0104 ambiguities. The namespace-decl + qualified-name passes are correct; the using fixup needs a semantic upgrade (MSBuildWorkspace + symbol resolution) before applying. Dry-run only; mutates nothing. Co-Authored-By: Claude Opus 4.8 --- tools/OnionRewriter/OnionRewriter.csproj | 18 +++ tools/OnionRewriter/Program.cs | 172 +++++++++++++++++++++++ 2 files changed, 190 insertions(+) create mode 100644 tools/OnionRewriter/OnionRewriter.csproj create mode 100644 tools/OnionRewriter/Program.cs diff --git a/tools/OnionRewriter/OnionRewriter.csproj b/tools/OnionRewriter/OnionRewriter.csproj new file mode 100644 index 000000000..857a12404 --- /dev/null +++ b/tools/OnionRewriter/OnionRewriter.csproj @@ -0,0 +1,18 @@ + + + + + Exe + net10.0 + enable + enable + false + + + + + + + diff --git a/tools/OnionRewriter/Program.cs b/tools/OnionRewriter/Program.cs new file mode 100644 index 000000000..2f062553d --- /dev/null +++ b/tools/OnionRewriter/Program.cs @@ -0,0 +1,172 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; + +// OnionRewriter — ADR-0006. Moves every type declared in a source project out of an old namespace +// prefix into a new one, and fixes references across the repo. The hard part it exists for: the old +// root namespace (Fallout.Common) is shared across several projects, so it disambiguates per file by +// the *types actually referenced* — adding/keeping/dropping `using`s accordingly. Biased to +// over-approximate (extra usings are harmless; the compiler catches any genuine miss). +// +// Usage: dotnet run --project tools/OnionRewriter [-- --apply] +// (default = dry run: report only, mutate nothing) + +var apply = args.Contains("--apply"); +var repo = Directory.GetCurrentDirectory(); +var sourceProj = Path.Combine(repo, "src", "Fallout.Build") + Path.DirectorySeparatorChar; + +const string OldRoot = "Fallout.Common"; +const string NewRoot = "Fallout.Application"; +const string OldExt = "Fallout.Build.Execution.Extensions"; +const string NewExt = "Fallout.Application.Execution.Extensions"; + +bool IsMovable(string ns) => ns == OldRoot || ns.StartsWith(OldRoot + ".") || ns == OldExt || ns.StartsWith(OldExt + "."); +string MapNs(string ns) => + ns == OldRoot || ns.StartsWith(OldRoot + ".") ? NewRoot + ns[OldRoot.Length..] + : ns == OldExt || ns.StartsWith(OldExt + ".") ? NewExt + ns[OldExt.Length..] + : ns; + +IEnumerable CsFiles(params string[] roots) => + roots.Where(Directory.Exists) + .SelectMany(r => Directory.EnumerateFiles(r, "*.cs", SearchOption.AllDirectories)) + .Where(p => !p.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}") + && !p.Contains($"{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}") + && !p.Contains($"{Path.DirectorySeparatorChar}.claude{Path.DirectorySeparatorChar}") + && !p.Contains($"{Path.DirectorySeparatorChar}vendor{Path.DirectorySeparatorChar}")); + +static string? NsOf(SyntaxNode n) => + n.Ancestors().OfType().FirstOrDefault()?.Name.ToString(); + +// True when a name appears in a type position (so an added `using` is warranted). Excludes the +// member name in `x.Foo` and the bare call target in `Foo(...)` — the main false-positive sources. +static bool IsTypePosition(SimpleNameSyntax n) => + !(n.Parent is MemberAccessExpressionSyntax ma && ma.Name == n) + && !(n.Parent is InvocationExpressionSyntax inv && inv.Expression == n); + +IEnumerable<(string Name, string Ns)> TopLevelTypes(SyntaxNode root) +{ + foreach (var t in root.DescendantNodes().OfType()) + if (t.Parent is BaseNamespaceDeclarationSyntax && NsOf(t) is { } ns) + yield return (t.Identifier.Text, ns); + foreach (var d in root.DescendantNodes().OfType()) + if (d.Parent is BaseNamespaceDeclarationSyntax && NsOf(d) is { } ns) + yield return (d.Identifier.Text, ns); +} + +// Pass A — types declared in the source project under a movable namespace (these MOVE). +var movedTypes = new Dictionary(); // simpleName -> new namespace +var movedNamespaces = new HashSet(); // old movable namespaces actually present +foreach (var f in CsFiles(sourceProj)) + foreach (var (name, ns) in TopLevelTypes(CSharpSyntaxTree.ParseText(File.ReadAllText(f)).GetRoot())) + if (IsMovable(ns)) { movedTypes[name] = MapNs(ns); movedNamespaces.Add(ns); } + +// Pass B — types under Fallout.Common.* declared OUTSIDE the source project (these STAY = residual). +var residualByNs = new Dictionary>(); +foreach (var f in CsFiles(Path.Combine(repo, "src"))) +{ + if (f.StartsWith(sourceProj, StringComparison.Ordinal)) continue; + foreach (var (name, ns) in TopLevelTypes(CSharpSyntaxTree.ParseText(File.ReadAllText(f)).GetRoot())) + if (ns == OldRoot || ns.StartsWith(OldRoot + ".")) + (residualByNs.TryGetValue(ns, out var s) ? s : residualByNs[ns] = new()).Add(name); +} + +// Pass C — rewrite references repo-wide. +int filesChanged = 0, usingsAdded = 0, usingsDropped = 0, nsDecls = 0; +var samples = new List(); + +foreach (var f in CsFiles(Path.Combine(repo, "src"), Path.Combine(repo, "tests"), Path.Combine(repo, "build"))) +{ + var original = File.ReadAllText(f); + var cu = (CompilationUnitSyntax)CSharpSyntaxTree.ParseText(original).GetRoot(); + var isSource = f.StartsWith(sourceProj, StringComparison.Ordinal); + + // (1) Source-project files: rewrite their namespace declarations. + if (isSource) + { + var before = nsDecls; + cu = (CompilationUnitSyntax)new NsRewriter(IsMovable, MapNs, () => nsDecls++).Visit(cu); + if (nsDecls > before) { /* counted */ } + } + + // (1b) Rewrite fully-qualified references to moved types (e.g. Fallout.Common.Execution.Foo). + cu = (CompilationUnitSyntax)new QualNameRewriter(IsMovable, MapNs, movedTypes).Visit(cu); + + // (2) All files: fix usings by type identity. + // - DROP decision uses a BROAD reference set (every identifier) so we only ever over-keep — safe. + // - ADD decision uses a TYPE-POSITION-filtered set so we don't add usings for method/property + // names that merely collide with a moved type's simple name. + var referencedAll = cu.DescendantNodes().OfType().Select(n => n.Identifier.Text).ToHashSet(); + var referencedTypes = cu.DescendantNodes().OfType().Where(IsTypePosition).Select(n => n.Identifier.Text).ToHashSet(); + var fileNs = cu.DescendantNodes().OfType().FirstOrDefault()?.Name.ToString(); + + var keep = new List(); + foreach (var u in cu.Usings) + { + var name = u.Name?.ToString(); + if (name != null && movedNamespaces.Contains(name)) + { + var residualUsed = residualByNs.TryGetValue(name, out var set) && set.Overlaps(referencedAll); + if (residualUsed) keep.Add(u); else usingsDropped++; // drop usings now empty of residual types + } + else keep.Add(u); + } + + var needed = referencedTypes.Where(movedTypes.ContainsKey).Select(n => movedTypes[n]).Distinct(); + foreach (var ns in needed) + { + if (ns == fileNs) continue; + if (keep.Any(u => u.Name?.ToString() == ns)) continue; + keep.Add(ParseCompilationUnit($"using {ns};\n").Usings[0]); + usingsAdded++; + } + + cu = cu.WithUsings(List(keep)); + var updated = cu.ToFullString(); + if (updated != original) + { + filesChanged++; + if (samples.Count < 12) samples.Add(Path.GetRelativePath(repo, f)); + if (apply) File.WriteAllText(f, updated); + } +} + +Console.WriteLine($"OnionRewriter ({(apply ? "APPLY" : "dry-run")})"); +Console.WriteLine($" moved types : {movedTypes.Count}"); +Console.WriteLine($" moved namespaces : {string.Join(", ", movedNamespaces.OrderBy(x => x))}"); +Console.WriteLine($" residual namespaces: {string.Join(", ", residualByNs.Keys.OrderBy(x => x))}"); +Console.WriteLine($" files changed : {filesChanged}"); +Console.WriteLine($" namespace decls : {nsDecls}"); +Console.WriteLine($" usings added : {usingsAdded}"); +Console.WriteLine($" usings dropped : {usingsDropped}"); +Console.WriteLine($" sample files :\n {string.Join("\n ", samples)}"); + +sealed class NsRewriter(Func isMovable, Func map, Action onHit) : CSharpSyntaxRewriter +{ + public override SyntaxNode? VisitNamespaceDeclaration(NamespaceDeclarationSyntax node) => Rewrite(node, base.VisitNamespaceDeclaration(node)); + public override SyntaxNode? VisitFileScopedNamespaceDeclaration(FileScopedNamespaceDeclarationSyntax node) => Rewrite(node, base.VisitFileScopedNamespaceDeclaration(node)); + + private SyntaxNode? Rewrite(BaseNamespaceDeclarationSyntax original, SyntaxNode? visited) + { + var name = original.Name.ToString(); + if (!isMovable(name) || visited is not BaseNamespaceDeclarationSyntax n) return visited; + onHit(); + return n.WithName(SyntaxFactory.ParseName(map(name)).WithTriviaFrom(original.Name)); + } +} + +// Rewrites fully-qualified references like `Fallout.Common.Execution.Foo` → `Fallout.Application.Execution.Foo`, +// but only when `Foo` is genuinely a moved type that lived in that namespace (guards against a same-named +// type from a different moved namespace). +sealed class QualNameRewriter(Func isMovable, Func map, IReadOnlyDictionary movedTypes) : CSharpSyntaxRewriter +{ + public override SyntaxNode? VisitQualifiedName(QualifiedNameSyntax node) + { + var visited = (QualifiedNameSyntax)base.VisitQualifiedName(node)!; + var left = node.Left.ToString(); + var right = node.Right.Identifier.Text; + if (isMovable(left) && movedTypes.TryGetValue(right, out var newNs) && newNs == map(left)) + return visited.WithLeft(SyntaxFactory.ParseName(map(left)).WithTriviaFrom(node.Left)); + return visited; + } +} From 328ecbd4c2385511d11fd80dce029a9ae39aa5db Mon Sep 17 00:00:00 2001 From: Chrison Simtian Date: Sun, 31 May 2026 22:22:16 +1200 Subject: [PATCH 2/4] tooling: make OnionRewriter semantic (MSBuildWorkspace + symbol resolution) Resolves each reference by the symbol it binds to, so namespace moves are precise: no spurious usings, no CS0104. Opens csprojs individually (sidesteps .slnx). Drops only usings orphaned by the move (leaves pre-existing unused usings alone). Dry-run on the Application ring: 91 moved types, 238 files, 12 qualified refs. Co-Authored-By: Claude Opus 4.8 --- tools/OnionRewriter/DocumentRewriter.cs | 97 +++++++++ tools/OnionRewriter/OnionRewriter.csproj | 10 +- tools/OnionRewriter/Program.cs | 242 ++++++++--------------- 3 files changed, 191 insertions(+), 158 deletions(-) create mode 100644 tools/OnionRewriter/DocumentRewriter.cs diff --git a/tools/OnionRewriter/DocumentRewriter.cs b/tools/OnionRewriter/DocumentRewriter.cs new file mode 100644 index 000000000..59d98678b --- /dev/null +++ b/tools/OnionRewriter/DocumentRewriter.cs @@ -0,0 +1,97 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; + +static class DocumentRewriter +{ + public record struct Counts(bool Changed, int Refs, int Added, int Dropped, int NsDecls); + + public static (SyntaxNode Root, Counts Counts) Rewrite( + SyntaxNode root, SemanticModel model, bool isSource, + Func isMovable, Func mapNs, Func isMoved) + { + var cu = (CompilationUnitSyntax)root; + + // --- Semantic pre-scan: which movable-namespace types are USED here, as types? --- + var usedMovedNewNs = new HashSet(); // new namespaces we must import + var usedMovedOldNs = new HashSet(); // old namespaces a MOVED type was used from + var usedResidualMovableNs = new HashSet(); // old movable namespaces still needed (residual types) + foreach (var name in cu.DescendantNodes().OfType()) + { + if (model.GetSymbolInfo(name).Symbol is not INamedTypeSymbol t) continue; // only type-position binds + var ns = t.OriginalDefinition.ContainingNamespace?.ToDisplayString() ?? ""; + if (!isMovable(ns)) continue; + if (isMoved(t)) { usedMovedNewNs.Add(mapNs(ns)); usedMovedOldNs.Add(ns); } + else usedResidualMovableNs.Add(ns); + } + + // The file's own namespaces (mapped) — never import those. + var ownNs = cu.DescendantNodes().OfType() + .Select(n => n.Name.ToString()) + .Select(n => isSource && isMovable(n) ? mapNs(n) : n) + .ToHashSet(); + + // --- Stage 1: rewrite namespace declarations (source files) + qualified refs to moved types. --- + var rewriter = new SyntaxFixer(model, isSource, isMovable, mapNs, isMoved); + cu = (CompilationUnitSyntax)rewriter.Visit(cu)!; + + // --- Stage 2: reconcile namespace `using` directives. --- + var keep = new List(); + int dropped = 0; + foreach (var u in cu.Usings) + { + var name = u.Name?.ToString(); + if (u.StaticKeyword.IsKind(SyntaxKind.None) && u.Alias is null && name != null && isMovable(name)) + { + // Drop only `using`s orphaned BY THE MOVE — i.e. a moved type was imported from here and + // no residual type still is. Leave pre-existing unused usings alone (not our concern). + if (usedMovedOldNs.Contains(name) && !usedResidualMovableNs.Contains(name)) dropped++; + else keep.Add(u); + } + else keep.Add(u); // static/alias usings get their type names remapped in Stage 1 + } + int added = 0; + foreach (var ns in usedMovedNewNs) + { + if (ownNs.Contains(ns)) continue; + if (keep.Any(u => u.StaticKeyword.IsKind(SyntaxKind.None) && u.Alias is null && u.Name?.ToString() == ns)) continue; + keep.Add(ParseCompilationUnit($"using {ns};\n").Usings[0]); + added++; + } + cu = cu.WithUsings(List(keep)); + + var changed = added > 0 || dropped > 0 || rewriter.Refs > 0 || rewriter.NsDecls > 0; + return (cu, new Counts(changed, rewriter.Refs, added, dropped, rewriter.NsDecls)); + } + + sealed class SyntaxFixer(SemanticModel model, bool isSource, Func isMovable, Func mapNs, Func isMoved) + : CSharpSyntaxRewriter + { + public int Refs, NsDecls; + + public override SyntaxNode? VisitNamespaceDeclaration(NamespaceDeclarationSyntax node) => MapNamespace(node, base.VisitNamespaceDeclaration(node)); + public override SyntaxNode? VisitFileScopedNamespaceDeclaration(FileScopedNamespaceDeclarationSyntax node) => MapNamespace(node, base.VisitFileScopedNamespaceDeclaration(node)); + + SyntaxNode? MapNamespace(BaseNamespaceDeclarationSyntax original, SyntaxNode? visited) + { + var name = original.Name.ToString(); + if (!isSource || !isMovable(name) || visited is not BaseNamespaceDeclarationSyntax n) return visited; + NsDecls++; + return n.WithName(ParseName(mapNs(name)).WithTriviaFrom(original.Name)); + } + + public override SyntaxNode? VisitQualifiedName(QualifiedNameSyntax node) + { + var symbol = model.GetSymbolInfo(node).Symbol as INamedTypeSymbol; + var visited = (QualifiedNameSyntax)base.VisitQualifiedName(node)!; + if (symbol != null && isMoved(symbol)) + { + var ns = symbol.OriginalDefinition.ContainingNamespace!.ToDisplayString(); + Refs++; + return visited.WithLeft(ParseName(mapNs(ns)).WithTriviaFrom(visited.Left)); + } + return visited; + } + } +} diff --git a/tools/OnionRewriter/OnionRewriter.csproj b/tools/OnionRewriter/OnionRewriter.csproj index 857a12404..0278102a5 100644 --- a/tools/OnionRewriter/OnionRewriter.csproj +++ b/tools/OnionRewriter/OnionRewriter.csproj @@ -1,18 +1,22 @@ + outside version.json's pathFilters. SEMANTIC mode: loads the real compilations via + MSBuildWorkspace and rewrites references by the symbol they actually bind to. Pins its own + package versions (central management off) so it doesn't perturb the product's version set. --> Exe net10.0 enable enable false + false - + + + diff --git a/tools/OnionRewriter/Program.cs b/tools/OnionRewriter/Program.cs index 2f062553d..a4ddcd5f3 100644 --- a/tools/OnionRewriter/Program.cs +++ b/tools/OnionRewriter/Program.cs @@ -1,172 +1,104 @@ +using System.Runtime.CompilerServices; +using Microsoft.Build.Locator; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; -// OnionRewriter — ADR-0006. Moves every type declared in a source project out of an old namespace -// prefix into a new one, and fixes references across the repo. The hard part it exists for: the old -// root namespace (Fallout.Common) is shared across several projects, so it disambiguates per file by -// the *types actually referenced* — adding/keeping/dropping `using`s accordingly. Biased to -// over-approximate (extra usings are harmless; the compiler catches any genuine miss). -// -// Usage: dotnet run --project tools/OnionRewriter [-- --apply] -// (default = dry run: report only, mutate nothing) +// OnionRewriter (semantic) — ADR-0006. Moves every type declared in a source project out of an old +// namespace prefix into a new one, and fixes references across the whole workspace by the symbol each +// reference actually BINDS to (so simple-name collisions across namespaces resolve correctly — no +// spurious usings, no CS0104). Rewrites: namespace declarations in the source project; qualified +// references to moved types; and `using` directives (add the new namespace, drop the old where no +// residual type is still used). Default = dry run (reports, mutates nothing). Pass --apply to write. -var apply = args.Contains("--apply"); -var repo = Directory.GetCurrentDirectory(); -var sourceProj = Path.Combine(repo, "src", "Fallout.Build") + Path.DirectorySeparatorChar; +MSBuildLocator.RegisterDefaults(); +return await Runner.RunAsync(args); -const string OldRoot = "Fallout.Common"; -const string NewRoot = "Fallout.Application"; -const string OldExt = "Fallout.Build.Execution.Extensions"; -const string NewExt = "Fallout.Application.Execution.Extensions"; - -bool IsMovable(string ns) => ns == OldRoot || ns.StartsWith(OldRoot + ".") || ns == OldExt || ns.StartsWith(OldExt + "."); -string MapNs(string ns) => - ns == OldRoot || ns.StartsWith(OldRoot + ".") ? NewRoot + ns[OldRoot.Length..] - : ns == OldExt || ns.StartsWith(OldExt + ".") ? NewExt + ns[OldExt.Length..] - : ns; - -IEnumerable CsFiles(params string[] roots) => - roots.Where(Directory.Exists) - .SelectMany(r => Directory.EnumerateFiles(r, "*.cs", SearchOption.AllDirectories)) - .Where(p => !p.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}") - && !p.Contains($"{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}") - && !p.Contains($"{Path.DirectorySeparatorChar}.claude{Path.DirectorySeparatorChar}") - && !p.Contains($"{Path.DirectorySeparatorChar}vendor{Path.DirectorySeparatorChar}")); - -static string? NsOf(SyntaxNode n) => - n.Ancestors().OfType().FirstOrDefault()?.Name.ToString(); - -// True when a name appears in a type position (so an added `using` is warranted). Excludes the -// member name in `x.Foo` and the bare call target in `Foo(...)` — the main false-positive sources. -static bool IsTypePosition(SimpleNameSyntax n) => - !(n.Parent is MemberAccessExpressionSyntax ma && ma.Name == n) - && !(n.Parent is InvocationExpressionSyntax inv && inv.Expression == n); - -IEnumerable<(string Name, string Ns)> TopLevelTypes(SyntaxNode root) -{ - foreach (var t in root.DescendantNodes().OfType()) - if (t.Parent is BaseNamespaceDeclarationSyntax && NsOf(t) is { } ns) - yield return (t.Identifier.Text, ns); - foreach (var d in root.DescendantNodes().OfType()) - if (d.Parent is BaseNamespaceDeclarationSyntax && NsOf(d) is { } ns) - yield return (d.Identifier.Text, ns); -} - -// Pass A — types declared in the source project under a movable namespace (these MOVE). -var movedTypes = new Dictionary(); // simpleName -> new namespace -var movedNamespaces = new HashSet(); // old movable namespaces actually present -foreach (var f in CsFiles(sourceProj)) - foreach (var (name, ns) in TopLevelTypes(CSharpSyntaxTree.ParseText(File.ReadAllText(f)).GetRoot())) - if (IsMovable(ns)) { movedTypes[name] = MapNs(ns); movedNamespaces.Add(ns); } - -// Pass B — types under Fallout.Common.* declared OUTSIDE the source project (these STAY = residual). -var residualByNs = new Dictionary>(); -foreach (var f in CsFiles(Path.Combine(repo, "src"))) +static class Runner { - if (f.StartsWith(sourceProj, StringComparison.Ordinal)) continue; - foreach (var (name, ns) in TopLevelTypes(CSharpSyntaxTree.ParseText(File.ReadAllText(f)).GetRoot())) - if (ns == OldRoot || ns.StartsWith(OldRoot + ".")) - (residualByNs.TryGetValue(ns, out var s) ? s : residualByNs[ns] = new()).Add(name); -} - -// Pass C — rewrite references repo-wide. -int filesChanged = 0, usingsAdded = 0, usingsDropped = 0, nsDecls = 0; -var samples = new List(); - -foreach (var f in CsFiles(Path.Combine(repo, "src"), Path.Combine(repo, "tests"), Path.Combine(repo, "build"))) -{ - var original = File.ReadAllText(f); - var cu = (CompilationUnitSyntax)CSharpSyntaxTree.ParseText(original).GetRoot(); - var isSource = f.StartsWith(sourceProj, StringComparison.Ordinal); - - // (1) Source-project files: rewrite their namespace declarations. - if (isSource) + const string OldRoot = "Fallout.Common"; + const string NewRoot = "Fallout.Application"; + const string OldExt = "Fallout.Build.Execution.Extensions"; + const string NewExt = "Fallout.Application.Execution.Extensions"; + const string SourceAssembly = "Fallout.Build"; + + static bool IsMovable(string ns) => ns == OldRoot || ns.StartsWith(OldRoot + ".") || ns == OldExt || ns.StartsWith(OldExt + "."); + static string MapNs(string ns) => + ns == OldRoot || ns.StartsWith(OldRoot + ".") ? NewRoot + ns[OldRoot.Length..] + : ns == OldExt || ns.StartsWith(OldExt + ".") ? NewExt + ns[OldExt.Length..] + : ns; + + [MethodImpl(MethodImplOptions.NoInlining)] + public static async Task RunAsync(string[] args) { - var before = nsDecls; - cu = (CompilationUnitSyntax)new NsRewriter(IsMovable, MapNs, () => nsDecls++).Visit(cu); - if (nsDecls > before) { /* counted */ } - } + var apply = args.Contains("--apply"); + var repo = Directory.GetCurrentDirectory(); - // (1b) Rewrite fully-qualified references to moved types (e.g. Fallout.Common.Execution.Foo). - cu = (CompilationUnitSyntax)new QualNameRewriter(IsMovable, MapNs, movedTypes).Visit(cu); + using var ws = Microsoft.CodeAnalysis.MSBuild.MSBuildWorkspace.Create(); + ws.WorkspaceFailed += (_, e) => { if (e.Diagnostic.Kind == WorkspaceDiagnosticKind.Failure) Console.Error.WriteLine(" ws: " + e.Diagnostic.Message); }; - // (2) All files: fix usings by type identity. - // - DROP decision uses a BROAD reference set (every identifier) so we only ever over-keep — safe. - // - ADD decision uses a TYPE-POSITION-filtered set so we don't add usings for method/property - // names that merely collide with a moved type's simple name. - var referencedAll = cu.DescendantNodes().OfType().Select(n => n.Identifier.Text).ToHashSet(); - var referencedTypes = cu.DescendantNodes().OfType().Where(IsTypePosition).Select(n => n.Identifier.Text).ToHashSet(); - var fileNs = cu.DescendantNodes().OfType().FirstOrDefault()?.Name.ToString(); + var csprojs = Directory.EnumerateFiles(Path.Combine(repo, "src"), "*.csproj", SearchOption.AllDirectories) + .Concat(Directory.EnumerateFiles(Path.Combine(repo, "tests"), "*.csproj", SearchOption.AllDirectories)) + .Concat(Directory.EnumerateFiles(Path.Combine(repo, "build"), "*.csproj", SearchOption.AllDirectories)) + .Where(p => !p.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}") && !p.Contains($"{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}")) + .OrderBy(p => p).ToList(); - var keep = new List(); - foreach (var u in cu.Usings) - { - var name = u.Name?.ToString(); - if (name != null && movedNamespaces.Contains(name)) + Console.WriteLine($"Loading {csprojs.Count} projects into the workspace…"); + foreach (var p in csprojs) { - var residualUsed = residualByNs.TryGetValue(name, out var set) && set.Overlaps(referencedAll); - if (residualUsed) keep.Add(u); else usingsDropped++; // drop usings now empty of residual types + try { await ws.OpenProjectAsync(p); } + catch (Exception ex) { Console.Error.WriteLine($" open failed {Path.GetFileName(p)}: {ex.Message}"); } } - else keep.Add(u); - } - - var needed = referencedTypes.Where(movedTypes.ContainsKey).Select(n => movedTypes[n]).Distinct(); - foreach (var ns in needed) - { - if (ns == fileNs) continue; - if (keep.Any(u => u.Name?.ToString() == ns)) continue; - keep.Add(ParseCompilationUnit($"using {ns};\n").Usings[0]); - usingsAdded++; - } - - cu = cu.WithUsings(List(keep)); - var updated = cu.ToFullString(); - if (updated != original) - { - filesChanged++; - if (samples.Count < 12) samples.Add(Path.GetRelativePath(repo, f)); - if (apply) File.WriteAllText(f, updated); - } -} + var sln = ws.CurrentSolution; + Console.WriteLine($"Loaded {sln.Projects.Count()} projects."); + + // Moved types: declared in the source assembly under a movable namespace. Keyed by full name. + var sourceProject = sln.Projects.FirstOrDefault(p => p.AssemblyName == SourceAssembly); + if (sourceProject is null) { Console.Error.WriteLine($"FATAL: source project {SourceAssembly} not loaded."); return 1; } + var sourceComp = await sourceProject.GetCompilationAsync(); + var movedFullNames = new HashSet(); + void Collect(INamespaceSymbol nsSym) + { + foreach (var t in nsSym.GetTypeMembers()) if (IsMovable(nsSym.ToDisplayString())) movedFullNames.Add($"{nsSym.ToDisplayString()}.{t.Name}"); + foreach (var child in nsSym.GetNamespaceMembers()) Collect(child); + } + Collect(sourceComp!.Assembly.GlobalNamespace); + Console.WriteLine($"Moved types (declared in {SourceAssembly}, movable ns): {movedFullNames.Count}"); -Console.WriteLine($"OnionRewriter ({(apply ? "APPLY" : "dry-run")})"); -Console.WriteLine($" moved types : {movedTypes.Count}"); -Console.WriteLine($" moved namespaces : {string.Join(", ", movedNamespaces.OrderBy(x => x))}"); -Console.WriteLine($" residual namespaces: {string.Join(", ", residualByNs.Keys.OrderBy(x => x))}"); -Console.WriteLine($" files changed : {filesChanged}"); -Console.WriteLine($" namespace decls : {nsDecls}"); -Console.WriteLine($" usings added : {usingsAdded}"); -Console.WriteLine($" usings dropped : {usingsDropped}"); -Console.WriteLine($" sample files :\n {string.Join("\n ", samples)}"); + bool IsMovedType(INamedTypeSymbol t) + { + var ns = t.OriginalDefinition.ContainingNamespace?.ToDisplayString() ?? ""; + return t.OriginalDefinition.ContainingAssembly?.Name == SourceAssembly && IsMovable(ns) && movedFullNames.Contains($"{ns}.{t.OriginalDefinition.Name}"); + } -sealed class NsRewriter(Func isMovable, Func map, Action onHit) : CSharpSyntaxRewriter -{ - public override SyntaxNode? VisitNamespaceDeclaration(NamespaceDeclarationSyntax node) => Rewrite(node, base.VisitNamespaceDeclaration(node)); - public override SyntaxNode? VisitFileScopedNamespaceDeclaration(FileScopedNamespaceDeclarationSyntax node) => Rewrite(node, base.VisitFileScopedNamespaceDeclaration(node)); + int filesChanged = 0, refsRewritten = 0, usingsAdded = 0, usingsDropped = 0, nsDecls = 0; + var samples = new List(); - private SyntaxNode? Rewrite(BaseNamespaceDeclarationSyntax original, SyntaxNode? visited) - { - var name = original.Name.ToString(); - if (!isMovable(name) || visited is not BaseNamespaceDeclarationSyntax n) return visited; - onHit(); - return n.WithName(SyntaxFactory.ParseName(map(name)).WithTriviaFrom(original.Name)); - } -} + foreach (var project in sln.Projects) + { + var isSource = project.AssemblyName == SourceAssembly; + foreach (var doc in project.Documents) + { + if (doc.FilePath is null || !doc.FilePath.EndsWith(".cs") || doc.FilePath.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}")) continue; + var model = await doc.GetSemanticModelAsync(); + var root = await doc.GetSyntaxRootAsync(); + if (model is null || root is null) continue; + + var (newRoot, c) = DocumentRewriter.Rewrite(root, model, isSource, IsMovable, MapNs, IsMovedType); + if (c.Changed) + { + filesChanged++; refsRewritten += c.Refs; usingsAdded += c.Added; usingsDropped += c.Dropped; nsDecls += c.NsDecls; + if (samples.Count < 12) samples.Add(Path.GetRelativePath(repo, doc.FilePath)); + if (apply) await File.WriteAllTextAsync(doc.FilePath, newRoot.ToFullString()); + } + } + } -// Rewrites fully-qualified references like `Fallout.Common.Execution.Foo` → `Fallout.Application.Execution.Foo`, -// but only when `Foo` is genuinely a moved type that lived in that namespace (guards against a same-named -// type from a different moved namespace). -sealed class QualNameRewriter(Func isMovable, Func map, IReadOnlyDictionary movedTypes) : CSharpSyntaxRewriter -{ - public override SyntaxNode? VisitQualifiedName(QualifiedNameSyntax node) - { - var visited = (QualifiedNameSyntax)base.VisitQualifiedName(node)!; - var left = node.Left.ToString(); - var right = node.Right.Identifier.Text; - if (isMovable(left) && movedTypes.TryGetValue(right, out var newNs) && newNs == map(left)) - return visited.WithLeft(SyntaxFactory.ParseName(map(left)).WithTriviaFrom(node.Left)); - return visited; + Console.WriteLine($"\nOnionRewriter ({(apply ? "APPLY" : "dry-run")})"); + Console.WriteLine($" files changed : {filesChanged}"); + Console.WriteLine($" namespace decls : {nsDecls}"); + Console.WriteLine($" qualified refs : {refsRewritten}"); + Console.WriteLine($" usings added : {usingsAdded}"); + Console.WriteLine($" usings dropped : {usingsDropped}"); + Console.WriteLine($" sample files :\n {string.Join("\n ", samples)}"); + return 0; } } From f91c0d097683d7b7ad49c12ed9a432b46fccace3 Mon Sep 17 00:00:00 2001 From: Chrison Simtian Date: Sun, 31 May 2026 22:48:35 +1200 Subject: [PATCH 3/4] =?UTF-8?q?refactor(arch)!:=20Application=20ring=20?= =?UTF-8?q?=E2=80=94=20core=20API=20->=20Fallout.Application=20(onion=20st?= =?UTF-8?q?ep=202)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ADR-0006 step 2, via the semantic OnionRewriter (MSBuildWorkspace + symbol resolution). Every type Fallout.Build declared under Fallout.Common.* (FalloutBuild, Target, [Parameter], Host, the ports, the execution engine, value injection) moves to Fallout.Application.*; references fixed repo-wide by the symbol each binds to. ~297 files; full solution builds and tests green (~450 tests, incl. Domain fitness). Tool refinements landed here: name-based moved-type classification (cross-project), package-consumer skip, attribute/extension-method detection, nested-type qualified refs, evacuated- vs surviving-namespace using reconciliation. Four dangling usings hand-finished; Verify snapshots (solution generator, cake-migration) updated. Deferred (ADR-0006): Nuke.* shim parity lapses — Nuke.Consumer + Nuke.Common.Shim.Tests temporarily excluded from the solution, to be re-addressed by the redesigned migration phase. Project-FILE rename (Fallout.Build dir/csproj -> Fallout.Application) still to do — namespaces are migrated; the assembly is renamed in a mechanical follow-up. BREAKING CHANGE: Fallout.Common.* core-API namespaces -> Fallout.Application.*. On experimental; batched to the 2026 major. Co-Authored-By: Claude Opus 4.8 --- build/Build.CodeGeneration.cs | 4 +- build/Build.Contributors.cs | 1 + build/Build.GlobalSolution.cs | 6 +-- build/Build.Licenses.cs | 2 +- build/Build.PublicApi.cs | 1 + build/Build.RunTargetInDockerTest.cs | 1 + build/Build.Stargazers.cs | 4 +- build/Build.Terminal.cs | 6 +-- build/Build.cs | 9 +++-- fallout.slnx | 6 ++- .../ArgumentsFromGitCommitMessageAttribute.cs | 10 +++-- .../DisableDefaultOutputAttribute.cs | 4 +- ...ShutdownDotNetAfterServerBuildAttribute.cs | 4 +- ...sualStudioEnvironmentVariablesAttribute.cs | 2 +- .../Attributes/VerbosityMappingAttribute.cs | 7 +++- .../BuildServerConfigurationGeneration.cs | 3 +- ...verConfigurationGenerationAttributeBase.cs | 7 ++-- src/Fallout.Build/CICD/CIAttribute.cs | 8 ++-- .../CICD/ChainedConfigurationAttributeBase.cs | 5 ++- .../CICD/ConfigurationAttributeBase.cs | 8 ++-- src/Fallout.Build/CICD/ConfigurationEntity.cs | 4 +- src/Fallout.Build/CICD/CustomFileWriter.cs | 3 +- ...erateBuildServerConfigurationsAttribute.cs | 8 ++-- src/Fallout.Build/CICD/IBuildServer.cs | 4 +- .../CICD/IConfigurationGenerator.cs | 4 +- ...dServerConfigurationGenerationAttribute.cs | 9 +++-- src/Fallout.Build/CICD/NoConvertAttribute.cs | 4 +- src/Fallout.Build/CICD/Partition.cs | 2 +- src/Fallout.Build/CICD/PartitionAttribute.cs | 3 +- src/Fallout.Build/ControlFlow.cs | 5 ++- src/Fallout.Build/Execution/BuildExecutor.cs | 4 +- src/Fallout.Build/Execution/BuildManager.cs | 6 ++- .../Execution/DelegateRequirementService.cs | 9 +++-- .../Execution/ExecutableTarget.cs | 3 +- .../Execution/ExecutableTargetFactory.cs | 6 ++- .../Execution/ExecutionPlanner.cs | 4 +- .../BuildExtensionAttributeBase.cs | 3 +- .../ToolInjectionAttributeBase.cs | 7 ++-- .../ValueInjectionAttributeBase.cs | 4 +- .../ArgumentsFromParametersFileAttribute.cs | 11 ++++-- .../Execution/Extensions/EventInvoker.cs | 5 ++- .../Extensions/HandleHelpRequestsAttribute.cs | 5 ++- .../Extensions/HandlePlanRequestsAttribute.cs | 6 +-- ...dleReSharperSurrogateArgumentsAttribute.cs | 5 ++- .../HandleShellCompletionAttribute.cs | 6 ++- .../HandleVisualStudioDebuggingAttribute.cs | 4 +- .../InjectNonParameterValuesAttribute.cs | 7 ++-- .../InjectParameterValuesAttribute.cs | 7 ++-- .../SerializeBuildServerStateAttribute.cs | 6 +-- .../Extensions/TelemetryAttribute.cs | 4 +- .../Extensions/UpdateNotificationAttribute.cs | 6 ++- .../Execution/ParameterService.Statics.cs | 5 ++- .../Execution/ParameterService.cs | 3 +- .../Execution/TargetDefinition.cs | 7 +++- .../Execution/TargetExecutionException.cs | 2 +- .../Execution/ToolRequirementService.cs | 6 ++- .../Execution/ValueInjectionUtility.cs | 6 ++- src/Fallout.Build/FalloutBuild.Events.cs | 6 +-- src/Fallout.Build/FalloutBuild.Interface.cs | 6 +-- src/Fallout.Build/FalloutBuild.Output.cs | 4 +- src/Fallout.Build/FalloutBuild.Statics.cs | 9 +++-- src/Fallout.Build/FalloutBuild.cs | 13 ++++--- src/Fallout.Build/Host.Activation.cs | 7 ++-- src/Fallout.Build/Host.Theming.cs | 6 +-- src/Fallout.Build/Host.cs | 9 +++-- src/Fallout.Build/IFalloutBuild.cs | 6 +-- src/Fallout.Build/ITargetDefinition.cs | 4 +- src/Fallout.Build/LogLevel.cs | 4 +- src/Fallout.Build/Logging.cs | 11 ++++-- src/Fallout.Build/ParameterAttribute.cs | 6 +-- src/Fallout.Build/RequiresAttribute.cs | 5 ++- src/Fallout.Build/Target.cs | 4 +- .../Telemetry/Telemetry.Events.cs | 6 ++- .../Telemetry/Telemetry.Properties.cs | 12 +++--- src/Fallout.Build/Telemetry/Telemetry.cs | 8 ++-- src/Fallout.Build/Terminal.cs | 5 ++- .../Theming/AnsiConsoleHostTheme.cs | 4 +- src/Fallout.Build/Theming/IHostTheme.cs | 4 +- .../Theming/SystemConsoleHostTheme.cs | 4 +- src/Fallout.Build/Utilities/ConsoleUtility.cs | 5 ++- .../Utilities/CredentialStore.cs | 7 +++- src/Fallout.Build/Utilities/SchemaUtility.cs | 7 +++- src/Fallout.Build/VCS/GitRepository.cs | 6 ++- .../VCS/GitRepositoryExtensions.cs | 4 +- src/Fallout.Build/Verbosity.cs | 4 +- src/Fallout.Cli/Program.AddPackage.cs | 5 ++- src/Fallout.Cli/Program.Cake.cs | 5 ++- src/Fallout.Cli/Program.GetConfiguration.cs | 3 +- src/Fallout.Cli/Program.Secrets.cs | 2 + src/Fallout.Cli/Program.Setup.cs | 3 +- src/Fallout.Cli/Program.Trigger.cs | 4 +- src/Fallout.Cli/Program.Update.cs | 5 ++- src/Fallout.Cli/Program.cs | 3 +- .../Rewriting/Cake/ClassRewriter.cs | 1 + .../Rewriting/Cake/FormattingRewriter.cs | 1 + .../Rewriting/Cake/InvocationRewriter.cs | 1 + .../Rewriting/Cake/SafeSyntaxRewriter.cs | 4 +- .../Cake/TargetDefinitionRewriter.cs | 1 + .../CheckPathEnvironmentVariableAttribute.cs | 3 +- .../FileSystemGlobbingAttributeBase.cs | 3 +- .../Attributes/GitRepositoryAttribute.cs | 5 ++- .../Attributes/GlobbingOptionsAttribute.cs | 2 +- .../HandleSingleFileExecutionAttribute.cs | 3 +- .../LatestGitHubReleaseAttribute.cs | 6 +-- .../Attributes/LatestMavenVersionAttribute.cs | 4 +- .../Attributes/LatestMyGetVersionAttribute.cs | 4 +- .../Attributes/LatestNpmVersionAttribute.cs | 4 +- .../Attributes/LatestNuGetVersionAttribute.cs | 4 +- .../Attributes/LocalPathAttribute.cs | 3 +- .../Attributes/NpmPackageAttribute.cs | 3 +- .../Attributes/NuGetPackageAttribute.cs | 3 +- .../Attributes/PathVariableAttribute.cs | 3 +- .../Attributes/SolutionAttribute.cs | 3 +- .../CI/AppVeyor/AppVeyor.Theming.cs | 4 +- src/Fallout.Common/CI/AppVeyor/AppVeyor.cs | 2 + .../CI/AppVeyor/AppVeyorAttribute.cs | 5 ++- .../Configuration/AppVeyorBranches.cs | 3 +- .../Configuration/AppVeyorConfiguration.cs | 2 + .../AppVeyorCustomWriterExtensions.cs | 1 + .../AzurePipelines/AzurePipelines.Theming.cs | 4 +- .../CI/AzurePipelines/AzurePipelines.cs | 4 +- .../AzurePipelines/AzurePipelinesAttribute.cs | 6 ++- .../AzurePipelineCheckoutStep.cs | 2 +- .../Configuration/AzurePipelinesCacheStep.cs | 3 +- .../Configuration/AzurePipelinesCmdStep.cs | 3 +- .../AzurePipelinesConfiguration.cs | 3 +- .../AzurePipelinesCustomWriterExtensions.cs | 1 + .../AzurePipelinesDownloadStep.cs | 3 +- .../Configuration/AzurePipelinesJob.cs | 2 + .../AzurePipelinesPublishStep.cs | 3 +- .../Configuration/AzurePipelinesStage.cs | 2 + .../Configuration/AzurePipelinesStep.cs | 3 +- .../AzurePipelinesVcsPushTrigger.cs | 5 ++- src/Fallout.Common/CI/Bamboo/Bamboo.cs | 4 +- src/Fallout.Common/CI/Bitbucket/Bitbucket.cs | 4 +- src/Fallout.Common/CI/Bitrise/Bitrise.cs | 4 +- .../GitHubActionsArtifactStep.cs | 3 +- .../Configuration/GitHubActionsCacheStep.cs | 3 +- .../GitHubActionsCheckoutStep.cs | 3 +- .../GitHubActionsConfiguration.cs | 2 + .../GitHubActionsDetailedTrigger.cs | 1 + .../Configuration/GitHubActionsJob.cs | 2 + .../Configuration/GitHubActionsRunStep.cs | 1 + .../GitHubActionsScheduledTrigger.cs | 2 +- .../Configuration/GitHubActionsStep.cs | 1 + .../Configuration/GitHubActionsVcsTrigger.cs | 1 + .../GitHubActionsWorkflowDispatchTrigger.cs | 3 +- .../CI/GitHubActions/GitHubActions.Theming.cs | 4 +- .../CI/GitHubActions/GitHubActions.cs | 2 + .../GitHubActions/GitHubActionsAttribute.cs | 6 ++- .../CI/GitLab/GitLab.Theming.cs | 4 +- src/Fallout.Common/CI/GitLab/GitLab.cs | 2 + src/Fallout.Common/CI/Jenkins/Jenkins.cs | 4 +- .../SpaceAutomationConfiguration.cs | 4 +- .../Configuration/SpaceAutomationContainer.cs | 4 +- .../SpaceAutomationCronScheduleTrigger.cs | 3 +- .../SpaceAutomationCustomWriterExtensions.cs | 3 +- .../SpaceAutomationPushTrigger.cs | 3 +- .../Configuration/SpaceAutomationResources.cs | 5 ++- .../Configuration/SpaceAutomationTrigger.cs | 3 +- .../SpaceAutomation.Theming.cs | 2 +- .../CI/SpaceAutomation/SpaceAutomation.cs | 4 +- .../SpaceAutomationAttribute.cs | 6 ++- .../TeamCityArtifactDependency.cs | 2 +- .../Configuration/TeamCityBuildType.cs | 2 + .../Configuration/TeamCityBuildTypeVcsRoot.cs | 3 +- .../Configuration/TeamCityConfiguration.cs | 2 + .../TeamCityConfigurationParameter.cs | 1 + .../TeamCityCustomWriterExtensions.cs | 1 + .../Configuration/TeamCityDependency.cs | 1 + .../TeamCityFinishBuildTrigger.cs | 1 + .../TeamCityKeyValueParameter.cs | 1 + .../Configuration/TeamCityParameter.cs | 1 + .../TeamCity/Configuration/TeamCityProject.cs | 2 + .../Configuration/TeamCityScheduledTrigger.cs | 2 +- .../TeamCitySnapshotDependency.cs | 1 + .../TeamCity/Configuration/TeamCityTrigger.cs | 1 + .../TeamCity/Configuration/TeamCityVcsRoot.cs | 3 +- .../Configuration/TeamCityVcsTrigger.cs | 2 +- .../CI/TeamCity/TeamCity.Theming.cs | 6 +-- src/Fallout.Common/CI/TeamCity/TeamCity.cs | 4 +- .../CI/TeamCity/TeamCityAttribute.cs | 7 +++- src/Fallout.Common/CI/TravisCI/TravisCI.cs | 4 +- .../ChangeLog/ChangeLogTasks.cs | 3 +- src/Fallout.Common/IO/FtpTasks.cs | 3 +- .../AzureKeyVaultAttributeBase.cs | 5 ++- .../AzureKeyVaultConfigurationAttribute.cs | 4 +- .../AzureKeyVaultSecretAttribute.cs | 3 +- .../AzureSignTool/AzureSignTool.Generated.cs | 5 +-- .../BenchmarkDotNet.Generated.cs | 1 - .../Tools/Boots/Boots.Generated.cs | 1 - .../Tools/Chocolatey/Chocolatey.Generated.cs | 5 +-- .../CodeMetrics/CodeMetrics.Generated.cs | 1 - .../Tools/Codecov/Codecov.Generated.cs | 5 +-- .../Tools/CorFlags/CorFlags.Generated.cs | 1 - .../CoverallsNet/CoverallsNet.Generated.cs | 5 +-- .../Tools/Coverlet/Coverlet.Generated.cs | 1 - .../Tools/Discord/Discord.Generated.cs | 1 - .../Tools/DocFX/DocFX.Generated.cs | 1 - .../Tools/Docker/Docker.Generated.cs | 5 +-- .../DockerTargetDefinitionExtensions.cs | 3 +- .../Tools/DotCover/DotCover.Generated.cs | 1 - .../TeamCitySetDotCoverHomePathAttribute.cs | 2 +- .../DotMemoryUnit/DotMemoryUnit.Generated.cs | 1 - .../Tools/DotNet/DotNet.Generated.cs | 5 +-- .../Tools/DotNet/DotNetTasks.cs | 1 + .../DotnetPackaging.Generated.cs | 1 - .../EntityFramework.Generated.cs | 1 - .../Tools/Fixie/Fixie.Generated.cs | 1 - src/Fallout.Common/Tools/Git/Git.Generated.cs | 1 - .../Tools/GitHub/GitHubTasks.cs | 3 +- .../Tools/GitLink/GitLink.Generated.cs | 1 - .../GitReleaseManager.Generated.cs | 5 +-- .../Tools/GitVersion/GitVersion.Generated.cs | 5 +-- .../Tools/GitVersion/GitVersionAttribute.cs | 9 +++-- .../Tools/Helm/Helm.Generated.cs | 5 +-- .../Tools/ILRepack/ILRepack.Generated.cs | 1 - .../Tools/InnoSetup/InnoSetup.Generated.cs | 1 - .../Tools/Kubernetes/Kubernetes.Generated.cs | 1 - .../Tools/MSBuild/MSBuild.Generated.cs | 1 - .../Tools/MSBuild/MSBuildTasks.cs | 1 + .../Tools/MSpec/MSpec.Generated.cs | 1 - .../Tools/MakeNsis/MakeNSIS.Generated.cs | 1 - .../Tools/Mastodon/Mastodon.Generated.cs | 1 - .../Tools/MauiCheck/MauiCheck.Generated.cs | 1 - .../Tools/MinVer/MinVer.Generated.cs | 1 - .../Tools/MinVer/MinVerAttribute.cs | 4 +- .../Tools/NSwag/NSwag.Generated.cs | 1 - .../Tools/NUnit/NUnit.Generated.cs | 1 - src/Fallout.Common/Tools/NUnit/NUnitTasks.cs | 2 +- .../NerdbankGitVersioning.Generated.cs | 1 - .../NerdbankGitVersioningAttribute.cs | 2 +- .../Tools/Netlify/Netlify.Generated.cs | 5 +-- src/Fallout.Common/Tools/Npm/Npm.Generated.cs | 1 - .../Tools/NuGet/NuGet.Generated.cs | 5 +-- .../NuGetKeyVaultSignTool.Generated.cs | 5 +-- .../OctoVersion/OctoVersion.Generated.cs | 1 - .../Tools/OctoVersion/OctoVersionAttribute.cs | 7 ++-- .../Tools/Octopus/Octopus.Generated.cs | 5 +-- .../Tools/OpenCover/OpenCover.Generated.cs | 1 - .../Tools/OpenCover/OpenCoverTasks.cs | 3 +- .../Tools/Paket/Paket.Generated.cs | 5 +-- .../Tools/PowerShell/PowerShell.Generated.cs | 1 - .../Tools/Pulumi/Pulumi.Generated.cs | 1 - .../Tools/Pwsh/Pwsh.Generated.cs | 1 - .../ReportGenerator.Generated.cs | 1 - .../ReportGenerator/ReportGeneratorTasks.cs | 2 +- .../Tools/SignClient/SignClient.Generated.cs | 5 +-- .../Tools/SignPath/SignPathTasks.cs | 5 ++- .../Tools/SignTool/SignTool.Generated.cs | 5 +-- .../Tools/Slack/Slack.Generated.cs | 1 - .../SonarScanner/SonarScanner.Generated.cs | 5 +-- .../Tools/SpecFlow/SpecFlow.Generated.cs | 5 +-- .../Tools/Squirrel/Squirrel.Generated.cs | 1 - .../StaticWebApps/StaticWebApps.Generated.cs | 5 +-- .../Tools/Teams/Teams.Generated.cs | 1 - .../Tools/TestCloud/TestCloud.Generated.cs | 1 - .../Tools/Unity/Unity.Generated.cs | 5 +-- src/Fallout.Common/Tools/Unity/UnityTasks.cs | 3 +- .../Tools/VSTest/VSTest.Generated.cs | 1 - .../Tools/VSWhere/VSWhere.Generated.cs | 1 - .../WebConfigTransformRunner.Generated.cs | 1 - .../Tools/Xunit/Xunit.Generated.cs | 1 - src/Fallout.Components/ICompile.cs | 4 +- .../ICreateGitHubRelease.cs | 3 +- src/Fallout.Components/IGlobalTool.cs | 2 +- src/Fallout.Components/IHasArtifacts.cs | 4 +- src/Fallout.Components/IHasChangelog.cs | 4 +- src/Fallout.Components/IHasConfiguration.cs | 4 +- src/Fallout.Components/IHasGitRepository.cs | 5 ++- src/Fallout.Components/IHasGitVersion.cs | 4 +- .../IHasNerdbankGitVersioning.cs | 4 +- src/Fallout.Components/IHasSolution.cs | 4 +- .../IHasTwitterCredentials.cs | 4 +- src/Fallout.Components/IPack.cs | 4 +- src/Fallout.Components/IPublish.cs | 1 + src/Fallout.Components/IReportCoverage.cs | 4 +- src/Fallout.Components/IRestore.cs | 4 +- src/Fallout.Components/ISignPackages.cs | 2 +- src/Fallout.Components/ITest.cs | 4 +- src/Shims/Nuke.Common/NukeBuild.cs | 5 ++- .../Consumers/Fallout.Consumer.Local/Build.cs | 6 +-- .../Fallout.Build.Tests/BuildExecutorTest.cs | 5 ++- tests/Fallout.Build.Tests/ControlFlowTest.cs | 1 + .../DefaultInterfaceExecutionTest.cs | 5 ++- .../ExecutableTargetFactoryTest.cs | 3 +- .../ExecutionPlannerTest.cs | 2 +- .../ExecutionTestsInitializer.cs | 4 +- .../Fallout.Build.Tests/GitRepositoryTest.cs | 4 +- tests/Fallout.Build.Tests/HostInitializer.cs | 3 +- .../ParameterServiceTest.cs | 1 + .../Fallout.Build.Tests/SchemaUtilityTest.cs | 5 ++- .../cake-scripts/default-target.verified.cs | 4 +- .../cake-scripts/globbing.verified.cs | 4 +- .../cake-scripts/parameters.verified.cs | 4 +- .../cake-scripts/paths.verified.cs | 4 +- .../cake-scripts/references.verified.cs | 4 +- .../cake-scripts/targets.verified.cs | 4 +- .../cake-scripts/tool-invocation.verified.cs | 4 +- .../CI/ConfigurationGenerationTest.cs | 7 ++-- .../CI/ITestConfigurationGenerator.cs | 2 +- tests/Fallout.Common.Tests/CITest.cs | 4 +- tests/Fallout.Common.Tests/GitHubTasksTest.cs | 2 +- ...nGeneratorTest.Test#Solution.g.verified.cs | 2 - .../StronglyTypedSolutionGeneratorTest.cs | 4 +- .../SampleConsumerBuild.cs | 3 +- tools/OnionRewriter/DocumentRewriter.cs | 38 +++++++++++++++---- tools/OnionRewriter/Program.cs | 31 ++++++++++++++- 308 files changed, 677 insertions(+), 514 deletions(-) diff --git a/build/Build.CodeGeneration.cs b/build/Build.CodeGeneration.cs index f8ab28165..77bca43d1 100644 --- a/build/Build.CodeGeneration.cs +++ b/build/Build.CodeGeneration.cs @@ -1,11 +1,11 @@ -using System; -using Fallout.Common; +using System; using Fallout.Common.IO; using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities.Collections; using static Fallout.CodeGeneration.CodeGenerator; using static Fallout.CodeGeneration.ReferenceUpdater; using static Fallout.Common.Tools.Git.GitTasks; +using Fallout.Application; partial class Build { diff --git a/build/Build.Contributors.cs b/build/Build.Contributors.cs index a3910c293..8a1ce85fe 100644 --- a/build/Build.Contributors.cs +++ b/build/Build.Contributors.cs @@ -5,6 +5,7 @@ using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.Git.GitTasks; +using Fallout.Application; partial class Build { diff --git a/build/Build.GlobalSolution.cs b/build/Build.GlobalSolution.cs index 7efdea75f..83bd1d7e3 100644 --- a/build/Build.GlobalSolution.cs +++ b/build/Build.GlobalSolution.cs @@ -2,15 +2,15 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Fallout.Common; -using Fallout.Common.Git; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities; using Fallout.Utilities.Text.Yaml; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.Git.GitTasks; +using Fallout.Application; +using Fallout.Application.Git; partial class Build { diff --git a/build/Build.Licenses.cs b/build/Build.Licenses.cs index 833e45b38..2a1d2df10 100644 --- a/build/Build.Licenses.cs +++ b/build/Build.Licenses.cs @@ -1,4 +1,3 @@ -using Fallout.Common; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -6,6 +5,7 @@ using Fallout.Components; using Serilog; using static Fallout.Common.IO.HttpTasks; +using Fallout.Application; partial class Build { diff --git a/build/Build.PublicApi.cs b/build/Build.PublicApi.cs index c14305a40..9872fc984 100644 --- a/build/Build.PublicApi.cs +++ b/build/Build.PublicApi.cs @@ -6,6 +6,7 @@ using Fallout.Common.IO; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; partial class Build { diff --git a/build/Build.RunTargetInDockerTest.cs b/build/Build.RunTargetInDockerTest.cs index 2fc40032e..14a3e93ae 100644 --- a/build/Build.RunTargetInDockerTest.cs +++ b/build/Build.RunTargetInDockerTest.cs @@ -3,6 +3,7 @@ using Fallout.Common.Tools.Docker; using Fallout.Common.Utilities; using Serilog; +using Fallout.Application; partial class Build { diff --git a/build/Build.Stargazers.cs b/build/Build.Stargazers.cs index 72d5449ba..762c70e5a 100644 --- a/build/Build.Stargazers.cs +++ b/build/Build.Stargazers.cs @@ -1,9 +1,9 @@ -using System.Linq; +using System.Linq; using System.Threading.Tasks; -using Fallout.Common; using Fallout.Common.IO; using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities; +using Fallout.Application; partial class Build { diff --git a/build/Build.Terminal.cs b/build/Build.Terminal.cs index 0a6f8e90c..589a7cf17 100644 --- a/build/Build.Terminal.cs +++ b/build/Build.Terminal.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common; -using Fallout.Common.Execution; +using Fallout.Application.Execution; +using Fallout.Application; [DisableDefaultOutput( DefaultOutput.Logo, diff --git a/build/Build.cs b/build/Build.cs index b1ecb3288..ab0221ed1 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -3,10 +3,7 @@ using System.Linq; using NuGet.Packaging; using Fallout.Common; -using Fallout.Common.CI; using Fallout.Common.CI.GitHubActions; -using Fallout.Common.Execution; -using Fallout.Common.Git; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Tooling; @@ -14,8 +11,12 @@ using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities; using Fallout.Components; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; +using Fallout.Application.CI; +using Fallout.Application.Git; +using Fallout.Application.Execution; [DotNetVerbosityMapping] [ShutdownDotNetAfterServerBuild] diff --git a/fallout.slnx b/fallout.slnx index ad895155c..974398a6a 100644 --- a/fallout.slnx +++ b/fallout.slnx @@ -41,13 +41,15 @@ - + - + diff --git a/src/Fallout.Build/Attributes/ArgumentsFromGitCommitMessageAttribute.cs b/src/Fallout.Build/Attributes/ArgumentsFromGitCommitMessageAttribute.cs index 4dcd435f0..b1f3d9d21 100644 --- a/src/Fallout.Build/Attributes/ArgumentsFromGitCommitMessageAttribute.cs +++ b/src/Fallout.Build/Attributes/ArgumentsFromGitCommitMessageAttribute.cs @@ -1,12 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.CI; -using Fallout.Common.Git; using Fallout.Common.Tooling; using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Git; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; public class ArgumentsFromGitCommitMessageAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Attributes/DisableDefaultOutputAttribute.cs b/src/Fallout.Build/Attributes/DisableDefaultOutputAttribute.cs index 740984fcc..f231b455b 100644 --- a/src/Fallout.Build/Attributes/DisableDefaultOutputAttribute.cs +++ b/src/Fallout.Build/Attributes/DisableDefaultOutputAttribute.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -namespace Fallout.Common; +namespace Fallout.Application; [AttributeUsage(AttributeTargets.Class)] public class DisableDefaultOutputAttribute : Attribute diff --git a/src/Fallout.Build/Attributes/ShutdownDotNetAfterServerBuildAttribute.cs b/src/Fallout.Build/Attributes/ShutdownDotNetAfterServerBuildAttribute.cs index 36ea254a7..1423e7bff 100644 --- a/src/Fallout.Build/Attributes/ShutdownDotNetAfterServerBuildAttribute.cs +++ b/src/Fallout.Build/Attributes/ShutdownDotNetAfterServerBuildAttribute.cs @@ -1,9 +1,9 @@ using System; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.Tooling; +using Fallout.Application.Execution; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; /// /// See dotnet/cli#11424. diff --git a/src/Fallout.Build/Attributes/UnsetVisualStudioEnvironmentVariablesAttribute.cs b/src/Fallout.Build/Attributes/UnsetVisualStudioEnvironmentVariablesAttribute.cs index f8ca1f93f..4bdc1e689 100644 --- a/src/Fallout.Build/Attributes/UnsetVisualStudioEnvironmentVariablesAttribute.cs +++ b/src/Fallout.Build/Attributes/UnsetVisualStudioEnvironmentVariablesAttribute.cs @@ -3,7 +3,7 @@ using System.Linq; using Fallout.Common.Utilities.Collections; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; public class UnsetVisualStudioEnvironmentVariablesAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Attributes/VerbosityMappingAttribute.cs b/src/Fallout.Build/Attributes/VerbosityMappingAttribute.cs index 9afcd3178..8688b79f5 100644 --- a/src/Fallout.Build/Attributes/VerbosityMappingAttribute.cs +++ b/src/Fallout.Build/Attributes/VerbosityMappingAttribute.cs @@ -1,10 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Execution; +using Fallout.Application; +using Fallout.Common; +using Fallout.Common.Tooling; -namespace Fallout.Common.Tooling; +namespace Fallout.Application.Tooling; public class VerbosityMappingAttribute : BuildExtensionAttributeBase, IOnBuildInitialized { diff --git a/src/Fallout.Build/CICD/BuildServerConfigurationGeneration.cs b/src/Fallout.Build/CICD/BuildServerConfigurationGeneration.cs index 2c5986940..88a1f47fa 100644 --- a/src/Fallout.Build/CICD/BuildServerConfigurationGeneration.cs +++ b/src/Fallout.Build/CICD/BuildServerConfigurationGeneration.cs @@ -1,7 +1,8 @@ using System; using System.Linq; +using Fallout.Application; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public static class BuildServerConfigurationGeneration { diff --git a/src/Fallout.Build/CICD/BuildServerConfigurationGenerationAttributeBase.cs b/src/Fallout.Build/CICD/BuildServerConfigurationGenerationAttributeBase.cs index 0a30f7a4b..4cc009066 100644 --- a/src/Fallout.Build/CICD/BuildServerConfigurationGenerationAttributeBase.cs +++ b/src/Fallout.Build/CICD/BuildServerConfigurationGenerationAttributeBase.cs @@ -1,11 +1,12 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Fallout.Common.Execution; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Execution; +using Fallout.Application; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public class BuildServerConfigurationGenerationAttributeBase : BuildExtensionAttributeBase { diff --git a/src/Fallout.Build/CICD/CIAttribute.cs b/src/Fallout.Build/CICD/CIAttribute.cs index 9778a4b2c..8339b38d4 100644 --- a/src/Fallout.Build/CICD/CIAttribute.cs +++ b/src/Fallout.Build/CICD/CIAttribute.cs @@ -1,10 +1,12 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Field | AttributeTargets.Property)] public class CIAttribute : ValueInjectionAttributeBase diff --git a/src/Fallout.Build/CICD/ChainedConfigurationAttributeBase.cs b/src/Fallout.Build/CICD/ChainedConfigurationAttributeBase.cs index 16aaa2eec..d7f466c28 100644 --- a/src/Fallout.Build/CICD/ChainedConfigurationAttributeBase.cs +++ b/src/Fallout.Build/CICD/ChainedConfigurationAttributeBase.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Execution; +using Fallout.Common; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public abstract class ChainedConfigurationAttributeBase : ConfigurationAttributeBase { diff --git a/src/Fallout.Build/CICD/ConfigurationAttributeBase.cs b/src/Fallout.Build/CICD/ConfigurationAttributeBase.cs index aa2304d21..47d487228 100644 --- a/src/Fallout.Build/CICD/ConfigurationAttributeBase.cs +++ b/src/Fallout.Build/CICD/ConfigurationAttributeBase.cs @@ -2,12 +2,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Utilities; -using static Fallout.Common.CI.BuildServerConfigurationGeneration; +using static Fallout.Application.CI.BuildServerConfigurationGeneration; +using Fallout.Application; +using Fallout.Application.Utilities; +using Fallout.Application.Execution; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; [AttributeUsage(AttributeTargets.Class)] public abstract class ConfigurationAttributeBase : Attribute, IConfigurationGenerator diff --git a/src/Fallout.Build/CICD/ConfigurationEntity.cs b/src/Fallout.Build/CICD/ConfigurationEntity.cs index f04a12d98..de97fc264 100644 --- a/src/Fallout.Build/CICD/ConfigurationEntity.cs +++ b/src/Fallout.Build/CICD/ConfigurationEntity.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.Utilities; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public abstract class ConfigurationEntity { diff --git a/src/Fallout.Build/CICD/CustomFileWriter.cs b/src/Fallout.Build/CICD/CustomFileWriter.cs index ba334ab2e..32442231d 100644 --- a/src/Fallout.Build/CICD/CustomFileWriter.cs +++ b/src/Fallout.Build/CICD/CustomFileWriter.cs @@ -1,8 +1,9 @@ using System; using System.IO; using System.Linq; +using Fallout.Common.Utilities; -namespace Fallout.Common.Utilities; +namespace Fallout.Application.Utilities; public class CustomFileWriter { diff --git a/src/Fallout.Build/CICD/GenerateBuildServerConfigurationsAttribute.cs b/src/Fallout.Build/CICD/GenerateBuildServerConfigurationsAttribute.cs index bcc716412..cc73a1e42 100644 --- a/src/Fallout.Build/CICD/GenerateBuildServerConfigurationsAttribute.cs +++ b/src/Fallout.Build/CICD/GenerateBuildServerConfigurationsAttribute.cs @@ -1,11 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.Utilities.Collections; -using static Fallout.Common.CI.BuildServerConfigurationGeneration; +using static Fallout.Application.CI.BuildServerConfigurationGeneration; +using Fallout.Application.Execution; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public class GenerateBuildServerConfigurationsAttribute : BuildServerConfigurationGenerationAttributeBase, IOnBuildCreated diff --git a/src/Fallout.Build/CICD/IBuildServer.cs b/src/Fallout.Build/CICD/IBuildServer.cs index 46cdc1804..f2b4ee24a 100644 --- a/src/Fallout.Build/CICD/IBuildServer.cs +++ b/src/Fallout.Build/CICD/IBuildServer.cs @@ -1,5 +1,5 @@ - -namespace Fallout.Common.CI; + +namespace Fallout.Application.CI; public interface IBuildServer { diff --git a/src/Fallout.Build/CICD/IConfigurationGenerator.cs b/src/Fallout.Build/CICD/IConfigurationGenerator.cs index f6c424531..232392a4a 100644 --- a/src/Fallout.Build/CICD/IConfigurationGenerator.cs +++ b/src/Fallout.Build/CICD/IConfigurationGenerator.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.IO; +using Fallout.Application.Execution; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public interface IConfigurationGenerator { diff --git a/src/Fallout.Build/CICD/InvokeBuildServerConfigurationGenerationAttribute.cs b/src/Fallout.Build/CICD/InvokeBuildServerConfigurationGenerationAttribute.cs index 371214e87..89b57d480 100644 --- a/src/Fallout.Build/CICD/InvokeBuildServerConfigurationGenerationAttribute.cs +++ b/src/Fallout.Build/CICD/InvokeBuildServerConfigurationGenerationAttribute.cs @@ -1,13 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Serilog; -using static Fallout.Common.CI.BuildServerConfigurationGeneration; +using static Fallout.Application.CI.BuildServerConfigurationGeneration; +using Fallout.Application.Execution; +using Fallout.Application; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public class InvokeBuildServerConfigurationGenerationAttribute : BuildServerConfigurationGenerationAttributeBase, IOnBuildCreated diff --git a/src/Fallout.Build/CICD/NoConvertAttribute.cs b/src/Fallout.Build/CICD/NoConvertAttribute.cs index 6b7faf4ae..7711dfdbc 100644 --- a/src/Fallout.Build/CICD/NoConvertAttribute.cs +++ b/src/Fallout.Build/CICD/NoConvertAttribute.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; [AttributeUsage(AttributeTargets.Property)] public class NoConvertAttribute : Attribute diff --git a/src/Fallout.Build/CICD/Partition.cs b/src/Fallout.Build/CICD/Partition.cs index 1f66d8df7..9ab944dd6 100644 --- a/src/Fallout.Build/CICD/Partition.cs +++ b/src/Fallout.Build/CICD/Partition.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.Linq; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; [TypeConverter(typeof(TypeConverter))] public class Partition diff --git a/src/Fallout.Build/CICD/PartitionAttribute.cs b/src/Fallout.Build/CICD/PartitionAttribute.cs index 14ed80c19..890249a87 100644 --- a/src/Fallout.Build/CICD/PartitionAttribute.cs +++ b/src/Fallout.Build/CICD/PartitionAttribute.cs @@ -1,8 +1,9 @@ using System; using System.Linq; using System.Reflection; +using Fallout.Application; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; public class PartitionAttribute : ParameterAttribute { diff --git a/src/Fallout.Build/ControlFlow.cs b/src/Fallout.Build/ControlFlow.cs index ca8f09cc0..b289d7fa5 100644 --- a/src/Fallout.Build/ControlFlow.cs +++ b/src/Fallout.Build/ControlFlow.cs @@ -1,15 +1,16 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Fallout.Common.Utilities; using Serilog; +using Fallout.Common; #pragma warning disable CS0618 // ReSharper disable CompareNonConstrainedGenericWithNull -namespace Fallout.Common; +namespace Fallout.Application; [DebuggerNonUserCode] [DebuggerStepThrough] diff --git a/src/Fallout.Build/Execution/BuildExecutor.cs b/src/Fallout.Build/Execution/BuildExecutor.cs index b1cb733ee..bbffb95f6 100644 --- a/src/Fallout.Build/Execution/BuildExecutor.cs +++ b/src/Fallout.Build/Execution/BuildExecutor.cs @@ -7,8 +7,10 @@ using Fallout.Common.Utilities.Collections; using Fallout.Domain.Execution; using Serilog; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; /// /// Gradually executes targets of the execution plan. diff --git a/src/Fallout.Build/Execution/BuildManager.cs b/src/Fallout.Build/Execution/BuildManager.cs index f0d8daefc..053bf20d3 100644 --- a/src/Fallout.Build/Execution/BuildManager.cs +++ b/src/Fallout.Build/Execution/BuildManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; @@ -10,9 +10,11 @@ using Fallout.Common.Utilities.Collections; using Fallout.Domain.Execution; using Serilog; +using Fallout.Application; +using Fallout.Application.Tooling; #pragma warning disable CA2255 -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal static class BuildManager { diff --git a/src/Fallout.Build/Execution/DelegateRequirementService.cs b/src/Fallout.Build/Execution/DelegateRequirementService.cs index 88caf5db1..6b172d476 100644 --- a/src/Fallout.Build/Execution/DelegateRequirementService.cs +++ b/src/Fallout.Build/Execution/DelegateRequirementService.cs @@ -1,12 +1,15 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Reflection; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application; +using Fallout.Application.ValueInjection; +using Fallout.Application.Utilities; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; /// /// Validates all requirements for targets that are part of the execution plan. diff --git a/src/Fallout.Build/Execution/ExecutableTarget.cs b/src/Fallout.Build/Execution/ExecutableTarget.cs index 64bcde8c0..81d4699be 100644 --- a/src/Fallout.Build/Execution/ExecutableTarget.cs +++ b/src/Fallout.Build/Execution/ExecutableTarget.cs @@ -7,9 +7,10 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities.Collections; using Fallout.Domain.Execution; +using Fallout.Application; // ReSharper disable MissingBaseTypeHighlighting -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; [DebuggerDisplay($"{{{nameof(Name)}}} ({{{nameof(Status)}}})")] public class ExecutableTarget : ITargetModel diff --git a/src/Fallout.Build/Execution/ExecutableTargetFactory.cs b/src/Fallout.Build/Execution/ExecutableTargetFactory.cs index 137146b8f..0360f1223 100644 --- a/src/Fallout.Build/Execution/ExecutableTargetFactory.cs +++ b/src/Fallout.Build/Execution/ExecutableTargetFactory.cs @@ -1,12 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Reflection; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; /// /// Creates all target objects according to the build instance. diff --git a/src/Fallout.Build/Execution/ExecutionPlanner.cs b/src/Fallout.Build/Execution/ExecutionPlanner.cs index 16450deca..0fd9f8437 100644 --- a/src/Fallout.Build/Execution/ExecutionPlanner.cs +++ b/src/Fallout.Build/Execution/ExecutionPlanner.cs @@ -5,8 +5,10 @@ using Fallout.Common.Utilities.Collections; using Fallout.Domain.Execution; using Fallout.Domain.Planning; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; /// /// Given the invoked target names, creates an execution plan under consideration of execution, ordering and trigger dependencies. diff --git a/src/Fallout.Build/Execution/Extensibility/BuildExtensionAttributeBase.cs b/src/Fallout.Build/Execution/Extensibility/BuildExtensionAttributeBase.cs index ad53bb3e4..ad7525ce0 100644 --- a/src/Fallout.Build/Execution/Extensibility/BuildExtensionAttributeBase.cs +++ b/src/Fallout.Build/Execution/Extensibility/BuildExtensionAttributeBase.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; +using Fallout.Application; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; public interface IBuildExtension { diff --git a/src/Fallout.Build/Execution/Extensibility/ToolInjectionAttributeBase.cs b/src/Fallout.Build/Execution/Extensibility/ToolInjectionAttributeBase.cs index 01fd5cf3c..a904c0440 100644 --- a/src/Fallout.Build/Execution/Extensibility/ToolInjectionAttributeBase.cs +++ b/src/Fallout.Build/Execution/Extensibility/ToolInjectionAttributeBase.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Linq; using System.Reflection; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; +using Fallout.Common.Tooling; -namespace Fallout.Common.Tooling; +namespace Fallout.Application.Tooling; public abstract class ToolInjectionAttributeBase : ValueInjectionAttributeBase { diff --git a/src/Fallout.Build/Execution/Extensibility/ValueInjectionAttributeBase.cs b/src/Fallout.Build/Execution/Extensibility/ValueInjectionAttributeBase.cs index 70105b78b..d744ac618 100644 --- a/src/Fallout.Build/Execution/Extensibility/ValueInjectionAttributeBase.cs +++ b/src/Fallout.Build/Execution/Extensibility/ValueInjectionAttributeBase.cs @@ -3,8 +3,10 @@ using System.Reflection; using Fallout.Common.Utilities; using Serilog; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.ValueInjection; +namespace Fallout.Application.ValueInjection; [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)] public abstract class ValueInjectionAttributeBase : Attribute diff --git a/src/Fallout.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs b/src/Fallout.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs index cb344c29c..91ce7f91a 100644 --- a/src/Fallout.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs @@ -1,16 +1,19 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.Json; using System.Text.Json.Nodes; -using Fallout.Common.CI; using Fallout.Common.IO; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; -using Fallout.Common.ValueInjection; +using Fallout.Application; +using Fallout.Application.ValueInjection; +using Fallout.Application.Utilities; +using Fallout.Application.CI; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; public class ArgumentsFromParametersFileAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Execution/Extensions/EventInvoker.cs b/src/Fallout.Build/Execution/Extensions/EventInvoker.cs index d435e3d15..1047b34ed 100644 --- a/src/Fallout.Build/Execution/Extensions/EventInvoker.cs +++ b/src/Fallout.Build/Execution/Extensions/EventInvoker.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; +using Fallout.Application; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class EventInvoker : BuildExtensionAttributeBase, IOnBuildCreated, diff --git a/src/Fallout.Build/Execution/Extensions/HandleHelpRequestsAttribute.cs b/src/Fallout.Build/Execution/Extensions/HandleHelpRequestsAttribute.cs index d7a6c50db..f5bac5aaf 100644 --- a/src/Fallout.Build/Execution/Extensions/HandleHelpRequestsAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/HandleHelpRequestsAttribute.cs @@ -4,9 +4,10 @@ using System.Reflection; using System.Text; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application; +using Fallout.Application.ValueInjection; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class HandleHelpRequestsAttribute : BuildExtensionAttributeBase, IOnBuildInitialized { diff --git a/src/Fallout.Build/Execution/Extensions/HandlePlanRequestsAttribute.cs b/src/Fallout.Build/Execution/Extensions/HandlePlanRequestsAttribute.cs index 98d9dfc0d..91f9dfcd8 100644 --- a/src/Fallout.Build/Execution/Extensions/HandlePlanRequestsAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/HandlePlanRequestsAttribute.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Execution; -namespace Fallout.Build.Execution.Extensions; +namespace Fallout.Application.Execution.Extensions; internal class HandlePlanRequestsAttribute : BuildExtensionAttributeBase, IOnBuildInitialized { diff --git a/src/Fallout.Build/Execution/Extensions/HandleReSharperSurrogateArgumentsAttribute.cs b/src/Fallout.Build/Execution/Extensions/HandleReSharperSurrogateArgumentsAttribute.cs index 4942df6bd..f2732037d 100644 --- a/src/Fallout.Build/Execution/Extensions/HandleReSharperSurrogateArgumentsAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/HandleReSharperSurrogateArgumentsAttribute.cs @@ -1,11 +1,12 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using Fallout.Common.IO; using Serilog; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class HandleReSharperSurrogateArgumentsAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Execution/Extensions/HandleShellCompletionAttribute.cs b/src/Fallout.Build/Execution/Extensions/HandleShellCompletionAttribute.cs index bd3d13aed..6ebb6aa26 100644 --- a/src/Fallout.Build/Execution/Extensions/HandleShellCompletionAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/HandleShellCompletionAttribute.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.CI; using Fallout.Common.IO; using Fallout.Common.Utilities; using static Fallout.Common.Constants; +using Fallout.Application.CI; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class HandleShellCompletionAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Execution/Extensions/HandleVisualStudioDebuggingAttribute.cs b/src/Fallout.Build/Execution/Extensions/HandleVisualStudioDebuggingAttribute.cs index 492aeeca9..a53759002 100644 --- a/src/Fallout.Build/Execution/Extensions/HandleVisualStudioDebuggingAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/HandleVisualStudioDebuggingAttribute.cs @@ -4,8 +4,10 @@ using System.Linq; using System.Threading; using Fallout.Common.IO; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class HandleVisualStudioDebuggingAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Execution/Extensions/InjectNonParameterValuesAttribute.cs b/src/Fallout.Build/Execution/Extensions/InjectNonParameterValuesAttribute.cs index 5f738ada6..88c896a68 100644 --- a/src/Fallout.Build/Execution/Extensions/InjectNonParameterValuesAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/InjectNonParameterValuesAttribute.cs @@ -1,11 +1,12 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Fallout.Common.Execution; using Fallout.Common.Utilities; +using Fallout.Application.Execution; +using Fallout.Application; -namespace Fallout.Common.ValueInjection; +namespace Fallout.Application.ValueInjection; internal class InjectNonParameterValuesAttribute : BuildExtensionAttributeBase, IOnBuildInitialized { diff --git a/src/Fallout.Build/Execution/Extensions/InjectParameterValuesAttribute.cs b/src/Fallout.Build/Execution/Extensions/InjectParameterValuesAttribute.cs index 449c23b01..b109b4f7f 100644 --- a/src/Fallout.Build/Execution/Extensions/InjectParameterValuesAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/InjectParameterValuesAttribute.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; +using Fallout.Application.Execution; +using Fallout.Application; -namespace Fallout.Common.ValueInjection; +namespace Fallout.Application.ValueInjection; internal class InjectParameterValuesAttribute : BuildExtensionAttributeBase, IOnBuildCreated { diff --git a/src/Fallout.Build/Execution/Extensions/SerializeBuildServerStateAttribute.cs b/src/Fallout.Build/Execution/Extensions/SerializeBuildServerStateAttribute.cs index 80eaeebd6..c1e539902 100644 --- a/src/Fallout.Build/Execution/Extensions/SerializeBuildServerStateAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/SerializeBuildServerStateAttribute.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Linq; -using Fallout.Common.Execution; +using Fallout.Application.Execution; -namespace Fallout.Common.CI; +namespace Fallout.Application.CI; internal class SerializeBuildServerStateAttribute : BuildServerConfigurationGenerationAttributeBase, IOnBuildFinished { diff --git a/src/Fallout.Build/Execution/Extensions/TelemetryAttribute.cs b/src/Fallout.Build/Execution/Extensions/TelemetryAttribute.cs index 715e79bfe..7f95d8464 100644 --- a/src/Fallout.Build/Execution/Extensions/TelemetryAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/TelemetryAttribute.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class TelemetryAttribute : BuildExtensionAttributeBase, IOnBuildInitialized, IOnTargetSucceeded { diff --git a/src/Fallout.Build/Execution/Extensions/UpdateNotificationAttribute.cs b/src/Fallout.Build/Execution/Extensions/UpdateNotificationAttribute.cs index 5841ffc29..03d6c2365 100644 --- a/src/Fallout.Build/Execution/Extensions/UpdateNotificationAttribute.cs +++ b/src/Fallout.Build/Execution/Extensions/UpdateNotificationAttribute.cs @@ -1,11 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using Fallout.Common.Utilities; using static Fallout.Common.Constants; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class UpdateNotificationAttribute : BuildExtensionAttributeBase, IOnBuildCreated, IOnBuildFinished { diff --git a/src/Fallout.Build/Execution/ParameterService.Statics.cs b/src/Fallout.Build/Execution/ParameterService.Statics.cs index e8e026b13..1f8de8128 100644 --- a/src/Fallout.Build/Execution/ParameterService.Statics.cs +++ b/src/Fallout.Build/Execution/ParameterService.Statics.cs @@ -1,10 +1,11 @@ -using System; +using System; using System.Linq; using System.Linq.Expressions; using System.Reflection; using Fallout.Common.Utilities; +using Fallout.Common; -namespace Fallout.Common; +namespace Fallout.Application; internal partial class ParameterService { diff --git a/src/Fallout.Build/Execution/ParameterService.cs b/src/Fallout.Build/Execution/ParameterService.cs index 0197449df..95a35965b 100644 --- a/src/Fallout.Build/Execution/ParameterService.cs +++ b/src/Fallout.Build/Execution/ParameterService.cs @@ -7,8 +7,9 @@ using Fallout.Common.Utilities; using Serilog; using static Fallout.Common.Utilities.ReflectionUtility; +using Fallout.Common; -namespace Fallout.Common; +namespace Fallout.Application; internal partial class ParameterService { diff --git a/src/Fallout.Build/Execution/TargetDefinition.cs b/src/Fallout.Build/Execution/TargetDefinition.cs index 64b235b4c..e157e0e0f 100644 --- a/src/Fallout.Build/Execution/TargetDefinition.cs +++ b/src/Fallout.Build/Execution/TargetDefinition.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; @@ -7,8 +7,11 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; +using Fallout.Application.Tooling; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal class TargetDefinition : ITargetDefinition { diff --git a/src/Fallout.Build/Execution/TargetExecutionException.cs b/src/Fallout.Build/Execution/TargetExecutionException.cs index d2e36c91f..b721cb3c4 100644 --- a/src/Fallout.Build/Execution/TargetExecutionException.cs +++ b/src/Fallout.Build/Execution/TargetExecutionException.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Runtime.Serialization; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; [Serializable] internal class TargetExecutionException : Exception diff --git a/src/Fallout.Build/Execution/ToolRequirementService.cs b/src/Fallout.Build/Execution/ToolRequirementService.cs index 229947250..408b87729 100644 --- a/src/Fallout.Build/Execution/ToolRequirementService.cs +++ b/src/Fallout.Build/Execution/ToolRequirementService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -6,8 +6,10 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Serilog; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal static class ToolRequirementService { diff --git a/src/Fallout.Build/Execution/ValueInjectionUtility.cs b/src/Fallout.Build/Execution/ValueInjectionUtility.cs index 8d637a3e9..917489c70 100644 --- a/src/Fallout.Build/Execution/ValueInjectionUtility.cs +++ b/src/Fallout.Build/Execution/ValueInjectionUtility.cs @@ -1,12 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Reflection; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.ValueInjection; +namespace Fallout.Application.ValueInjection; internal static class ValueInjectionUtility { diff --git a/src/Fallout.Build/FalloutBuild.Events.cs b/src/Fallout.Build/FalloutBuild.Events.cs index 2b44e2a19..def3548b6 100644 --- a/src/Fallout.Build/FalloutBuild.Events.cs +++ b/src/Fallout.Build/FalloutBuild.Events.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Fallout.Common.Execution; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using Serilog; +using Fallout.Application.Execution; -namespace Fallout.Common; +namespace Fallout.Application; [EventInvoker(Priority = float.MinValue)] public abstract partial class FalloutBuild diff --git a/src/Fallout.Build/FalloutBuild.Interface.cs b/src/Fallout.Build/FalloutBuild.Interface.cs index 815f1c712..18e1c6861 100644 --- a/src/Fallout.Build/FalloutBuild.Interface.cs +++ b/src/Fallout.Build/FalloutBuild.Interface.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using Fallout.Common.Execution; using Fallout.Common.IO; -using Fallout.Common.ValueInjection; +using Fallout.Application.Execution; +using Fallout.Application.ValueInjection; -namespace Fallout.Common; +namespace Fallout.Application; public abstract partial class FalloutBuild { diff --git a/src/Fallout.Build/FalloutBuild.Output.cs b/src/Fallout.Build/FalloutBuild.Output.cs index b8eab31fa..71a6d64fc 100644 --- a/src/Fallout.Build/FalloutBuild.Output.cs +++ b/src/Fallout.Build/FalloutBuild.Output.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.Utilities; -namespace Fallout.Common; +namespace Fallout.Application; partial class FalloutBuild { diff --git a/src/Fallout.Build/FalloutBuild.Statics.cs b/src/Fallout.Build/FalloutBuild.Statics.cs index 2f1dfc285..2b7dd692e 100644 --- a/src/Fallout.Build/FalloutBuild.Statics.cs +++ b/src/Fallout.Build/FalloutBuild.Statics.cs @@ -1,15 +1,16 @@ -using System; +using System; using System.IO; using System.Linq; using System.Reflection; -using Fallout.Common.CI; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Constants; +using Fallout.Application.Execution; +using Fallout.Application.CI; +using Fallout.Common; -namespace Fallout.Common; +namespace Fallout.Application; public abstract partial class FalloutBuild { diff --git a/src/Fallout.Build/FalloutBuild.cs b/src/Fallout.Build/FalloutBuild.cs index 9f00da1f6..16d90fbee 100644 --- a/src/Fallout.Build/FalloutBuild.cs +++ b/src/Fallout.Build/FalloutBuild.cs @@ -1,21 +1,22 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Fallout.Build.Execution.Extensions; -using Fallout.Common.CI; -using Fallout.Common.Execution; using Fallout.Domain.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; using static Fallout.Common.Constants; +using Fallout.Application.Execution; +using Fallout.Application.ValueInjection; +using Fallout.Application.CI; +using Fallout.Application.Execution.Extensions; +using Fallout.Common; // ReSharper disable VirtualMemberNeverOverridden.Global -namespace Fallout.Common; +namespace Fallout.Application; /// /// Base class for build definitions. Derived types must declare static int Main which calls diff --git a/src/Fallout.Build/Host.Activation.cs b/src/Fallout.Build/Host.Activation.cs index 8d611ed92..88537473f 100644 --- a/src/Fallout.Build/Host.Activation.cs +++ b/src/Fallout.Build/Host.Activation.cs @@ -1,12 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Globalization; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.Utilities; +using Fallout.Application.Execution; +using Fallout.Common; -namespace Fallout.Common; +namespace Fallout.Application; public partial class Host { diff --git a/src/Fallout.Build/Host.Theming.cs b/src/Fallout.Build/Host.Theming.cs index 5ce359718..8f7f989fe 100644 --- a/src/Fallout.Build/Host.Theming.cs +++ b/src/Fallout.Build/Host.Theming.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Linq; -using Fallout.Common.Execution; +using Fallout.Application.Execution; -namespace Fallout.Common; +namespace Fallout.Application; public partial class Host { diff --git a/src/Fallout.Build/Host.cs b/src/Fallout.Build/Host.cs index 413cb6bb9..1c99da094 100644 --- a/src/Fallout.Build/Host.cs +++ b/src/Fallout.Build/Host.cs @@ -1,18 +1,19 @@ -using System; +using System; using System.ComponentModel; using System.Globalization; using System.Linq; -using Fallout.Common.Execution; using Fallout.Domain.Execution; -using Fallout.Common.Execution.Theming; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using Serilog; using Serilog.Core; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; +using Fallout.Application.Execution.Theming; +using Fallout.Application.Execution; +using Fallout.Common; -namespace Fallout.Common; +namespace Fallout.Application; [TypeConverter(typeof(TypeConverter))] public partial class Host diff --git a/src/Fallout.Build/IFalloutBuild.cs b/src/Fallout.Build/IFalloutBuild.cs index 7a0a4fb6a..d2bf0d88c 100644 --- a/src/Fallout.Build/IFalloutBuild.cs +++ b/src/Fallout.Build/IFalloutBuild.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Fallout.Common.CI; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; +using Fallout.Application.Execution; +using Fallout.Application.CI; -namespace Fallout.Common; +namespace Fallout.Application; public interface IFalloutBuild { diff --git a/src/Fallout.Build/ITargetDefinition.cs b/src/Fallout.Build/ITargetDefinition.cs index 6e7af941a..2b4fcf398 100644 --- a/src/Fallout.Build/ITargetDefinition.cs +++ b/src/Fallout.Build/ITargetDefinition.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Linq; using System.Linq.Expressions; using System.Runtime.CompilerServices; using System.Threading.Tasks; using Fallout.Common.Tooling; -namespace Fallout.Common; +namespace Fallout.Application; /// /// Public API for defining targets. diff --git a/src/Fallout.Build/LogLevel.cs b/src/Fallout.Build/LogLevel.cs index 8a6982e8a..3e9ef55c4 100644 --- a/src/Fallout.Build/LogLevel.cs +++ b/src/Fallout.Build/LogLevel.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -namespace Fallout.Common; +namespace Fallout.Application; public enum LogLevel { diff --git a/src/Fallout.Build/Logging.cs b/src/Fallout.Build/Logging.cs index 9d99f5052..1d91b91c0 100644 --- a/src/Fallout.Build/Logging.cs +++ b/src/Fallout.Build/Logging.cs @@ -1,9 +1,7 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Fallout.Common.CI; -using Fallout.Common.Execution.Theming; using Fallout.Common.IO; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; @@ -12,8 +10,13 @@ using Serilog.Events; using Serilog.Formatting.Compact; using Serilog.Sinks.SystemConsole.Themes; +using Fallout.Application.Execution.Theming; +using Fallout.Application; +using Fallout.Application.CI; +using Fallout.Application.Execution; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; public static class Logging { diff --git a/src/Fallout.Build/ParameterAttribute.cs b/src/Fallout.Build/ParameterAttribute.cs index 8767af603..410672017 100644 --- a/src/Fallout.Build/ParameterAttribute.cs +++ b/src/Fallout.Build/ParameterAttribute.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; -namespace Fallout.Common; +namespace Fallout.Application; /// /// Injected parameters are resolved case-insensitively in the following order: diff --git a/src/Fallout.Build/RequiresAttribute.cs b/src/Fallout.Build/RequiresAttribute.cs index ffde922ed..2c6cbdf9d 100644 --- a/src/Fallout.Build/RequiresAttribute.cs +++ b/src/Fallout.Build/RequiresAttribute.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.Tooling; +using Fallout.Common; -namespace Fallout.Common; +namespace Fallout.Application; public abstract class RequiresAttribute : Attribute { diff --git a/src/Fallout.Build/Target.cs b/src/Fallout.Build/Target.cs index 38dd3c3e8..59ca43f98 100644 --- a/src/Fallout.Build/Target.cs +++ b/src/Fallout.Build/Target.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; +using Fallout.Application.Execution; -namespace Fallout.Common; +namespace Fallout.Application; /// /// Defines a target. diff --git a/src/Fallout.Build/Telemetry/Telemetry.Events.cs b/src/Fallout.Build/Telemetry/Telemetry.Events.cs index ee01b590e..db09a1efb 100644 --- a/src/Fallout.Build/Telemetry/Telemetry.Events.cs +++ b/src/Fallout.Build/Telemetry/Telemetry.Events.cs @@ -1,12 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using Fallout.Domain.Execution; using Serilog; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal partial class Telemetry { diff --git a/src/Fallout.Build/Telemetry/Telemetry.Properties.cs b/src/Fallout.Build/Telemetry/Telemetry.Properties.cs index 11c2cf702..7d6fd2734 100644 --- a/src/Fallout.Build/Telemetry/Telemetry.Properties.cs +++ b/src/Fallout.Build/Telemetry/Telemetry.Properties.cs @@ -1,17 +1,19 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using System.Runtime.InteropServices; -using Fallout.Common.CI; -using Fallout.Common.Git; using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; -using Fallout.Common.ValueInjection; +using Fallout.Application; +using Fallout.Application.Git; +using Fallout.Application.ValueInjection; +using Fallout.Application.CI; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal partial class Telemetry { diff --git a/src/Fallout.Build/Telemetry/Telemetry.cs b/src/Fallout.Build/Telemetry/Telemetry.cs index 0f7878410..8323edde9 100644 --- a/src/Fallout.Build/Telemetry/Telemetry.cs +++ b/src/Fallout.Build/Telemetry/Telemetry.cs @@ -1,13 +1,15 @@ -using System; +using System; using System.Linq; using System.Reflection; using System.Threading; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Utilities; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; +using Fallout.Application; +using Fallout.Common; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; internal static partial class Telemetry { diff --git a/src/Fallout.Build/Terminal.cs b/src/Fallout.Build/Terminal.cs index 2ed103e21..4881489fd 100644 --- a/src/Fallout.Build/Terminal.cs +++ b/src/Fallout.Build/Terminal.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; public class Terminal : Host { diff --git a/src/Fallout.Build/Theming/AnsiConsoleHostTheme.cs b/src/Fallout.Build/Theming/AnsiConsoleHostTheme.cs index cdb0e2ddf..ac3392492 100644 --- a/src/Fallout.Build/Theming/AnsiConsoleHostTheme.cs +++ b/src/Fallout.Build/Theming/AnsiConsoleHostTheme.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Fallout.Common.Utilities; using Serilog.Sinks.SystemConsole.Themes; -namespace Fallout.Common.Execution.Theming; +namespace Fallout.Application.Execution.Theming; public class AnsiConsoleHostTheme : AnsiConsoleTheme, IHostTheme { diff --git a/src/Fallout.Build/Theming/IHostTheme.cs b/src/Fallout.Build/Theming/IHostTheme.cs index c5ad6ce1c..4ca3e3dd6 100644 --- a/src/Fallout.Build/Theming/IHostTheme.cs +++ b/src/Fallout.Build/Theming/IHostTheme.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -namespace Fallout.Common.Execution.Theming; +namespace Fallout.Application.Execution.Theming; public interface IHostTheme { diff --git a/src/Fallout.Build/Theming/SystemConsoleHostTheme.cs b/src/Fallout.Build/Theming/SystemConsoleHostTheme.cs index 826468ada..9e247c77b 100644 --- a/src/Fallout.Build/Theming/SystemConsoleHostTheme.cs +++ b/src/Fallout.Build/Theming/SystemConsoleHostTheme.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using Fallout.Common.Utilities; using Serilog; using Serilog.Sinks.SystemConsole.Themes; -namespace Fallout.Common.Execution.Theming; +namespace Fallout.Application.Execution.Theming; public class SystemConsoleHostTheme : SystemConsoleTheme, IHostTheme { diff --git a/src/Fallout.Build/Utilities/ConsoleUtility.cs b/src/Fallout.Build/Utilities/ConsoleUtility.cs index 1e59cb972..8bac101a4 100644 --- a/src/Fallout.Build/Utilities/ConsoleUtility.cs +++ b/src/Fallout.Build/Utilities/ConsoleUtility.cs @@ -2,8 +2,11 @@ using System.Drawing; using System.Linq; using System.Text; +using Fallout.Application; +using Fallout.Common; +using Fallout.Common.Utilities; -namespace Fallout.Common.Utilities; +namespace Fallout.Application.Utilities; public class ConsoleUtility { diff --git a/src/Fallout.Build/Utilities/CredentialStore.cs b/src/Fallout.Build/Utilities/CredentialStore.cs index 58c2aa9af..f38d495de 100644 --- a/src/Fallout.Build/Utilities/CredentialStore.cs +++ b/src/Fallout.Build/Utilities/CredentialStore.cs @@ -1,8 +1,11 @@ -using System; +using System; using System.Linq; using Fallout.Common.Tooling; +using Fallout.Application; +using Fallout.Common; +using Fallout.Common.Utilities; -namespace Fallout.Common.Utilities; +namespace Fallout.Application.Utilities; public static class CredentialStore { diff --git a/src/Fallout.Build/Utilities/SchemaUtility.cs b/src/Fallout.Build/Utilities/SchemaUtility.cs index 7c6e5c171..09449610c 100644 --- a/src/Fallout.Build/Utilities/SchemaUtility.cs +++ b/src/Fallout.Build/Utilities/SchemaUtility.cs @@ -10,10 +10,13 @@ using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; using static Fallout.Common.Constants; +using Fallout.Application; +using Fallout.Application.ValueInjection; +using Fallout.Common; +using Fallout.Application.Execution; -namespace Fallout.Common.Execution; +namespace Fallout.Application.Execution; /// /// Generates a draft-04 JSON Schema for a build's [Parameter]-attributed members so editors diff --git a/src/Fallout.Build/VCS/GitRepository.cs b/src/Fallout.Build/VCS/GitRepository.cs index b97e2c3d5..b966b0865 100644 --- a/src/Fallout.Build/VCS/GitRepository.cs +++ b/src/Fallout.Build/VCS/GitRepository.cs @@ -2,11 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Fallout.Common.CI; using Fallout.Common.IO; using Fallout.Common.Utilities; +using Fallout.Application; +using Fallout.Application.CI; +using Fallout.Common; -namespace Fallout.Common.Git; +namespace Fallout.Application.Git; public enum GitProtocol { diff --git a/src/Fallout.Build/VCS/GitRepositoryExtensions.cs b/src/Fallout.Build/VCS/GitRepositoryExtensions.cs index aa9806ae8..b2de5742e 100644 --- a/src/Fallout.Build/VCS/GitRepositoryExtensions.cs +++ b/src/Fallout.Build/VCS/GitRepositoryExtensions.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; -namespace Fallout.Common.Git; +namespace Fallout.Application.Git; public static class GitRepositoryExtensions { diff --git a/src/Fallout.Build/Verbosity.cs b/src/Fallout.Build/Verbosity.cs index 125ec5e1c..9f48bba0c 100644 --- a/src/Fallout.Build/Verbosity.cs +++ b/src/Fallout.Build/Verbosity.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -namespace Fallout.Common; +namespace Fallout.Application; public enum Verbosity { diff --git a/src/Fallout.Cli/Program.AddPackage.cs b/src/Fallout.Cli/Program.AddPackage.cs index ea6d28cf5..816e859e1 100644 --- a/src/Fallout.Cli/Program.AddPackage.cs +++ b/src/Fallout.Cli/Program.AddPackage.cs @@ -1,11 +1,12 @@ -using System; +using System; using System.Linq; using Fallout.Common; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Tooling; using Fallout.Common.Tools.DotNet; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.Cake.cs b/src/Fallout.Cli/Program.Cake.cs index 6169798d1..728e8a33f 100644 --- a/src/Fallout.Cli/Program.Cake.cs +++ b/src/Fallout.Cli/Program.Cake.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Fallout.Common; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Tooling; @@ -12,6 +11,8 @@ using Fallout.Cli.Rewriting.Cake; using static Fallout.Common.Constants; using static Fallout.Common.EnvironmentInfo; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.GetConfiguration.cs b/src/Fallout.Cli/Program.GetConfiguration.cs index 6600b3273..03004adfb 100644 --- a/src/Fallout.Cli/Program.GetConfiguration.cs +++ b/src/Fallout.Cli/Program.GetConfiguration.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -6,6 +6,7 @@ using Fallout.Common.IO; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.Secrets.cs b/src/Fallout.Cli/Program.Secrets.cs index d6dfc277a..3db43c42d 100644 --- a/src/Fallout.Cli/Program.Secrets.cs +++ b/src/Fallout.Cli/Program.Secrets.cs @@ -8,6 +8,8 @@ using Fallout.Common.Utilities.Collections; using static Fallout.Common.Constants; using static Fallout.Common.Utilities.EncryptionUtility; +using Fallout.Application; +using Fallout.Application.Utilities; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.Setup.cs b/src/Fallout.Cli/Program.Setup.cs index 36bbf1019..5c662cd26 100644 --- a/src/Fallout.Cli/Program.Setup.cs +++ b/src/Fallout.Cli/Program.Setup.cs @@ -5,7 +5,6 @@ using System.Reflection; using System.Text; using Fallout.Common; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; @@ -15,6 +14,8 @@ using static Fallout.Common.EnvironmentInfo; using static Fallout.Common.Tooling.ProcessTasks; using static Fallout.Common.Utilities.TemplateUtility; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.Trigger.cs b/src/Fallout.Cli/Program.Trigger.cs index 1497e5626..3b4154372 100644 --- a/src/Fallout.Cli/Program.Trigger.cs +++ b/src/Fallout.Cli/Program.Trigger.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Linq; using Fallout.Common; -using Fallout.Common.Git; using Fallout.Common.IO; using Fallout.Common.Tools.Git; using Fallout.Common.Utilities; +using Fallout.Application.Git; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.Update.cs b/src/Fallout.Cli/Program.Update.cs index 145bf805c..1a36e0e17 100644 --- a/src/Fallout.Cli/Program.Update.cs +++ b/src/Fallout.Cli/Program.Update.cs @@ -1,14 +1,15 @@ -using System; +using System; using System.IO; using System.Linq; using System.Text.Json.Nodes; using Fallout.Common; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Tools.DotNet; using Fallout.Common.Utilities; using static Fallout.Common.Constants; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Program.cs b/src/Fallout.Cli/Program.cs index 1702ab81a..f68cda890 100644 --- a/src/Fallout.Cli/Program.cs +++ b/src/Fallout.Cli/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; using System.Text; @@ -6,6 +6,7 @@ using Fallout.Common.IO; using Fallout.Common.Utilities; using Spectre.Console; +using Fallout.Application; namespace Fallout.Cli; diff --git a/src/Fallout.Cli/Rewriting/Cake/ClassRewriter.cs b/src/Fallout.Cli/Rewriting/Cake/ClassRewriter.cs index 9bfe9e402..f7490da4f 100644 --- a/src/Fallout.Cli/Rewriting/Cake/ClassRewriter.cs +++ b/src/Fallout.Cli/Rewriting/Cake/ClassRewriter.cs @@ -10,6 +10,7 @@ using Fallout.Common.Tools.NuGet; using Fallout.Common.Tools.SignTool; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; +using Fallout.Application; namespace Fallout.Cli.Rewriting.Cake; diff --git a/src/Fallout.Cli/Rewriting/Cake/FormattingRewriter.cs b/src/Fallout.Cli/Rewriting/Cake/FormattingRewriter.cs index 63a84b8ad..2b1db73cd 100644 --- a/src/Fallout.Cli/Rewriting/Cake/FormattingRewriter.cs +++ b/src/Fallout.Cli/Rewriting/Cake/FormattingRewriter.cs @@ -5,6 +5,7 @@ using Fallout.Common; using Fallout.Common.Utilities.Collections; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; +using Fallout.Application; namespace Fallout.Cli.Rewriting.Cake; diff --git a/src/Fallout.Cli/Rewriting/Cake/InvocationRewriter.cs b/src/Fallout.Cli/Rewriting/Cake/InvocationRewriter.cs index c30b3efcf..0960cd80c 100644 --- a/src/Fallout.Cli/Rewriting/Cake/InvocationRewriter.cs +++ b/src/Fallout.Cli/Rewriting/Cake/InvocationRewriter.cs @@ -7,6 +7,7 @@ using Fallout.Common.IO; using Serilog; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; +using Fallout.Application; namespace Fallout.Cli.Rewriting.Cake; diff --git a/src/Fallout.Cli/Rewriting/Cake/SafeSyntaxRewriter.cs b/src/Fallout.Cli/Rewriting/Cake/SafeSyntaxRewriter.cs index e0614e8c6..7e0cf59c8 100644 --- a/src/Fallout.Cli/Rewriting/Cake/SafeSyntaxRewriter.cs +++ b/src/Fallout.Cli/Rewriting/Cake/SafeSyntaxRewriter.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using Fallout.Common; +using Fallout.Application; namespace Fallout.Cli.Rewriting.Cake; diff --git a/src/Fallout.Cli/Rewriting/Cake/TargetDefinitionRewriter.cs b/src/Fallout.Cli/Rewriting/Cake/TargetDefinitionRewriter.cs index 0738e4eac..b37a9605e 100644 --- a/src/Fallout.Cli/Rewriting/Cake/TargetDefinitionRewriter.cs +++ b/src/Fallout.Cli/Rewriting/Cake/TargetDefinitionRewriter.cs @@ -5,6 +5,7 @@ using Fallout.Common; using Fallout.Common.Utilities.Collections; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; +using Fallout.Application; namespace Fallout.Cli.Rewriting.Cake; diff --git a/src/Fallout.Common/Attributes/CheckPathEnvironmentVariableAttribute.cs b/src/Fallout.Common/Attributes/CheckPathEnvironmentVariableAttribute.cs index 26b24376b..610133e07 100644 --- a/src/Fallout.Common/Attributes/CheckPathEnvironmentVariableAttribute.cs +++ b/src/Fallout.Common/Attributes/CheckPathEnvironmentVariableAttribute.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Fallout.Common.Tooling; +using Fallout.Application.Execution; namespace Fallout.Common.Execution; diff --git a/src/Fallout.Common/Attributes/FileSystemGlobbingAttributeBase.cs b/src/Fallout.Common/Attributes/FileSystemGlobbingAttributeBase.cs index dd4fd9de7..f72700717 100644 --- a/src/Fallout.Common/Attributes/FileSystemGlobbingAttributeBase.cs +++ b/src/Fallout.Common/Attributes/FileSystemGlobbingAttributeBase.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; namespace Fallout.Common.IO; diff --git a/src/Fallout.Common/Attributes/GitRepositoryAttribute.cs b/src/Fallout.Common/Attributes/GitRepositoryAttribute.cs index 9b6d80a07..beb70d71f 100644 --- a/src/Fallout.Common/Attributes/GitRepositoryAttribute.cs +++ b/src/Fallout.Common/Attributes/GitRepositoryAttribute.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using System.Reflection; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; +using Fallout.Application.Git; namespace Fallout.Common.Git; diff --git a/src/Fallout.Common/Attributes/GlobbingOptionsAttribute.cs b/src/Fallout.Common/Attributes/GlobbingOptionsAttribute.cs index 5f84f04ff..8ddd578c9 100644 --- a/src/Fallout.Common/Attributes/GlobbingOptionsAttribute.cs +++ b/src/Fallout.Common/Attributes/GlobbingOptionsAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common.Execution; +using Fallout.Application.Execution; namespace Fallout.Common.IO; diff --git a/src/Fallout.Common/Attributes/HandleSingleFileExecutionAttribute.cs b/src/Fallout.Common/Attributes/HandleSingleFileExecutionAttribute.cs index 3034762ee..e28185e03 100644 --- a/src/Fallout.Common/Attributes/HandleSingleFileExecutionAttribute.cs +++ b/src/Fallout.Common/Attributes/HandleSingleFileExecutionAttribute.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -10,6 +10,7 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Serilog; +using Fallout.Application.Execution; namespace Fallout.Common.Execution; diff --git a/src/Fallout.Common/Attributes/LatestGitHubReleaseAttribute.cs b/src/Fallout.Common/Attributes/LatestGitHubReleaseAttribute.cs index 5149b0cfb..7bfa03c63 100644 --- a/src/Fallout.Common/Attributes/LatestGitHubReleaseAttribute.cs +++ b/src/Fallout.Common/Attributes/LatestGitHubReleaseAttribute.cs @@ -1,12 +1,12 @@ -using System; +using System; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; using NuGet.Versioning; -using Fallout.Common.Git; using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; +using Fallout.Application.Git; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/LatestMavenVersionAttribute.cs b/src/Fallout.Common/Attributes/LatestMavenVersionAttribute.cs index aafdd04c2..e9e55ba4c 100644 --- a/src/Fallout.Common/Attributes/LatestMavenVersionAttribute.cs +++ b/src/Fallout.Common/Attributes/LatestMavenVersionAttribute.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Linq; using System.Reflection; using NuGet.Versioning; using Fallout.Common.IO; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/LatestMyGetVersionAttribute.cs b/src/Fallout.Common/Attributes/LatestMyGetVersionAttribute.cs index ddbbd899a..67935f34d 100644 --- a/src/Fallout.Common/Attributes/LatestMyGetVersionAttribute.cs +++ b/src/Fallout.Common/Attributes/LatestMyGetVersionAttribute.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.IO; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/LatestNpmVersionAttribute.cs b/src/Fallout.Common/Attributes/LatestNpmVersionAttribute.cs index 4a1383cab..da5eca413 100644 --- a/src/Fallout.Common/Attributes/LatestNpmVersionAttribute.cs +++ b/src/Fallout.Common/Attributes/LatestNpmVersionAttribute.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Linq; using System.Reflection; using NuGet.Versioning; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/LatestNuGetVersionAttribute.cs b/src/Fallout.Common/Attributes/LatestNuGetVersionAttribute.cs index fe7ca7919..fa0ad9f06 100644 --- a/src/Fallout.Common/Attributes/LatestNuGetVersionAttribute.cs +++ b/src/Fallout.Common/Attributes/LatestNuGetVersionAttribute.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Linq; using System.Reflection; using NuGet.Versioning; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/LocalPathAttribute.cs b/src/Fallout.Common/Attributes/LocalPathAttribute.cs index b71e0e74d..6879d4577 100644 --- a/src/Fallout.Common/Attributes/LocalPathAttribute.cs +++ b/src/Fallout.Common/Attributes/LocalPathAttribute.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.IO; using System.Linq; using System.Reflection; using Fallout.Common.IO; +using Fallout.Application.Tooling; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/NpmPackageAttribute.cs b/src/Fallout.Common/Attributes/NpmPackageAttribute.cs index 4b7644046..76e6a2a85 100644 --- a/src/Fallout.Common/Attributes/NpmPackageAttribute.cs +++ b/src/Fallout.Common/Attributes/NpmPackageAttribute.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using System.Reflection; +using Fallout.Application.Tooling; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/NuGetPackageAttribute.cs b/src/Fallout.Common/Attributes/NuGetPackageAttribute.cs index 4fd17d51a..93c7b027c 100644 --- a/src/Fallout.Common/Attributes/NuGetPackageAttribute.cs +++ b/src/Fallout.Common/Attributes/NuGetPackageAttribute.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using System.Reflection; +using Fallout.Application.Tooling; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/PathVariableAttribute.cs b/src/Fallout.Common/Attributes/PathVariableAttribute.cs index 92a6adf89..7de8915b5 100644 --- a/src/Fallout.Common/Attributes/PathVariableAttribute.cs +++ b/src/Fallout.Common/Attributes/PathVariableAttribute.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using System.Reflection; +using Fallout.Application.Tooling; namespace Fallout.Common.Tooling; diff --git a/src/Fallout.Common/Attributes/SolutionAttribute.cs b/src/Fallout.Common/Attributes/SolutionAttribute.cs index a2b46d5b4..f3428b56d 100644 --- a/src/Fallout.Common/Attributes/SolutionAttribute.cs +++ b/src/Fallout.Common/Attributes/SolutionAttribute.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.IO; @@ -6,6 +6,7 @@ using Serilog; using Fallout.Common; +using Fallout.Application; namespace Fallout.Solutions; diff --git a/src/Fallout.Common/CI/AppVeyor/AppVeyor.Theming.cs b/src/Fallout.Common/CI/AppVeyor/AppVeyor.Theming.cs index 9dd8b4413..39ec10ca8 100644 --- a/src/Fallout.Common/CI/AppVeyor/AppVeyor.Theming.cs +++ b/src/Fallout.Common/CI/AppVeyor/AppVeyor.Theming.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; -using Fallout.Common.Execution.Theming; +using System.Collections.Generic; using Serilog.Sinks.SystemConsole.Themes; +using Fallout.Application.Execution.Theming; namespace Fallout.Common.CI.AppVeyor; diff --git a/src/Fallout.Common/CI/AppVeyor/AppVeyor.cs b/src/Fallout.Common/CI/AppVeyor/AppVeyor.cs index a9d32edbc..129c2679a 100644 --- a/src/Fallout.Common/CI/AppVeyor/AppVeyor.cs +++ b/src/Fallout.Common/CI/AppVeyor/AppVeyor.cs @@ -4,6 +4,8 @@ using System.Linq; using Fallout.Common.Tooling; using Fallout.Common.Utilities; +using Fallout.Application; +using Fallout.Application.CI; namespace Fallout.Common.CI.AppVeyor; // diff --git a/src/Fallout.Common/CI/AppVeyor/AppVeyorAttribute.cs b/src/Fallout.Common/CI/AppVeyor/AppVeyorAttribute.cs index a0ea0d3b2..c98e2c6d1 100644 --- a/src/Fallout.Common/CI/AppVeyor/AppVeyorAttribute.cs +++ b/src/Fallout.Common/CI/AppVeyor/AppVeyorAttribute.cs @@ -4,10 +4,11 @@ using System.Linq; using System.Reflection; using Fallout.Common.CI.AppVeyor.Configuration; -using Fallout.Common.Execution; using Fallout.Common.IO; -using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; +using Fallout.Application.Execution; namespace Fallout.Common.CI.AppVeyor; diff --git a/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorBranches.cs b/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorBranches.cs index cb2f721f8..339ad30d7 100644 --- a/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorBranches.cs +++ b/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorBranches.cs @@ -1,7 +1,8 @@ using System; using System.Linq; -using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AppVeyor.Configuration; diff --git a/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorConfiguration.cs b/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorConfiguration.cs index 4e76c58d6..8744d042a 100644 --- a/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorConfiguration.cs +++ b/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorConfiguration.cs @@ -4,6 +4,8 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AppVeyor.Configuration; diff --git a/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorCustomWriterExtensions.cs b/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorCustomWriterExtensions.cs index 5e753554a..55c223b22 100644 --- a/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorCustomWriterExtensions.cs +++ b/src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorCustomWriterExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AppVeyor.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.Theming.cs b/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.Theming.cs index 160de8739..942880149 100644 --- a/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.Theming.cs +++ b/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.Theming.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; -using Fallout.Common.Execution.Theming; using Fallout.Common.Utilities; using Serilog.Sinks.SystemConsole.Themes; +using Fallout.Application.Execution.Theming; namespace Fallout.Common.CI.AzurePipelines; diff --git a/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.cs b/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.cs index 93f66e267..50df16a23 100644 --- a/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.cs +++ b/src/Fallout.Common/CI/AzurePipelines/AzurePipelines.cs @@ -1,9 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application; +using Fallout.Application.CI; namespace Fallout.Common.CI.AzurePipelines; diff --git a/src/Fallout.Common/CI/AzurePipelines/AzurePipelinesAttribute.cs b/src/Fallout.Common/CI/AzurePipelines/AzurePipelinesAttribute.cs index b6bf766b9..2c5f41baf 100644 --- a/src/Fallout.Common/CI/AzurePipelines/AzurePipelinesAttribute.cs +++ b/src/Fallout.Common/CI/AzurePipelines/AzurePipelinesAttribute.cs @@ -1,14 +1,16 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using Fallout.Common.CI.AzurePipelines.Configuration; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.IO.PathConstruction; +using Fallout.Application.CI; +using Fallout.Application.Utilities; +using Fallout.Application.Execution; namespace Fallout.Common.CI.AzurePipelines; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelineCheckoutStep.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelineCheckoutStep.cs index 3b1633d9b..f7b91f414 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelineCheckoutStep.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelineCheckoutStep.cs @@ -1,4 +1,4 @@ -using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCacheStep.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCacheStep.cs index 555712c7b..8a78d0384 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCacheStep.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCacheStep.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Tooling; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCmdStep.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCmdStep.cs index 1a9b7ed80..58a8dbcc6 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCmdStep.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCmdStep.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesConfiguration.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesConfiguration.cs index 327fa509b..1ff728f08 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesConfiguration.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesConfiguration.cs @@ -1,5 +1,6 @@ -using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCustomWriterExtensions.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCustomWriterExtensions.cs index 0d86dbd2d..4d9b63f8f 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCustomWriterExtensions.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCustomWriterExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesDownloadStep.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesDownloadStep.cs index 759ff7fab..379b2b108 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesDownloadStep.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesDownloadStep.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesJob.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesJob.cs index 90ad9ba37..e1f19fe3b 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesJob.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesJob.cs @@ -3,6 +3,8 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesPublishStep.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesPublishStep.cs index de71af96a..e43dcd145 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesPublishStep.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesPublishStep.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStage.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStage.cs index 749858e6d..0fee503b5 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStage.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStage.cs @@ -3,6 +3,8 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStep.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStep.cs index c25fb30ba..dde174943 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStep.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesStep.cs @@ -1,5 +1,6 @@ -using System; +using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesVcsPushTrigger.cs b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesVcsPushTrigger.cs index a5bc905e2..b44327db3 100644 --- a/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesVcsPushTrigger.cs +++ b/src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesVcsPushTrigger.cs @@ -1,6 +1,7 @@ -using System.Collections.Generic; -using Fallout.Common.Utilities; +using System.Collections.Generic; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.AzurePipelines.Configuration; diff --git a/src/Fallout.Common/CI/Bamboo/Bamboo.cs b/src/Fallout.Common/CI/Bamboo/Bamboo.cs index a963ae45c..8afb45267 100644 --- a/src/Fallout.Common/CI/Bamboo/Bamboo.cs +++ b/src/Fallout.Common/CI/Bamboo/Bamboo.cs @@ -1,5 +1,7 @@ -using System; +using System; using System.Diagnostics.CodeAnalysis; +using Fallout.Application.CI; +using Fallout.Application; namespace Fallout.Common.CI.Bamboo; diff --git a/src/Fallout.Common/CI/Bitbucket/Bitbucket.cs b/src/Fallout.Common/CI/Bitbucket/Bitbucket.cs index cc79eabf9..b311a1b41 100644 --- a/src/Fallout.Common/CI/Bitbucket/Bitbucket.cs +++ b/src/Fallout.Common/CI/Bitbucket/Bitbucket.cs @@ -1,6 +1,8 @@ -using System; +using System; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Fallout.Application.CI; +using Fallout.Application; namespace Fallout.Common.CI.Bitbucket; diff --git a/src/Fallout.Common/CI/Bitrise/Bitrise.cs b/src/Fallout.Common/CI/Bitrise/Bitrise.cs index 3a6920d61..c51d488c0 100644 --- a/src/Fallout.Common/CI/Bitrise/Bitrise.cs +++ b/src/Fallout.Common/CI/Bitrise/Bitrise.cs @@ -1,6 +1,8 @@ -using System; +using System; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Fallout.Application; +using Fallout.Application.CI; namespace Fallout.Common.CI.Bitrise; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsArtifactStep.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsArtifactStep.cs index ae5269c64..6e405afa5 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsArtifactStep.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsArtifactStep.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCacheStep.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCacheStep.cs index d1fb7da89..83b7c9582 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCacheStep.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCacheStep.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCheckoutStep.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCheckoutStep.cs index 2f2cdb624..5a6574f0f 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCheckoutStep.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsCheckoutStep.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsConfiguration.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsConfiguration.cs index 97ad0c9c4..f616c554b 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsConfiguration.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsConfiguration.cs @@ -2,6 +2,8 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsDetailedTrigger.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsDetailedTrigger.cs index a79de83ca..de6fb629f 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsDetailedTrigger.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsDetailedTrigger.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsJob.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsJob.cs index ab19c6ad4..500ecb15a 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsJob.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsJob.cs @@ -3,6 +3,8 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsRunStep.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsRunStep.cs index 5ff03f0cb..30632d872 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsRunStep.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsRunStep.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsScheduledTrigger.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsScheduledTrigger.cs index 2814cdd84..ac52bbb37 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsScheduledTrigger.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsScheduledTrigger.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsStep.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsStep.cs index 4971b527a..447700cec 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsStep.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsStep.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsVcsTrigger.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsVcsTrigger.cs index 50b0ce47f..5d6319fbe 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsVcsTrigger.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsVcsTrigger.cs @@ -3,6 +3,7 @@ using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsWorkflowDispatchTrigger.cs b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsWorkflowDispatchTrigger.cs index bf4b77490..05b1a2e25 100644 --- a/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsWorkflowDispatchTrigger.cs +++ b/src/Fallout.Common/CI/GitHubActions/Configuration/GitHubActionsWorkflowDispatchTrigger.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.GitHubActions.Configuration; diff --git a/src/Fallout.Common/CI/GitHubActions/GitHubActions.Theming.cs b/src/Fallout.Common/CI/GitHubActions/GitHubActions.Theming.cs index 2dcc184f8..1b0749dfc 100644 --- a/src/Fallout.Common/CI/GitHubActions/GitHubActions.Theming.cs +++ b/src/Fallout.Common/CI/GitHubActions/GitHubActions.Theming.cs @@ -1,6 +1,6 @@ -using System; -using Fallout.Common.Execution.Theming; +using System; using Fallout.Common.Utilities; +using Fallout.Application.Execution.Theming; namespace Fallout.Common.CI.GitHubActions; diff --git a/src/Fallout.Common/CI/GitHubActions/GitHubActions.cs b/src/Fallout.Common/CI/GitHubActions/GitHubActions.cs index 0e76cf618..026002121 100644 --- a/src/Fallout.Common/CI/GitHubActions/GitHubActions.cs +++ b/src/Fallout.Common/CI/GitHubActions/GitHubActions.cs @@ -10,6 +10,8 @@ using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; +using Fallout.Application; +using Fallout.Application.CI; namespace Fallout.Common.CI.GitHubActions; diff --git a/src/Fallout.Common/CI/GitHubActions/GitHubActionsAttribute.cs b/src/Fallout.Common/CI/GitHubActions/GitHubActionsAttribute.cs index 98c870cd8..f503997aa 100644 --- a/src/Fallout.Common/CI/GitHubActions/GitHubActionsAttribute.cs +++ b/src/Fallout.Common/CI/GitHubActions/GitHubActionsAttribute.cs @@ -1,13 +1,15 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using Fallout.Common.CI.GitHubActions.Configuration; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; +using Fallout.Application.Execution; namespace Fallout.Common.CI.GitHubActions; diff --git a/src/Fallout.Common/CI/GitLab/GitLab.Theming.cs b/src/Fallout.Common/CI/GitLab/GitLab.Theming.cs index 1c917f5f7..7a88a4ac5 100644 --- a/src/Fallout.Common/CI/GitLab/GitLab.Theming.cs +++ b/src/Fallout.Common/CI/GitLab/GitLab.Theming.cs @@ -1,6 +1,6 @@ -using System; -using Fallout.Common.Execution.Theming; +using System; using Fallout.Common.Utilities; +using Fallout.Application.Execution.Theming; namespace Fallout.Common.CI.GitLab; diff --git a/src/Fallout.Common/CI/GitLab/GitLab.cs b/src/Fallout.Common/CI/GitLab/GitLab.cs index c89fe2746..e428f2f0f 100644 --- a/src/Fallout.Common/CI/GitLab/GitLab.cs +++ b/src/Fallout.Common/CI/GitLab/GitLab.cs @@ -2,6 +2,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application; namespace Fallout.Common.CI.GitLab; diff --git a/src/Fallout.Common/CI/Jenkins/Jenkins.cs b/src/Fallout.Common/CI/Jenkins/Jenkins.cs index 7707c14b1..486f32cd5 100644 --- a/src/Fallout.Common/CI/Jenkins/Jenkins.cs +++ b/src/Fallout.Common/CI/Jenkins/Jenkins.cs @@ -1,6 +1,8 @@ -using System; +using System; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Fallout.Application.CI; +using Fallout.Application; namespace Fallout.Common.CI.Jenkins; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationConfiguration.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationConfiguration.cs index 7e26eb7ec..9361d2b92 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationConfiguration.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationConfiguration.cs @@ -1,6 +1,8 @@ -using System.Linq; +using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationContainer.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationContainer.cs index 4e950362f..5c44bf5d3 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationContainer.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationContainer.cs @@ -1,8 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCronScheduleTrigger.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCronScheduleTrigger.cs index 92a0dd6f2..458d9738b 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCronScheduleTrigger.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCronScheduleTrigger.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCustomWriterExtensions.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCustomWriterExtensions.cs index 79e1d096f..c5cca1db7 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCustomWriterExtensions.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationCustomWriterExtensions.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationPushTrigger.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationPushTrigger.cs index 25bdb3782..88297a1ca 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationPushTrigger.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationPushTrigger.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationResources.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationResources.cs index 07784c3d5..0c933aacb 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationResources.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationResources.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationTrigger.cs b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationTrigger.cs index 1a691d8a8..892f42d5b 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationTrigger.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/Configuration/SpaceAutomationTrigger.cs @@ -1,5 +1,6 @@ -using System; +using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.SpaceAutomation.Configuration; diff --git a/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.Theming.cs b/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.Theming.cs index 253e8b538..01dd5d88d 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.Theming.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.Theming.cs @@ -1,4 +1,4 @@ -using Fallout.Common.Execution; +using Fallout.Application.Execution; namespace Fallout.Common.CI.SpaceAutomation; diff --git a/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.cs b/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.cs index 54efe276e..026aa34fc 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomation.cs @@ -1,6 +1,8 @@ -using System; +using System; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Fallout.Application.CI; +using Fallout.Application; namespace Fallout.Common.CI.SpaceAutomation; diff --git a/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomationAttribute.cs b/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomationAttribute.cs index d14cdd31e..436174487 100644 --- a/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomationAttribute.cs +++ b/src/Fallout.Common/CI/SpaceAutomation/SpaceAutomationAttribute.cs @@ -1,11 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using Fallout.Common.CI.SpaceAutomation.Configuration; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Utilities; +using Fallout.Application.Execution; namespace Fallout.Common.CI.SpaceAutomation; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityArtifactDependency.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityArtifactDependency.cs index bf9080c54..aafe1c949 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityArtifactDependency.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityArtifactDependency.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildType.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildType.cs index 30bf70cc7..b9021c2c0 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildType.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildType.cs @@ -1,6 +1,8 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildTypeVcsRoot.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildTypeVcsRoot.cs index 530945720..f82dbd266 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildTypeVcsRoot.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityBuildTypeVcsRoot.cs @@ -1,6 +1,7 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfiguration.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfiguration.cs index 49fd4ce09..97ec4a852 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfiguration.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfiguration.cs @@ -2,6 +2,8 @@ using System.Linq; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfigurationParameter.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfigurationParameter.cs index 3bbe95cff..9c5558867 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfigurationParameter.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityConfigurationParameter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityCustomWriterExtensions.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityCustomWriterExtensions.cs index 75b9a1546..2abdbec42 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityCustomWriterExtensions.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityCustomWriterExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityDependency.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityDependency.cs index 995ee019a..b083466a1 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityDependency.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityDependency.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityFinishBuildTrigger.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityFinishBuildTrigger.cs index 65d3bdbc1..997d8f537 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityFinishBuildTrigger.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityFinishBuildTrigger.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityKeyValueParameter.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityKeyValueParameter.cs index 54c28ba41..eefaec27b 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityKeyValueParameter.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityKeyValueParameter.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityParameter.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityParameter.cs index 647d3d2ae..17392b694 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityParameter.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityParameter.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityProject.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityProject.cs index 74bd74de6..c97e2289e 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityProject.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityProject.cs @@ -1,6 +1,8 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityScheduledTrigger.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityScheduledTrigger.cs index 82a283544..947b46876 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityScheduledTrigger.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityScheduledTrigger.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCitySnapshotDependency.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCitySnapshotDependency.cs index d8358967e..0ce106c43 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCitySnapshotDependency.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCitySnapshotDependency.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityTrigger.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityTrigger.cs index fa302d64a..8bda89b82 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityTrigger.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityTrigger.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Fallout.Application.CI; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsRoot.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsRoot.cs index 0435792b9..44eb80217 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsRoot.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsRoot.cs @@ -1,6 +1,7 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.CI; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsTrigger.cs b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsTrigger.cs index af6010d08..55e5f6342 100644 --- a/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsTrigger.cs +++ b/src/Fallout.Common/CI/TeamCity/Configuration/TeamCityVcsTrigger.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Fallout.Common.Utilities; +using Fallout.Application.Utilities; namespace Fallout.Common.CI.TeamCity.Configuration; diff --git a/src/Fallout.Common/CI/TeamCity/TeamCity.Theming.cs b/src/Fallout.Common/CI/TeamCity/TeamCity.Theming.cs index a670029cb..c14505bc8 100644 --- a/src/Fallout.Common/CI/TeamCity/TeamCity.Theming.cs +++ b/src/Fallout.Common/CI/TeamCity/TeamCity.Theming.cs @@ -1,7 +1,7 @@ -using System; -using Fallout.Common.Execution; -using Fallout.Common.Execution.Theming; +using System; using Fallout.Common.Utilities; +using Fallout.Application.Execution.Theming; +using Fallout.Application.Execution; namespace Fallout.Common.CI.TeamCity; diff --git a/src/Fallout.Common/CI/TeamCity/TeamCity.cs b/src/Fallout.Common/CI/TeamCity/TeamCity.cs index b12931127..058294755 100644 --- a/src/Fallout.Common/CI/TeamCity/TeamCity.cs +++ b/src/Fallout.Common/CI/TeamCity/TeamCity.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; @@ -9,6 +9,8 @@ using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using Serilog; +using Fallout.Application; +using Fallout.Application.CI; namespace Fallout.Common.CI.TeamCity; diff --git a/src/Fallout.Common/CI/TeamCity/TeamCityAttribute.cs b/src/Fallout.Common/CI/TeamCity/TeamCityAttribute.cs index 04453628b..4aec99742 100644 --- a/src/Fallout.Common/CI/TeamCity/TeamCityAttribute.cs +++ b/src/Fallout.Common/CI/TeamCity/TeamCityAttribute.cs @@ -6,13 +6,16 @@ using System.Linq.Expressions; using System.Reflection; using Fallout.Common.CI.TeamCity.Configuration; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Solutions; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; -using Fallout.Common.ValueInjection; using static Fallout.Common.IO.PathConstruction; +using Fallout.Application.CI; +using Fallout.Application.Utilities; +using Fallout.Application.Execution; +using Fallout.Application.ValueInjection; +using Fallout.Application; namespace Fallout.Common.CI.TeamCity; diff --git a/src/Fallout.Common/CI/TravisCI/TravisCI.cs b/src/Fallout.Common/CI/TravisCI/TravisCI.cs index 3065a9148..342438f95 100644 --- a/src/Fallout.Common/CI/TravisCI/TravisCI.cs +++ b/src/Fallout.Common/CI/TravisCI/TravisCI.cs @@ -1,6 +1,8 @@ -using System; +using System; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Fallout.Application; +using Fallout.Application.CI; namespace Fallout.Common.CI.TravisCI; diff --git a/src/Fallout.Common/ChangeLog/ChangeLogTasks.cs b/src/Fallout.Common/ChangeLog/ChangeLogTasks.cs index 473da0562..c44b88ad0 100644 --- a/src/Fallout.Common/ChangeLog/ChangeLogTasks.cs +++ b/src/Fallout.Common/ChangeLog/ChangeLogTasks.cs @@ -3,11 +3,12 @@ using System.Diagnostics; using System.Linq; using NuGet.Versioning; -using Fallout.Common.Git; using Fallout.Common.IO; using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities; using Serilog; +using Fallout.Application.Git; +using Fallout.Application; // ReSharper disable ArgumentsStyleLiteral namespace Fallout.Common.ChangeLog; diff --git a/src/Fallout.Common/IO/FtpTasks.cs b/src/Fallout.Common/IO/FtpTasks.cs index ad1bd6840..fe9422cdc 100644 --- a/src/Fallout.Common/IO/FtpTasks.cs +++ b/src/Fallout.Common/IO/FtpTasks.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.IO; using System.Linq; using System.Net; using Serilog; +using Fallout.Application; #pragma warning disable SYSLIB0014 namespace Fallout.Common.IO; diff --git a/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultAttributeBase.cs b/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultAttributeBase.cs index c77a8f02e..63d85126e 100644 --- a/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultAttributeBase.cs +++ b/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultAttributeBase.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using System.Reflection; -using Fallout.Common.ValueInjection; +using Fallout.Application; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tools.AzureKeyVault { diff --git a/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultConfigurationAttribute.cs b/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultConfigurationAttribute.cs index 1736b355a..03f5f869c 100644 --- a/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultConfigurationAttribute.cs +++ b/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultConfigurationAttribute.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Linq; using System.Reflection; -using Fallout.Common.ValueInjection; using Serilog; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tools.AzureKeyVault { diff --git a/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultSecretAttribute.cs b/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultSecretAttribute.cs index 507c74639..55985ab7d 100644 --- a/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultSecretAttribute.cs +++ b/src/Fallout.Common/Tools/AzureKeyVault/AzureKeyVaultSecretAttribute.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Linq; using System.Reflection; +using Fallout.Application; namespace Fallout.Common.Tools.AzureKeyVault { diff --git a/src/Fallout.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs b/src/Fallout.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs index 12db5a322..030be4657 100644 --- a/src/Fallout.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs +++ b/src/Fallout.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/AzureSignTool/AzureSignTool.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.AzureSignTool; diff --git a/src/Fallout.Common/Tools/BenchmarkDotNet/BenchmarkDotNet.Generated.cs b/src/Fallout.Common/Tools/BenchmarkDotNet/BenchmarkDotNet.Generated.cs index d7bf92b63..6dee6f6d5 100644 --- a/src/Fallout.Common/Tools/BenchmarkDotNet/BenchmarkDotNet.Generated.cs +++ b/src/Fallout.Common/Tools/BenchmarkDotNet/BenchmarkDotNet.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Boots/Boots.Generated.cs b/src/Fallout.Common/Tools/Boots/Boots.Generated.cs index 9895638dd..d7fb8b9ee 100644 --- a/src/Fallout.Common/Tools/Boots/Boots.Generated.cs +++ b/src/Fallout.Common/Tools/Boots/Boots.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Chocolatey/Chocolatey.Generated.cs b/src/Fallout.Common/Tools/Chocolatey/Chocolatey.Generated.cs index a3d3d9ec7..504a58c21 100644 --- a/src/Fallout.Common/Tools/Chocolatey/Chocolatey.Generated.cs +++ b/src/Fallout.Common/Tools/Chocolatey/Chocolatey.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Chocolatey/Chocolatey.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Chocolatey; diff --git a/src/Fallout.Common/Tools/CodeMetrics/CodeMetrics.Generated.cs b/src/Fallout.Common/Tools/CodeMetrics/CodeMetrics.Generated.cs index ab4a42a2e..35d0b846a 100644 --- a/src/Fallout.Common/Tools/CodeMetrics/CodeMetrics.Generated.cs +++ b/src/Fallout.Common/Tools/CodeMetrics/CodeMetrics.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Codecov/Codecov.Generated.cs b/src/Fallout.Common/Tools/Codecov/Codecov.Generated.cs index 8a1969f03..930d9970d 100644 --- a/src/Fallout.Common/Tools/Codecov/Codecov.Generated.cs +++ b/src/Fallout.Common/Tools/Codecov/Codecov.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Codecov/Codecov.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Codecov; diff --git a/src/Fallout.Common/Tools/CorFlags/CorFlags.Generated.cs b/src/Fallout.Common/Tools/CorFlags/CorFlags.Generated.cs index e640f3b08..7ccb947da 100644 --- a/src/Fallout.Common/Tools/CorFlags/CorFlags.Generated.cs +++ b/src/Fallout.Common/Tools/CorFlags/CorFlags.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/CoverallsNet/CoverallsNet.Generated.cs b/src/Fallout.Common/Tools/CoverallsNet/CoverallsNet.Generated.cs index 51362c4a2..9ab051b0b 100644 --- a/src/Fallout.Common/Tools/CoverallsNet/CoverallsNet.Generated.cs +++ b/src/Fallout.Common/Tools/CoverallsNet/CoverallsNet.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/CoverallsNet/CoverallsNet.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.CoverallsNet; diff --git a/src/Fallout.Common/Tools/Coverlet/Coverlet.Generated.cs b/src/Fallout.Common/Tools/Coverlet/Coverlet.Generated.cs index 317aeca9e..78801f476 100644 --- a/src/Fallout.Common/Tools/Coverlet/Coverlet.Generated.cs +++ b/src/Fallout.Common/Tools/Coverlet/Coverlet.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Tools.DotNet; using Fallout.Common.Utilities.Collections; using System; diff --git a/src/Fallout.Common/Tools/Discord/Discord.Generated.cs b/src/Fallout.Common/Tools/Discord/Discord.Generated.cs index cd09ab349..2277892ce 100644 --- a/src/Fallout.Common/Tools/Discord/Discord.Generated.cs +++ b/src/Fallout.Common/Tools/Discord/Discord.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/DocFX/DocFX.Generated.cs b/src/Fallout.Common/Tools/DocFX/DocFX.Generated.cs index 96ed4968c..114506878 100644 --- a/src/Fallout.Common/Tools/DocFX/DocFX.Generated.cs +++ b/src/Fallout.Common/Tools/DocFX/DocFX.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Docker/Docker.Generated.cs b/src/Fallout.Common/Tools/Docker/Docker.Generated.cs index 1a7b39d91..964545ea8 100644 --- a/src/Fallout.Common/Tools/Docker/Docker.Generated.cs +++ b/src/Fallout.Common/Tools/Docker/Docker.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Docker/Docker.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Docker; diff --git a/src/Fallout.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs b/src/Fallout.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs index 0016dac68..26ad0bb90 100644 --- a/src/Fallout.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs +++ b/src/Fallout.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Tools.DotNet; @@ -12,6 +11,8 @@ using Serilog.Formatting.Compact.Reader; using static Fallout.Common.Tools.Docker.DockerTasks; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; +using Fallout.Application.Execution; namespace Fallout.Common.Tools.Docker; diff --git a/src/Fallout.Common/Tools/DotCover/DotCover.Generated.cs b/src/Fallout.Common/Tools/DotCover/DotCover.Generated.cs index 1f95e1bac..aabc45e9c 100644 --- a/src/Fallout.Common/Tools/DotCover/DotCover.Generated.cs +++ b/src/Fallout.Common/Tools/DotCover/DotCover.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/DotCover/TeamCitySetDotCoverHomePathAttribute.cs b/src/Fallout.Common/Tools/DotCover/TeamCitySetDotCoverHomePathAttribute.cs index ca999c4e9..0aeeb3137 100644 --- a/src/Fallout.Common/Tools/DotCover/TeamCitySetDotCoverHomePathAttribute.cs +++ b/src/Fallout.Common/Tools/DotCover/TeamCitySetDotCoverHomePathAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Fallout.Common.CI.TeamCity; -using Fallout.Common.Execution; +using Fallout.Application.Execution; namespace Fallout.Common.Tools.DotCover; diff --git a/src/Fallout.Common/Tools/DotMemoryUnit/DotMemoryUnit.Generated.cs b/src/Fallout.Common/Tools/DotMemoryUnit/DotMemoryUnit.Generated.cs index 308a475ef..195aff2d4 100644 --- a/src/Fallout.Common/Tools/DotMemoryUnit/DotMemoryUnit.Generated.cs +++ b/src/Fallout.Common/Tools/DotMemoryUnit/DotMemoryUnit.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/DotNet/DotNet.Generated.cs b/src/Fallout.Common/Tools/DotNet/DotNet.Generated.cs index 624f40593..487b2c251 100644 --- a/src/Fallout.Common/Tools/DotNet/DotNet.Generated.cs +++ b/src/Fallout.Common/Tools/DotNet/DotNet.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/DotNet/DotNet.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.DotNet; diff --git a/src/Fallout.Common/Tools/DotNet/DotNetTasks.cs b/src/Fallout.Common/Tools/DotNet/DotNetTasks.cs index 261fab0fc..0a827f2da 100644 --- a/src/Fallout.Common/Tools/DotNet/DotNetTasks.cs +++ b/src/Fallout.Common/Tools/DotNet/DotNetTasks.cs @@ -2,6 +2,7 @@ using System.Linq; using Fallout.Common.Tooling; using Serilog.Events; +using Fallout.Application.Tooling; namespace Fallout.Common.Tools.DotNet; diff --git a/src/Fallout.Common/Tools/DotnetPackaging/DotnetPackaging.Generated.cs b/src/Fallout.Common/Tools/DotnetPackaging/DotnetPackaging.Generated.cs index 3c161d88b..c46e18bf0 100644 --- a/src/Fallout.Common/Tools/DotnetPackaging/DotnetPackaging.Generated.cs +++ b/src/Fallout.Common/Tools/DotnetPackaging/DotnetPackaging.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/EntityFramework/EntityFramework.Generated.cs b/src/Fallout.Common/Tools/EntityFramework/EntityFramework.Generated.cs index d7bd6b22c..64976eda4 100644 --- a/src/Fallout.Common/Tools/EntityFramework/EntityFramework.Generated.cs +++ b/src/Fallout.Common/Tools/EntityFramework/EntityFramework.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Fixie/Fixie.Generated.cs b/src/Fallout.Common/Tools/Fixie/Fixie.Generated.cs index 0be64d219..5ede1d7d5 100644 --- a/src/Fallout.Common/Tools/Fixie/Fixie.Generated.cs +++ b/src/Fallout.Common/Tools/Fixie/Fixie.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Git/Git.Generated.cs b/src/Fallout.Common/Tools/Git/Git.Generated.cs index d28ebc7ef..44777a52d 100644 --- a/src/Fallout.Common/Tools/Git/Git.Generated.cs +++ b/src/Fallout.Common/Tools/Git/Git.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/GitHub/GitHubTasks.cs b/src/Fallout.Common/Tools/GitHub/GitHubTasks.cs index 1d1abc282..01749e343 100644 --- a/src/Fallout.Common/Tools/GitHub/GitHubTasks.cs +++ b/src/Fallout.Common/Tools/GitHub/GitHubTasks.cs @@ -3,10 +3,11 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using Fallout.Common.Git; using Fallout.Common.Utilities; using Octokit; using static Fallout.Common.IO.PathConstruction; +using Fallout.Application; +using Fallout.Application.Git; namespace Fallout.Common.Tools.GitHub; diff --git a/src/Fallout.Common/Tools/GitLink/GitLink.Generated.cs b/src/Fallout.Common/Tools/GitLink/GitLink.Generated.cs index 198d06207..1c2a10b14 100644 --- a/src/Fallout.Common/Tools/GitLink/GitLink.Generated.cs +++ b/src/Fallout.Common/Tools/GitLink/GitLink.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/GitReleaseManager/GitReleaseManager.Generated.cs b/src/Fallout.Common/Tools/GitReleaseManager/GitReleaseManager.Generated.cs index 888c9a99f..7bb390297 100644 --- a/src/Fallout.Common/Tools/GitReleaseManager/GitReleaseManager.Generated.cs +++ b/src/Fallout.Common/Tools/GitReleaseManager/GitReleaseManager.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/GitReleaseManager/GitReleaseManager.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.GitReleaseManager; diff --git a/src/Fallout.Common/Tools/GitVersion/GitVersion.Generated.cs b/src/Fallout.Common/Tools/GitVersion/GitVersion.Generated.cs index be230ca7e..67abdd2ae 100644 --- a/src/Fallout.Common/Tools/GitVersion/GitVersion.Generated.cs +++ b/src/Fallout.Common/Tools/GitVersion/GitVersion.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/GitVersion/GitVersion.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.GitVersion; diff --git a/src/Fallout.Common/Tools/GitVersion/GitVersionAttribute.cs b/src/Fallout.Common/Tools/GitVersion/GitVersionAttribute.cs index 894f06e10..c0dd493f4 100644 --- a/src/Fallout.Common/Tools/GitVersion/GitVersionAttribute.cs +++ b/src/Fallout.Common/Tools/GitVersion/GitVersionAttribute.cs @@ -1,15 +1,16 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.CI.AppVeyor; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.TeamCity; -using Fallout.Common.Git; using Fallout.Common.Tooling; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; using Serilog; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; +using Fallout.Application; +using Fallout.Application.ValueInjection; +using Fallout.Application.Git; namespace Fallout.Common.Tools.GitVersion; diff --git a/src/Fallout.Common/Tools/Helm/Helm.Generated.cs b/src/Fallout.Common/Tools/Helm/Helm.Generated.cs index f5386197b..a838faa8f 100644 --- a/src/Fallout.Common/Tools/Helm/Helm.Generated.cs +++ b/src/Fallout.Common/Tools/Helm/Helm.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Helm/Helm.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Helm; diff --git a/src/Fallout.Common/Tools/ILRepack/ILRepack.Generated.cs b/src/Fallout.Common/Tools/ILRepack/ILRepack.Generated.cs index 62ad73738..ea8df412b 100644 --- a/src/Fallout.Common/Tools/ILRepack/ILRepack.Generated.cs +++ b/src/Fallout.Common/Tools/ILRepack/ILRepack.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/InnoSetup/InnoSetup.Generated.cs b/src/Fallout.Common/Tools/InnoSetup/InnoSetup.Generated.cs index 3199c7007..4a20bdb12 100644 --- a/src/Fallout.Common/Tools/InnoSetup/InnoSetup.Generated.cs +++ b/src/Fallout.Common/Tools/InnoSetup/InnoSetup.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Kubernetes/Kubernetes.Generated.cs b/src/Fallout.Common/Tools/Kubernetes/Kubernetes.Generated.cs index 066b5240c..40a7608ab 100644 --- a/src/Fallout.Common/Tools/Kubernetes/Kubernetes.Generated.cs +++ b/src/Fallout.Common/Tools/Kubernetes/Kubernetes.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/MSBuild/MSBuild.Generated.cs b/src/Fallout.Common/Tools/MSBuild/MSBuild.Generated.cs index 62315f2be..864d02fbe 100644 --- a/src/Fallout.Common/Tools/MSBuild/MSBuild.Generated.cs +++ b/src/Fallout.Common/Tools/MSBuild/MSBuild.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/MSBuild/MSBuildTasks.cs b/src/Fallout.Common/Tools/MSBuild/MSBuildTasks.cs index 09bad0fa1..0205c1658 100644 --- a/src/Fallout.Common/Tools/MSBuild/MSBuildTasks.cs +++ b/src/Fallout.Common/Tools/MSBuild/MSBuildTasks.cs @@ -3,6 +3,7 @@ using System.Reflection; using Fallout.Common.Tooling; using Fallout.Common.Utilities; +using Fallout.Application.Tooling; namespace Fallout.Common.Tools.MSBuild; diff --git a/src/Fallout.Common/Tools/MSpec/MSpec.Generated.cs b/src/Fallout.Common/Tools/MSpec/MSpec.Generated.cs index 4f1e524a1..d4a6bcdb2 100644 --- a/src/Fallout.Common/Tools/MSpec/MSpec.Generated.cs +++ b/src/Fallout.Common/Tools/MSpec/MSpec.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/MakeNsis/MakeNSIS.Generated.cs b/src/Fallout.Common/Tools/MakeNsis/MakeNSIS.Generated.cs index e3209c7e5..f719bcd3e 100644 --- a/src/Fallout.Common/Tools/MakeNsis/MakeNSIS.Generated.cs +++ b/src/Fallout.Common/Tools/MakeNsis/MakeNSIS.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Mastodon/Mastodon.Generated.cs b/src/Fallout.Common/Tools/Mastodon/Mastodon.Generated.cs index 5fd158545..b3a2b21d1 100644 --- a/src/Fallout.Common/Tools/Mastodon/Mastodon.Generated.cs +++ b/src/Fallout.Common/Tools/Mastodon/Mastodon.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/MauiCheck/MauiCheck.Generated.cs b/src/Fallout.Common/Tools/MauiCheck/MauiCheck.Generated.cs index 077767fe4..7422118cf 100644 --- a/src/Fallout.Common/Tools/MauiCheck/MauiCheck.Generated.cs +++ b/src/Fallout.Common/Tools/MauiCheck/MauiCheck.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/MinVer/MinVer.Generated.cs b/src/Fallout.Common/Tools/MinVer/MinVer.Generated.cs index 29bd510fb..4469aec10 100644 --- a/src/Fallout.Common/Tools/MinVer/MinVer.Generated.cs +++ b/src/Fallout.Common/Tools/MinVer/MinVer.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/MinVer/MinVerAttribute.cs b/src/Fallout.Common/Tools/MinVer/MinVerAttribute.cs index 00a9d34b9..93a5b53f8 100644 --- a/src/Fallout.Common/Tools/MinVer/MinVerAttribute.cs +++ b/src/Fallout.Common/Tools/MinVer/MinVerAttribute.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.CI.AppVeyor; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.TeamCity; using Fallout.Common.Tooling; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tools.MinVer; diff --git a/src/Fallout.Common/Tools/NSwag/NSwag.Generated.cs b/src/Fallout.Common/Tools/NSwag/NSwag.Generated.cs index c0a2d9234..3d3f7aec0 100644 --- a/src/Fallout.Common/Tools/NSwag/NSwag.Generated.cs +++ b/src/Fallout.Common/Tools/NSwag/NSwag.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/NUnit/NUnit.Generated.cs b/src/Fallout.Common/Tools/NUnit/NUnit.Generated.cs index c3e888756..27c0e05b6 100644 --- a/src/Fallout.Common/Tools/NUnit/NUnit.Generated.cs +++ b/src/Fallout.Common/Tools/NUnit/NUnit.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/NUnit/NUnitTasks.cs b/src/Fallout.Common/Tools/NUnit/NUnitTasks.cs index 8a742dc17..dc2e992a3 100644 --- a/src/Fallout.Common/Tools/NUnit/NUnitTasks.cs +++ b/src/Fallout.Common/Tools/NUnit/NUnitTasks.cs @@ -1,4 +1,4 @@ -using Fallout.Common.Tooling; +using Fallout.Application.Tooling; namespace Fallout.Common.Tools.NUnit; diff --git a/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioning.Generated.cs b/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioning.Generated.cs index adc22564f..3f68403e5 100644 --- a/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioning.Generated.cs +++ b/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioning.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioningAttribute.cs b/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioningAttribute.cs index ff235424e..91a2ca6d9 100644 --- a/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioningAttribute.cs +++ b/src/Fallout.Common/Tools/NerdbankGitVersioning/NerdbankGitVersioningAttribute.cs @@ -4,7 +4,7 @@ using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.TeamCity; using Fallout.Common.Tooling; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; namespace Fallout.Common.Tools.NerdbankGitVersioning; diff --git a/src/Fallout.Common/Tools/Netlify/Netlify.Generated.cs b/src/Fallout.Common/Tools/Netlify/Netlify.Generated.cs index 91e1073e4..8b909ed01 100644 --- a/src/Fallout.Common/Tools/Netlify/Netlify.Generated.cs +++ b/src/Fallout.Common/Tools/Netlify/Netlify.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Netlify/Netlify.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Netlify; diff --git a/src/Fallout.Common/Tools/Npm/Npm.Generated.cs b/src/Fallout.Common/Tools/Npm/Npm.Generated.cs index 334e5896e..e8f1e618b 100644 --- a/src/Fallout.Common/Tools/Npm/Npm.Generated.cs +++ b/src/Fallout.Common/Tools/Npm/Npm.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/NuGet/NuGet.Generated.cs b/src/Fallout.Common/Tools/NuGet/NuGet.Generated.cs index e673705d4..2ff757328 100644 --- a/src/Fallout.Common/Tools/NuGet/NuGet.Generated.cs +++ b/src/Fallout.Common/Tools/NuGet/NuGet.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/NuGet/NuGet.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.NuGet; diff --git a/src/Fallout.Common/Tools/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.Generated.cs b/src/Fallout.Common/Tools/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.Generated.cs index 7c0fea017..8531aa0c5 100644 --- a/src/Fallout.Common/Tools/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.Generated.cs +++ b/src/Fallout.Common/Tools/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.NuGetKeyVaultSignTool; diff --git a/src/Fallout.Common/Tools/OctoVersion/OctoVersion.Generated.cs b/src/Fallout.Common/Tools/OctoVersion/OctoVersion.Generated.cs index c979c3bb4..823505fc9 100644 --- a/src/Fallout.Common/Tools/OctoVersion/OctoVersion.Generated.cs +++ b/src/Fallout.Common/Tools/OctoVersion/OctoVersion.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/OctoVersion/OctoVersionAttribute.cs b/src/Fallout.Common/Tools/OctoVersion/OctoVersionAttribute.cs index 2a931a425..d7f2796a8 100644 --- a/src/Fallout.Common/Tools/OctoVersion/OctoVersionAttribute.cs +++ b/src/Fallout.Common/Tools/OctoVersion/OctoVersionAttribute.cs @@ -1,14 +1,15 @@ -using System; +using System; using System.Linq; using System.Reflection; using Fallout.Common.CI.AppVeyor; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.TeamCity; -using Fallout.Common.Git; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; -using Fallout.Common.ValueInjection; +using Fallout.Application.ValueInjection; +using Fallout.Application.Git; +using Fallout.Application; namespace Fallout.Common.Tools.OctoVersion; diff --git a/src/Fallout.Common/Tools/Octopus/Octopus.Generated.cs b/src/Fallout.Common/Tools/Octopus/Octopus.Generated.cs index c8ec07da2..7024ea049 100644 --- a/src/Fallout.Common/Tools/Octopus/Octopus.Generated.cs +++ b/src/Fallout.Common/Tools/Octopus/Octopus.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Octopus/Octopus.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Octopus; diff --git a/src/Fallout.Common/Tools/OpenCover/OpenCover.Generated.cs b/src/Fallout.Common/Tools/OpenCover/OpenCover.Generated.cs index 00a9f5334..2a247c613 100644 --- a/src/Fallout.Common/Tools/OpenCover/OpenCover.Generated.cs +++ b/src/Fallout.Common/Tools/OpenCover/OpenCover.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/OpenCover/OpenCoverTasks.cs b/src/Fallout.Common/Tools/OpenCover/OpenCoverTasks.cs index a40535c73..0c990e4d9 100644 --- a/src/Fallout.Common/Tools/OpenCover/OpenCoverTasks.cs +++ b/src/Fallout.Common/Tools/OpenCover/OpenCoverTasks.cs @@ -1,5 +1,6 @@ -using Fallout.Common.Tooling; +using Fallout.Common.Tooling; using Fallout.Common.Utilities; +using Fallout.Application.Tooling; namespace Fallout.Common.Tools.OpenCover; diff --git a/src/Fallout.Common/Tools/Paket/Paket.Generated.cs b/src/Fallout.Common/Tools/Paket/Paket.Generated.cs index 288956b44..4ee363300 100644 --- a/src/Fallout.Common/Tools/Paket/Paket.Generated.cs +++ b/src/Fallout.Common/Tools/Paket/Paket.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Paket/Paket.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Paket; diff --git a/src/Fallout.Common/Tools/PowerShell/PowerShell.Generated.cs b/src/Fallout.Common/Tools/PowerShell/PowerShell.Generated.cs index 79a7836e8..880d0938c 100644 --- a/src/Fallout.Common/Tools/PowerShell/PowerShell.Generated.cs +++ b/src/Fallout.Common/Tools/PowerShell/PowerShell.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Pulumi/Pulumi.Generated.cs b/src/Fallout.Common/Tools/Pulumi/Pulumi.Generated.cs index 422b11cb7..e81229d6c 100644 --- a/src/Fallout.Common/Tools/Pulumi/Pulumi.Generated.cs +++ b/src/Fallout.Common/Tools/Pulumi/Pulumi.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Pwsh/Pwsh.Generated.cs b/src/Fallout.Common/Tools/Pwsh/Pwsh.Generated.cs index d4fc36ca9..bfc033145 100644 --- a/src/Fallout.Common/Tools/Pwsh/Pwsh.Generated.cs +++ b/src/Fallout.Common/Tools/Pwsh/Pwsh.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/ReportGenerator/ReportGenerator.Generated.cs b/src/Fallout.Common/Tools/ReportGenerator/ReportGenerator.Generated.cs index dc207bb8c..2980745db 100644 --- a/src/Fallout.Common/Tools/ReportGenerator/ReportGenerator.Generated.cs +++ b/src/Fallout.Common/Tools/ReportGenerator/ReportGenerator.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/ReportGenerator/ReportGeneratorTasks.cs b/src/Fallout.Common/Tools/ReportGenerator/ReportGeneratorTasks.cs index ba1405be6..a6fb83133 100644 --- a/src/Fallout.Common/Tools/ReportGenerator/ReportGeneratorTasks.cs +++ b/src/Fallout.Common/Tools/ReportGenerator/ReportGeneratorTasks.cs @@ -1,4 +1,4 @@ -using Fallout.Common.Tooling; +using Fallout.Application.Tooling; namespace Fallout.Common.Tools.ReportGenerator; diff --git a/src/Fallout.Common/Tools/SignClient/SignClient.Generated.cs b/src/Fallout.Common/Tools/SignClient/SignClient.Generated.cs index f49474682..58a054226 100644 --- a/src/Fallout.Common/Tools/SignClient/SignClient.Generated.cs +++ b/src/Fallout.Common/Tools/SignClient/SignClient.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/SignClient/SignClient.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.SignClient; diff --git a/src/Fallout.Common/Tools/SignPath/SignPathTasks.cs b/src/Fallout.Common/Tools/SignPath/SignPathTasks.cs index 477f96441..ff076e82c 100644 --- a/src/Fallout.Common/Tools/SignPath/SignPathTasks.cs +++ b/src/Fallout.Common/Tools/SignPath/SignPathTasks.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; using System.Net; @@ -11,7 +11,8 @@ using Fallout.Common.IO; using Fallout.Common.Utilities; using Serilog; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; +using Fallout.Application; namespace Fallout.Common.Tools.SignPath; diff --git a/src/Fallout.Common/Tools/SignTool/SignTool.Generated.cs b/src/Fallout.Common/Tools/SignTool/SignTool.Generated.cs index 8337499de..9d1cdb580 100644 --- a/src/Fallout.Common/Tools/SignTool/SignTool.Generated.cs +++ b/src/Fallout.Common/Tools/SignTool/SignTool.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/SignTool/SignTool.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.SignTool; diff --git a/src/Fallout.Common/Tools/Slack/Slack.Generated.cs b/src/Fallout.Common/Tools/Slack/Slack.Generated.cs index 0c6dd2e44..bc9bbe6bf 100644 --- a/src/Fallout.Common/Tools/Slack/Slack.Generated.cs +++ b/src/Fallout.Common/Tools/Slack/Slack.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/SonarScanner/SonarScanner.Generated.cs b/src/Fallout.Common/Tools/SonarScanner/SonarScanner.Generated.cs index 27c1c7ef7..a996c882e 100644 --- a/src/Fallout.Common/Tools/SonarScanner/SonarScanner.Generated.cs +++ b/src/Fallout.Common/Tools/SonarScanner/SonarScanner.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/SonarScanner/SonarScanner.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.SonarScanner; diff --git a/src/Fallout.Common/Tools/SpecFlow/SpecFlow.Generated.cs b/src/Fallout.Common/Tools/SpecFlow/SpecFlow.Generated.cs index 5011b6335..a57ebe00c 100644 --- a/src/Fallout.Common/Tools/SpecFlow/SpecFlow.Generated.cs +++ b/src/Fallout.Common/Tools/SpecFlow/SpecFlow.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/SpecFlow/SpecFlow.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.SpecFlow; diff --git a/src/Fallout.Common/Tools/Squirrel/Squirrel.Generated.cs b/src/Fallout.Common/Tools/Squirrel/Squirrel.Generated.cs index cf803dbb1..e6f407469 100644 --- a/src/Fallout.Common/Tools/Squirrel/Squirrel.Generated.cs +++ b/src/Fallout.Common/Tools/Squirrel/Squirrel.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/StaticWebApps/StaticWebApps.Generated.cs b/src/Fallout.Common/Tools/StaticWebApps/StaticWebApps.Generated.cs index a240dfe11..e05a56f5e 100644 --- a/src/Fallout.Common/Tools/StaticWebApps/StaticWebApps.Generated.cs +++ b/src/Fallout.Common/Tools/StaticWebApps/StaticWebApps.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/StaticWebApps/StaticWebApps.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.StaticWebApps; diff --git a/src/Fallout.Common/Tools/Teams/Teams.Generated.cs b/src/Fallout.Common/Tools/Teams/Teams.Generated.cs index 2755a14c6..61f3eb919 100644 --- a/src/Fallout.Common/Tools/Teams/Teams.Generated.cs +++ b/src/Fallout.Common/Tools/Teams/Teams.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/TestCloud/TestCloud.Generated.cs b/src/Fallout.Common/Tools/TestCloud/TestCloud.Generated.cs index 98ca878b6..a00591134 100644 --- a/src/Fallout.Common/Tools/TestCloud/TestCloud.Generated.cs +++ b/src/Fallout.Common/Tools/TestCloud/TestCloud.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Unity/Unity.Generated.cs b/src/Fallout.Common/Tools/Unity/Unity.Generated.cs index e22f8de2e..d015f6a16 100644 --- a/src/Fallout.Common/Tools/Unity/Unity.Generated.cs +++ b/src/Fallout.Common/Tools/Unity/Unity.Generated.cs @@ -1,8 +1,4 @@ -// Generated from https://github.com/ChrisonSimtian/Fallout/blob/main/src/Fallout.Common/Tools/Unity/Unity.json - -using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; @@ -13,6 +9,7 @@ using System.Linq; using System.Text; using System.Text.Json.Serialization; +using Fallout.Application; namespace Fallout.Common.Tools.Unity; diff --git a/src/Fallout.Common/Tools/Unity/UnityTasks.cs b/src/Fallout.Common/Tools/Unity/UnityTasks.cs index 6005105e2..904da7be2 100644 --- a/src/Fallout.Common/Tools/Unity/UnityTasks.cs +++ b/src/Fallout.Common/Tools/Unity/UnityTasks.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -10,6 +10,7 @@ using Fallout.Utilities.Text.Yaml; using Serilog; using Serilog.Events; +using Fallout.Application; namespace Fallout.Common.Tools.Unity; diff --git a/src/Fallout.Common/Tools/VSTest/VSTest.Generated.cs b/src/Fallout.Common/Tools/VSTest/VSTest.Generated.cs index 1b6f1a1bf..b37acaa82 100644 --- a/src/Fallout.Common/Tools/VSTest/VSTest.Generated.cs +++ b/src/Fallout.Common/Tools/VSTest/VSTest.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/VSWhere/VSWhere.Generated.cs b/src/Fallout.Common/Tools/VSWhere/VSWhere.Generated.cs index dcf27f93b..c17ca9679 100644 --- a/src/Fallout.Common/Tools/VSWhere/VSWhere.Generated.cs +++ b/src/Fallout.Common/Tools/VSWhere/VSWhere.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/WebConfigTransformRunner/WebConfigTransformRunner.Generated.cs b/src/Fallout.Common/Tools/WebConfigTransformRunner/WebConfigTransformRunner.Generated.cs index 1d6165d1e..77b0b929a 100644 --- a/src/Fallout.Common/Tools/WebConfigTransformRunner/WebConfigTransformRunner.Generated.cs +++ b/src/Fallout.Common/Tools/WebConfigTransformRunner/WebConfigTransformRunner.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Common/Tools/Xunit/Xunit.Generated.cs b/src/Fallout.Common/Tools/Xunit/Xunit.Generated.cs index 15bbe287c..cfe9b7694 100644 --- a/src/Fallout.Common/Tools/Xunit/Xunit.Generated.cs +++ b/src/Fallout.Common/Tools/Xunit/Xunit.Generated.cs @@ -2,7 +2,6 @@ using Fallout.Common; using Fallout.Common.Tooling; -using Fallout.Common.Tools; using Fallout.Common.Utilities.Collections; using System; using System.Collections.Generic; diff --git a/src/Fallout.Components/ICompile.cs b/src/Fallout.Components/ICompile.cs index 6bec3c673..e2c020c02 100644 --- a/src/Fallout.Components/ICompile.cs +++ b/src/Fallout.Components/ICompile.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using Fallout.Common; using Fallout.Solutions; using Fallout.Common.Tooling; using Fallout.Common.Tools.DotNet; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/ICreateGitHubRelease.cs b/src/Fallout.Components/ICreateGitHubRelease.cs index 7c386bdd2..ebe3505f5 100644 --- a/src/Fallout.Components/ICreateGitHubRelease.cs +++ b/src/Fallout.Components/ICreateGitHubRelease.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -10,6 +10,7 @@ using Fallout.Common.Tools.GitHub; using Fallout.Common.Utilities; using Octokit; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IGlobalTool.cs b/src/Fallout.Components/IGlobalTool.cs index 69447ffbd..2f38a9c0a 100644 --- a/src/Fallout.Components/IGlobalTool.cs +++ b/src/Fallout.Components/IGlobalTool.cs @@ -1,9 +1,9 @@ using System; using System.IO; using System.Linq; -using Fallout.Common; using Fallout.Common.Tools.DotNet; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasArtifacts.cs b/src/Fallout.Components/IHasArtifacts.cs index 2e76d86d7..e7addeb06 100644 --- a/src/Fallout.Components/IHasArtifacts.cs +++ b/src/Fallout.Components/IHasArtifacts.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Common.IO; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasChangelog.cs b/src/Fallout.Components/IHasChangelog.cs index 1aeff4d5b..6598bf5b5 100644 --- a/src/Fallout.Components/IHasChangelog.cs +++ b/src/Fallout.Components/IHasChangelog.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using static Fallout.Common.ChangeLog.ChangelogTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasConfiguration.cs b/src/Fallout.Components/IHasConfiguration.cs index c39fcd3cf..e09fdbf1d 100644 --- a/src/Fallout.Components/IHasConfiguration.cs +++ b/src/Fallout.Components/IHasConfiguration.cs @@ -1,6 +1,6 @@ -using System; +using System; using System.Linq; -using Fallout.Common; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasGitRepository.cs b/src/Fallout.Components/IHasGitRepository.cs index f88dc751f..849425190 100644 --- a/src/Fallout.Components/IHasGitRepository.cs +++ b/src/Fallout.Components/IHasGitRepository.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Common.Git; +using Fallout.Application; +using Fallout.Application.Git; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasGitVersion.cs b/src/Fallout.Components/IHasGitVersion.cs index 7ae0e2e9e..661ae9e76 100644 --- a/src/Fallout.Components/IHasGitVersion.cs +++ b/src/Fallout.Components/IHasGitVersion.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Common.Tools.GitVersion; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasNerdbankGitVersioning.cs b/src/Fallout.Components/IHasNerdbankGitVersioning.cs index d3edcebfc..00ad78f39 100644 --- a/src/Fallout.Components/IHasNerdbankGitVersioning.cs +++ b/src/Fallout.Components/IHasNerdbankGitVersioning.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Common.Tools.NerdbankGitVersioning; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasSolution.cs b/src/Fallout.Components/IHasSolution.cs index 8d5637319..9f5e5b497 100644 --- a/src/Fallout.Components/IHasSolution.cs +++ b/src/Fallout.Components/IHasSolution.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Solutions; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IHasTwitterCredentials.cs b/src/Fallout.Components/IHasTwitterCredentials.cs index acf1314b7..3e09fbf90 100644 --- a/src/Fallout.Components/IHasTwitterCredentials.cs +++ b/src/Fallout.Components/IHasTwitterCredentials.cs @@ -1,6 +1,6 @@ -using System; +using System; using System.Linq; -using Fallout.Common; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IPack.cs b/src/Fallout.Components/IPack.cs index 9b3a66a4b..804d9c722 100644 --- a/src/Fallout.Components/IPack.cs +++ b/src/Fallout.Components/IPack.cs @@ -1,12 +1,12 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Tools.DotNet; using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IPublish.cs b/src/Fallout.Components/IPublish.cs index 38a97d626..00f0620d6 100644 --- a/src/Fallout.Components/IPublish.cs +++ b/src/Fallout.Components/IPublish.cs @@ -10,6 +10,7 @@ using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IReportCoverage.cs b/src/Fallout.Components/IReportCoverage.cs index 5023fc79c..3705664d2 100644 --- a/src/Fallout.Components/IReportCoverage.cs +++ b/src/Fallout.Components/IReportCoverage.cs @@ -1,7 +1,6 @@ -using System; +using System; using System.IO; using System.Linq; -using Fallout.Common; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.IO; using Fallout.Common.Tooling; @@ -11,6 +10,7 @@ using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.Codecov.CodecovTasks; using static Fallout.Common.Tools.ReportGenerator.ReportGeneratorTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/IRestore.cs b/src/Fallout.Components/IRestore.cs index 5819fe98a..f2c2eb2d8 100644 --- a/src/Fallout.Components/IRestore.cs +++ b/src/Fallout.Components/IRestore.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Linq; -using Fallout.Common; using Fallout.Common.Tooling; using Fallout.Common.Tools.DotNet; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/ISignPackages.cs b/src/Fallout.Components/ISignPackages.cs index 2a3f8f003..2a82d60f0 100644 --- a/src/Fallout.Components/ISignPackages.cs +++ b/src/Fallout.Components/ISignPackages.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Fallout.Common; using Fallout.Common.CI.AppVeyor; using Fallout.Common.IO; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.SignPath.SignPathTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Fallout.Components/ITest.cs b/src/Fallout.Components/ITest.cs index 537beb206..7dcec604b 100644 --- a/src/Fallout.Components/ITest.cs +++ b/src/Fallout.Components/ITest.cs @@ -1,8 +1,7 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Fallout.Common; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.GitHubActions; using Fallout.Common.CI.TeamCity; @@ -14,6 +13,7 @@ using Fallout.Common.Utilities; using Fallout.Common.Utilities.Collections; using static Fallout.Common.Tools.DotNet.DotNetTasks; +using Fallout.Application; namespace Fallout.Components; diff --git a/src/Shims/Nuke.Common/NukeBuild.cs b/src/Shims/Nuke.Common/NukeBuild.cs index c41c6994b..9a1fe39e3 100644 --- a/src/Shims/Nuke.Common/NukeBuild.cs +++ b/src/Shims/Nuke.Common/NukeBuild.cs @@ -1,3 +1,4 @@ +using Fallout.Application; // The TransitionShimGenerator handles namespace prefix swaps (Fallout.* -> Nuke.*) // but cannot rename types. NukeBuild -> FalloutBuild and INukeBuild -> // IFalloutBuild were renamed during the rebrand (#59), so we hand-write those @@ -9,13 +10,13 @@ namespace Nuke.Common; /// /// Transition shim. Inherits from . /// -public abstract class NukeBuild : Fallout.Common.FalloutBuild +public abstract class NukeBuild : Fallout.Application.FalloutBuild { } /// /// Transition shim. Extends . /// -public interface INukeBuild : Fallout.Common.IFalloutBuild +public interface INukeBuild : Fallout.Application.IFalloutBuild { } diff --git a/tests/Consumers/Fallout.Consumer.Local/Build.cs b/tests/Consumers/Fallout.Consumer.Local/Build.cs index fa5510cc7..bc22f662b 100644 --- a/tests/Consumers/Fallout.Consumer.Local/Build.cs +++ b/tests/Consumers/Fallout.Consumer.Local/Build.cs @@ -1,10 +1,6 @@ -// -// Fallout consumer against this repo's local source. Catches breakage of the -// public Fallout surface in the current PR. - -using Fallout.Common; using Fallout.Common.IO; using Fallout.Solutions; // was Fallout.Common.ProjectModel; — renamed in #254 (persistence layering + namespace cleanup) +using Fallout.Application; class Build : FalloutBuild { diff --git a/tests/Fallout.Build.Tests/BuildExecutorTest.cs b/tests/Fallout.Build.Tests/BuildExecutorTest.cs index d4ed53e86..d8c9e5a67 100644 --- a/tests/Fallout.Build.Tests/BuildExecutorTest.cs +++ b/tests/Fallout.Build.Tests/BuildExecutorTest.cs @@ -1,10 +1,11 @@ -using System; +using System; using System.Linq; using FluentAssertions; -using Fallout.Common.Execution; using Fallout.Domain.Execution; using Fallout.Common.Utilities.Collections; using Xunit; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Common.Tests.Execution; diff --git a/tests/Fallout.Build.Tests/ControlFlowTest.cs b/tests/Fallout.Build.Tests/ControlFlowTest.cs index d995cbbfb..b87dceb23 100644 --- a/tests/Fallout.Build.Tests/ControlFlowTest.cs +++ b/tests/Fallout.Build.Tests/ControlFlowTest.cs @@ -2,6 +2,7 @@ using System.Linq; using FluentAssertions; using Xunit; +using Fallout.Application; // ReSharper disable ArgumentsStyleLiteral diff --git a/tests/Fallout.Build.Tests/DefaultInterfaceExecutionTest.cs b/tests/Fallout.Build.Tests/DefaultInterfaceExecutionTest.cs index c2c21979a..d3704cd8e 100644 --- a/tests/Fallout.Build.Tests/DefaultInterfaceExecutionTest.cs +++ b/tests/Fallout.Build.Tests/DefaultInterfaceExecutionTest.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Linq; using System.Linq.Expressions; using FluentAssertions; -using Fallout.Common.Execution; using Xunit; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Common.Tests.Execution; diff --git a/tests/Fallout.Build.Tests/ExecutableTargetFactoryTest.cs b/tests/Fallout.Build.Tests/ExecutableTargetFactoryTest.cs index 168797267..974bdb618 100644 --- a/tests/Fallout.Build.Tests/ExecutableTargetFactoryTest.cs +++ b/tests/Fallout.Build.Tests/ExecutableTargetFactoryTest.cs @@ -2,8 +2,9 @@ using System.Linq; using System.Linq.Expressions; using FluentAssertions; -using Fallout.Common.Execution; using Xunit; +using Fallout.Application.Execution; +using Fallout.Application; namespace Fallout.Common.Tests.Execution; diff --git a/tests/Fallout.Build.Tests/ExecutionPlannerTest.cs b/tests/Fallout.Build.Tests/ExecutionPlannerTest.cs index b8e51e94f..9c4d6ee98 100644 --- a/tests/Fallout.Build.Tests/ExecutionPlannerTest.cs +++ b/tests/Fallout.Build.Tests/ExecutionPlannerTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using Fallout.Common.Execution; using Xunit; +using Fallout.Application.Execution; namespace Fallout.Common.Tests.Execution; diff --git a/tests/Fallout.Build.Tests/ExecutionTestsInitializer.cs b/tests/Fallout.Build.Tests/ExecutionTestsInitializer.cs index 30ec8acd4..b8ba0e5a1 100644 --- a/tests/Fallout.Build.Tests/ExecutionTestsInitializer.cs +++ b/tests/Fallout.Build.Tests/ExecutionTestsInitializer.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Linq; using System.Runtime.CompilerServices; -using Fallout.Common.Execution; +using Fallout.Application.Execution; namespace Fallout.Common.Tests; diff --git a/tests/Fallout.Build.Tests/GitRepositoryTest.cs b/tests/Fallout.Build.Tests/GitRepositoryTest.cs index 6fa952f64..f466bd75b 100644 --- a/tests/Fallout.Build.Tests/GitRepositoryTest.cs +++ b/tests/Fallout.Build.Tests/GitRepositoryTest.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.IO; using System.Linq; using FluentAssertions; -using Fallout.Common.Git; using Xunit; +using Fallout.Application.Git; namespace Fallout.Common.Tests; diff --git a/tests/Fallout.Build.Tests/HostInitializer.cs b/tests/Fallout.Build.Tests/HostInitializer.cs index 05bfd7f54..4a08d758b 100644 --- a/tests/Fallout.Build.Tests/HostInitializer.cs +++ b/tests/Fallout.Build.Tests/HostInitializer.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Linq; using System.Runtime.CompilerServices; using Fallout.Common.Utilities; +using Fallout.Application; namespace Fallout.Common.Tests; diff --git a/tests/Fallout.Build.Tests/ParameterServiceTest.cs b/tests/Fallout.Build.Tests/ParameterServiceTest.cs index 92a2618cf..5d73a5e62 100644 --- a/tests/Fallout.Build.Tests/ParameterServiceTest.cs +++ b/tests/Fallout.Build.Tests/ParameterServiceTest.cs @@ -6,6 +6,7 @@ using Fallout.Common.Utilities.Collections; using Xunit; using static Fallout.Common.Utilities.ReflectionUtility; +using Fallout.Application; namespace Fallout.Common.Tests; diff --git a/tests/Fallout.Build.Tests/SchemaUtilityTest.cs b/tests/Fallout.Build.Tests/SchemaUtilityTest.cs index 745585966..be531bd94 100644 --- a/tests/Fallout.Build.Tests/SchemaUtilityTest.cs +++ b/tests/Fallout.Build.Tests/SchemaUtilityTest.cs @@ -1,13 +1,14 @@ -using System; +using System; using System.ComponentModel; using System.Linq; using System.Threading.Tasks; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using Fallout.Common.Utilities; using VerifyXunit; using Xunit; +using Fallout.Application.Execution; +using Fallout.Application; #pragma warning disable CS0169 // Field is never used diff --git a/tests/Fallout.Cli.Tests/cake-scripts/default-target.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/default-target.verified.cs index ec7f690a0..1f4570e26 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/default-target.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/default-target.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Cli.Tests/cake-scripts/globbing.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/globbing.verified.cs index bdadd924a..b8af39e71 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/globbing.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/globbing.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Cli.Tests/cake-scripts/parameters.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/parameters.verified.cs index b8012a3f7..7cc99b401 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/parameters.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/parameters.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Cli.Tests/cake-scripts/paths.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/paths.verified.cs index 495291107..c5d5cb56a 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/paths.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/paths.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Cli.Tests/cake-scripts/references.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/references.verified.cs index 1d0bc1e73..a0f943d48 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/references.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/references.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Cli.Tests/cake-scripts/targets.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/targets.verified.cs index 2754810b2..3e4364634 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/targets.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/targets.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Cli.Tests/cake-scripts/tool-invocation.verified.cs b/tests/Fallout.Cli.Tests/cake-scripts/tool-invocation.verified.cs index 0368b35c4..e0fe71714 100644 --- a/tests/Fallout.Cli.Tests/cake-scripts/tool-invocation.verified.cs +++ b/tests/Fallout.Cli.Tests/cake-scripts/tool-invocation.verified.cs @@ -14,7 +14,7 @@ using Fallout.Common.Tools.GitVersion; using Fallout.Common.Tools.SignTool; using Fallout.Common.Utilities.Collections; -using Fallout.Common; +using Fallout.Application; using Fallout.Common.Tools.DotNet; using Fallout.Common.Tools.MSBuild; using Fallout.Common.Tools.SignTool; @@ -22,7 +22,7 @@ using Fallout.Common.IO; using Fallout.Common.IO; using Fallout.Common; -using static Fallout.Common.ControlFlow; +using static Fallout.Application.ControlFlow; using static Fallout.Common.Tools.DotNet.DotNetTasks; using static Fallout.Common.Tools.MSBuild.MSBuildTasks; using static Fallout.Common.Tools.SignTool.SignToolTasks; diff --git a/tests/Fallout.Common.Tests/CI/ConfigurationGenerationTest.cs b/tests/Fallout.Common.Tests/CI/ConfigurationGenerationTest.cs index ce164bfb5..8866dbcf5 100644 --- a/tests/Fallout.Common.Tests/CI/ConfigurationGenerationTest.cs +++ b/tests/Fallout.Common.Tests/CI/ConfigurationGenerationTest.cs @@ -1,19 +1,20 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Linq; using System.Threading.Tasks; -using Fallout.Common.CI; using Fallout.Common.CI.AppVeyor; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.GitHubActions; using Fallout.Common.CI.TeamCity; -using Fallout.Common.Execution; using Fallout.Common.IO; using Fallout.Common.Tooling; using VerifyXunit; using Xunit; +using Fallout.Application.Execution; +using Fallout.Application.CI; +using Fallout.Application; namespace Fallout.Common.Tests.CI; diff --git a/tests/Fallout.Common.Tests/CI/ITestConfigurationGenerator.cs b/tests/Fallout.Common.Tests/CI/ITestConfigurationGenerator.cs index 547000106..bc8f3c653 100644 --- a/tests/Fallout.Common.Tests/CI/ITestConfigurationGenerator.cs +++ b/tests/Fallout.Common.Tests/CI/ITestConfigurationGenerator.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Linq; -using Fallout.Common.CI; +using Fallout.Application.CI; namespace Fallout.Common.Tests.CI; diff --git a/tests/Fallout.Common.Tests/CITest.cs b/tests/Fallout.Common.Tests/CITest.cs index ac1a79ab3..44aa6c78d 100644 --- a/tests/Fallout.Common.Tests/CITest.cs +++ b/tests/Fallout.Common.Tests/CITest.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Reflection; using FluentAssertions; -using Fallout.Common.CI; using Fallout.Common.CI.AppVeyor; using Fallout.Common.CI.AzurePipelines; using Fallout.Common.CI.Bitrise; @@ -13,6 +12,7 @@ using Fallout.Common.CI.TeamCity; using Fallout.Common.CI.TravisCI; using Xunit; +using Fallout.Application.CI; namespace Fallout.Common.Tests; diff --git a/tests/Fallout.Common.Tests/GitHubTasksTest.cs b/tests/Fallout.Common.Tests/GitHubTasksTest.cs index 1b13ea081..defc2c1d0 100644 --- a/tests/Fallout.Common.Tests/GitHubTasksTest.cs +++ b/tests/Fallout.Common.Tests/GitHubTasksTest.cs @@ -1,10 +1,10 @@ using System; using System.Linq; using FluentAssertions; -using Fallout.Common.Git; using Fallout.Common.IO; using Fallout.Common.Tools.GitHub; using Xunit; +using Fallout.Application.Git; namespace Fallout.Common.Tests; diff --git a/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test#Solution.g.verified.cs b/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test#Solution.g.verified.cs index 18855dfd8..803ac6916 100644 --- a/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test#Solution.g.verified.cs +++ b/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test#Solution.g.verified.cs @@ -47,10 +47,8 @@ internal class Solution(SolutionModel model, AbsolutePath path) : Fallout.Soluti public Fallout.Solutions.Project Fallout_Utilities_Text_Yaml => this.GetProject("Fallout.Utilities.Text.Yaml"); public Fallout.Solutions.Project Nuke_Build => this.GetProject("Nuke.Build"); public Fallout.Solutions.Project Nuke_Common => this.GetProject("Nuke.Common"); - public Fallout.Solutions.Project Nuke_Common_Shim_Tests => this.GetProject("Nuke.Common.Shim.Tests"); public Fallout.Solutions.Project Nuke_Components => this.GetProject("Nuke.Components"); public Fallout.Solutions.Project Nuke_Components_Shim_Tests => this.GetProject("Nuke.Components.Shim.Tests"); - public Fallout.Solutions.Project Nuke_Consumer => this.GetProject("Nuke.Consumer"); public _misc misc => Unsafe.As<_misc>(this.GetSolutionFolder("misc")); diff --git a/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.cs b/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.cs index 3cb6d2a52..65b531f46 100644 --- a/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.cs +++ b/tests/Fallout.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using FluentAssertions; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using Fallout.Common; using Fallout.Solutions; using VerifyXunit; using Xunit; +using Fallout.Application; namespace Fallout.SourceGenerators.Tests; diff --git a/tests/Nuke.Common.Shim.Tests/SampleConsumerBuild.cs b/tests/Nuke.Common.Shim.Tests/SampleConsumerBuild.cs index 32dcad3af..a3a29f117 100644 --- a/tests/Nuke.Common.Shim.Tests/SampleConsumerBuild.cs +++ b/tests/Nuke.Common.Shim.Tests/SampleConsumerBuild.cs @@ -15,6 +15,7 @@ using Nuke.Common.IO; using Nuke.Common.ProjectModel; using Nuke.Common.Utilities; +using Fallout.Application.Git; namespace Nuke.Common.Shim.Tests; @@ -30,7 +31,7 @@ public abstract class SampleConsumerBuild : NukeBuild, INukeBuild [Secret] readonly string NuGetApiKey; [Solution] readonly Fallout.Solutions.Solution Solution; [Solution("path/to/explicit.slnx")] readonly Fallout.Solutions.Solution ExplicitSolution; - [GitRepository] readonly Fallout.Common.Git.GitRepository GitRepository; + [GitRepository] readonly Fallout.Application.Git.GitRepository GitRepository; // CI-host shims expose only the static `Instance` accessor. Consumers can // still chain into instance members because the returned type is canonical. diff --git a/tools/OnionRewriter/DocumentRewriter.cs b/tools/OnionRewriter/DocumentRewriter.cs index 59d98678b..b96253624 100644 --- a/tools/OnionRewriter/DocumentRewriter.cs +++ b/tools/OnionRewriter/DocumentRewriter.cs @@ -9,7 +9,8 @@ public record struct Counts(bool Changed, int Refs, int Added, int Dropped, int public static (SyntaxNode Root, Counts Counts) Rewrite( SyntaxNode root, SemanticModel model, bool isSource, - Func isMovable, Func mapNs, Func isMoved) + Func isMovable, Func mapNs, Func isMoved, + HashSet surviving) { var cu = (CompilationUnitSyntax)root; @@ -19,7 +20,15 @@ public static (SyntaxNode Root, Counts Counts) Rewrite( var usedResidualMovableNs = new HashSet(); // old movable namespaces still needed (residual types) foreach (var name in cu.DescendantNodes().OfType()) { - if (model.GetSymbolInfo(name).Symbol is not INamedTypeSymbol t) continue; // only type-position binds + // Type-position binds to a type symbol; an attribute/`new` binds to its constructor; an + // extension call (x.NotNull()) binds to the reduced method — take the declaring type in each + // case so attributes AND extension-method imports (often same-namespace siblings a moved file + // loses) are counted. + var sym = model.GetSymbolInfo(name).Symbol; + var t = sym as INamedTypeSymbol + ?? (sym is IMethodSymbol { MethodKind: MethodKind.Constructor } ctor ? ctor.ContainingType : null) + ?? (sym is IMethodSymbol { IsExtensionMethod: true } ext ? (ext.ReducedFrom ?? ext).ContainingType : null); + if (t is null) continue; var ns = t.OriginalDefinition.ContainingNamespace?.ToDisplayString() ?? ""; if (!isMovable(ns)) continue; if (isMoved(t)) { usedMovedNewNs.Add(mapNs(ns)); usedMovedOldNs.Add(ns); } @@ -44,15 +53,22 @@ public static (SyntaxNode Root, Counts Counts) Rewrite( var name = u.Name?.ToString(); if (u.StaticKeyword.IsKind(SyntaxKind.None) && u.Alias is null && name != null && isMovable(name)) { - // Drop only `using`s orphaned BY THE MOVE — i.e. a moved type was imported from here and - // no residual type still is. Leave pre-existing unused usings alone (not our concern). - if (usedMovedOldNs.Contains(name) && !usedResidualMovableNs.Contains(name)) dropped++; + // Drop a movable `using` when its namespace is fully evacuated (no residual declarations + // anywhere — would otherwise dangle), OR when a moved type was imported from here and no + // residual type still is. Otherwise keep (residual still used, or a pre-existing unused + // using of a surviving namespace — not our concern). + var evacuated = !surviving.Contains(name); + if (evacuated || (usedMovedOldNs.Contains(name) && !usedResidualMovableNs.Contains(name))) dropped++; else keep.Add(u); } else keep.Add(u); // static/alias usings get their type names remapped in Stage 1 } int added = 0; - foreach (var ns in usedMovedNewNs) + // Moved types → new-namespace usings. Plus, for SOURCE files that change namespace: residual + // movable-namespace types they used to see as same-namespace siblings now need an explicit + // `using` (e.g. ParameterService leaving Fallout.Common still uses Utilities' ArgumentParser). + var toAdd = isSource ? usedMovedNewNs.Concat(usedResidualMovableNs) : usedMovedNewNs; + foreach (var ns in toAdd.Distinct()) { if (ownNs.Contains(ns)) continue; if (keep.Any(u => u.StaticKeyword.IsKind(SyntaxKind.None) && u.Alias is null && u.Name?.ToString() == ns)) continue; @@ -88,8 +104,14 @@ sealed class SyntaxFixer(SemanticModel model, bool isSource, Func if (symbol != null && isMoved(symbol)) { var ns = symbol.OriginalDefinition.ContainingNamespace!.ToDisplayString(); - Refs++; - return visited.WithLeft(ParseName(mapNs(ns)).WithTriviaFrom(visited.Left)); + // Only remap when Left is EXACTLY the namespace (direct `Namespace.Type`). For a nested + // ref (`Namespace.Outer.Nested`), Left includes the outer type — leave it to the inner + // QualifiedName visit, which remaps just the namespace and preserves the outer qualifier. + if (node.Left.ToString() == ns) + { + Refs++; + return visited.WithLeft(ParseName(mapNs(ns)).WithTriviaFrom(visited.Left)); + } } return visited; } diff --git a/tools/OnionRewriter/Program.cs b/tools/OnionRewriter/Program.cs index a4ddcd5f3..bd0682623 100644 --- a/tools/OnionRewriter/Program.cs +++ b/tools/OnionRewriter/Program.cs @@ -1,6 +1,8 @@ using System.Runtime.CompilerServices; using Microsoft.Build.Locator; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; // OnionRewriter (semantic) — ADR-0006. Moves every type declared in a source project out of an old // namespace prefix into a new one, and fixes references across the whole workspace by the symbol each @@ -63,10 +65,31 @@ void Collect(INamespaceSymbol nsSym) Collect(sourceComp!.Assembly.GlobalNamespace); Console.WriteLine($"Moved types (declared in {SourceAssembly}, movable ns): {movedFullNames.Count}"); + // Match by assembly NAME + the moved-type set (resolves correctly across projects — a referenced + // project's assembly symbol is a different instance per compilation, so identity comparison fails + // cross-project). The pinned Consumer.NuGet/Nuke.Consumer projects also have a "Fallout.Build" + // assembly via their package, but those projects are skipped entirely in the document loop. bool IsMovedType(INamedTypeSymbol t) { var ns = t.OriginalDefinition.ContainingNamespace?.ToDisplayString() ?? ""; - return t.OriginalDefinition.ContainingAssembly?.Name == SourceAssembly && IsMovable(ns) && movedFullNames.Contains($"{ns}.{t.OriginalDefinition.Name}"); + return t.OriginalDefinition.ContainingAssembly?.Name == SourceAssembly + && IsMovable(ns) + && movedFullNames.Contains($"{ns}.{t.OriginalDefinition.Name}"); + } + + // Movable namespaces still declared OUTSIDE the source project (so they survive the move). A + // movable `using` whose namespace is NOT here is evacuated and must be dropped even if the file + // referenced its types only via inference (no explicit type name). + var survivingMovableNs = new HashSet(); + foreach (var f in Directory.EnumerateFiles(Path.Combine(repo, "src"), "*.cs", SearchOption.AllDirectories)) + { + if (f.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}") || f.Contains($"{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}")) continue; + if (f.StartsWith(Path.Combine(repo, "src", "Fallout.Build") + Path.DirectorySeparatorChar, StringComparison.Ordinal)) continue; + foreach (var n in CSharpSyntaxTree.ParseText(File.ReadAllText(f)).GetRoot().DescendantNodes().OfType()) + { + var ns = n.Name.ToString(); + if (IsMovable(ns)) survivingMovableNs.Add(ns); + } } int filesChanged = 0, refsRewritten = 0, usingsAdded = 0, usingsDropped = 0, nsDecls = 0; @@ -78,11 +101,15 @@ bool IsMovedType(INamedTypeSymbol t) foreach (var doc in project.Documents) { if (doc.FilePath is null || !doc.FilePath.EndsWith(".cs") || doc.FilePath.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}")) continue; + // Package consumers (Consumer.NuGet, Nuke.Consumer) compile against the PUBLISHED package, + // which still has the old namespaces — the local rename must not touch them. (Consumer.Local + // references the local source and IS migrated.) + if (doc.FilePath.Contains("Consumer.NuGet") || doc.FilePath.Contains("Nuke.Consumer")) continue; var model = await doc.GetSemanticModelAsync(); var root = await doc.GetSyntaxRootAsync(); if (model is null || root is null) continue; - var (newRoot, c) = DocumentRewriter.Rewrite(root, model, isSource, IsMovable, MapNs, IsMovedType); + var (newRoot, c) = DocumentRewriter.Rewrite(root, model, isSource, IsMovable, MapNs, IsMovedType, survivingMovableNs); if (c.Changed) { filesChanged++; refsRewritten += c.Refs; usingsAdded += c.Added; usingsDropped += c.Dropped; nsDecls += c.NsDecls; From 4f29ae4c9d5d6203ee3e57e0927a9d965beaeb80 Mon Sep 17 00:00:00 2001 From: Chrison Simtian Date: Sun, 31 May 2026 23:44:08 +1200 Subject: [PATCH 4/4] docs(changelog): record Application ring (step 2) under the onion entry Co-Authored-By: Claude Opus 4.8 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c94dfb169..8f429014c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **Onion layering — namespace realignment begun; `Fallout.Core` → `Fallout.Domain`** ([ADR-0006](docs/adr/0006-onion-layering-and-namespace-realignment.md)). First ring of a project-wide realignment to explicit onion layers (`Fallout.Domain` / `Fallout.Application` / `Fallout.Infrastructure`, `Fallout.Cli` composition root) with `namespace = project = layer`, dissolving the `Fallout.Common.*` catch-all. This entry covers **step 1 (the Domain ring)**; the Application/Infrastructure/tooling-port rings land on `experimental` as separate PRs (any that miss the 2026 cut roll to 2027). - **Namespaces**: `Fallout.Core.Planning` → `Fallout.Domain.Planning`; `ITargetModel` and `ExecutionStatus` move out of `Fallout.Common.Execution` → `Fallout.Domain.Execution`. **Package/assembly**: `Fallout.Core` → `Fallout.Domain`. Replace the corresponding `using` directives and any `PackageReference`/`ProjectReference`. - **Migration / shim**: the `Nuke.*` transition shims silently stop re-exporting the two moved types (the generator only mirrors the `Fallout.Common.*` prefix). A fresh migration/shim strategy is designed once the realignment completes (ADR-0006 defers it deliberately); native `Fallout.*` consumers rewrite the two `using`s above. + - **Step 2 (the Application ring)**: the core API `Fallout.Build` declared under `Fallout.Common.*` — `FalloutBuild`, `Target`, `[Parameter]` & attributes, `Host`, the execution engine, value injection, and the CI ports — moves to **`Fallout.Application.*`**. Native consumers rewrite `using Fallout.Common;` → `using Fallout.Application;` (and the `Fallout.Common.Execution`/`.CI`/`.ValueInjection` sub-namespaces likewise). Performed by a semantic rewriter (`tools/OnionRewriter`). The `Nuke.*` shim surface that mirrored these (`Nuke.Common.Target`, `…Parameter`, …) lapses for now — `Nuke.Consumer` and `Nuke.Common.Shim.Tests` are temporarily out of the solution until the migration phase. The `Fallout.Build` **assembly/project** is renamed to `Fallout.Application` in a later mechanical step (namespaces are already migrated). - **Adopted calendar versioning (`YYYY.MINOR.PATCH`) + dual-pace channel model; retired the v11 numbering** ([ADR-0004](docs/adr/0004-calendar-versioning-and-dual-pace-channels.md)). Fallout now ships on calendar versions (`2026.0.0`, `2026.1.0`, …) — mechanically valid SemVer with the major equal to the calendar year. **Breaking changes are batched to the yearly major cut**; mid-year stable releases (`release/YYYY`) are strictly non-breaking. `main` becomes the published **edge** channel (date-stamped prereleases to GitHub Packages); the slow/stable track lives on `release/YYYY`. Opt-in unstable APIs are marked `[Experimental("FALLOUT0xx")]`. - **Migration / impact**: the `11.0.x` packages never shipped a clean stable release (all unlisted), so this strands no stable consumers. The headline content previously slated for "v11" now ships as **`2026.0.0`**. Any tooling pinned to a `[11.0,12.0)`-style range should retarget the `2026.x` line. - **Legacy unaffected**: the `release/v10` line stays on semver `10.x` and continues to receive security/critical fixes — v10 consumers do nothing.