Skip to content

Fix CloudBuildAllVars value formatting #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2023
Merged

Fix CloudBuildAllVars value formatting #882

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03e9883
Fix CloudBuildAllVars value formatting
ronaldbarendse Jan 4, 2023
4f415c1
Use 'o' format specifier for DateTimeOffset
AArnott Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/NerdBank.GitVersioning/VersionOracle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public IEnumerable<string> BuildMetadataWithCommitId
/// <summary>
/// Gets the version options used to initialize this instance.
/// </summary>
[Ignore]
public VersionOptions? VersionOptions { get; }

/// <summary>
Expand Down Expand Up @@ -296,17 +297,29 @@ public IDictionary<string, string> CloudBuildAllVars
{
var variables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

PropertyInfo[]? properties = this.GetType().GetTypeInfo().GetProperties(BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance);
foreach (PropertyInfo? property in properties)
PropertyInfo[] properties = this.GetType().GetTypeInfo().GetProperties(BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance);
foreach (PropertyInfo property in properties)
{
if (property.GetCustomAttribute<IgnoreAttribute>() is null)
if (property.GetCustomAttribute<IgnoreAttribute>() is not null)
{
continue;
}

object? propertyValue = property.GetValue(this);
if (propertyValue is null)
{
object? value = property.GetValue(this);
if (value is object)
{
variables.Add($"NBGV_{property.Name}", value.ToString() ?? string.Empty);
}
continue;
}

const string isoDateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.FFFFFFFK";

string value = propertyValue switch
{
DateTimeOffset dateTimeOffset => dateTimeOffset.ToString(isoDateTimeFormat, CultureInfo.InvariantCulture),
_ => Convert.ToString(propertyValue, CultureInfo.InvariantCulture) ?? string.Empty,
};

variables.Add($"NBGV_{property.Name}", value);
}

return variables;
Expand Down