mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #8882 from dotnet/merges/release/2.1.3xx-to-master

Browse source 
Merge release/2.1.3xx to master
This commit is contained in:
Peter Huene 2018-03-23 16:33:06 -07:00 • committed by GitHub
commit d0780d81e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
201 changed files with 640 additions and 1628 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj Normal file
View file

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
</Project>

16
TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs Normal file
View file

@ -0,0 +1,16 @@
// 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.
using System;
namespace MSBuildTestApp
{
public class Program
{
public static void Main(string[] args)
{
var message = Environment.GetEnvironmentVariable("ASPNETCORE_URLS");
Console.WriteLine(message);
}
}
}

27
TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json Normal file
View file

@ -0,0 +1,27 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:49850/",
"sslPort": 0
}
},
"profiles": {
"First": {
"commandName": "Project",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_URLS": "http://localhost:12345/"
},
"applicationUrl": "http://localhost:67890/"
},
"Second": {
"commandName": "Project",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:54321/"
}
}
}

6
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
</configuration>

41
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs
View file

@ -1,41 +0,0 @@
namespace FSharpProject.AssemblyInfo
open System.Reflection
open System.Runtime.CompilerServices
open System.Runtime.InteropServices
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[<assembly: AssemblyTitle("FSharpProject")>]
[<assembly: AssemblyDescription("")>]
[<assembly: AssemblyConfiguration("")>]
[<assembly: AssemblyCompany("")>]
[<assembly: AssemblyProduct("FSharpProject")>]
[<assembly: AssemblyCopyright("Copyright © 2016")>]
[<assembly: AssemblyTrademark("")>]
[<assembly: AssemblyCulture("")>]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[<assembly: ComVisible(false)>]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[<assembly: Guid("52161bb2-18bf-4304-87e7-8d7f0c98ccf3")>]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [<assembly: AssemblyVersion("1.0.*")>]
[<assembly: AssemblyVersion("1.0.0.0")>]
[<assembly: AssemblyFileVersion("1.0.0.0")>]
do
()

79
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj
View file

@ -1,81 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>52161bb2-18bf-4304-87e7-8d7f0c98ccf3</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>FSharpProject</RootNamespace>
<AssemblyName>FSharpProject</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<Name>FSharpProject</Name>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
</PropertyGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '11.0'">
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</Otherwise>
</Choose>
<Import Project="$(FSharpTargetsPath)" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Program.fs" />
<None Include="App.config" />
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

4
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net452" />
</packages>

18
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/App.sln Normal file
View file

@ -0,0 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26006.2
MinimumVisualStudioVersion = 10.0.40219.1
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

3
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

2
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectTypeGuid>{20E2F8CC-55AA-4705-B10F-7ABA6F107ECE};{130159A9-F047-44B3-88CF-0CF7F02ED50F}</ProjectTypeGuid>
<ProjectTypeGuids>{20E2F8CC-55AA-4705-B10F-7ABA6F107ECE};{130159A9-F047-44B3-88CF-0CF7F02ED50F}</ProjectTypeGuids>
</PropertyGroup>
</Project>

2
TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectTypeGuid>{130159A9-F047-44B3-88CF-0CF7F02ED50F}</ProjectTypeGuid>
<ProjectTypeGuids>{130159A9-F047-44B3-88CF-0CF7F02ED50F}</ProjectTypeGuids>
</PropertyGroup>
</Project>

6
build/BundledDotnetTools.props
View file

@ -1,8 +1,8 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<BundledDotnetTools Include="dotnet-dev-certs" Version="$(AspNetCoreVersion)" />
<BundledDotnetTools Include="dotnet-sql-cache" Version="$(AspNetCoreVersion)" />
<BundledDotnetTools Include="dotnet-user-secrets" Version="$(AspNetCoreVersion)" />
<BundledDotnetTools Include="dotnet-watch" Version="$(AspNetCoreVersion)" />
<BundledDotnetTools Include="dotnet-sql-cache" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.Extensions.Caching.SqlConfig.Tools" />
<BundledDotnetTools Include="dotnet-user-secrets" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
<BundledDotnetTools Include="dotnet-watch" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.DotNet.Watcher.Tools" />
</ItemGroup>
</Project>

