Skip to content

Commit d89cdf8

Browse files
committed
Refactoring: splitting the Product class, moving namespaces, fixing accessibility.
1 parent 055ef5c commit d89cdf8

File tree

165 files changed

+3834
-3402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+3834
-3402
lines changed

global.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
2+
"//": "This file is generated by PostSharp.Engineering. Do not edit or add to git.",
23
"sdk": {
3-
"version": "9.0.100",
4-
"rollForward": "major"
4+
"version": "8.0",
5+
"rollForward": "patch",
6+
"allowPrerelease": "false"
7+
},
8+
"msbuild-sdks": {
9+
"PostSharp.Engineering.Sdk": "2023.2.197.1191-local-GaelFraiteur-debug"
510
}
611
}

src/PostSharp.Engineering.BuildTools/AppExtensions.cs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@
33
using JetBrains.Annotations;
44
using PostSharp.Engineering.BuildTools.BillOfMaterials;
55
using PostSharp.Engineering.BuildTools.Build;
6+
using PostSharp.Engineering.BuildTools.Build.Bumping;
67
using PostSharp.Engineering.BuildTools.Build.Model;
8+
using PostSharp.Engineering.BuildTools.Build.MSBuild;
9+
using PostSharp.Engineering.BuildTools.Build.Publishing;
10+
using PostSharp.Engineering.BuildTools.Build.Swapping;
11+
using PostSharp.Engineering.BuildTools.Build.Testing;
712
using PostSharp.Engineering.BuildTools.CodeStyle;
813
using PostSharp.Engineering.BuildTools.ContinuousIntegration;
9-
using PostSharp.Engineering.BuildTools.Csproj;
1014
using PostSharp.Engineering.BuildTools.Dependencies;
1115
using PostSharp.Engineering.BuildTools.DotNetTools;
12-
using PostSharp.Engineering.BuildTools.Git;
13-
using PostSharp.Engineering.BuildTools.NuGet;
14-
using PostSharp.Engineering.BuildTools.XmlDoc;
16+
using PostSharp.Engineering.BuildTools.Tools;
17+
using PostSharp.Engineering.BuildTools.Tools.Csproj;
18+
using PostSharp.Engineering.BuildTools.Tools.Git;
19+
using PostSharp.Engineering.BuildTools.Tools.NuGet;
20+
using PostSharp.Engineering.BuildTools.Tools.TeamCity;
21+
using PostSharp.Engineering.BuildTools.Tools.XmlDoc;
1522
using Spectre.Console.Cli;
1623
using System;
1724
using System.Linq;
@@ -48,9 +55,9 @@ internal static void AddCommands( this CommandApp app, Product product )
4855
.WithData( data )
4956
.WithDescription( "Builds all packages in the product (implies 'prepare')" );
5057

51-
root.AddCommand<GenerateCiScriptsCommand>( "generate-scripts" )
58+
root.AddCommand<GenerateScriptsCommand>( "generate-scripts" )
5259
.WithData( data )
53-
.WithDescription( "Generates the continuous integration scripts" );
60+
.WithDescription( "Generates the CI and Docker scripts" );
5461

5562
root.AddCommand<ListSolutionsCommand>( "list-solutions" )
5663
.WithData( data )

src/PostSharp.Engineering.BuildTools/BaseCommand.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
using PostSharp.Engineering.BuildTools.Build;
44
using PostSharp.Engineering.BuildTools.Build.Model;
5+
using PostSharp.Engineering.BuildTools.Build.MSBuild;
56
using PostSharp.Engineering.BuildTools.Utilities;
67
using Spectre.Console;
78
using Spectre.Console.Cli;
89
using System;
910
using System.Diagnostics;
1011
using System.IO;
1112
using System.Linq;
13+
using System.Runtime.InteropServices;
1214
using System.Text.Json;
1315

1416
namespace PostSharp.Engineering.BuildTools
@@ -91,7 +93,10 @@ public sealed override int Execute( CommandContext context, T settings )
9193
.Color( Color.Purple ) );
9294

9395
buildContext.Console.Out.WriteLine();
94-
buildContext.Console.WriteMessage( $"Using PostSharp.Engineering v{myVersion}. TeamCity: {buildContext.IsContinuousIntegrationBuild}. Docker: {buildContext.IsRunningUnderContainer}." );
96+
97+
buildContext.Console.WriteMessage(
98+
$"Using PostSharp.Engineering v{myVersion}. TeamCity: {buildContext.IsContinuousIntegrationBuild}. Docker: {buildContext.IsRunningUnderContainer}. Runtime: {RuntimeInformation.FrameworkDescription} {RuntimeInformation.RuntimeIdentifier}." );
99+
95100
buildContext.Console.Out.WriteLine();
96101
}
97102

src/PostSharp.Engineering.BuildTools/BillOfMaterials/DependencyWalker.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
using Microsoft.Extensions.FileSystemGlobbing;
44
using PostSharp.Engineering.BuildTools.Build;
5+
using PostSharp.Engineering.BuildTools.Build.Files;
56
using PostSharp.Engineering.BuildTools.Build.Model;
67
using System.Net;
78
using System.Text.RegularExpressions;
@@ -41,7 +42,7 @@ internal static class DependencyWalker
4142

4243
private static IReadOnlyList<PackageDependencyInfo> GetPackageDependencies( BuildContext context )
4344
{
44-
var defaultConfiguration = context.Product.ReadDefaultConfiguration( context ) ?? BuildConfiguration.Debug;
45+
var defaultConfiguration = ConfigurationNeutralVersionFile.ReadDefaultConfiguration( context ) ?? BuildConfiguration.Debug;
4546

4647
var list = new List<PackageDependencyInfo>();
4748

src/PostSharp.Engineering.BuildTools/BillOfMaterials/GenerateThirdPartyNoticesCommand.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
using JetBrains.Annotations;
44
using PostSharp.Engineering.BuildTools.Build;
5-
using PostSharp.Engineering.BuildTools.Build.Model;
65
using System;
7-
using System.Collections.Generic;
86
using System.IO;
97
using System.Linq;
108

src/PostSharp.Engineering.BuildTools/Build/BaseBuildSettings.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
22

33
using JetBrains.Annotations;
4+
using PostSharp.Engineering.BuildTools.Build.Files;
5+
using PostSharp.Engineering.BuildTools.Build.Publishing;
46
using Spectre.Console.Cli;
57
using System;
68
using System.ComponentModel;
@@ -55,7 +57,7 @@ public override void Initialize( BuildContext context )
5557
return;
5658
}
5759

58-
var defaultConfiguration = context.Product.ReadDefaultConfiguration( context );
60+
var defaultConfiguration = ConfigurationNeutralVersionFile.ReadDefaultConfiguration( context );
5961

6062
if ( defaultConfiguration == null )
6163
{

0 commit comments

Comments
 (0)