Skip to content

Commit 659ef35

Browse files
committed
Renamed and internalized DependenciesOverrideFile.
1 parent 87ecf59 commit 659ef35

21 files changed

+54
-57
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ eng/tools
1313
/.tools
1414
nuget.config
1515
global.json
16-
eng/docker-context/env.g.json
16+
*.g.json
17+
*.g.ps1

eng/DockerMounts.g.ps1

Lines changed: 0 additions & 2 deletions
This file was deleted.

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"allowPrerelease": false
77
},
88
"msbuild-sdks": {
9-
"PostSharp.Engineering.Sdk": "2023.2.200"
9+
"PostSharp.Engineering.Sdk": "2023.2.200.1000-local-GaelFraiteur-debug"
1010
}
1111
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static bool Execute( BuildContext context, BuildSettings settings )
6363
}
6464

6565
// Build dependencies.
66-
DependenciesOverrideFile? dependenciesOverrideFile;
66+
DependenciesConfigurationFile? dependenciesOverrideFile;
6767

6868
if ( !settings.NoDependencies )
6969
{
@@ -75,7 +75,7 @@ public static bool Execute( BuildContext context, BuildSettings settings )
7575
else
7676
{
7777
// Read the resolved dependencies.
78-
if ( !DependenciesOverrideFile.TryLoad( context, settings, configuration, out dependenciesOverrideFile ) )
78+
if ( !DependenciesConfigurationFile.TryLoad( context, settings, configuration, out dependenciesOverrideFile ) )
7979
{
8080
return false;
8181
}

src/PostSharp.Engineering.BuildTools/Build/Files/ArtifactManifestFile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal static class ArtifactManifestFile
2222
public static bool TryWrite(
2323
VersionComponents version,
2424
BuildConfiguration configuration,
25-
DependenciesOverrideFile dependenciesOverrideFile,
25+
DependenciesConfigurationFile dependenciesConfigurationFile,
2626
BuildContext context,
2727
BuildSettings buildSettings,
2828
string buildDate )
@@ -110,7 +110,7 @@ void AppendToArcadeSuffix( string s )
110110
</PropertyGroup>
111111
<ItemGroup>";
112112

113-
foreach ( var dependency in dependenciesOverrideFile.Dependencies )
113+
foreach ( var dependency in dependenciesConfigurationFile.Dependencies )
114114
{
115115
var buildSpec = dependency.Value.BuildServerSource;
116116

@@ -150,7 +150,7 @@ void AppendToArcadeSuffix( string s )
150150
<PropertyGroup>
151151
";
152152

153-
foreach ( var dependency in dependenciesOverrideFile.Dependencies.Where( d => d.Value.SourceKind == DependencySourceKind.Feed ) )
153+
foreach ( var dependency in dependenciesConfigurationFile.Dependencies.Where( d => d.Value.SourceKind == DependencySourceKind.Feed ) )
154154
{
155155
var nameWithoutDot = dependency.Key.Replace( ".", "", StringComparison.OrdinalIgnoreCase );
156156

src/PostSharp.Engineering.BuildTools/Build/Files/ConfigurationNeutralVersionFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static void Write(
5454
BuildConfiguration buildConfiguration )
5555
{
5656
var configurationNeutralVersionsFilePath = GetPath( context );
57-
var configurationSpecificVersionFilePath = DependenciesOverrideFile.GetPath( context, settings, buildConfiguration );
57+
var configurationSpecificVersionFilePath = DependenciesConfigurationFile.GetPath( context, settings, buildConfiguration );
5858

5959
context.Console.WriteMessage( $"Writing '{configurationNeutralVersionsFilePath}'." );
6060

src/PostSharp.Engineering.BuildTools/Build/Files/MasterGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal static class MasterGenerator
1111
public static bool TryWriteFiles(
1212
BuildContext context,
1313
BuildSettings settings,
14-
[NotNullWhen( true )] out DependenciesOverrideFile? dependenciesOverrideFile )
14+
[NotNullWhen( true )] out DependenciesConfigurationFile? dependenciesOverrideFile )
1515
{
1616
var configuration = settings.BuildConfiguration;
1717

@@ -20,7 +20,7 @@ public static bool TryWriteFiles(
2020
var propsFilePath = ArtifactManifestFile.GetPath( context, settings.BuildConfiguration );
2121

2222
// Load Versions.<Configuration>.g.props.
23-
if ( !DependenciesOverrideFile.TryLoad( context, settings, configuration, out dependenciesOverrideFile ) )
23+
if ( !DependenciesConfigurationFile.TryLoad( context, settings, configuration, out dependenciesOverrideFile ) )
2424
{
2525
return false;
2626
}

src/PostSharp.Engineering.BuildTools/Build/Files/NuGetConfigFile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace PostSharp.Engineering.BuildTools.Build.Files;
1515
/// </summary>
1616
internal static class NuGetConfigFile
1717
{
18-
internal static bool TryWrite( BuildContext context, DependenciesOverrideFile dependenciesOverrideFile, BuildConfiguration configuration )
18+
internal static bool TryWrite( BuildContext context, DependenciesConfigurationFile dependenciesConfigurationFile, BuildConfiguration configuration )
1919
{
2020
var product = context.Product;
2121

@@ -25,7 +25,7 @@ internal static bool TryWrite( BuildContext context, DependenciesOverrideFile de
2525
}
2626

2727
// Fetch to resolve the VersionFile properties.
28-
if ( !dependenciesOverrideFile.Fetch( context ) )
28+
if ( !dependenciesConfigurationFile.Fetch( context ) )
2929
{
3030
return false;
3131
}
@@ -85,7 +85,7 @@ internal static bool TryWrite( BuildContext context, DependenciesOverrideFile de
8585
AddDirectory( product.ProductName, artifactDirectory, product.DependencyDefinition.PackagePatterns );
8686

8787
// Add dependencies.
88-
foreach ( var dependencySource in dependenciesOverrideFile.Dependencies )
88+
foreach ( var dependencySource in dependenciesConfigurationFile.Dependencies )
8989
{
9090
if ( dependencySource.Value.SourceKind == DependencySourceKind.Feed )
9191
{

src/PostSharp.Engineering.BuildTools/Build/Files/TeamCitySettingsFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private static bool TryWriteStandalone( BuildContext context, CommonCommandSetti
7676
additionalArtifactRules = product.DefaultArtifactRules.AddRange( configurationInfo.AdditionalArtifactRules );
7777
}
7878

79-
if ( !DependenciesOverrideFile.TryLoad( context, settings, configuration, out var dependenciesOverrideFile ) )
79+
if ( !DependenciesConfigurationFile.TryLoad( context, settings, configuration, out var dependenciesOverrideFile ) )
8080
{
8181
return false;
8282
}

src/PostSharp.Engineering.BuildTools/Build/Files/VersionFileHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static bool TryComputeVersion(
4141
BuildSettings settings,
4242
BuildConfiguration configuration,
4343
MainVersionFile mainVersionFile,
44-
DependenciesOverrideFile dependenciesOverrideFile,
44+
DependenciesConfigurationFile dependenciesConfigurationFile,
4545
[NotNullWhen( true )] out VersionComponents? version )
4646
{
4747
var product = context.Product;
@@ -56,7 +56,7 @@ public static bool TryComputeVersion(
5656

5757
// The main version is defined in a dependency. Load the import file.
5858

59-
if ( !dependenciesOverrideFile.Dependencies.TryGetValue( mainVersionDependencyName, out var dependencySource ) )
59+
if ( !dependenciesConfigurationFile.Dependencies.TryGetValue( mainVersionDependencyName, out var dependencySource ) )
6060
{
6161
context.Console.WriteError( $"Cannot find a dependency named '{mainVersionDependencyName}'." );
6262

0 commit comments

Comments
 (0)