6
build/DependencyVersions.props
View file

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MicrosoftAspNetCoreAppPackageVersion>2.1.0-preview2-30338</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26313-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.7.0-preview-000066</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
@ -28,8 +28,8 @@
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-26313-01</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-26313-01</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-26314-02</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-26314-02</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1-alpha-174</MicrosoftDotNetCliCommandLinePackageVersion>
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.2.1-alpha-002133</MicrosoftDotNetProjectJsonMigrationPackageVersion>
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>

38
build/MSBuildExtensions.targets
View file

@ -1,6 +1,8 @@
<Project>
<Import Project="BundledDotnetTools.props" />
<Target Name="GenerateMSBuildExtensions"
DependsOnTargets="GenerateBundledVersionsProps;RestoreMSBuildExtensionsPackages">
DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps;RestoreMSBuildExtensionsPackages">
<ItemGroup>
@ -152,4 +154,38 @@ Copyright (c) .NET Foundation. All rights reserved.
Lines="$(BundledVersionsPropsContent)"
Overwrite="true" />
</Target>
<Target Name="GenerateBundledCliToolsProps">
<PropertyGroup>
<BundledBundledCliToolsPropsFileName>Microsoft.NETCoreSdk.BundledCliTools.props</BundledBundledCliToolsPropsFileName>
</PropertyGroup>
<PropertyGroup>
<BundledBundledCliToolsPropsContent>
<![CDATA[
<!--
***********************************************************************************************
$(BundledBundledCliToolsPropsFileName)
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project>
<ItemGroup>
@(BundledDotnetTools->HasMetadata('ObsoletesCliTool')->' %3CBundledDotNetCliToolReference Include="%(ObsoletesCliTool)" /%3E','%0A')
</ItemGroup>
</Project>
]]>
</BundledBundledCliToolsPropsContent>
</PropertyGroup>
<MakeDir Directories="$(GeneratedMSBuildExtensionsDirectory)" />
<WriteLinesToFile File="$(GeneratedMSBuildExtensionsDirectory)/$(BundledBundledCliToolsPropsFileName)"
Lines="$(BundledBundledCliToolsPropsContent)"
Overwrite="true" />
</Target>
</Project>

8
scripts/cli-test-env.bat
View file

@ -10,11 +10,11 @@ for %%i in (%~dp0..\) DO (
title CLI Test (%CLI_REPO_ROOT%)
REM Add Stage 2 CLI to path
set PATH=%CLI_REPO_ROOT%bin\2\win10-x64\dotnet;%PATH%
set PATH=%CLI_REPO_ROOT%bin\2\win-x64\dotnet;%PATH%
set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
set DOTNET_MULTILEVEL_LOOKUP=0
set NUGET_PACKAGES=%CLI_REPO_ROOT%.nuget\packages
set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win10-x64\test\packages
set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win10-x64\test\artifacts
set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win10-x64\PreviousStage.props
set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win-x64\test\packages
set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win-x64\test\artifacts
set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win-x64\PreviousStage.props

2
src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs
View file

@ -6,6 +6,8 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
public static class ProjectTypeGuids
{
public const string CSharpProjectTypeGuid = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}";
public const string FSharpProjectTypeGuid = "{F2A71F9B-5D33-465A-A702-920D77279786}";
public const string VBProjectTypeGuid = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}";
public const string SolutionFolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}";
}
}

2
src/Microsoft.DotNet.Configurer/LocalizableStrings.resx
View file

@ -151,7 +151,7 @@ Here are some options to fix this error:
<value>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</value>
</data>
</root>

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
View file

@ -62,9 +62,9 @@ Tuto chybu můžete opravit pomocí některé z těchto možností:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Úspěšně se podařilo nainstalovat certifikát pro vývoj ASP.NET Core HTTPS Development Certificate.
Pokud chcete certifikátu důvěřovat (platí jenom pro Windows a macOS), nainstalujte nejprve nástroj dev-certs. To uděláte tak, že spustíte dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final a potom dotnet-dev-certs https --trust.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
View file

@ -62,9 +62,9 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Das ASP.NET Core-HTTPS-Entwicklungszertifikat wurde erfolgreich installiert.
Um dem Zertifikat zu vertrauen (nur Windows und macOS), installieren Sie zuerst das Tool "dev-certs", indem Sie "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" und anschließend "dotnet-dev-certs https --trust" ausführen.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
View file

@ -61,9 +61,9 @@ Estas son algunas opciones para corregir este error:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
El certificado de desarrollo HTTPS de ASP.NET Core se ha instalado correctamente.
Para confiar en el certificado (solo Windows y macOS), instale primero la herramienta dev-certs ejecutando "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" y, después, ejecute "dotnet-dev-certs https --trust".

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
View file

