Add source option to install tool command.
This commit adds the `--source` option to the `install tool` command. This option is equivalent to the option of the same name for the `restore` command. The option is forwarded to the underlying restore operation. Fixes #8226.
This commit is contained in:
parent
a212d5a017
commit
fe89456f2a
22 changed files with 423 additions and 43 deletions
|
@ -10,6 +10,7 @@ namespace Microsoft.DotNet.ToolPackage
|
||||||
void Restore(
|
void Restore(
|
||||||
FilePath projectPath,
|
FilePath projectPath,
|
||||||
DirectoryPath assetJsonOutput,
|
DirectoryPath assetJsonOutput,
|
||||||
FilePath? nugetconfig);
|
FilePath? nugetconfig,
|
||||||
|
string source);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,8 @@ namespace Microsoft.DotNet.ToolPackage
|
||||||
string packageId,
|
string packageId,
|
||||||
string packageVersion = null,
|
string packageVersion = null,
|
||||||
FilePath? nugetconfig = null,
|
FilePath? nugetconfig = null,
|
||||||
string targetframework = null)
|
string targetframework = null,
|
||||||
|
string source = null)
|
||||||
{
|
{
|
||||||
if (packageId == null)
|
if (packageId == null)
|
||||||
{
|
{
|
||||||
|
@ -74,7 +75,7 @@ namespace Microsoft.DotNet.ToolPackage
|
||||||
packageId);
|
packageId);
|
||||||
}
|
}
|
||||||
|
|
||||||
InvokeRestore(nugetconfig: nugetconfig, tempProjectPath: tempProjectPath, individualToolVersion: toolDirectory);
|
_projectRestorer.Restore(tempProjectPath, toolDirectory, nugetconfig, source);
|
||||||
|
|
||||||
if (packageVersionOrPlaceHolder.IsPlaceholder)
|
if (packageVersionOrPlaceHolder.IsPlaceholder)
|
||||||
{
|
{
|
||||||
|
@ -131,14 +132,6 @@ namespace Microsoft.DotNet.ToolPackage
|
||||||
return toolConfiguration;
|
return toolConfiguration;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void InvokeRestore(
|
|
||||||
FilePath? nugetconfig,
|
|
||||||
FilePath tempProjectPath,
|
|
||||||
DirectoryPath individualToolVersion)
|
|
||||||
{
|
|
||||||
_projectRestorer.Restore(tempProjectPath, individualToolVersion, nugetconfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
private FilePath CreateTempProject(
|
private FilePath CreateTempProject(
|
||||||
string packageId,
|
string packageId,
|
||||||
PackageVersion packageVersion,
|
PackageVersion packageVersion,
|
||||||
|
|
126
src/dotnet/commands/dotnet-install/LocalizableStrings.resx
Normal file
126
src/dotnet/commands/dotnet-install/LocalizableStrings.resx
Normal file
|
@ -0,0 +1,126 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<data name="SourceOptionDescription" xml:space="preserve">
|
||||||
|
<value>Specifies a NuGet package source to use during installation.</value>
|
||||||
|
</data>
|
||||||
|
<data name="SourceOptionName" xml:space="preserve">
|
||||||
|
<value>SOURCE</value>
|
||||||
|
</data>
|
||||||
|
</root>
|
|
@ -20,6 +20,7 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
private static string _packageVersion;
|
private static string _packageVersion;
|
||||||
private static string _configFilePath;
|
private static string _configFilePath;
|
||||||
private static string _framework;
|
private static string _framework;
|
||||||
|
private static string _source;
|
||||||
|
|
||||||
public InstallToolCommand(
|
public InstallToolCommand(
|
||||||
AppliedOption appliedCommand,
|
AppliedOption appliedCommand,
|
||||||
|
@ -35,25 +36,14 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
_packageVersion = appliedCommand.ValueOrDefault<string>("version");
|
_packageVersion = appliedCommand.ValueOrDefault<string>("version");
|
||||||
_configFilePath = appliedCommand.ValueOrDefault<string>("configfile");
|
_configFilePath = appliedCommand.ValueOrDefault<string>("configfile");
|
||||||
_framework = appliedCommand.ValueOrDefault<string>("framework");
|
_framework = appliedCommand.ValueOrDefault<string>("framework");
|
||||||
|
_source = appliedCommand.ValueOrDefault<string>("source");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int Execute()
|
public override int Execute()
|
||||||
{
|
{
|
||||||
FilePath? configFile = null;
|
|
||||||
|
|
||||||
if (_configFilePath != null)
|
|
||||||
{
|
|
||||||
configFile = new FilePath(_configFilePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
var executablePackagePath = new DirectoryPath(new CliFolderPathCalculator().ExecutablePackagesPath);
|
var executablePackagePath = new DirectoryPath(new CliFolderPathCalculator().ExecutablePackagesPath);
|
||||||
|
|
||||||
var toolConfigurationAndExecutableDirectory = ObtainPackage(
|
var toolConfigurationAndExecutableDirectory = ObtainPackage(executablePackagePath);
|
||||||
_packageId,
|
|
||||||
_packageVersion,
|
|
||||||
configFile,
|
|
||||||
_framework,
|
|
||||||
executablePackagePath);
|
|
||||||
|
|
||||||
DirectoryPath executable = toolConfigurationAndExecutableDirectory
|
DirectoryPath executable = toolConfigurationAndExecutableDirectory
|
||||||
.ExecutableDirectory
|
.ExecutableDirectory
|
||||||
|
@ -80,15 +70,16 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ToolConfigurationAndExecutableDirectory ObtainPackage(
|
private static ToolConfigurationAndExecutableDirectory ObtainPackage(DirectoryPath executablePackagePath)
|
||||||
string packageId,
|
|
||||||
string packageVersion,
|
|
||||||
FilePath? configFile,
|
|
||||||
string framework,
|
|
||||||
DirectoryPath executablePackagePath)
|
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
FilePath? configFile = null;
|
||||||
|
if (_configFilePath != null)
|
||||||
|
{
|
||||||
|
configFile = new FilePath(_configFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
var toolPackageObtainer =
|
var toolPackageObtainer =
|
||||||
new ToolPackageObtainer(
|
new ToolPackageObtainer(
|
||||||
executablePackagePath,
|
executablePackagePath,
|
||||||
|
@ -100,10 +91,10 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
new ProjectRestorer());
|
new ProjectRestorer());
|
||||||
|
|
||||||
return toolPackageObtainer.ObtainAndReturnExecutablePath(
|
return toolPackageObtainer.ObtainAndReturnExecutablePath(
|
||||||
packageId: packageId,
|
packageId: _packageId,
|
||||||
packageVersion: packageVersion,
|
packageVersion: _packageVersion,
|
||||||
nugetconfig: configFile,
|
nugetconfig: configFile,
|
||||||
targetframework: framework);
|
targetframework: _framework);
|
||||||
}
|
}
|
||||||
catch (PackageObtainException ex)
|
catch (PackageObtainException ex)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
|
||||||
|
using System.Linq;
|
||||||
using Microsoft.DotNet.Cli.CommandLine;
|
using Microsoft.DotNet.Cli.CommandLine;
|
||||||
|
using Microsoft.DotNet.Tools.Install.Tool;
|
||||||
|
using LocalizableStrings = Microsoft.DotNet.Tools.Install.LocalizableStrings;
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli
|
namespace Microsoft.DotNet.Cli
|
||||||
{
|
{
|
||||||
|
@ -22,6 +25,11 @@ namespace Microsoft.DotNet.Cli
|
||||||
"--configfile",
|
"--configfile",
|
||||||
"NuGet configuration file",
|
"NuGet configuration file",
|
||||||
Accept.ExactlyOneArgument()),
|
Accept.ExactlyOneArgument()),
|
||||||
|
Create.Option(
|
||||||
|
"--source",
|
||||||
|
LocalizableStrings.SourceOptionDescription,
|
||||||
|
Accept.ExactlyOneArgument()
|
||||||
|
.With(name: LocalizableStrings.SourceOptionName)),
|
||||||
Create.Option(
|
Create.Option(
|
||||||
"-f|--framework",
|
"-f|--framework",
|
||||||
"Target framework to publish for. The target framework has to be specified in the project file.",
|
"Target framework to publish for. The target framework has to be specified in the project file.",
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Microsoft.DotNet.Cli;
|
using Microsoft.DotNet.Cli;
|
||||||
|
using Microsoft.DotNet.Cli.Utils;
|
||||||
using Microsoft.DotNet.ToolPackage;
|
using Microsoft.DotNet.ToolPackage;
|
||||||
using Microsoft.DotNet.PlatformAbstractions;
|
using Microsoft.DotNet.PlatformAbstractions;
|
||||||
using Microsoft.Extensions.EnvironmentAbstractions;
|
using Microsoft.Extensions.EnvironmentAbstractions;
|
||||||
|
@ -15,7 +16,8 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
public void Restore(
|
public void Restore(
|
||||||
FilePath projectPath,
|
FilePath projectPath,
|
||||||
DirectoryPath assetJsonOutput,
|
DirectoryPath assetJsonOutput,
|
||||||
FilePath? nugetconfig)
|
FilePath? nugetconfig,
|
||||||
|
string source = null)
|
||||||
{
|
{
|
||||||
var argsToPassToRestore = new List<string>();
|
var argsToPassToRestore = new List<string>();
|
||||||
|
|
||||||
|
@ -26,6 +28,12 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
argsToPassToRestore.Add(nugetconfig.Value.Value);
|
argsToPassToRestore.Add(nugetconfig.Value.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (source != null)
|
||||||
|
{
|
||||||
|
argsToPassToRestore.Add("--source");
|
||||||
|
argsToPassToRestore.Add(source);
|
||||||
|
}
|
||||||
|
|
||||||
argsToPassToRestore.AddRange(new List<string>
|
argsToPassToRestore.AddRange(new List<string>
|
||||||
{
|
{
|
||||||
"--runtime",
|
"--runtime",
|
||||||
|
@ -34,9 +42,7 @@ namespace Microsoft.DotNet.Tools.Install.Tool
|
||||||
});
|
});
|
||||||
|
|
||||||
var command = new DotNetCommandFactory(alwaysRunOutOfProc: true)
|
var command = new DotNetCommandFactory(alwaysRunOutOfProc: true)
|
||||||
.Create(
|
.Create("restore", argsToPassToRestore)
|
||||||
"restore",
|
|
||||||
argsToPassToRestore)
|
|
||||||
.CaptureStdOut()
|
.CaptureStdOut()
|
||||||
.CaptureStdErr();
|
.CaptureStdErr();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="cs" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="de" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="es" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="fr" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="it" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="ja" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="ko" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="pl" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="pt-BR" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="ru" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="tr" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||||
|
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../LocalizableStrings.resx">
|
||||||
|
<body>
|
||||||
|
<trans-unit id="SourceOptionDescription">
|
||||||
|
<source>Specifies a NuGet package source to use during installation.</source>
|
||||||
|
<target state="new">Specifies a NuGet package source to use during installation.</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="SourceOptionName">
|
||||||
|
<source>SOURCE</source>
|
||||||
|
<target state="new">SOURCE</target>
|
||||||
|
<note />
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
|
@ -23,6 +23,7 @@
|
||||||
<EmbeddedResource Update="**\dotnet-build\*.resx" Namespace="Microsoft.DotNet.Tools.Build" />
|
<EmbeddedResource Update="**\dotnet-build\*.resx" Namespace="Microsoft.DotNet.Tools.Build" />
|
||||||
<EmbeddedResource Update="**\dotnet-clean\*.resx" Namespace="Microsoft.DotNet.Tools.Clean" />
|
<EmbeddedResource Update="**\dotnet-clean\*.resx" Namespace="Microsoft.DotNet.Tools.Clean" />
|
||||||
<EmbeddedResource Update="**\dotnet-help\*.resx" Namespace="Microsoft.DotNet.Tools.Help" />
|
<EmbeddedResource Update="**\dotnet-help\*.resx" Namespace="Microsoft.DotNet.Tools.Help" />
|
||||||
|
<EmbeddedResource Update="**\dotnet-install\*.resx" Namespace="Microsoft.DotNet.Tools.Install" />
|
||||||
<EmbeddedResource Update="**\dotnet-list\*.resx" Namespace="Microsoft.DotNet.Tools.List" />
|
<EmbeddedResource Update="**\dotnet-list\*.resx" Namespace="Microsoft.DotNet.Tools.List" />
|
||||||
<EmbeddedResource Update="**\dotnet-list-proj\*.resx" Namespace="Microsoft.DotNet.Tools.List.ProjectsInSolution" />
|
<EmbeddedResource Update="**\dotnet-list-proj\*.resx" Namespace="Microsoft.DotNet.Tools.List.ProjectsInSolution" />
|
||||||
<EmbeddedResource Update="**\dotnet-list-reference\*.resx" Namespace="Microsoft.DotNet.Tools.List.ProjectToProjectReferences" />
|
<EmbeddedResource Update="**\dotnet-list-reference\*.resx" Namespace="Microsoft.DotNet.Tools.List.ProjectToProjectReferences" />
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Reflection;
|
||||||
using FluentAssertions;
|
using FluentAssertions;
|
||||||
using Microsoft.DotNet.Tools.Test.Utilities;
|
using Microsoft.DotNet.Tools.Test.Utilities;
|
||||||
using Microsoft.Extensions.EnvironmentAbstractions;
|
using Microsoft.Extensions.EnvironmentAbstractions;
|
||||||
|
@ -207,6 +208,32 @@ namespace Microsoft.DotNet.ToolPackage.Tests
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void GivenASourceItCanObtainThePackageFromThatSource()
|
||||||
|
{
|
||||||
|
var toolsPath = Path.Combine(Directory.GetCurrentDirectory(), Path.GetRandomFileName());
|
||||||
|
|
||||||
|
var packageObtainer = ConstructDefaultPackageObtainer(toolsPath);
|
||||||
|
var toolConfigurationAndExecutableDirectory = packageObtainer.ObtainAndReturnExecutablePath(
|
||||||
|
packageId: TestPackageId,
|
||||||
|
packageVersion: TestPackageVersion,
|
||||||
|
targetframework: _testTargetframework,
|
||||||
|
source: Path.Combine(
|
||||||
|
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
|
||||||
|
"TestAssetLocalNugetFeed"));
|
||||||
|
|
||||||
|
var executable = toolConfigurationAndExecutableDirectory
|
||||||
|
.ExecutableDirectory
|
||||||
|
.WithFile(
|
||||||
|
toolConfigurationAndExecutableDirectory
|
||||||
|
.Configuration
|
||||||
|
.ToolAssemblyEntryPoint);
|
||||||
|
|
||||||
|
File.Exists(executable.Value)
|
||||||
|
.Should()
|
||||||
|
.BeTrue(executable + " should have the executable");
|
||||||
|
}
|
||||||
|
|
||||||
private static readonly Func<FilePath> GetUniqueTempProjectPathEachTest = () =>
|
private static readonly Func<FilePath> GetUniqueTempProjectPathEachTest = () =>
|
||||||
{
|
{
|
||||||
var tempProjectDirectory =
|
var tempProjectDirectory =
|
||||||
|
@ -229,12 +256,7 @@ namespace Microsoft.DotNet.ToolPackage.Tests
|
||||||
private static FilePath WriteNugetConfigFileToPointToTheFeed()
|
private static FilePath WriteNugetConfigFileToPointToTheFeed()
|
||||||
{
|
{
|
||||||
var nugetConfigName = "nuget.config";
|
var nugetConfigName = "nuget.config";
|
||||||
var executeDirectory =
|
var executeDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
||||||
Path.GetDirectoryName(
|
|
||||||
System.Reflection
|
|
||||||
.Assembly
|
|
||||||
.GetExecutingAssembly()
|
|
||||||
.Location);
|
|
||||||
|
|
||||||
var tempPathForNugetConfigWithWhiteSpace =
|
var tempPathForNugetConfigWithWhiteSpace =
|
||||||
Path.Combine(Path.GetTempPath(),
|
Path.Combine(Path.GetTempPath(),
|
||||||
|
|
|
@ -48,5 +48,16 @@ namespace Microsoft.DotNet.Tests.ParserTests
|
||||||
parseResult.ValueOrDefault<string>("configfile").Should().Be(@"C:\TestAssetLocalNugetFeed");
|
parseResult.ValueOrDefault<string>("configfile").Should().Be(@"C:\TestAssetLocalNugetFeed");
|
||||||
parseResult.ValueOrDefault<string>("framework").Should().Be("netcoreapp2.0");
|
parseResult.ValueOrDefault<string>("framework").Should().Be("netcoreapp2.0");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void InstallToolParserCanParseSourceOption()
|
||||||
|
{
|
||||||
|
const string expectedSourceValue = "TestSourceValue";
|
||||||
|
|
||||||
|
var result = Parser.Instance.Parse($"dotnet install tool --source {expectedSourceValue} console.test.app");
|
||||||
|
|
||||||
|
var appliedOptions = result["dotnet"]["install"]["tool"];
|
||||||
|
appliedOptions.ValueOrDefault<string>("source").Should().Be(expectedSourceValue);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue