Skip to content

Commit 37e4a6a

Browse files
gfraiteurgfraiteur
committed
Fixed copying of public artifacts.
1 parent 515e612 commit 37e4a6a

12 files changed

Lines changed: 31 additions & 37 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static bool Execute( BuildContext context, BuildSettings settings )
127127
// We have to read the version from the file we have generated - using MSBuild, because it contains properties.
128128
var buildInfo = BuildArguments.Read( context, settings.BuildConfiguration );
129129

130-
var privateArtifactsDirectory = product.GetPrivateArtifactsDirectory( settings.BuildConfiguration );
130+
var privateArtifactsDirectory = product.GetPrivateArtifactsAbsoluteDirectory( context, settings.BuildConfiguration );
131131

132132
// Build solutions.
133133
IEnumerable<Solution> solutionsToBuild;
@@ -167,7 +167,7 @@ public static bool Execute( BuildContext context, BuildSettings settings )
167167
}
168168
}
169169

170-
var publicArtifactsDirectory = product.GetPublicArtifactsDirectory( context );
170+
var publicArtifactsDirectory = product.GetPublicArtifactsAbsoluteDirectory( context );
171171

172172
// Allow for some customization before we create the zip file and copy to the public directory.
173173
var eventArgs = new BuildCompletedEventArgs( context, settings, buildInfo, privateArtifactsDirectory, publicArtifactsDirectory );

‎src/PostSharp.Engineering.BuildTools/Build/BuildContext.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public static bool IsGuestDevice
6262
/// </summary>
6363
public string GetManifestFilePath( BuildConfiguration configuration )
6464
=> Path.Combine(
65-
this.RepoDirectory,
66-
this.Product.GetPrivateArtifactsDirectory( configuration ),
65+
this.Product.GetPrivateArtifactsAbsoluteDirectory( this, configuration ),
6766
$"{this.Product.ProductName}.version.props" );
6867

6968
private BuildContext(

‎src/PostSharp.Engineering.BuildTools/Build/CleanCommand.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,9 @@ void CleanNugetCache()
116116
DeleteDirectory( Path.Combine( context.RepoDirectory, directory ) );
117117
}
118118

119-
DeleteDirectory(
120-
Path.Combine(
121-
context.RepoDirectory,
122-
product.GetPrivateArtifactsDirectory( settings.BuildConfiguration ) ) );
119+
DeleteDirectory( product.GetPrivateArtifactsAbsoluteDirectory( context, settings.BuildConfiguration ) );
123120

124-
DeleteDirectory(
125-
Path.Combine(
126-
context.RepoDirectory,
127-
product.PublicArtifactsDirectory ) );
121+
DeleteDirectory( product.GetPublicArtifactsAbsoluteDirectory( context ) );
128122

129123
DeleteDirectory(
130124
Path.Combine(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void AppendToArcadeSuffix( string s )
9999
<{product.ProductNameWithoutDot}BuildConfiguration>{configuration}</{product.ProductNameWithoutDot}BuildConfiguration>
100100
<{product.ProductNameWithoutDot}Dependencies>{string.Join( ";", product.ParametrizedDependencies.Select( x => x.Name ) )}</{product.ProductNameWithoutDot}Dependencies>
101101
<{product.ProductNameWithoutDot}PublicArtifactsDirectory>{product.PublicArtifactsDirectory}</{product.ProductNameWithoutDot}PublicArtifactsDirectory>
102-
<{product.ProductNameWithoutDot}PrivateArtifactsDirectory>{product.GetPrivateArtifactsDirectory( configuration )}</{product.ProductNameWithoutDot}PrivateArtifactsDirectory>
102+
<{product.ProductNameWithoutDot}PrivateArtifactsDirectory>{product.GetPrivateArtifactsRelativeDirectory( configuration )}</{product.ProductNameWithoutDot}PrivateArtifactsDirectory>
103103
<{product.ProductNameWithoutDot}EngineeringVersion>{VersionHelper.EngineeringVersion}</{product.ProductNameWithoutDot}EngineeringVersion>
104104
<{product.ProductNameWithoutDot}VersionFilePath>{product.VersionsFilePath}</{product.ProductNameWithoutDot}VersionFilePath>
105105
<{product.ProductNameWithoutDot}BuildNumber>{buildSettings.BuildNumber}</{product.ProductNameWithoutDot}BuildNumber>
@@ -206,7 +206,7 @@ internal static string GetPath( BuildContext context, BuildConfiguration configu
206206
{
207207
var product = context.Product;
208208

209-
var privateArtifactsRelativeDir = product.GetPrivateArtifactsDirectory( configuration );
209+
var privateArtifactsRelativeDir = product.GetPrivateArtifactsRelativeDirectory( configuration );
210210

211211
var artifactsDir = Path.Combine( context.RepoDirectory, privateArtifactsRelativeDir );
212212

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ internal static bool TryWrite( BuildContext context, DependenciesConfigurationFi
7979
}
8080

8181
// Add the current artifact directory.
82-
var artifactDirectory = Path.Combine(
83-
context.RepoDirectory,
84-
product.GetPrivateArtifactsDirectory( configuration ) );
82+
var artifactDirectory =
83+
product.GetPrivateArtifactsAbsoluteDirectory( context, configuration );
8584

8685
AddDirectory( product.ProductName, artifactDirectory, product.DependencyDefinition.PackagePatterns );
8786

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ private static bool TryWriteStandalone( BuildContext context, CommonCommandSetti
5050

5151
// Set artifact rules.
5252
var publicArtifactsDirectory =
53-
context.Product.PublicArtifactsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
53+
product.PublicArtifactsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
5454

5555
var privateArtifactsDirectory =
56-
context.Product.GetPrivateArtifactsDirectory( configuration ).Replace( "\\", "/", StringComparison.Ordinal );
56+
product.GetPrivateArtifactsRelativeDirectory( configuration ).Replace( "\\", "/", StringComparison.Ordinal );
5757

5858
var testResultsDirectory =
59-
context.Product.TestResultsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
59+
product.TestResultsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
6060

61-
var logsDirectory = context.Product.LogsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
62-
var dumpsDirectory = context.Product.DumpDirectory.Replace( "\\", "/", StringComparison.Ordinal );
61+
var logsDirectory = product.LogsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
62+
var dumpsDirectory = product.DumpDirectory.Replace( "\\", "/", StringComparison.Ordinal );
6363

6464
var deployedArtifactRules = $"+:{publicArtifactsDirectory}/**/*=>{publicArtifactsDirectory}";
6565
deployedArtifactRules += $@"\n+:{privateArtifactsDirectory}/**/*=>{privateArtifactsDirectory}";
@@ -529,7 +529,7 @@ bool TryPopulateBuildConfigurations(
529529
}
530530

531531
var privateArtifactsDirectory =
532-
product.GetPrivateArtifactsDirectory( configuration ).Replace( "\\", "/", StringComparison.Ordinal );
532+
product.GetPrivateArtifactsRelativeDirectory( configuration ).Replace( "\\", "/", StringComparison.Ordinal );
533533

534534
var publicArtifactsDirectory =
535535
product.PublicArtifactsDirectory.Replace( "\\", "/", StringComparison.Ordinal );

‎src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ public string BumpInfoFilePath
7979

8080
public string ProductNameWithoutDot => this.ProductName.Replace( ".", "", StringComparison.OrdinalIgnoreCase );
8181

82-
[Obsolete( "Use GetPrivateArtifactsDirectory." )]
82+
[Obsolete( "Use GetPrivateArtifactsRelativeDirectory." )]
8383
public string PrivateArtifactsDirectory => this.DependencyDefinition.PrivateArtifactsDirectory;
8484

85-
public string GetPrivateArtifactsDirectory( BuildConfiguration configuration )
85+
public string GetPrivateArtifactsRelativeDirectory( BuildConfiguration configuration )
8686
=> this.DependencyDefinition.GetPrivateArtifactsDirectory( configuration );
8787

8888
public string PublicArtifactsDirectory => this.DependencyDefinition.PublicArtifactsDirectory;
@@ -300,12 +300,12 @@ public bool TryGetDependencyDefinition( string name, [NotNullWhen( true )] out D
300300

301301
public bool IsBundle { get; init; }
302302

303-
internal string GetPrivateArtifactsDirectory( BuildContext context, BuildConfiguration configuration )
303+
internal string GetPrivateArtifactsAbsoluteDirectory( BuildContext context, BuildConfiguration configuration )
304304
=> Path.Combine(
305305
context.RepoDirectory,
306-
this.GetPrivateArtifactsDirectory( configuration ) );
306+
this.GetPrivateArtifactsRelativeDirectory( configuration ) );
307307

308-
internal string GetPublicArtifactsDirectory( BuildContext context )
308+
internal string GetPublicArtifactsAbsoluteDirectory( BuildContext context )
309309
=> Path.Combine(
310310
context.RepoDirectory,
311311
this.PublicArtifactsDirectory );
@@ -341,10 +341,10 @@ internal void OnPrepareCompleted( PrepareCompletedEventArgs args )
341341
this.PrepareCompleted?.Invoke( args );
342342
}
343343

344-
internal (string Private, string Public) GetArtifactsDirectories( BuildContext context, BuildConfiguration configuration )
344+
internal (string Private, string Public) GetArtifactsAbsoluteDirectories( BuildContext context, BuildConfiguration configuration )
345345
{
346346
return (
347-
Path.Combine( context.RepoDirectory, this.GetPrivateArtifactsDirectory( configuration ) ),
347+
Path.Combine( context.RepoDirectory, this.GetPrivateArtifactsRelativeDirectory( configuration ) ),
348348
Path.Combine( context.RepoDirectory, this.PublicArtifactsDirectory )
349349
);
350350
}

‎src/PostSharp.Engineering.BuildTools/Build/PrepareCommand.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public static bool Execute(
3333

3434
if ( settings.BuildConfiguration == BuildConfiguration.Public && !context.IsContinuousIntegrationBuild && !settings.Force )
3535
{
36-
context.Console.WriteError( "Cannot prepare a public configuration on a local machine without --force because it may corrupt the package cache." );
36+
context.Console.WriteError(
37+
"Cannot prepare a public configuration on a development machine without --force because it may corrupt the package cache." );
3738

3839
dependenciesOverrideFile = null;
3940

@@ -60,7 +61,8 @@ public static bool Execute(
6061
return false;
6162
}
6263

63-
context.Console.WriteSuccess( $"Preparing the build was successful. {product.ProductNameWithoutDot}Version={artifactManifestVersionInfo.PackageVersion}" );
64+
context.Console.WriteSuccess(
65+
$"Preparing the build was successful. {product.ProductNameWithoutDot}Version={artifactManifestVersionInfo.PackageVersion}" );
6466

6567
return true;
6668
}

‎src/PostSharp.Engineering.BuildTools/Build/Publishing/PublishCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
119119

120120
var configuration = settings.BuildConfiguration;
121121
var buildArguments = BuildArguments.Read( context, configuration );
122-
var directories = product.GetArtifactsDirectories( context, configuration );
122+
var directories = product.GetArtifactsAbsoluteDirectories( context, configuration );
123123
var configurationInfo = product.Configurations.GetValue( configuration );
124124
var hasTarget = false;
125125

‎src/PostSharp.Engineering.BuildTools/Build/Swapping/SwapCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private static bool Execute( BuildContext context, SwapSettings settings )
2828
var product = context.Product;
2929
var configuration = product.Configurations.GetValue( settings.BuildConfiguration );
3030
var buildArguments = BuildArguments.Read( context, settings.BuildConfiguration );
31-
var directories = product.GetArtifactsDirectories( context, settings.BuildConfiguration );
31+
var directories = product.GetArtifactsAbsoluteDirectories( context, settings.BuildConfiguration );
3232

3333
var success = true;
3434

0 commit comments

Comments
 (0)