@ -62,9 +62,9 @@ Voici quelques options pour corriger cette erreur :
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Le certificat de développement ASP.NET Core HTTPS a été installé.
Pour approuver le certificat (Windows et macOS uniquement), installez d'abord l'outil dev-certs en exécutant 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final', puis exécutez 'dotnet-dev-certs https --trust'.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
View file

@ -62,9 +62,9 @@ Ecco alcune opzioni per correggere questo errore:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Il certificato di sviluppo HTTPS di ASP.NET Core è stato installato.
Per considerare attendibile il certificato (solo Windows e macOS), installare prima lo strumento dev-certs eseguendo 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' e quindi eseguire 'dotnet-dev-certs https --trust'.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
View file

@ -62,9 +62,9 @@ Here are some options to fix this error:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
ASP.NET Core HTTPS 開発証明書が正常にインストールされました。
証明書を信頼する (Windows および macOS のみ) には、まず 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' を実行して dev-certs ツールをインストールし、次に 'dotnet-dev-certs https --trust' を実行します。

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
View file

@ -62,9 +62,9 @@ Here are some options to fix this error:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
ASP.NET Core HTTPS 개발 인증서를 설치했습니다.
인증서를 신뢰하려면(Windows 및 macOS만 해당) 먼저 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final'을 실행하여 dev-certs 도구를 설치한 다음, 'dotnet-dev-certs https --trust'를 실행하세요.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
View file

@ -62,9 +62,9 @@ Oto kilka opcji naprawiania tego błędu:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Pomyślnie zainstalowano certyfikat deweloperski protokołu HTTPS programu ASP.NET Core.
Aby ufać temu certyfikatowi (dotyczy tylko systemów Windows i macOS), najpierw zainstaluj narzędzie dev-certs, uruchamiając polecenie „dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final”, a następnie uruchom polecenie „dotnet-dev-certs https --trust”.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
View file

@ -62,9 +62,9 @@ Aqui estão algumas opções para corrigir este erro:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Certificado de Desenvolvimento HTTPS ASP.NET Core instalado com êxito.
Para confiar no certificado (apenas Windows e macOS), primeiramente instale a ferramenta dev-certs executando ‘dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final’ e, em seguida, execute ‘dotnet-dev-certs https --trust’.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
View file

@ -62,9 +62,9 @@ Here are some options to fix this error:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
Сертификат разработки HTTPS для ASP.NET Core установлен.
Чтобы сделать сертификат доверенным (только Windows и macOS), сначала установите инструмент dev-certs, выполнив команду "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final", а затем выполните "dotnet-dev-certs https --trust".

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
View file

@ -62,9 +62,9 @@ Bu hatayı düzeltmek için bazı seçenekler:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
ASP.NET Core HTTPS Geliştirme Sertifikası başarıyla yüklendi.
Sertifikaya güvenmek için (yalnızca Windows ve macOS) önce 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final', sonra 'dotnet-dev-certs https --trust' komutlarını çalıştırarak dev-certs aracını yükleyin.

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
View file

@ -62,9 +62,9 @@ Here are some options to fix this error:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
已成功安装 ASP.NET Core HTTPS 开发证书。
要信任证书(仅限 Windows 和 macOS)，请首先通过运行 "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" 安装 dev-certs 工具，然后运行 "dotnet-dev-certs https --trust"。

4
src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
View file

@ -62,9 +62,9 @@ Here are some options to fix this error:
<source>ASP.NET Core
------------
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
<target state="translated">ASP.NET Core
<target state="needs-review-translation">ASP.NET Core
------------
已成功安裝 ASP.NET Core HTTPS 開發憑證。
若要信任此憑證 (僅限 Windows 與 macOS)，請先執行 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' 安裝 dev-certs 工具，然後再執行 'dotnet-dev-certs https --trust'。

16
src/dotnet/BuiltInCommandsCatalog.cs
View file

