Skip to content

Commit 397b667

Browse files
committed
Fixed publish.
1 parent 728c19e commit 397b667

File tree

6 files changed

+50
-14
lines changed

6 files changed

+50
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static bool Execute( BuildContext context, BuildSettings settings )
125125
ImportFile.Delete( context );
126126

127127
// We have to read the version from the file we have generated - using MSBuild, because it contains properties.
128-
var buildInfo = BuildArguments.Read( context, settings.BuildConfiguration );
128+
var buildInfo = BuildArguments.ReadFromArtifactManifest( context, settings.BuildConfiguration );
129129

130130
var privateArtifactsDirectory = product.GetPrivateArtifactsAbsoluteDirectory( context, settings.BuildConfiguration );
131131

src/PostSharp.Engineering.BuildTools/Build/Model/BuildArguments.cs

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using PostSharp.Engineering.BuildTools.Build.Files;
44
using PostSharp.Engineering.BuildTools.Dependencies.Model;
55
using System;
6+
using System.Diagnostics.CodeAnalysis;
67

78
namespace PostSharp.Engineering.BuildTools.Build.Model
89
{
@@ -24,7 +25,7 @@ internal BuildArguments( string? packageVersion, BuildConfiguration configuratio
2425
product.DependencyDefinition,
2526
packagePreviewVersion ) { }
2627

27-
internal BuildArguments(
28+
private BuildArguments(
2829
string? packageVersion,
2930
BuildConfiguration configuration,
3031
DependencyDefinition dependencyDefinition,
@@ -34,7 +35,7 @@ internal BuildArguments(
3435
dependencyDefinition.MSBuildConfiguration[configuration],
3536
packagePreviewVersion ) { }
3637

37-
internal BuildArguments( string? packageVersion, string configuration, string msBuildConfiguration, string? packagePreviewVersion )
38+
private BuildArguments( string? packageVersion, string configuration, string msBuildConfiguration, string? packagePreviewVersion )
3839
{
3940
this.PackageVersion = packageVersion;
4041
this.Configuration = configuration;
@@ -55,7 +56,33 @@ internal BuildArguments( string? packageVersion, string configuration, string ms
5556

5657
public string? PackagePreviewVersion { get; init; }
5758

58-
public static BuildArguments Read( BuildContext context, BuildConfiguration buildConfiguration )
59+
public static BuildArguments ReadFromArtifactManifest( BuildContext context, BuildConfiguration buildConfiguration )
5960
=> ArtifactManifestFile.CreateParametricStringArguments( context, buildConfiguration );
61+
62+
public static bool TryCreate( BuildContext context, BuildConfiguration configuration, [NotNullWhen( true )] out BuildArguments? buildArguments )
63+
{
64+
if ( !MainVersionFile.TryRead( context, out var mainVersionFile ) )
65+
{
66+
buildArguments = null;
67+
68+
return false;
69+
}
70+
71+
if ( !AutoUpdatedVersionsFile.TryRead( context, out var packageVersion, out var packageMainVersion ) )
72+
{
73+
buildArguments = null;
74+
75+
return false;
76+
}
77+
78+
buildArguments = new BuildArguments()
79+
{
80+
MSBuildConfiguration = context.Product.DependencyDefinition.MSBuildConfiguration[configuration],
81+
Configuration = configuration.ToString(),
82+
PackageVersion = packageVersion
83+
};
84+
85+
return true;
86+
}
6087
}
6188
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,8 @@ private static bool Execute( BuildContext context, PublishSettings settings )
8484
return false;
8585
}
8686

87-
if ( !MasterGenerator.TryWriteFiles( context, settings ) )
88-
{
89-
return false;
90-
}
91-
9287
// TODO: Verification is broken - NuGet verification is slow and makes the verification fail
93-
// on seemimngly unpublished packages.
88+
// on seemingly unpublished packages.
9489
// if ( settings.BuildConfiguration == BuildConfiguration.Public )
9590
// {
9691
// if ( !product.Verify( context, settings ) )
@@ -100,7 +95,12 @@ private static bool Execute( BuildContext context, PublishSettings settings )
10095
// }
10196

10297
var configuration = settings.BuildConfiguration;
103-
var buildArguments = BuildArguments.Read( context, configuration );
98+
99+
if ( !BuildArguments.TryCreate( context, configuration, out var buildArguments ) )
100+
{
101+
return false;
102+
}
103+
104104
var directories = product.GetArtifactsAbsoluteDirectories( context, configuration );
105105
var configurationInfo = product.Configurations.GetValue( configuration );
106106
var hasTarget = false;

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ private static bool Execute( BuildContext context, SwapSettings settings )
2626
{
2727
var product = context.Product;
2828
var configuration = product.Configurations.GetValue( settings.BuildConfiguration );
29-
var buildArguments = BuildArguments.Read( context, settings.BuildConfiguration );
29+
30+
if ( !BuildArguments.TryCreate( context, settings.BuildConfiguration, out var buildArguments ) )
31+
{
32+
return false;
33+
}
34+
3035
var directories = product.GetArtifactsAbsoluteDirectories( context, settings.BuildConfiguration );
3136

3237
var success = true;

src/PostSharp.Engineering.BuildTools/Build/Testing/TestCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static bool Execute( BuildContext context, BuildSettings settings )
110110
}
111111

112112
// Raise the post-test event.
113-
var buildInfo = BuildArguments.Read( context, settings.BuildConfiguration );
113+
var buildInfo = BuildArguments.ReadFromArtifactManifest( context, settings.BuildConfiguration );
114114
var privateArtifactsDirectory = product.GetPrivateArtifactsAbsoluteDirectory( context, settings.BuildConfiguration );
115115
var publicArtifactsDirectory = product.GetPublicArtifactsAbsoluteDirectory( context );
116116

src/PostSharp.Engineering.BuildTools/Tools/VerifyCommand.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ public static bool Execute( BuildContext context, PublishSettings settings )
2020

2121
if ( configuration == BuildConfiguration.Public )
2222
{
23-
var buildArguments = BuildArguments.Read( context, configuration );
23+
if ( !BuildArguments.TryCreate( context, configuration, out var buildArguments ) )
24+
{
25+
return false;
26+
}
27+
2428
var directories = product.GetArtifactsAbsoluteDirectories( context, configuration );
2529

2630
// Verify that public packages have no private dependencies.

0 commit comments

Comments
 (0)