diff --git a/Directory.Packages.props b/Directory.Packages.props
index 99a68241b..9eae936ab 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,7 +22,7 @@
-
+
@@ -30,8 +30,8 @@
-
-
+
+
diff --git a/appveyor.yml b/appveyor.yml
index decd911ec..19d5c7037 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,7 +37,7 @@ environment:
PublicNuGetApiKey:
secure: AzhHrKZGYyWnvMtPg06Q7PMJPp47dl5NxAHaE9ZB9tjIWVqmySx3F26YtVhRSPGa
GitHubReleaseGitHubToken:
- secure: a5UfxXiDEere9GkCCN9TURaC8CmN/ZaqWIeoHbHNshmXWLedwrEAdwGNzPf3dusKEykOMB7T/fIorZHPIqSRuuR3JsMya/3zPrvozT5o1A5qf6LpNAtWpdB20+3rvupZ
+ secure: a5UfxXiDEere9GkCCN9TUUq2+8QHAJoeVpZudQZXdWyloZWE5xKOkqzpxdMoYDPSxrVbWxjXbk1Xe9p0OydwuGVnr/3DC//BguNeGtFddbyMWlAiX36XvD1ZGEgP+ZIN
SignPathApiToken:
secure: uQTH2MxpqiqWTy7EJkjtNc43ipG17EUOQN99QsODRNgtNEcikDaP0t4ylekK/ibn
TwitterConsumerKey:
diff --git a/build/Build.CI.AppVeyor.cs b/build/Build.CI.AppVeyor.cs
index 1c3099eda..78b1635ee 100644
--- a/build/Build.CI.AppVeyor.cs
+++ b/build/Build.CI.AppVeyor.cs
@@ -35,7 +35,7 @@
InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
Secrets = new string[0])]
[AppVeyorSecret(nameof(PublicNuGetApiKey), "AzhHrKZGYyWnvMtPg06Q7PMJPp47dl5NxAHaE9ZB9tjIWVqmySx3F26YtVhRSPGa")]
-[AppVeyorSecret(ICreateGitHubRelease.GitHubRelease + nameof(ICreateGitHubRelease.GitHubToken), "a5UfxXiDEere9GkCCN9TURaC8CmN/ZaqWIeoHbHNshmXWLedwrEAdwGNzPf3dusKEykOMB7T/fIorZHPIqSRuuR3JsMya/3zPrvozT5o1A5qf6LpNAtWpdB20+3rvupZ")]
+[AppVeyorSecret(ICreateGitHubRelease.GitHubRelease + nameof(ICreateGitHubRelease.GitHubToken), "a5UfxXiDEere9GkCCN9TUUq2+8QHAJoeVpZudQZXdWyloZWE5xKOkqzpxdMoYDPSxrVbWxjXbk1Xe9p0OydwuGVnr/3DC//BguNeGtFddbyMWlAiX36XvD1ZGEgP+ZIN")]
[AppVeyorSecret(ISignPackages.SignPath + nameof(ISignPackages.ApiToken), "uQTH2MxpqiqWTy7EJkjtNc43ipG17EUOQN99QsODRNgtNEcikDaP0t4ylekK/ibn")]
[AppVeyorSecret(IHazTwitterCredentials.Twitter + nameof(IHazTwitterCredentials.ConsumerKey), "T61zL4r+xtyj7b0aOGYCsyixrXHooXE759T8z3M67Lw=")]
[AppVeyorSecret(IHazTwitterCredentials.Twitter + nameof(IHazTwitterCredentials.ConsumerSecret), "CZwdlO4PHT51Xr0Pe/mT6WpfBzQXsL0C3yWfHgXqdYrf22rx8ePEt5qpszWckbHE5Vh5ErtVfIAQgLeFrqe2Gg==")]
diff --git a/source/Nuke.Common.Tests/SettingsTest.cs b/source/Nuke.Common.Tests/SettingsTest.cs
index 350d5824b..e5435124d 100644
--- a/source/Nuke.Common.Tests/SettingsTest.cs
+++ b/source/Nuke.Common.Tests/SettingsTest.cs
@@ -142,9 +142,9 @@ public void TestDocker()
{
Assert(new DockerAttachSettings()
.SetDetachKeys("detach-keys")
- .SetContainer("container")
- .SetLogLevel(DockerLogLevel.debug),
- "attach --detach-keys detach-keys container --log-level debug");
+ .SetLogLevel(DockerLogLevel.debug)
+ .SetContainer("container"),
+ "attach --detach-keys detach-keys --log-level debug container");
}
[Fact]
diff --git a/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs b/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs
index b4b023856..419fe44bb 100644
--- a/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs
+++ b/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs
@@ -44,19 +44,19 @@ public partial class AzureSignToolTasks : ToolTasks, IRequireNuGetPackage
public partial class AzureSignToolSettings : ToolOptions
{
/// A fully qualified URL of the key vault with the certificate that will be used for signing. An example value might be https://my-vault.vault.azure.net.
- [Argument(Format = "--azure-key-vault-url {value}")] public string KeyVaultUrl => Get(() => KeyVaultUrl);
+ [Argument(Format = "--azure-key-vault-url {value}", Secret = false)] public string KeyVaultUrl => Get(() => KeyVaultUrl);
/// This is the client ID used to authenticate to Azure, which will be used to generate an access token. This parameter is not required if an access token is supplied directly with the --azure-key-vault-accesstoken option. If this parameter is supplied, --azure-key-vault-client-secret and --azure-key-vault-tenant-id must be supplied as well.
- [Argument(Format = "--azure-key-vault-client-id {value}")] public string KeyVaultClientId => Get(() => KeyVaultClientId);
+ [Argument(Format = "--azure-key-vault-client-id {value}", Secret = false)] public string KeyVaultClientId => Get(() => KeyVaultClientId);
/// This is the client secret used to authenticate to Azure, which will be used to generate an access token. This parameter is not required if an access token is supplied directly with the --azure-key-vault-accesstoken option or when using managed identities with --azure-key-vault-managed-identity. If this parameter is supplied, --azure-key-vault-client-id and --azure-key-vault-tenant-id must be supplied as well.
[Argument(Format = "--azure-key-vault-client-secret {value}", Secret = true)] public string KeyVaultClientSecret => Get(() => KeyVaultClientSecret);
/// This is the tenant id used to authenticate to Azure, which will be used to generate an access token. This parameter is not required if an access token is supplied directly with the --azure-key-vault-accesstoken option or when using managed identities with --azure-key-vault-managed-identity. If this parameter is supplied, --azure-key-vault-client-id and --azure-key-vault-client-secret must be supplied as well.
- [Argument(Format = "--azure-key-vault-tenant-id {value}")] public string KeyVaultTenantId => Get(() => KeyVaultTenantId);
+ [Argument(Format = "--azure-key-vault-tenant-id {value}", Secret = false)] public string KeyVaultTenantId => Get(() => KeyVaultTenantId);
/// The name of the certificate used to perform the signing operation.
- [Argument(Format = "--azure-key-vault-certificate {value}")] public string KeyVaultCertificateName => Get(() => KeyVaultCertificateName);
+ [Argument(Format = "--azure-key-vault-certificate {value}", Secret = false)] public string KeyVaultCertificateName => Get(() => KeyVaultCertificateName);
/// An access token used to authenticate to Azure. This can be used instead of the --azure-key-vault-managed-identity, --azure-key-vault-client-id and --azure-key-vault-client-secret options. This is useful if AzureSignTool is being used as part of another program that is already authenticated and has an access token to Azure.
[Argument(Format = "--azure-key-vault-accesstoken {value}", Secret = true)] public string KeyVaultAccessToken => Get(() => KeyVaultAccessToken);
/// Use the ambient Managed Identity to authenticate to Azure. This can be used instead of the --azure-key-vault-accesstoken, --azure-key-vault-client-id and --azure-key-vault-client-secret options. This is useful if AzureSignTool is being used on a VM/service/CLI that is configured for managed identities to Azure.
- [Argument(Format = "--azure-key-vault-managed-identity")] public bool? KeyVaultManagedIdentity => Get(() => KeyVaultManagedIdentity);
+ [Argument(Format = "--azure-key-vault-managed-identity", Secret = false)] public bool? KeyVaultManagedIdentity => Get(() => KeyVaultManagedIdentity);
/// A description of the signed content. This parameter serves the same purpose as the /d option in the Windows SDK signtool. If this parameter is not supplied, the signature will not contain a description.
[Argument(Format = "--description {value}")] public string Description => Get(() => Description);
/// A URL with more information of the signed content. This parameter serves the same purpose as the /du option in the Windows SDK signtool. If this parameter is not supplied, the signature will not contain a URL description.
diff --git a/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.json b/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.json
index 046323be5..8f6adf405 100644
--- a/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.json
+++ b/source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.json
@@ -14,12 +14,14 @@
"name": "KeyVaultUrl",
"type": "string",
"format": "--azure-key-vault-url {value}",
+ "secret": false,
"help": "A fully qualified URL of the key vault with the certificate that will be used for signing. An example value might be https://my-vault.vault.azure.net."
},
{
"name": "KeyVaultClientId",
"type": "string",
"format": "--azure-key-vault-client-id {value}",
+ "secret": false,
"help": "This is the client ID used to authenticate to Azure, which will be used to generate an access token. This parameter is not required if an access token is supplied directly with the --azure-key-vault-accesstoken option. If this parameter is supplied, --azure-key-vault-client-secret and --azure-key-vault-tenant-id must be supplied as well."
},
{
@@ -33,12 +35,14 @@
"name": "KeyVaultTenantId",
"type": "string",
"format": "--azure-key-vault-tenant-id {value}",
+ "secret": false,
"help": "This is the tenant id used to authenticate to Azure, which will be used to generate an access token. This parameter is not required if an access token is supplied directly with the --azure-key-vault-accesstoken option or when using managed identities with --azure-key-vault-managed-identity. If this parameter is supplied, --azure-key-vault-client-id and --azure-key-vault-client-secret must be supplied as well."
},
{
"name": "KeyVaultCertificateName",
"type": "string",
"format": "--azure-key-vault-certificate {value}",
+ "secret": false,
"help": "The name of the certificate used to perform the signing operation."
},
{
@@ -52,6 +56,7 @@
"name": "KeyVaultManagedIdentity",
"type": "bool",
"format": "--azure-key-vault-managed-identity",
+ "secret": false,
"help": "Use the ambient Managed Identity to authenticate to Azure. This can be used instead of the --azure-key-vault-accesstoken, --azure-key-vault-client-id and --azure-key-vault-client-secret options. This is useful if AzureSignTool is being used on a VM/service/CLI that is configured for managed identities to Azure."
},
{
diff --git a/source/Nuke.Common/Tools/DocFX/DocFX.Generated.cs b/source/Nuke.Common/Tools/DocFX/DocFX.Generated.cs
index 42136cc57..2c39454b3 100644
--- a/source/Nuke.Common/Tools/DocFX/DocFX.Generated.cs
+++ b/source/Nuke.Common/Tools/DocFX/DocFX.Generated.cs
@@ -155,7 +155,7 @@ public partial class DocFXBuildSettings : ToolOptions
/// Set the max parallelism, 0 is auto.
[Argument(Format = "--maxParallelism={value}")] public int? MaxParallelism => Get(() => MaxParallelism);
/// Disable default lang keyword.
- [Argument(Format = "--noLangKeyword")] public bool? NoLangKeyword => Get(() => NoLangKeyword);
+ [Argument(Format = "--noLangKeyword", Secret = false)] public bool? NoLangKeyword => Get(() => NoLangKeyword);
/// Specify the output base directory.
[Argument(Format = "--output={value}")] public string OutputFolder => Get(() => OutputFolder);
/// The output folder for files generated for debugging purpose when in debug mode. If not specified, it is ${TempPath}/docfx.
@@ -416,7 +416,7 @@ public partial class DocFXPdfSettings : ToolOptions
/// Set the max parallelism, 0 is auto.
[Argument(Format = "--maxParallelism={value}")] public int? MaxParallelism => Get(() => MaxParallelism);
/// Disable default lang keyword.
- [Argument(Format = "--noLangKeyword")] public bool? NoLangKeyword => Get(() => NoLangKeyword);
+ [Argument(Format = "--noLangKeyword", Secret = false)] public bool? NoLangKeyword => Get(() => NoLangKeyword);
/// Specify the output base directory.
[Argument(Format = "--output={value}")] public string OutputFolder => Get(() => OutputFolder);
/// The output folder for files generated for debugging purpose when in debug mode. If not specified, it is ${TempPath}/docfx.
diff --git a/source/Nuke.Common/Tools/DocFX/DocFX.json b/source/Nuke.Common/Tools/DocFX/DocFX.json
index 21d0919ba..0677da969 100644
--- a/source/Nuke.Common/Tools/DocFX/DocFX.json
+++ b/source/Nuke.Common/Tools/DocFX/DocFX.json
@@ -167,6 +167,7 @@
"name": "NoLangKeyword",
"type": "bool",
"format": "--noLangKeyword",
+ "secret": false,
"help": "Disable default lang keyword."
},
{
@@ -864,6 +865,7 @@
"name": "NoLangKeyword",
"type": "bool",
"format": "--noLangKeyword",
+ "secret": false,
"help": "Disable default lang keyword."
},
{
diff --git a/source/Nuke.Common/Tools/Docker/Docker.Generated.cs b/source/Nuke.Common/Tools/Docker/Docker.Generated.cs
index b5759aa9e..55413ad3a 100644
--- a/source/Nuke.Common/Tools/Docker/Docker.Generated.cs
+++ b/source/Nuke.Common/Tools/Docker/Docker.Generated.cs
@@ -62,13 +62,6 @@ public partial class DockerTasks : ToolTasks, IRequirePathTool
public static IReadOnlyCollection