@ -18,11 +18,9 @@ using Microsoft.DotNet.Tools.Run;
using Microsoft.DotNet.Tools.Sln;
using Microsoft.DotNet.Tools.Store;
using Microsoft.DotNet.Tools.Test;
using Microsoft.DotNet.Tools.Uninstall;
using Microsoft.DotNet.Tools.VSTest;
using System.Collections.Generic;
using Microsoft.DotNet.Tools.Install;
using Microsoft.DotNet.Tools.Update;
using Microsoft.DotNet.Tools.Tool;
namespace Microsoft.DotNet.Cli
{
@ -147,17 +145,9 @@ namespace Microsoft.DotNet.Cli
{
Command = ParseCommand.Run
},
["install"] = new BuiltInCommandMetadata
["tool"] = new BuiltInCommandMetadata
{
Command = InstallCommand.Run
},
["uninstall"] = new BuiltInCommandMetadata
{
Command = UninstallCommand.Run
},
["update"] = new BuiltInCommandMetadata
{
Command = UpdateCommand.Run
Command = ToolCommand.Run
},
["internal-reportinstallsuccess"] = new BuiltInCommandMetadata
{

2
src/dotnet/CommonLocalizableStrings.resx
View file

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="UnsupportedProjectType" xml:space="preserve">
<value>Unsupported project type. Please check with your sdk provider.</value>
<value>Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support.</value>
</data>
<data name="ProjectAlreadyHasAreference" xml:space="preserve">
<value>Project already has a reference to `{0}`.</value>

4
src/dotnet/Parser.cs
View file

@ -55,9 +55,7 @@ namespace Microsoft.DotNet.Cli
Create.Command("vstest", ""),
CompleteCommandParser.Complete(),
InternalReportinstallsuccessCommandParser.InternalReportinstallsuccess(),
InstallCommandParser.Install(),
UninstallCommandParser.Uninstall(),
UpdateCommandParser.Update(),
ToolCommandParser.Tool(),
CommonOptions.HelpOption(),
Create.Option("--info", ""),
Create.Option("-d", ""),

26
src/dotnet/ProjectInstanceExtensions.cs
View file

@ -20,31 +20,9 @@ namespace Microsoft.DotNet.Tools.Common
return projectGuid.ToString("B").ToUpper();
}
public static string GetProjectTypeGuid(this ProjectInstance projectInstance)
public static string GetDefaultProjectTypeGuid(this ProjectInstance projectInstance)
{
string projectTypeGuid = null;
var projectTypeGuidProperty = projectInstance.GetPropertyValue("ProjectTypeGuid");
if (!string.IsNullOrEmpty(projectTypeGuidProperty))
{
projectTypeGuid = projectTypeGuidProperty.Split(';').Last();
}
else
{
projectTypeGuid = projectInstance.GetPropertyValue("DefaultProjectTypeGuid");
}
if (string.IsNullOrEmpty(projectTypeGuid))
{
//ISSUE: https://github.com/dotnet/sdk/issues/522
//The real behavior we want (once DefaultProjectTypeGuid support is in) is to throw
//when we cannot find ProjectTypeGuid or DefaultProjectTypeGuid. But for now we
//need to default to the C# one.
//throw new GracefulException(CommonLocalizableStrings.UnsupportedProjectType);
projectTypeGuid = ProjectTypeGuids.CSharpProjectTypeGuid;
}
return projectTypeGuid;
return projectInstance.GetPropertyValue("DefaultProjectTypeGuid");
}
public static IEnumerable<string> GetPlatforms(this ProjectInstance projectInstance)

23
src/dotnet/ProjectRootElementExtensions.cs Normal file
View file

@ -0,0 +1,23 @@
// 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.
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Build.Construction;
namespace Microsoft.DotNet.Tools.Common
{
public static class ProjectRootElementExtensions
{
public static string GetProjectTypeGuid(this ProjectRootElement rootElement)
{
return rootElement
.Properties
.FirstOrDefault(p => string.Equals(p.Name, "ProjectTypeGuids", StringComparison.OrdinalIgnoreCase))
?.Value
.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
.LastOrDefault(g => !string.IsNullOrWhiteSpace(g));
}
}
}

15
src/dotnet/SlnFileExtensions.cs
View file

@ -37,10 +37,12 @@ namespace Microsoft.DotNet.Tools.Common
}
else
{
ProjectRootElement rootElement = null;
ProjectInstance projectInstance = null;
try
{
projectInstance = new ProjectInstance(fullProjectPath);
rootElement = ProjectRootElement.Open(fullProjectPath);
projectInstance = new ProjectInstance(rootElement);
}
catch (InvalidProjectFileException e)
{
@ -54,11 +56,20 @@ namespace Microsoft.DotNet.Tools.Common
var slnProject = new SlnProject
{
Id = projectInstance.GetProjectId(),
TypeGuid = projectInstance.GetProjectTypeGuid(),
TypeGuid = rootElement.GetProjectTypeGuid() ?? projectInstance.GetDefaultProjectTypeGuid(),
Name = Path.GetFileNameWithoutExtension(relativeProjectPath),
FilePath = relativeProjectPath
};
if (string.IsNullOrEmpty(slnProject.TypeGuid))
{
Reporter.Error.WriteLine(
string.Format(
CommonLocalizableStrings.UnsupportedProjectType,
projectInstance.FullPath));
return;
}
// NOTE: The order you create the sections determines the order they are written to the sln
// file. In the case of an empty sln file, in order to make sure the solution configurations
// section comes first we need to add it first. This doesn't affect correctness but does

2
src/dotnet/ToolPackage/ToolPackageFactory.cs
View file

@ -3,7 +3,7 @@
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Configurer;
using Microsoft.DotNet.Tools.Install.Tool;
using Microsoft.DotNet.Tools.Tool.Install;
using Microsoft.Extensions.EnvironmentAbstractions;
namespace Microsoft.DotNet.ToolPackage

4
src/dotnet/commands/dotnet-help/HelpUsageText.cs
View file

@ -28,9 +28,7 @@ path-to-application:
msbuild {LocalizableStrings.MsBuildDefinition}
vstest {LocalizableStrings.VsTestDefinition}
store {LocalizableStrings.StoreDefinition}
install {LocalizableStrings.InstallDefinition}
uninstall {LocalizableStrings.UninstallDefinition}
update {LocalizableStrings.UpdateDefinition}
tool {LocalizableStrings.ToolDefinition}
help {LocalizableStrings.HelpDefinition}
{LocalizableStrings.CommonOptions}:

10
src/dotnet/commands/dotnet-help/LocalizableStrings.resx
View file

@ -267,13 +267,7 @@
<data name="AdditionalDeps" xml:space="preserve">
<value>Path to additional deps.json file.</value>
</data>
<data name="InstallDefinition" xml:space="preserve">
<value>Installs an item into the development environment.</value>
</data>
<data name="UninstallDefinition" xml:space="preserve">
<value>Uninstalls an item from the development environment.</value>
</data>
<data name="UpdateDefinition" xml:space="preserve">
<value>Updates an item in the development environment.</value>
<data name="ToolDefinition" xml:space="preserve">
<value>Modify tools.</value>
</data>
</root>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Ukládá zadaná nastavení do úložiště runtime.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Nainstaluje položku do vývojového prostředí.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Odinstaluje položku z vývojového prostředí.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Speichert die angegebenen Assemblys im Runtimespeicher.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Installiert ein Element in der Entwicklungsumgebung.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Deinstalliert ein Element aus der Entwicklungsumgebung.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Almacena los ensamblados especificados en el almacén del tiempo de ejecución.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Instala un elemento en el entorno de desarrollo.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Desinstala un elemento en el entorno de desarrollo.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Stocke les assemblys spécifiés dans le magasin de runtimes.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Installe un élément dans l'environnement de développement.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Désinstalle un élément dans l'environnement de développement.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Memorizza gli assembly specificati nell'archivio di runtime.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Installa un elemento nell'ambiente di sviluppo.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Disinstalla un elemento dall'ambiente di sviluppo.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">指定されたアセンブリを実行時ストアに格納します。</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">項目を開発環境にインストールします。</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">項目を開発環境からアンインストールします。</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">지정된 어셈블리를 런타임 저장소에 저장합니다.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">개발 환경에 항목을 설치합니다.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">개발 환경에서 항목을 제거합니다.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Przechowuje określone zestawy w magazynie środowiska uruchomieniowego.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Instaluje element w środowisku deweloperskim.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Odinstalowuje element ze środowiska deweloperskiego.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Armazena os assemblies especificados no repositório de tempo de execução.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Instala um item no ambiente de desenvolvimento.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Desinstala um item do ambiente de desenvolvimento.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Он сохраняет указанные сборки в хранилище среды выполнения.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Устанавливает элемент в среде разработки.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Удаляет элемент из среды разработки.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">Belirtilen bütünleştirilmiş kodları çalışma zamanı deposunda depolar.</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">Bir öğeyi geliştirme ortamına yükler.</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">Bir öğeyi geliştirme ortamından kaldırır.</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">在运行时存储中存储指定的程序集。</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">将项目安装到开发环境中。</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">从开发环境中卸载项目。</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

16
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf
View file

@ -252,19 +252,9 @@
<target state="translated">將指定組件儲存到執行階段存放區中。</target>
<note />
</trans-unit>
<trans-unit id="InstallDefinition">
<source>Installs an item into the development environment.</source>
<target state="translated">將項目安裝至部署環境。</target>
<note />
</trans-unit>
<trans-unit id="UninstallDefinition">
<source>Uninstalls an item from the development environment.</source>
<target state="translated">將開發環境的項目解除安裝。</target>
<note />
</trans-unit>
<trans-unit id="UpdateDefinition">
<source>Updates an item in the development environment.</source>
<target state="new">Updates an item in the development environment.</target>
<trans-unit id="ToolDefinition">
<source>Modify tools.</source>
<target state="new">Modify tools.</target>
<note />
</trans-unit>
</body>

5
src/dotnet/commands/dotnet-list/ListCommand.cs
View file

@ -7,7 +7,6 @@ using Microsoft.DotNet.Cli;
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Tools.List.ProjectToProjectReferences;
using Microsoft.DotNet.Tools.List.Tool;
namespace Microsoft.DotNet.Tools.List
{
@ -24,10 +23,6 @@ namespace Microsoft.DotNet.Tools.List
{
"reference",
o => new ListProjectToProjectReferencesCommand(o, ParseResult)
},
{
"tool",
o => new ListToolCommand(o["tool"], ParseResult)
}
};

4
src/dotnet/commands/dotnet-list/ListCommandParser.cs
View file

@ -4,7 +4,6 @@
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Tools;
using Microsoft.DotNet.Tools.List.ProjectToProjectReferences;
using Microsoft.DotNet.Tools.List.Tool;
using LocalizableStrings = Microsoft.DotNet.Tools.List.LocalizableStrings;
namespace Microsoft.DotNet.Cli
@ -20,7 +19,6 @@ namespace Microsoft.DotNet.Cli
description: CommonLocalizableStrings.ArgumentsProjectDescription)
.DefaultToCurrentDirectory(),
CommonOptions.HelpOption(),
ListProjectToProjectReferencesCommandParser.ListProjectToProjectReferences(),
ListToolCommandParser.ListTool());
ListProjectToProjectReferencesCommandParser.ListProjectToProjectReferences());
}
}

