Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nuke-build/nuke
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.10.4
Choose a base ref
...
head repository: nuke-build/nuke
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.10.5
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 10, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cc6911a View commit details
  2. Copy the full SHA
    e892fcd View commit details
  3. Merge branch 'hotfix/0.10.5'

    matkoch committed Oct 10, 2018
    Copy the full SHA
    6dea863 View commit details
Showing with 60 additions and 13 deletions.
  1. +6 −2 CHANGELOG.md
  2. +2 −2 build/specifications/DotNet.json
  3. +52 −9 source/Nuke.Common/Tools/DotNet/DotNet.Generated.cs
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [vNext]

## [0.10.5] / 2018-10-10
- Fixed `--source` parameter for `DotNetRestore` to be collection

## [0.10.4] / 2018-10-10
- Fixed `GitRepository` when origin url is a ssh url without username.
- Fixed `GitRepository` when origin URL uses SSH without username

## [0.10.3] / 2018-10-05
- Fixed `WinRelativePath` and `UnixRelativePath` to use correct separator
@@ -170,7 +173,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added CLT tasks for Git
- Fixed background color in console output

[vNext]: https://github.com/nuke-build/nuke/compare/0.10.4...HEAD
[vNext]: https://github.com/nuke-build/nuke/compare/0.10.5...HEAD
[0.10.5]: https://github.com/nuke-build/nuke/compare/0.10.4...0.10.5
[0.10.4]: https://github.com/nuke-build/nuke/compare/0.10.3...0.10.4
[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
4 changes: 2 additions & 2 deletions build/specifications/DotNet.json
Original file line number Diff line number Diff line change
@@ -258,8 +258,8 @@
"help": "Specifies a runtime for the package restore. This is used to restore packages for runtimes not explicitly listed in the <c>&lt;RuntimeIdentifiers&gt;</c> tag in the <em>.csproj</em> file. For a list of Runtime Identifiers (RIDs), see the <a href=\"https://docs.microsoft.com/en-us/dotnet/core/rid-catalog\">RID catalog</a>. Provide multiple RIDs by specifying this option multiple times."
},
{
"name": "Source",
"type": "string",
"name": "Sources",
"type": "List<string>",
"format": "--source {value}",
"help": "Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times."
},
61 changes: 52 additions & 9 deletions source/Nuke.Common/Tools/DotNet/DotNet.Generated.cs
Original file line number Diff line number Diff line change
@@ -273,7 +273,8 @@ public partial class DotNetRestoreSettings : ToolSettings
public virtual IReadOnlyList<string> Runtimes => RuntimesInternal.AsReadOnly();
internal List<string> RuntimesInternal { get; set; } = new List<string>();
/// <summary><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
public virtual string Source { get; internal set; }
public virtual IReadOnlyList<string> Sources => SourcesInternal.AsReadOnly();
internal List<string> SourcesInternal { get; set; } = new List<string>();
/// <summary><p>Sets the verbosity level of the command. Allowed values are <c>q[uiet]</c>, <c>m[inimal]</c>, <c>n[ormal]</c>, <c>d[etailed]</c>, and <c>diag[nostic]</c>.</p></summary>
public virtual DotNetVerbosity Verbosity { get; internal set; }
protected override Arguments ConfigureArguments(Arguments arguments)
@@ -289,7 +290,7 @@ protected override Arguments ConfigureArguments(Arguments arguments)
.Add("--no-dependencies", NoDependencies)
.Add("--packages {value}", PackageDirectory)
.Add("--runtime {value}", Runtimes)
.Add("--source {value}", Source)
.Add("--source {value}", Sources)
.Add("--verbosity {value}", Verbosity);
return base.ConfigureArguments(arguments);
}
@@ -2192,21 +2193,63 @@ public static DotNetRestoreSettings RemoveRuntimes(this DotNetRestoreSettings to
return toolSettings;
}
#endregion
#region Source
/// <summary><p><em>Sets <see cref="DotNetRestoreSettings.Source"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
#region Sources
/// <summary><p><em>Sets <see cref="DotNetRestoreSettings.Sources"/> to a new list.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings SetSource(this DotNetRestoreSettings toolSettings, string source)
public static DotNetRestoreSettings SetSources(this DotNetRestoreSettings toolSettings, params string[] sources)
{
toolSettings = toolSettings.NewInstance();
toolSettings.Source = source;
toolSettings.SourcesInternal = sources.ToList();
return toolSettings;
}
/// <summary><p><em>Resets <see cref="DotNetRestoreSettings.Source"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
/// <summary><p><em>Sets <see cref="DotNetRestoreSettings.Sources"/> to a new list.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings ResetSource(this DotNetRestoreSettings toolSettings)
public static DotNetRestoreSettings SetSources(this DotNetRestoreSettings toolSettings, IEnumerable<string> sources)
{
toolSettings = toolSettings.NewInstance();
toolSettings.Source = null;
toolSettings.SourcesInternal = sources.ToList();
return toolSettings;
}
/// <summary><p><em>Adds values to <see cref="DotNetRestoreSettings.Sources"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings AddSources(this DotNetRestoreSettings toolSettings, params string[] sources)
{
toolSettings = toolSettings.NewInstance();
toolSettings.SourcesInternal.AddRange(sources);
return toolSettings;
}
/// <summary><p><em>Adds values to <see cref="DotNetRestoreSettings.Sources"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings AddSources(this DotNetRestoreSettings toolSettings, IEnumerable<string> sources)
{
toolSettings = toolSettings.NewInstance();
toolSettings.SourcesInternal.AddRange(sources);
return toolSettings;
}
/// <summary><p><em>Clears <see cref="DotNetRestoreSettings.Sources"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings ClearSources(this DotNetRestoreSettings toolSettings)
{
toolSettings = toolSettings.NewInstance();
toolSettings.SourcesInternal.Clear();
return toolSettings;
}
/// <summary><p><em>Removes values from <see cref="DotNetRestoreSettings.Sources"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings RemoveSources(this DotNetRestoreSettings toolSettings, params string[] sources)
{
toolSettings = toolSettings.NewInstance();
var hashSet = new HashSet<string>(sources);
toolSettings.SourcesInternal.RemoveAll(x => hashSet.Contains(x));
return toolSettings;
}
/// <summary><p><em>Removes values from <see cref="DotNetRestoreSettings.Sources"/>.</em></p><p>Specifies a NuGet package source to use during the restore operation. This overrides all of the sources specified in the <em>NuGet.config</em> file(s). Multiple sources can be provided by specifying this option multiple times.</p></summary>
[Pure]
public static DotNetRestoreSettings RemoveSources(this DotNetRestoreSettings toolSettings, IEnumerable<string> sources)
{
toolSettings = toolSettings.NewInstance();
var hashSet = new HashSet<string>(sources);
toolSettings.SourcesInternal.RemoveAll(x => hashSet.Contains(x));
return toolSettings;
}
#endregion