10
src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs
View file

@ -15,6 +15,11 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings
{
var config = model.ToObject<ProjectLaunchSettingsModel>();
if (!string.IsNullOrEmpty(config.ApplicationUrl))
{
command.EnvironmentVariable("ASPNETCORE_URLS", config.ApplicationUrl);
}
//For now, ignore everything but the environment variables section
foreach (var entry in config.EnvironmentVariables)
@ -24,11 +29,6 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings
command.EnvironmentVariable(entry.Key, value);
}
if (!string.IsNullOrEmpty(config.ApplicationUrl))
{
command.EnvironmentVariable("ASPNETCORE_URLS", config.ApplicationUrl);
}
return new LaunchSettingsApplyResult(true, null, config.LaunchUrl);
}

2
src/dotnet/commands/dotnet-install/LocalizableStrings.resx → src/dotnet/commands/dotnet-tool/LocalizableStrings.resx
View file

@ -121,6 +121,6 @@
<value>.NET Install Command</value>
</data>
<data name="CommandDescription" xml:space="preserve">
<value>Installs an item into the development environment.</value>
<value>Modify tools.</value>
</data>
</root>

31
src/dotnet/commands/dotnet-install/InstallCommand.cs → src/dotnet/commands/dotnet-tool/ToolCommand.cs
View file

@ -6,13 +6,16 @@ using System.Collections.Generic;
using Microsoft.DotNet.Cli;
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Tools.Install.Tool;
using Microsoft.DotNet.Tools.Tool.Install;
using Microsoft.DotNet.Tools.Tool.List;
using Microsoft.DotNet.Tools.Tool.Uninstall;
using Microsoft.DotNet.Tools.Tool.Update;
namespace Microsoft.DotNet.Tools.Install
namespace Microsoft.DotNet.Tools.Tool
{
public class InstallCommand : DotNetTopLevelCommandBase
public class ToolCommand : DotNetTopLevelCommandBase
{
protected override string CommandName => "install";
protected override string CommandName => "tool";
protected override string FullCommandNameLocalized => LocalizableStrings.InstallFullCommandNameLocalized;
protected override string ArgumentName => Constants.ProjectArgumentName;
protected override string ArgumentDescriptionLocalized => CommonLocalizableStrings.ArgumentsProjectDescription;
@ -20,15 +23,27 @@ namespace Microsoft.DotNet.Tools.Install
internal override Dictionary<string, Func<AppliedOption, CommandBase>> SubCommands =>
new Dictionary<string, Func<AppliedOption, CommandBase>>
{
["tool"] =
appliedOption => new InstallToolCommand(
appliedOption["tool"],
["install"] =
appliedOption => new ToolInstallCommand(
appliedOption["install"],
ParseResult),
["uninstall"] =
appliedOption => new ToolUninstallCommand(
appliedOption["uninstall"],
ParseResult),
["update"] =
appliedOption => new ToolUpdateCommand(
appliedOption["update"],
ParseResult),
["list"] =
appliedOption => new ListToolCommand(
appliedOption["list"],
ParseResult)
};
public static int Run(string[] args)
{
var command = new InstallCommand();
var command = new ToolCommand();
return command.RunCommand(args);
}
}

13
src/dotnet/commands/dotnet-install/InstallCommandParser.cs → src/dotnet/commands/dotnet-tool/ToolCommandParser.cs
View file

@ -2,20 +2,23 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.Cli.CommandLine;
using LocalizableStrings = Microsoft.DotNet.Tools.Install.LocalizableStrings;
using LocalizableStrings = Microsoft.DotNet.Tools.Tool.LocalizableStrings;
namespace Microsoft.DotNet.Cli
{
internal static class InstallCommandParser
internal static class ToolCommandParser
{
public static Command Install()
public static Command Tool()
{
return Create.Command(
"install",
"tool",
LocalizableStrings.CommandDescription,
Accept.NoArguments(),
CommonOptions.HelpOption(),
InstallToolCommandParser.InstallTool());
ToolInstallCommandParser.ToolInstall(),
ToolUninstallCommandParser.ToolUninstall(),
ToolUpdateCommandParser.ToolUpdate(),
ToolListCommandParser.ToolList());
}
}
}

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx → src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx
View file

2
src/dotnet/commands/dotnet-install/dotnet-install-tool/ProjectRestorer.cs → src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs
View file

@ -10,7 +10,7 @@ using Microsoft.DotNet.ToolPackage;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.Extensions.EnvironmentAbstractions;
namespace Microsoft.DotNet.Tools.Install.Tool
namespace Microsoft.DotNet.Tools.Tool.Install
{
internal class ProjectRestorer : IProjectRestorer
{

6
src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs → src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs
View file

@ -15,12 +15,12 @@ using Microsoft.DotNet.ToolPackage;
using Microsoft.Extensions.EnvironmentAbstractions;
using NuGet.Versioning;
namespace Microsoft.DotNet.Tools.Install.Tool
namespace Microsoft.DotNet.Tools.Tool.Install
{
internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null);
internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(DirectoryPath? nonGlobalLocation = null);
internal class InstallToolCommand : CommandBase
internal class ToolInstallCommand : CommandBase
{
private readonly IEnvironmentPathInstruction _environmentPathInstruction;
private readonly IReporter _reporter;
@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Install.Tool
private readonly string _verbosity;
private readonly string _toolPath;
public InstallToolCommand(
public ToolInstallCommand(
AppliedOption appliedCommand,
ParseResult parseResult,
CreateToolPackageStoreAndInstaller createToolPackageStoreAndInstaller = null,

2
src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandLowLevelErrorConverter.cs → src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs
View file

@ -6,7 +6,7 @@ using System.Collections.Generic;
using Microsoft.DotNet.ShellShim;
using Microsoft.DotNet.ToolPackage;
namespace Microsoft.DotNet.Tools.Install.Tool
namespace Microsoft.DotNet.Tools.Tool.Install
{
internal static class InstallToolCommandLowLevelErrorConverter
{

8
src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandParser.cs → src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs
View file

@ -2,15 +2,15 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.Cli.CommandLine;
using LocalizableStrings = Microsoft.DotNet.Tools.Install.Tool.LocalizableStrings;
using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings;
namespace Microsoft.DotNet.Cli
{
internal static class InstallToolCommandParser
internal static class ToolInstallCommandParser
{
public static Command InstallTool()
public static Command ToolInstall()
{
return Create.Command("tool",
return Create.Command("install",
LocalizableStrings.CommandDescription,
Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId)
.With(name: LocalizableStrings.PackageIdArgumentName,

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf
View file

0
src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf → src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx → src/dotnet/commands/dotnet-tool/list/LocalizableStrings.resx
View file

2
src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs → src/dotnet/commands/dotnet-tool/list/ToolListCommand.cs
View file

@ -11,7 +11,7 @@ using Microsoft.DotNet.Configurer;
using Microsoft.DotNet.ToolPackage;
using Microsoft.Extensions.EnvironmentAbstractions;
namespace Microsoft.DotNet.Tools.List.Tool
namespace Microsoft.DotNet.Tools.Tool.List
{
internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null);

8
src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs → src/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs
View file

@ -2,16 +2,16 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.Cli.CommandLine;
using LocalizableStrings = Microsoft.DotNet.Tools.List.Tool.LocalizableStrings;
using LocalizableStrings = Microsoft.DotNet.Tools.Tool.List.LocalizableStrings;
namespace Microsoft.DotNet.Cli
{
internal static class ListToolCommandParser
internal static class ToolListCommandParser
{
public static Command ListTool()
public static Command ToolList()
{
return Create.Command(
"tool",
"list",
LocalizableStrings.CommandDescription,
Create.Option(
"-g|--global",

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf
View file

0
src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf → src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf
View file

0
src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx → src/dotnet/commands/dotnet-tool/uninstall/LocalizableStrings.resx
View file

10
src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs → src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs
View file

@ -14,11 +14,11 @@ using Microsoft.DotNet.ShellShim;
using Microsoft.DotNet.ToolPackage;
using Microsoft.Extensions.EnvironmentAbstractions;
namespace Microsoft.DotNet.Tools.Uninstall.Tool
namespace Microsoft.DotNet.Tools.Tool.Uninstall
{
internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null);
internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null);
internal class UninstallToolCommand : CommandBase
internal class ToolUninstallCommand : CommandBase
{
private readonly AppliedOption _options;
private readonly IReporter _reporter;
@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool
private CreateShellShimRepository _createShellShimRepository;
private CreateToolPackageStore _createToolPackageStore;
public UninstallToolCommand(
public ToolUninstallCommand(
AppliedOption options,
ParseResult result,
CreateToolPackageStore createToolPackageStore = null,
@ -120,10 +120,10 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool
package.Version.ToNormalizedString()).Green());
return 0;
}
catch (Exception ex) when (UninstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
catch (Exception ex) when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
{
throw new GracefulException(
messages: UninstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId),
messages: ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId),
verboseMessages: new[] {ex.ToString()},
isUserError: false);
}

6
src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandLowLevelErrorConverter.cs → src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs
View file

@ -6,9 +6,9 @@ using System.Collections.Generic;
using Microsoft.DotNet.ShellShim;
using Microsoft.DotNet.ToolPackage;
namespace Microsoft.DotNet.Tools.Uninstall.Tool
namespace Microsoft.DotNet.Tools.Tool.Uninstall
{
internal static class UninstallToolCommandLowLevelErrorConverter
internal static class ToolUninstallCommandLowLevelErrorConverter
{
public static IEnumerable<string> GetUserFacingMessages(Exception ex, PackageId packageId)
{
@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool
{
userFacingMessages = new[]
{
String.Format(
string.Format(
LocalizableStrings.FailedToUninstallTool,
packageId,
ex.Message)

8
src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandParser.cs → src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs
View file

@ -2,15 +2,15 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.Cli.CommandLine;
using LocalizableStrings = Microsoft.DotNet.Tools.Uninstall.Tool.LocalizableStrings;
using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Uninstall.LocalizableStrings;
namespace Microsoft.DotNet.Cli
{
internal static class UninstallToolCommandParser
internal static class ToolUninstallCommandParser
{
public static Command UninstallTool()
public static Command ToolUninstall()
{
return Create.Command("tool",
return Create.Command("uninstall",
LocalizableStrings.CommandDescription,
Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId)
.With(name: LocalizableStrings.PackageIdArgumentName,

0
src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf → src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf
View file

0
src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf → src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf
View file

0
src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf → src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf
View file

0
src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf → src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf
View file

Some files were not shown because too many files have changed in this diff Show more