From 1e2c8bed24ed85ef4dc0ad88f2b69ed1c1639ef6 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 16 Apr 2018 12:04:00 -0700
Subject: [PATCH 01/37] Update the branding of the SDK to 2.2.100-preview1.
---
build/Version.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/Version.props b/build/Version.props
index c8dd4c795..2877c012a 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,9 +1,9 @@
2
- 1
- 300
- preview3
+ 2
+ 100
+ preview1
$(VersionMajor).$(VersionMinor).$(VersionPatch)
$(CliVersionNoSuffix)-$(ReleaseSuffix)
From d99d7adc86290233299bb1ba452b32d0411582cc Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 16 Apr 2018 14:50:21 -0700
Subject: [PATCH 02/37] Removing a flaky timebound test.
---
.../GivenThatWeWantToReadLockFilesQuickly.cs | 49 -------------------
1 file changed, 49 deletions(-)
delete mode 100644 test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs
deleted file mode 100644
index 5b1300348..000000000
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.Diagnostics;
-using System.IO;
-using FluentAssertions;
-using Microsoft.DotNet.Cli;
-using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.InternalAbstractions;
-using Microsoft.DotNet.TestFramework;
-using Microsoft.DotNet.Tools.Test.Utilities;
-using NuGet.Frameworks;
-using NuGet.ProjectModel;
-using Xunit;
-
-namespace Microsoft.DotNet.Cli.Utils.Tests
-{
- public class GivenThatWeWantToReadLockFilesQuickly : TestBase
- {
- [Fact]
- public void ItFailsInLessThanOneSecondWhenTheProjectAssetsJsonDoesNotExist()
- {
- var testInstance = TestAssets.Get("TestAppWithProjDepTool")
- .CreateInstance()
- .WithSourceFiles();
-
- var assetsFile = testInstance.Root.GetDirectory("obj").GetFile("project.assets.json").FullName;
- var expectedMessage = string.Join(
- Environment.NewLine,
- string.Format(LocalizableStrings.FileNotFound, assetsFile),
- LocalizableStrings.ProjectNotRestoredOrRestoreFailed);
-
- Action action = () =>
- {
- var lockFile = new LockFileFormat()
- .ReadWithLock(assetsFile)
- .Result;
- };
-
- var stopWatch = Stopwatch.StartNew();
-
- action.ShouldThrow().WithMessage(expectedMessage);
-
- stopWatch.Stop();
- stopWatch.ElapsedMilliseconds.Should().BeLessThan(1000);
- }
- }
-}
From 665daa07fcd47f43469d69b08875599faad9ea8a Mon Sep 17 00:00:00 2001
From: Daniel Plaisted
Date: Mon, 16 Apr 2018 17:07:57 -0700
Subject: [PATCH 03/37] Update latest patch versions of .NET Core runtime
---
build/MSBuildExtensions.targets | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 74401de5e..a2a27d61a 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -144,9 +144,9 @@ Copyright (c) .NET Foundation. All rights reserved.
<_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview)
- 1.0.10
- 1.1.7
- 2.0.6
+ 1.0.11
+ 1.1.8
+ 2.0.7
]]>
From 8c937a0db08e56660aca456ac088f2d0e70735ab Mon Sep 17 00:00:00 2001
From: Steve MacLean
Date: Tue, 17 Apr 2018 19:54:01 -0400
Subject: [PATCH 04/37] [Arm64] Add crosscomponent crossgen (#9011)
---
build/CrossGen.props | 7 +++++--
src/redist/redist.csproj | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build/CrossGen.props b/build/CrossGen.props
index 6a5907629..355405b36 100644
--- a/build/CrossGen.props
+++ b/build/CrossGen.props
@@ -1,8 +1,11 @@
runtime.$(SharedFrameworkRid).microsoft.netcore.app
- $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools/crossgen$(ExeExtension)
- $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(SharedFrameworkRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)
+ <_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64
+ $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)
+ $(SharedFrameworkRid)
+ x64_arm64
+ $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)
$(OutputDirectory)/shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppPackageVersion)
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index e3f051a92..7a40c6067 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -257,7 +257,7 @@
From dabc2bc577011f11bd95c06632a63290701f1466 Mon Sep 17 00:00:00 2001
From: Petr Onderka
Date: Tue, 1 May 2018 11:41:54 +0200
Subject: [PATCH 05/37] Simplify completions scripts
---
scripts/register-completions.bash | 4 +---
scripts/register-completions.zsh | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/scripts/register-completions.bash b/scripts/register-completions.bash
index b4753def3..09d167bd2 100644
--- a/scripts/register-completions.bash
+++ b/scripts/register-completions.bash
@@ -1,14 +1,12 @@
-#!/bin/bash
# bash parameter completion for the dotnet CLI
_dotnet_bash_complete()
{
local word=${COMP_WORDS[COMP_CWORD]}
- local dotnetPath=${COMP_WORDS[1]}
local completions=("$(dotnet complete --position ${COMP_POINT} "${COMP_LINE}")")
COMPREPLY=( $(compgen -W "$completions" -- "$word") )
}
-complete -f -F _dotnet_bash_complete dotnet
\ No newline at end of file
+complete -f -F _dotnet_bash_complete dotnet
diff --git a/scripts/register-completions.zsh b/scripts/register-completions.zsh
index 9f290bc68..8eebe9a86 100644
--- a/scripts/register-completions.zsh
+++ b/scripts/register-completions.zsh
@@ -2,11 +2,9 @@
_dotnet_zsh_complete()
{
- local dotnetPath=$words[1]
-
local completions=("$(dotnet complete "$words")")
reply=( "${(ps:\n:)completions}" )
}
-compctl -K _dotnet_zsh_complete dotnet
\ No newline at end of file
+compctl -K _dotnet_zsh_complete dotnet
From 6c9942bae6830a4f5b370d978d56b21807be49ba Mon Sep 17 00:00:00 2001
From: Petr Onderka
Date: Wed, 2 May 2018 00:39:12 +0200
Subject: [PATCH 06/37] Use NuGet autocomplete API for add-package suggestions
(#9171)
---
.../dotnet-add/dotnet-add-package/AddPackageParser.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs
index 5ee3fd10c..2415d1479 100644
--- a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs
+++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs
@@ -59,7 +59,7 @@ namespace Microsoft.DotNet.Cli
try
{
var cancellation = new CancellationTokenSource(TimeSpan.FromSeconds(10));
- var response = httpClient.GetAsync($"https://api-v2v3search-0.nuget.org/query?q={match}&skip=0&take=100&prerelease=true", cancellation.Token)
+ var response = httpClient.GetAsync($"https://api-v2v3search-0.nuget.org/autocomplete?q={match}&skip=0&take=100", cancellation.Token)
.Result;
result = response.Content.ReadAsStreamAsync().Result;
@@ -77,7 +77,7 @@ namespace Microsoft.DotNet.Cli
foreach (var id in json["data"])
{
- yield return id["id"].Value();
+ yield return id.Value();
}
}
}
From 575ad4e9dc647c166707f83bc204d98d1965c7cf Mon Sep 17 00:00:00 2001
From: kasper3 <33230602+kasper3@users.noreply.github.com>
Date: Thu, 10 May 2018 19:15:54 +0300
Subject: [PATCH 07/37] Use the latest nuget.exe in generatenupkg script
---
packaging/windows/clisdk/generatenupkg.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packaging/windows/clisdk/generatenupkg.ps1 b/packaging/windows/clisdk/generatenupkg.ps1
index ca91f2e3a..f2df9810d 100644
--- a/packaging/windows/clisdk/generatenupkg.ps1
+++ b/packaging/windows/clisdk/generatenupkg.ps1
@@ -26,7 +26,7 @@ function DownloadNugetExe
if (-not (Test-Path $NuGetExe)) {
Write-Output 'Downloading nuget.exe to ' + $NuGetExe
- wget https://dist.nuget.org/win-x86-commandline/v3.5.0-rc1/NuGet.exe -OutFile $NuGetExe
+ wget https://dist.nuget.org/win-x86-commandline/v4.7.0/nuget.exe -OutFile $NuGetExe
}
}
From ca8fefb1be3938e0b18e9325aacf67a2f6b14e15 Mon Sep 17 00:00:00 2001
From: Simon Cropp
Date: Tue, 29 May 2018 23:00:23 +1000
Subject: [PATCH 08/37] Update Sha256Hasher.cs
---
src/dotnet/Telemetry/Sha256Hasher.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/dotnet/Telemetry/Sha256Hasher.cs b/src/dotnet/Telemetry/Sha256Hasher.cs
index f077b8fb8..473a5eb6a 100644
--- a/src/dotnet/Telemetry/Sha256Hasher.cs
+++ b/src/dotnet/Telemetry/Sha256Hasher.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.Telemetry
internal static class Sha256Hasher
{
///
- /// // The hashed mac address needs to be the same hashed value as produced by the other distinct sources given the same input. (e.g. VsCode)
+ /// The hashed mac address needs to be the same hashed value as produced by the other distinct sources given the same input. (e.g. VsCode)
///
public static string Hash(string text)
{
From c01e7c3e42f4710cc57629d489a8236d534aae5e Mon Sep 17 00:00:00 2001
From: Sebastian Karasek
Date: Tue, 29 May 2018 20:02:26 +0200
Subject: [PATCH 09/37] Fix extraction of folders (#9335)
---
scripts/obtain/dotnet-install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh
index 27443c397..6d17c58e7 100755
--- a/scripts/obtain/dotnet-install.sh
+++ b/scripts/obtain/dotnet-install.sh
@@ -628,7 +628,7 @@ extract_dotnet_package() {
tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true
local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
- find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
+ find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
rm -rf "$temp_out_path"
From dae5099ffbd7f35ee761dc53f0040007f1a7209c Mon Sep 17 00:00:00 2001
From: John Beisner
Date: Tue, 29 May 2018 13:46:07 -0700
Subject: [PATCH 10/37] Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to
"master" (#9362)
---
README.md | 62 +++++++++++++++++++++---------------------
build/BranchInfo.props | 4 +--
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/README.md b/README.md
index ba014315e..24c12e500 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling?
If you are looking for the v2.0 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download!
-> **Note:** the release/2.1.4xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
+> **Note:** the master branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
> released version of the tools available at https://dot.net/core
Found an issue?
@@ -65,7 +65,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
> want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling).
> In order to be able to restore these pre-release packages, you may need to add a NuGet feed pointing to https://dotnet.myget.org/F/dotnet-core/api/v3/index.json. Other feeds may also be necessary depending on what kind of project you are working with.
-| Platform | Latest Daily Build *release/2.1.4xx* [![][version-badge]][version] |
+| Platform | Latest Daily Build *master* [![][version-badge]][version] |
| -------- | :-------------------------------------: |
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum] [zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum] [zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
@@ -76,7 +76,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
| **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] |
| **Linux-musl** | [tar.gz][linux-musl-targz] - [Checksum][linux-musl-targz-checksum] |
-| Latest Coherent Build2 *release/2.1.4xx* |
+| Latest Coherent Build2 *master* |
|:------:|
| [![][coherent-version-badge]][coherent-version] |
@@ -84,44 +84,44 @@ Reference notes:
> **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.*
> **2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.*
-[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/latest.version
-[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/latest.coherent.version
+[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version
+[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.coherent.version
[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
-[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/win_x64_Release_version_badge.svg
-[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/win_x64_Release_coherent_badge.svg
+[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg
+[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_coherent_badge.svg
-[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.exe
-[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.exe.sha
-[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.zip
-[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.zip.sha
+[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe
+[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe.sha
+[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip
+[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip.sha
-[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.exe
-[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.exe.sha
-[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.zip
-[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.zip.sha
+[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.exe
+[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.exe.sha
+[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.zip
+[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.zip.sha
-[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.pkg
-[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.pkg.sha
-[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.tar.gz
-[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.tar.gz.sha
+[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.pkg
+[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.pkg.sha
+[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz
+[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz.sha
-[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-x64.tar.gz
-[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-x64.tar.gz.sha
+[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-x64.tar.gz
+[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-x64.tar.gz.sha
-[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm.tar.gz
-[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm.tar.gz.sha
+[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz
+[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz.sha
-[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm64.tar.gz
-[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha
+[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz
+[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz.sha
-[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb
-[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb.sha
+[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb
+[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb.sha
-[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.rpm
-[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.rpm.sha
+[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.rpm
+[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.rpm.sha
-[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-rhel.6-x64.tar.gz
-[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha
+[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz
+[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha
[linux-musl-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-musl-x64.tar.gz
[linux-musl-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha
diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index c7a84c19d..f62c8fd00 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
- release/2.1.4xx
- release/2.1.4xx
+ master
+ master
From 139fc86dbcb8a73bd138118681258dcd22ba7631 Mon Sep 17 00:00:00 2001
From: Petr Onderka
Date: Thu, 31 May 2018 01:03:27 +0200
Subject: [PATCH 11/37] Simplified combining dictionaries in Telemetry
---
src/dotnet/Telemetry/Telemetry.cs | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/dotnet/Telemetry/Telemetry.cs b/src/dotnet/Telemetry/Telemetry.cs
index 2a88de24f..57c2133c7 100644
--- a/src/dotnet/Telemetry/Telemetry.cs
+++ b/src/dotnet/Telemetry/Telemetry.cs
@@ -141,14 +141,7 @@ namespace Microsoft.DotNet.Cli.Telemetry
{
foreach (KeyValuePair measurement in measurements)
{
- if (eventMeasurements.ContainsKey(measurement.Key))
- {
- eventMeasurements[measurement.Key] = measurement.Value;
- }
- else
- {
- eventMeasurements.Add(measurement.Key, measurement.Value);
- }
+ eventMeasurements[measurement.Key] = measurement.Value;
}
}
return eventMeasurements;
@@ -161,14 +154,7 @@ namespace Microsoft.DotNet.Cli.Telemetry
var eventProperties = new Dictionary(_commonProperties);
foreach (KeyValuePair property in properties)
{
- if (eventProperties.ContainsKey(property.Key))
- {
- eventProperties[property.Key] = property.Value;
- }
- else
- {
- eventProperties.Add(property.Key, property.Value);
- }
+ eventProperties[property.Key] = property.Value;
}
return eventProperties;
}
From 2f0f270a730841cb00779087cad98b4c75085873 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Thu, 24 May 2018 15:41:03 -0700
Subject: [PATCH 12/37] Updating the build and tests to work with the 2.2.0
runtime.
---
Directory.Build.props | 4 +++-
.../AppWithProjTool2Fx/App.csproj | 4 ++--
.../XUnitProject/XUnitProject.csproj | 2 +-
.../MultiTFMTestApp/MultiTFMTestApp.csproj | 2 +-
.../ToolWithOutputName/ToolWithOutputName.csproj | 2 +-
.../dotnet-dependency-context-test.csproj | 2 +-
.../dotnet-dependency-tool-invoker.csproj | 2 +-
.../dotnet-fallbackfoldertool.csproj | 2 +-
.../v1/dotnet-hello/dotnet-hello.csproj | 2 +-
.../v2/dotnet-hello/dotnet-hello.csproj | 2 +-
.../dotnet-portable/dotnet-portable.csproj | 2 +-
.../dotnet-prefercliruntime.csproj | 2 +-
.../AppWithApplicationUrlInLaunchSettings.csproj | 2 +-
.../AppWithCorruptedLaunchSettings.csproj | 2 +-
.../AppWithDepOnToolWithOutputName.csproj | 2 +-
.../AppWithDirectAndToolDep.csproj | 2 +-
.../AppWithDirectDep/AppWithDirectDep.csproj | 2 +-
.../AppWithDirectDepWithOutputName.csproj | 2 +-
.../AppWithFallbackFolderToolDependency.csproj | 2 +-
.../AppWithLaunchSettings.csproj | 2 +-
.../AppWithLaunchSettingsNoDefault.csproj | 2 +-
...BuildAppWithMultipleFrameworksAndTools.csproj | 4 ++--
.../AppWithToolDependency.csproj | 2 +-
.../DependencyContextFromTool.csproj | 2 +-
.../FSharpTestAppSimple/TestAppSimple.fsproj | 2 +-
.../MSBuildAppWithMultipleFrameworks.csproj | 2 +-
...BuildAppWithMultipleFrameworksAndTools.csproj | 4 ++--
.../MSBuildTestApp/MSBuildTestApp.csproj | 2 +-
.../MultiDependentProject.csproj | 2 +-
.../NewtonSoftDependentProject.csproj | 2 +-
.../NuGetConfigDependentProject.csproj | 2 +-
.../FSharpProject/FSharpProject.fsproj | 2 +-
.../TestAppSimple/TestAppSimple.csproj | 2 +-
.../TestAppWithEmptySln/App/App.csproj | 2 +-
.../TestAppWithMultipleSlnFiles/App/App.csproj | 2 +-
.../TestAppWithProjDepTool.csproj | 2 +-
.../src/App/App.csproj | 2 +-
.../TestAppWithSlnAndCsprojFiles/App/App.csproj | 2 +-
.../TestAppWithSlnAndCsprojInSubDir/App.csproj | 2 +-
.../App.csproj | 2 +-
.../App/App.csproj | 2 +-
.../App/App.csproj | 2 +-
.../App/App.csproj | 2 +-
.../App/App.csproj | 2 +-
.../App/App.csproj | 2 +-
.../App.csproj | 2 +-
.../src/App/App.csproj | 2 +-
.../TestWebAppSimple/TestWebAppSimple.csproj | 2 +-
.../TestProjects/VBTestApp/VBTestApp.vbproj | 2 +-
.../TestProjects/VSTestCore/VSTestCore.csproj | 2 +-
.../VSTestMulti/VSTestDesktopAndNetCore.csproj | 2 +-
.../TestProjects/XunitCore/XunitCore.csproj | 2 +-
.../VSTestXunitDesktopAndNetCore.csproj | 4 ++--
build/DependencyVersions.props | 10 +++++-----
test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +-
.../GivenAProjectDependenciesCommandFactory.cs | 4 ++--
.../GivenAProjectDependencyCommandResolver.cs | 8 ++++----
.../GivenAProjectToolsCommandResolver.cs | 6 +++---
.../NuGetFrameworks.cs | 3 +++
.../GivenDotnetPackageAdd.cs | 2 +-
.../GivenDotnetBuildBuildsCsproj.cs | 4 ++--
.../GivenDotnetCleanCleansBuildArtifacts.cs | 2 +-
test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 12 ++++++------
.../GivenDotnetPublishPublishesProjects.cs | 16 ++++++++--------
.../dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs | 4 ++--
.../GivenDotnetStoresAndPublishesProjects.cs | 2 +-
...tBuildsAndRunsTestFromCsprojForMultipleTFM.cs | 2 +-
...GivenDotnetTestBuildsAndRunsTestfromCsproj.cs | 2 +-
test/dotnet-vstest.Tests/VSTestTests.cs | 2 +-
test/dotnet.Tests/GivenThatICareAboutVBApps.cs | 2 +-
test/dotnet.Tests/PackagedCommandTests.cs | 4 ++--
71 files changed, 104 insertions(+), 99 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 4a8c44efd..f14cc0b04 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -29,7 +29,9 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
true
true
- netcoreapp2.1
+ netcoreapp2.2
+
+ 2.2
diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
index 331a6e75f..b7c3c6720 100644
--- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
+++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
@@ -2,9 +2,9 @@
- netcoreapp2.1;net451
+ netcoreapp2.2;net451
Exe
- $(AssetTargetFallback);portable-net45+win8;dnxcore50
+ $(AssetTargetFallback);portable-net45+win8;dnxcore50
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64
$(TEST_PACKAGES)
diff --git a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj
index 70844e9e1..4063c62d2 100644
--- a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj
+++ b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj
@@ -2,7 +2,7 @@
- net461;netcoreapp2.1
+ net461;netcoreapp2.2
diff --git a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj
index 465f0e78a..42170c6bb 100644
--- a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj
+++ b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.1;net461
+ netcoreapp2.2;net461
diff --git a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
index c237cd483..9913cfd8a 100644
--- a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
+++ b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
dotnet-tool-with-output-name
ToolWithOutputName
Exe
diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
index 5af4b20b4..fa8676db2 100644
--- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
@@ -3,7 +3,7 @@
1.0.0-rc
- netcoreapp2.1
+ netcoreapp2.2
Exe
diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
index f625dcbe6..71975ef6f 100644
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
@@ -6,7 +6,7 @@
1.0.0-rc
- netcoreapp2.1
+ netcoreapp2.2
Exe
false
diff --git a/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj b/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj
index 9e29a16a7..3112ce34f 100644
--- a/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj
+++ b/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
dotnet-fallbackfoldertool
Exe
diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
index 4ff2b8d00..777a031cc 100644
--- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
+++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
@@ -5,7 +5,7 @@
1.0.0
- netcoreapp2.1
+ netcoreapp2.2
dotnet-hello
Exe
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64
diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
index 7e4bc54d0..6c305470a 100644
--- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
+++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
@@ -5,7 +5,7 @@
2.0.0
- netcoreapp2.1
+ netcoreapp2.2
dotnet-hello
Exe
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64
diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
index 70f8b0dde..1aef6a2d9 100644
--- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
+++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
index 5275ba5fc..8706fd623 100644
--- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
+++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
index be02066ff..576839f8e 100644
--- a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
+++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
@@ -3,6 +3,6 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj
index bde0adabe..d4e31136a 100644
--- a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj
+++ b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64
diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
index 4ea5be23c..3bbb28817 100755
--- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
index afcfb340e..99e82e3e5 100755
--- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
+++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
index 5b5c0f757..1818cdb1a 100755
--- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
@@ -3,7 +3,7 @@
1.0.0
- netcoreapp2.1
+ netcoreapp2.2
AppWithDirectDep
Exe
false
diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
index 4eef16036..216b6a543 100755
--- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj b/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj
index 76195b1ca..5701923a5 100755
--- a/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj
+++ b/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj
index bde0adabe..d4e31136a 100644
--- a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj
+++ b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64
diff --git a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj
index bde0adabe..d4e31136a 100644
--- a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj
+++ b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64
diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
index 4aeb0de85..9986f54fc 100644
--- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@@ -3,7 +3,7 @@
Exe
- net451;netcoreapp2.1
+ net451;netcoreapp2.2
$(TEST_PACKAGES)
@@ -11,7 +11,7 @@
-
+
diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
index a18ee9852..945c59f44 100755
--- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
+++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
index 2de1535e2..d2949d134 100755
--- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
+++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
@@ -3,7 +3,7 @@
1.0.0
- netcoreapp2.1
+ netcoreapp2.2
DependencyContextFromTool
Exe
false
diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj
index 7c81fcb9c..bd7fe7deb 100644
--- a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj
+++ b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
true
diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
index 4ef98259b..49785ea14 100644
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
@@ -3,7 +3,7 @@
Exe
- net451;netcoreapp2.1
+ net451;netcoreapp2.2
\ No newline at end of file
diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
index 276e1c618..3cad5f8ab 100644
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@@ -3,14 +3,14 @@
Exe
- net451;netcoreapp2.1
+ net451;netcoreapp2.2
-
+
diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index de20e4481..89540778e 100644
--- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj b/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj
index 9d52a2484..b70e9cd58 100644
--- a/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj
+++ b/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj b/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj
index cff7d9c45..c33c5b112 100644
--- a/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj
+++ b/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj b/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj
index 340e58180..ab48b8ed6 100644
--- a/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj
+++ b/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj
index 43b200bd5..77e0646a6 100644
--- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
index 9c5f2a885..7f72f6294 100755
--- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
+++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
Exe
\ No newline at end of file
diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
index cefcb0402..683a2bf14 100644
--- a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
index d466f76c6..7eae8fc04 100644
--- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
index b4e6c9844..71c0021d7 100644
--- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
+++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj
index 264eddb85..2c41925b8 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
index cefcb0402..683a2bf14 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj
index d02e1c64b..7d85a48e1 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj
index 653032148..73ff8c948 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
index cefcb0402..683a2bf14 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
index d466f76c6..7eae8fc04 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
index cefcb0402..683a2bf14 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj
index 867909f5d..ea3bd4c8a 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj
index 867909f5d..ea3bd4c8a 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj
index 653032148..73ff8c948 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj
index 264eddb85..2c41925b8 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
index f600e9d8e..0d5ffc364 100644
--- a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
+++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj b/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj
index 23df6047f..21dff5ca2 100644
--- a/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj
+++ b/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj
index 26592bc1d..ac1e26e32 100644
--- a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj
+++ b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj
index 2b2cc7769..eab18393e 100644
--- a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj
@@ -2,7 +2,7 @@
- net46;netcoreapp2.1
+ net46;netcoreapp2.2
diff --git a/TestAssets/TestProjects/XunitCore/XunitCore.csproj b/TestAssets/TestProjects/XunitCore/XunitCore.csproj
index 84a3da759..3e750f58a 100644
--- a/TestAssets/TestProjects/XunitCore/XunitCore.csproj
+++ b/TestAssets/TestProjects/XunitCore/XunitCore.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.1
+ netcoreapp2.2
diff --git a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
index 4534df62b..c678d6b4a 100644
--- a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
@@ -2,7 +2,7 @@
- net46;netcoreapp2.1
+ net46;netcoreapp2.2
win7-x86
win7-x86
@@ -11,7 +11,7 @@
DESKTOP;$(DefineConstants)
-
+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 0861f2016..d4ea0811b 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,9 +1,9 @@
- 2.1.0-rtm-30752
+ 2.1.0
$(MicrosoftAspNetCoreAllPackageVersion)
- 2.1.0-rtm-26515-03
+ 2.2.0-preview1-26508-01
$(MicrosoftNETCoreAppPackageVersion)
15.7.179
$(MicrosoftBuildPackageVersion)
@@ -16,7 +16,7 @@
$(MicrosoftCodeAnalysisCSharpPackageVersion)
$(MicrosoftCodeAnalysisCSharpPackageVersion)
$(MicrosoftCodeAnalysisCSharpPackageVersion)
- 2.1.300-rtm-62915-10
+ 1.0.0-preview1-62924-06
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftAspNetCoreAppPackageVersion)
2.1.300-rtm-20180515-1688249
@@ -30,8 +30,8 @@
$(MicrosoftTemplateEngineCliPackageVersion)
$(MicrosoftTemplateEngineCliPackageVersion)
$(MicrosoftTemplateEngineCliPackageVersion)
- 2.1.0-rtm-26515-03
- 2.1.0-rtm-26515-03
+ 2.2.0-preview1-26508-01
+ 2.2.0-preview1-26508-01
0.1.1-rtm-62915-03
1.3.1-rtm-62915-03
$(MicrosoftDotNetProjectJsonMigrationPackageVersion)
diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
index 9c79fb94e..e7332eddc 100644
--- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs
+++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
@@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput(
- $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.1 portable")
+ $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.2 portable")
.Should().Pass()
.And.HaveStdOutContaining("Hello Portable World!");;
}
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
index a3f5976f5..71edf4f15 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
@@ -190,7 +190,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
.Should().Pass();
var factory = new ProjectDependenciesCommandFactory(
- NuGetFrameworks.NetCoreApp21,
+ NuGetFrameworks.NetCoreApp22,
configuration,
null,
null,
@@ -199,7 +199,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
var command = factory.Create("dotnet-tool-with-output-name", null);
command.CommandArgs.Should().Contain(
- Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp2.1", "dotnet-tool-with-output-name.dll"));
+ Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp2.2", "dotnet-tool-with-output-name.dll"));
}
}
}
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs
index a7b6c402e..09bbc28df 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs
@@ -48,7 +48,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandName = "dotnet-portable",
Configuration = "Debug",
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
- Framework = NuGetFrameworks.NetCoreApp21
+ Framework = NuGetFrameworks.NetCoreApp22
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@@ -84,7 +84,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandName = "dotnet-portable",
Configuration = "Debug",
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
- Framework = NuGetFrameworks.NetCoreApp21
+ Framework = NuGetFrameworks.NetCoreApp22
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@@ -110,7 +110,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandName = "nonexistent-command",
CommandArguments = null,
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
- Framework = NuGetFrameworks.NetCoreApp21
+ Framework = NuGetFrameworks.NetCoreApp22
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@@ -136,7 +136,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandName = "dotnet-portable",
Configuration = "Debug",
ProjectDirectory = testInstance.Root.FullName,
- Framework = NuGetFrameworks.NetCoreApp21,
+ Framework = NuGetFrameworks.NetCoreApp22,
OutputPath = outputDir.FullName
};
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 89d74d82f..9cb3f69dd 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests
public class GivenAProjectToolsCommandResolver : TestBase
{
private static readonly NuGetFramework s_toolPackageFramework =
- NuGetFrameworks.NetCoreApp21;
+ NuGetFrameworks.NetCoreApp22;
private const string TestProjectName = "AppWithToolDependency";
@@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull();
- result.Args.Should().Contain("--fx-version 2.1.0");
+ result.Args.Should().Contain("--fx-version 2.2.0");
}
[Fact]
@@ -370,7 +370,7 @@ namespace Microsoft.DotNet.Tests
"dotnet-fallbackfoldertool",
"1.0.0",
"lib",
- "netcoreapp2.1",
+ "netcoreapp2.2",
"dotnet-fallbackfoldertool.dll"));
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs
index c82d78051..a7ad2fa18 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs
@@ -10,5 +10,8 @@ namespace Microsoft.DotNet.Tools.Tests.Utilities
{
public static readonly NuGetFramework NetCoreApp21
= new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, new Version(2, 1, 0, 0));
+
+ public static readonly NuGetFramework NetCoreApp22
+ = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, new Version(2, 2, 0, 0));
}
}
diff --git a/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs b/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs
index 268c64f33..bdcad464a 100644
--- a/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs
+++ b/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs
@@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Cli.Package.Add.Tests
var packageName = "Newtonsoft.Json";
var packageVersion = "9.0.1";
- var framework = "netcoreapp2.1";
+ var framework = "netcoreapp2.2";
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"add package {packageName} --version {packageVersion} --framework {framework}");
diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
index 26845ee01..15f8527c8 100644
--- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
+++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
@@ -29,7 +29,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
- var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.1")
+ var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.2")
.GetFile($"{testAppName}.dll");
var outputRunCommand = new DotnetCommand();
@@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
new BuildCommand()
.WithWorkingDirectory(projectDirectory)
- .Execute("--framework netcoreapp2.1")
+ .Execute("--framework netcoreapp2.2")
.Should().Pass();
}
diff --git a/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs b/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs
index 474a7f2b1..a4210cb4b 100644
--- a/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs
+++ b/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs
@@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Clean.Tests
.Should().Pass();
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
- var outputFolder = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.1", "win7-x64");
+ var outputFolder = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.2", "win7-x64");
outputFolder.Should().NotBeEmpty();
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
index bb2c148f5..d63d844b3 100644
--- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
+++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
@@ -74,16 +74,16 @@ namespace Microsoft.DotNet.New.Tests
.Should().Pass();
}
+ // Remove the expectedVersion parameter once we have templates targetting netcoreapp2.2.
[Theory]
- [InlineData("console", "microsoft.netcore.app")]
- // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
- [InlineData("classlib", "netstandard.library")]
- public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
+ [InlineData("console", "microsoft.netcore.app", "2.1.0")]
+ [InlineData("classlib", "netstandard.library", null)]
+ public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion)
{
var rootPath = TestAssets.CreateTestDirectory(identifier: $"_{type}").FullName;
var packagesDirectory = Path.Combine(rootPath, "packages");
var projectName = "Project";
- var expectedVersion = GetFrameworkPackageVersion();
+ expectedVersion = expectedVersion ?? GetFrameworkPackageVersion();
var repoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
@@ -107,7 +107,7 @@ namespace Microsoft.DotNet.New.Tests
var sharedFxDir = dotnetDir
.GetDirectory("shared", "Microsoft.NETCore.App")
.EnumerateDirectories()
- .Single(d => d.Name.StartsWith("2.1.0"));
+ .Single(d => d.Name.StartsWith("2.2.0"));
if (packageName == "microsoft.netcore.app")
{
diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
index 9b325256f..6a29e4282 100644
--- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
+++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
@@ -33,11 +33,11 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
new PublishCommand()
.WithWorkingDirectory(testProjectDirectory)
- .Execute("--framework netcoreapp2.1")
+ .Execute("--framework netcoreapp2.2")
.Should().Pass();
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
- var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp2.1", "publish", $"{testAppName}.dll");
+ var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp2.2", "publish", $"{testAppName}.dll");
new DotnetCommand()
.ExecuteWithCapturedOutput(outputDll)
@@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
new PublishCommand()
.WithWorkingDirectory(testProjectDirectory)
- .Execute("--framework netcoreapp2.1")
+ .Execute("--framework netcoreapp2.2")
.Should().Pass();
}
@@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
new PublishCommand()
.WithWorkingDirectory(projectDirectory)
- .Execute("--framework netcoreapp2.1")
+ .Execute("--framework netcoreapp2.2")
.Should().Pass();
}
@@ -90,7 +90,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
new PublishCommand()
.WithWorkingDirectory(testProjectDirectory)
- .ExecuteWithCapturedOutput("--framework netcoreapp2.1 --no-restore")
+ .ExecuteWithCapturedOutput("--framework netcoreapp2.2 --no-restore")
.Should().Fail()
.And.HaveStdOutContaining("project.assets.json");
}
@@ -110,7 +110,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier();
new PublishCommand()
- .WithFramework("netcoreapp2.1")
+ .WithFramework("netcoreapp2.2")
.WithRuntime(rid)
.WithWorkingDirectory(testProjectDirectory)
.Execute()
@@ -119,7 +119,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
var outputProgram = testProjectDirectory
- .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish", $"{testAppName}{Constants.ExeSuffix}")
+ .GetDirectory("bin", configuration, "netcoreapp2.2", rid, "publish", $"{testAppName}{Constants.ExeSuffix}")
.FullName;
EnsureProgramIsRunnable(outputProgram);
@@ -185,7 +185,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
return testProjectDirectory
- .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish");
+ .GetDirectory("bin", configuration, "netcoreapp2.2", rid, "publish");
}
private static void EnsureProgramIsRunnable(string path)
diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
index f85d7446e..abc0108d3 100644
--- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
+++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
@@ -70,7 +70,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
new RunCommand()
.WithWorkingDirectory(projectDirectory)
- .ExecuteWithCapturedOutput("--framework netcoreapp2.1")
+ .ExecuteWithCapturedOutput("--framework netcoreapp2.2")
.Should().Pass()
.And.HaveStdOutContaining("This string came from the test library!");
}
@@ -150,7 +150,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
new RunCommand()
.WithWorkingDirectory(testProjectDirectory)
- .ExecuteWithCapturedOutput("--framework netcoreapp2.1")
+ .ExecuteWithCapturedOutput("--framework netcoreapp2.2")
.Should().Pass()
.And.HaveStdOut("Hello World!");
}
diff --git a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs
index a0e95d8f9..e51af937f 100644
--- a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs
+++ b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
{
public class GivenDotnetStoresAndPublishesProjects : TestBase
{
- private static string _tfm = "netcoreapp2.1";
+ private static string _tfm = "netcoreapp2.2";
private static string _frameworkVersion = TestAssetInstance.CurrentRuntimeFrameworkVersion;
private static string _arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant();
diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
index 801879573..f6918efc9 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
@@ -97,7 +97,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
new DotnetTestCommand()
.WithWorkingDirectory(projectDirectory)
- .ExecuteWithCapturedOutput($"{TestBase.ConsoleLoggerOutputNormal} --framework netcoreapp2.1")
+ .ExecuteWithCapturedOutput($"{TestBase.ConsoleLoggerOutputNormal} --framework netcoreapp2.2")
.Should().Pass();
}
}
diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index 1a8dddf88..a97875ec3 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -171,7 +171,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
var testProjectDirectory = this.CopyAndRestoreVSTestDotNetCoreTestApp("5");
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
string expectedError = Path.Combine(testProjectDirectory, "bin",
- configuration, "netcoreapp2.1", "VSTestCore.dll");
+ configuration, "netcoreapp2.2", "VSTestCore.dll");
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
// Call test
diff --git a/test/dotnet-vstest.Tests/VSTestTests.cs b/test/dotnet-vstest.Tests/VSTestTests.cs
index c6a7dd035..4f6cb5983 100644
--- a/test/dotnet-vstest.Tests/VSTestTests.cs
+++ b/test/dotnet-vstest.Tests/VSTestTests.cs
@@ -31,7 +31,7 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
.Should().Pass();
var outputDll = testRoot
- .GetDirectory("bin", configuration, "netcoreapp2.1")
+ .GetDirectory("bin", configuration, "netcoreapp2.2")
.GetFile($"{testAppName}.dll");
var argsForVstest = $"\"{outputDll.FullName}\" --logger:console;verbosity=normal";
diff --git a/test/dotnet.Tests/GivenThatICareAboutVBApps.cs b/test/dotnet.Tests/GivenThatICareAboutVBApps.cs
index 26fb40dd4..3b97b291c 100644
--- a/test/dotnet.Tests/GivenThatICareAboutVBApps.cs
+++ b/test/dotnet.Tests/GivenThatICareAboutVBApps.cs
@@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Tests
_testInstance.Root.FullName,
"bin",
configuration,
- "netcoreapp2.1",
+ "netcoreapp2.2",
"publish",
"VBTestApp.dll");
diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs
index 6e36eb87f..070156db5 100644
--- a/test/dotnet.Tests/PackagedCommandTests.cs
+++ b/test/dotnet.Tests/PackagedCommandTests.cs
@@ -247,7 +247,7 @@ namespace Microsoft.DotNet.Tests
.WithSourceFiles()
.WithRestoreFiles();
- string framework = Tools.Tests.Utilities.NuGetFrameworks.NetCoreApp21.DotNetFrameworkName;
+ string framework = Tools.Tests.Utilities.NuGetFrameworks.NetCoreApp22.DotNetFrameworkName;
new BuildCommand()
.WithProjectDirectory(testInstance.Root)
@@ -423,7 +423,7 @@ namespace Microsoft.DotNet.Tests
.WithRestoreFiles();
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
- .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.1")
+ .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.2")
.GetFile("project.assets.json");
var stopWatch = Stopwatch.StartNew();
From 33c3a2688006793513e075c3b8560d09754a14d3 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Fri, 1 Jun 2018 13:31:03 -0700
Subject: [PATCH 13/37] Updating asp.net to 2.2.0 as well.
---
build/BundledTemplates.props | 2 +-
build/DependencyVersions.props | 4 ++--
build/NugetConfigFile.targets | 2 ++
test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs | 2 +-
tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index 1a77f6043..e1cb85a8f 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -5,7 +5,7 @@
-
+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index d4ea0811b..574d7f6d5 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,9 +1,9 @@
- 2.1.0
+ 2.2.0-preview1-34355
$(MicrosoftAspNetCoreAllPackageVersion)
- 2.2.0-preview1-26508-01
+ 2.2.0-preview1-26529-01
$(MicrosoftNETCoreAppPackageVersion)
15.7.179
$(MicrosoftBuildPackageVersion)
diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets
index 5e72d79b7..4c32beeb1 100644
--- a/build/NugetConfigFile.targets
+++ b/build/NugetConfigFile.targets
@@ -20,6 +20,8 @@
+
+
diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
index dc780f792..da7163646 100644
--- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
+++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
@@ -209,7 +209,7 @@ namespace EndToEnd
?.Version;
}
- public static string LatestSupportedAspNetCoreAppVersion = "2.1";
+ public static string LatestSupportedAspNetCoreAppVersion = "2.2";
public static IEnumerable SupportedAspNetCoreAppVersions
{
diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
index 161f48c70..0ca594efa 100644
--- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
+++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.0
+ netcoreapp2.2
$(SharedFrameworkRid)
From 7ce47778b4a5238db133cd0d4ffc3aa2695e406c Mon Sep 17 00:00:00 2001
From: Maira Wenzel
Date: Fri, 1 Jun 2018 14:16:41 -0700
Subject: [PATCH 14/37] fix typo (#9364)
* fix typo
* add loc files
---
src/dotnet/commands/dotnet-test/LocalizableStrings.resx | 4 ++--
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf | 2 +-
.../commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf | 2 +-
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf | 2 +-
.../commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf | 2 +-
.../commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx
index c07ad463f..adb3d2065 100644
--- a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx
+++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx
@@ -156,7 +156,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
@@ -208,4 +208,4 @@ Outputs a 'Sequence.xml' file in the current directory that captures the order o
The configuration to use for running tests. The default for most projects is 'Debug'.
-
\ No newline at end of file
+
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf
index 94511aa91..68dc7ef81 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Zadejte protokolovací nástroj pro výsledky testů.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf
index b52436c4c..c019d10f0 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Geben Sie einen Protokollierer für Testergebnisse an.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf
index 54493c468..555a035fa 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Especifique un registrador para los resultados de la prueba.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf
index 3bebaa4b4..c7845a389 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Spécifiez un journal pour les résultats de test.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf
index cbb981e1a..9ca83d689 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Consente di specificare un logger per i risultati dei test.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf
index 1ae1c7217..347ef3fa4 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
テスト結果のロガーを指定します。
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf
index a27cf8d2b..ccb88bdc6 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
테스트 결과에 대해 로거를 지정합니다.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf
index 181ef2273..8d3dc2e38 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Określ rejestrator dla wyników testów.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf
index ebc2bd361..0e6a3576f 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Especifique um agente para os resultados de teste.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf
index 42146eecd..48a7da91a 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Укажите средство ведения журнала для результатов теста.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf
index beabd90c9..83da72b24 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
Test sonuçları için bir günlükçü belirtin.
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf
index 50ed84684..de55c30ae 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
为测试结果指定一个记录器。
diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf
index 061a89582..61854f4fd 100644
--- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf
@@ -63,7 +63,7 @@
The logger to use for test results.
Examples:
- Log in trx format using a unqiue file name: --logger trx
+ Log in trx format using a unique file name: --logger trx
Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
See https://aka.ms/vstest-report for more information on logger arguments.
指定測試結果的記錄器。
From 78c7f5af5be4851cd11f77cef1efd5b164c563c6 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Fri, 1 Jun 2018 15:46:22 -0700
Subject: [PATCH 15/37] Shortening the path to the intermediate folder by
renaming it to int.
---
build/OutputDirectories.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index b5d26d549..fb3960228 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -17,7 +17,7 @@
$(SdkOutputDirectory)/Roslyn
$(SdkOutputDirectory)/FSharp
$(BaseOutputDirectory)/compilation
- $(BaseOutputDirectory)/intermediate
+ $(BaseOutputDirectory)/int
$(BaseOutputDirectory)/packages
$(IntermediateDirectory)/sharedFrameworkPublish
$(IntermediateDirectory)/aspnetSharedFxPublish
From f45acc5e10f37d7c2dbc2ca3810fd71e9ab6f7aa Mon Sep 17 00:00:00 2001
From: Steve Harter
Date: Mon, 4 Jun 2018 14:46:13 -0500
Subject: [PATCH 16/37] Update runtimeconfig.json doc for 2.1 (#9382)
---
.../specs/runtime-configuration-file.md | 337 ++++++++----------
1 file changed, 142 insertions(+), 195 deletions(-)
diff --git a/Documentation/specs/runtime-configuration-file.md b/Documentation/specs/runtime-configuration-file.md
index b021f9358..d70c100fb 100644
--- a/Documentation/specs/runtime-configuration-file.md
+++ b/Documentation/specs/runtime-configuration-file.md
@@ -2,43 +2,42 @@
The runtime configuration files store the dependencies of an application (formerly stored in the `.deps` file). They also include runtime configuration options, such as the Garbage Collector mode. Optionally they can also include data for runtime compilation (compilation settings used to compile the original application, and reference assemblies used by the application).
-**Note:** This document doesn't provide full explanations as to why individual items are needed in this file. That is covered in the [`corehost` spec](corehost.md) and via the `Microsoft.Extensions.DependencyModel` assembly.
+**Note:** This document doesn't provide full explanations as to why individual items are needed in this file. That is covered in the [host spec](corehost.md) and via the `Microsoft.Extensions.DependencyModel` assembly.
## What produces the files and where are they?
There are two runtime configuration files for a particular application. Given a project named `MyApp`, the compilation process produces the following files (on Windows, other platforms are similar):
* `MyApp.dll` - The managed assembly for `MyApp`, including an ECMA-compliant entry point token.
-* `MyApp.exe` - A copy of the `corehost.exe` executable. Only present when the application is a self-contained application.
-* `MyApp.runtimeconfig.json` - An **optional** configuration file containing runtime configuration settings. This file is required for portable applications, but not for self-contained apps.
-* `MyApp.deps.json` - A list of dependencies, as well as compilation context data and compilation dependencies. Not technically required, but required to use the servicing or package cache/shared package install features.
+* `MyApp.exe` - A copy of the `apphost.exe` executable. This is present when the application is self-contained, and in newer functionality (2.1.0+) for framework-dependent applications that wish to support platform-specific (non-portable) executables.
+* `MyApp.runtimeconfig.json` - An **optional** configuration file containing runtime configuration settings. This file is required for framework-dependent applications, but not for self-contained apps.
+* `MyApp.runtimeconfig.dev.json` - An **optional** configuration file containing runtime configuration settings that typically only exists in a non-published output and thus is used for development-time scenarios. This file typically specifies additional probing paths. Depending on the semantics of each setting, the setting is either combined with or overridden by the values from `MyApp.runtimeconfig.json`.
+* `MyApp.deps.json` - A list of dependencies, compilation dependencies and version information used to address assembly conflicts. Not technically required, but required to use the servicing or package cache/shared package install features, and to assist during roll-forward scenarios to select the newest version of any assembly that exists more than once in the application and framework(s). If the file is not present, all assemblies in the current folder are used instead.
The `MyApp.runtimeconfig.json` is designed to be user-editable (in the case of an app consumer wanting to change various CLR runtime options for an app, much like the `MyApp.exe.config` XML file works in .NET 4.x today). However, the `MyApp.deps.json` file is designed to be processed by automated tools and should not be user-edited. Having the files as separate makes this clearer. We could use a different format for the deps file, but if we're already integrating a JSON parser into the host, it seems most appropriate to re-use that here. Also, there are diagnostic benefits to being able to read the `.deps.json` file in a simple text editor.
-**IMPORTANT**: Portable Applications, i.e. those published without a specific RID, have some adjustments to this spec which is covered at the end.
+**IMPORTANT**: Framework-dependent applications have some adjustments to this spec which are covered at the end.
## File format
-The files are both JSON files stored in UTF-8 encoding. Below are sample files. Note that not all sections are required and some will be opt-in only (see below for more details). The `.runtimeconfig.json` file is completely optional, and in the `.deps.json` file, only the `runtimeTarget`, `targets` and `libraries` sections are required (and within the `targets` section, only the runtime-specific target is required).
+The files are both JSON files stored in UTF-8 encoding. Below are sample files. Note that not all sections are required and some will be opt-in only (see below for more details). The `.runtimeconfig.json` file is completely optional, and in the `.deps.json` file, only the `runtimeTarget`, `targets` and `libraries` sections are required (and within the `targets` section, only the runtime-specific target is required). If no `.deps.json` exists, all assemblies local to the app will be added as TPA (trusted platform assemblies).
### [appname].runtimeconfig.json
```json
{
"runtimeOptions": {
-
"configProperties": {
"System.GC.Server": true,
"System.GC.Concurrent": true,
"System.Threading.ThreadPool.MinThreads": 4,
"System.Threading.ThreadPool.MaxThreads": 8
},
-
"framework": {
- "name": "Microsoft.DotNetCore",
- "version": "1.0.1"
+ "name": "Microsoft.NETCore.App",
+ "version": "2.1.0"
},
-
- "applyPatches": false
+ "applyPatches": true,
+ "rollForwardOnNoCandidateFx": 1
}
}
```
@@ -46,75 +45,71 @@ The files are both JSON files stored in UTF-8 encoding. Below are sample files.
### [appname].deps.json
```json
{
- "runtimeTarget": ".NETStandardApp,Version=v1.5/osx.10.10-x64",
- "compilationOptions": {
- "defines": [ "DEBUG" ]
- },
- "targets": {
- ".NETStandardApp,Version=v1.5": {
- "MyApp/1.0": {
- "type": "project",
- "dependencies": {
- "AspNet.Mvc": "1.0.0"
- }
- },
- "System.Foo/1.0.0": {
- "type": "package",
- },
- "System.Banana/1.0.0": {
- "type": "package",
- "dependencies": {
- "System.Foo": "1.0.0"
- },
- "compile": {
- "ref/dotnet5.4/System.Banana.dll": { }
- }
- }
+ "runtimeTarget": {
+ "name": ".NETCoreApp,Version=v2.0",
+ "signature": "aafc507050a6c13a0cf2d6d4c3de136e6571da6e"
+ },
+ "compilationOptions": {
+ "defines": [
+ "TRACE",
+ "DEBUG"
+ ],
+ "languageVersion": "",
+ "platform": "",
+ "warningsAsErrors": false,
+ },
+ "targets": {
+ ".NETCoreApp,Version=v2.0": {
+ "MyApp/1.0.0": {
+ "dependencies": {
+ "System.Banana": "1.0.0"
},
- ".NETStandardApp,Version=v1.5/osx.10.10-x64": {
- "MyApp/1.0": {
- "type": "project",
- "dependencies": {
- "AspNet.Mvc": "1.0.0"
- }
- },
- "System.Foo/1.0.0": {
- "type": "package",
- "runtime": {
- "lib/dnxcore50/System.Foo.dll": { }
- }
- },
- "System.Banana/1.0.0": {
- "type": "package",
- "dependencies": {
- "System.Foo": "1.0.0"
- },
- "runtime": {
- "lib/dnxcore50/System.Banana.dll": { }
- },
- "resources": {
- "lib/dnxcore50/fr-FR/System.Banana.resources.dll": { "locale": "fr-FR" }
- },
- "native": {
- "runtimes/osx.10.10-x64/native/libbananahelper.dylib": { }
- }
- }
+ "runtime": {
+ "MyApp.dll": {}
}
- },
- "libraries": {
- "MyApp/1.0": {
- "type": "project"
+ },
+ "System.Banana/1.0.0": {
+ "dependencies": {
+ "System.Foo": "1.0.0"
},
- "System.Foo/1.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "[base64 string]"
- },
- "System.Banana/1.0": {
- "type": "package",
- "sha512": "[base64 string]"
+ "runtime": {
+ "lib/netcoreapp2.0/System.Banana.dll": {
+ "assemblyVersion": "1.0.0.0",
+ "fileVersion": "1.0.0.0"
+ }
}
+ },
+ "System.Foo/1.0.0": {
+ "runtime": {
+ "lib/netcoreapp2.0/System.Foo.dll": {
+ "assemblyVersion": "1.0.0.0",
+ "fileVersion": "1.0.0.0"
+ }
+ }
+ }
}
+ },
+ "libraries": {
+ "MyApp/1.0.0": {
+ "type": "project",
+ "serviceable": false,
+ "sha512": ""
+ },
+ "System.Banana/1.0.0": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-C63ok7q+Fi6O6I/WB4ut3hFibGSraUlE461LxhhwNk5Vcdl4ijDhX1QDupDdp3Cxr7TgwB55Sd4zNtlwT7ksAA==",
+ "path": "system.banana/1.0.0",
+ "hashPath": "system.banana.1.0.0.nupkg.sha512"
+ },
+ "System.Foo/1.0.0": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-avYGOiBQ4U/fJfzEDF7lzPLhk/w6P9/28y0iiQh3AxlWOheuZTgXA/pzuORuAu/s5B2bXHO2BlvQKZN0PfQ2HQ==",
+ "path": "system.foo/1.0.0",
+ "hashPath": "system.foo.1.0.0.nupkg.sha512"
+ }
+ }
}
```
@@ -122,71 +117,29 @@ The files are both JSON files stored in UTF-8 encoding. Below are sample files.
### `runtimeOptions` Section (`.runtimeconfig.json`)
-This section is copied verbatim from an identical section in the input `project.json` file (with the exception of the `target` parameter which is generated by the compilation process). The `runtimeConfig` section specifies parameters to be provided to the runtime during initialization. Known parameters include:
+This section is created when building a project. Settings include:
* `configProperties` - Indicates configuration properties to configure the runtime and the framework
* Examples:
* Full list of [configuration properties](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/clr-configuration-knobs.md) for CoreCLR.
* `System.GC.Server` (old: `gcServer`) - Boolean indicating if the server GC should be used (Default: `true`).
* `System.GC.Concurrent` (old: `gcConcurrent`) - Boolean indicating if background garbage collection should be used.
-* `framework` - Indicates the `name`, `version`, and other properties of the shared framework to use when activating the application. The presence of this section indicates that the application is a portable app designed to use a shared redistributable framework.
-* `applyPatches` - When `false`, the framework version is strictly obeyed by the host. When `applyPatches` is unspecified or specified as `true`, the framework from either the same or a higher version that differs only in the `SemVer` patch field will be used.
+* `framework` - Indicates the `name`, `version`, and other properties of the shared framework to use when activating the application including `applyPathes` and `rollForwardOnNoCandidateFx`. The presence of this section indicates that the application is a framework-dependent app.
+* `applyPatches` - When `false`, the framework version is strictly obeyed by the host. When `applyPatches` is unspecified or `true`, the framework from either the same or a higher version that differs only by the patch field will be used.
* For example, if `version=1.0.1` and `applyPatches` is `true`, the host would load the shared framework from `1.0.{n}`, where `n >= 1`, but will not load from `1.1.0`, even if present. When `applyPatches` is `false`, the shared framework will be loaded from `1.0.1` strictly.
- * **Note:** This does not apply to `SemVer`'s `prerelease` versions, but only for `production` releases.
- * **Note:** This section will not be used for standalone applications that do not rely upon a shared framework.
+ * **Note:** This does not apply to `pre-release` versions; it applies only to `production` releases.
+ * **Note:** This section should not exist self-contained applications because they do not rely upon a shared framework.
+* `rollForwardOnNoCandidateFx` - Determines roll-forward behavior of major and minor. Only applies to `production` releases. Values: 0(Off), 1 (roll forward on [minor]), 2 (Roll forward on [major] and [minor])
+ See [roll-forward-on-no-candidate documentation](https://github.com/dotnet/core-setup/blob/master/Documentation/design-docs/roll-forward-on-no-candidate-fx.md) for more information.
-* Others _TBD_
-
-These settings are read by `corehost` to determine how to initialize the runtime. All versions of `corehost` **must ignore** settings in this section that they do not understand (thus allowing new settings to be added in later versions).
+These settings are read by host (apphost or dotnet executable) to determine how to initialize the runtime. All versions of the host **must ignore** settings in this section that they do not understand (thus allowing new settings to be added in later versions).
### `compilationOptions` Section (`.deps.json`)
-This section is copied by storing the merged `compilationOptions` from the input `project.json`. The `project.json` can define three sets of compilation options: Global, Per-Configuration, and Per-Framework. However, the `[appname].runtimeconfig.json` is specific to a configuration and framework so there is only one merged section here.
-
-The exact settings found here are specific to the compiler that produced the original application binary. Some example settings include: `defines`, `languageVersion` (C#/VB), `allowUnsafe` (C#), etc.
-
-As an example, here is a possible `project.json` file:
-
-```json
-{
- "compilationOptions": {
- "allowUnsafe": true
- },
- "frameworks": {
- "net451": {
- "compilationOptions": {
- "defines": [ "DESKTOP_CLR" ]
- }
- },
- "dnxcore50": {
- "compilationOptions": {
- "defines": [ "CORE_CLR" ]
- }
- }
- },
- "configurations": {
- "Debug": {
- "compilationOptions": {
- "defines": [ "DEBUG_MODE" ]
- }
- }
- }
-}
-```
-
-When this project is built for `dnxcore50` in the `Debug` configuration, the outputted `MyApp.deps.json` file will have the following `compilationOptions` section:
-
-```json
-{
- "compilationOptions": {
- "allowUnsafe": true,
- "defines": [ "CORE_CLR", "DEBUG_MODE" ]
- }
-}
-```
+This section is created during build from the project's settings. The exact settings found here are specific to the compiler that produced the original application binary. Some example settings include: `defines`, `languageVersion` (e.g. the version of C# or VB), `allowUnsafe` (a C# option), etc.
### `runtimeTarget` Section (`.deps.json`)
-This property contains the name of the target from `targets` that should be used by the runtime. This is present to simplify `corehost` so that it does not have to parse or understand target names and the meaning thereof.
+This property contains the name of the target from `targets` that should be used by the runtime. This is present to simplify the host so that it does not have to parse or understand target names and the meaning thereof.
### `targets` Section (`.deps.json`)
@@ -194,14 +147,10 @@ This section contains subsetted data from the input `project.lock.json`.
Each property under `targets` describes a "target", which is a collection of libraries required by the application when run or compiled in a certain framework and platform context. A target **must** specify a Framework name, and **may** specify a Runtime Identifier. Targets without Runtime Identifiers represent the dependencies and assets used for compiling the application for a particular framework. Targets with Runtime Identifiers represent the dependencies and assets used for running the application under a particular framework and on the platform defined by the Runtime Identifier. In the example above, the `.NETStandardApp,Version=v1.5` target lists the dependencies and assets used to compile the application for `dnxcore50`, and the `.NETStandardApp,Version=v1.5/osx.10.10-x64` target lists the dependencies and assets used to run the application on `dnxcore50` on a 64-bit Mac OS X 10.10 machine.
-There will always be two targets in the `[appname].runtimeconfig.json` file: A compilation target, and a runtime target. The compilation target will be named with the framework name used for the compilation (`.NETStandardApp,Version=v1.5` in the example above). The runtime target will be named with the framework name and runtime identifier used to execute the application (`.NETStandardApp,Version=v1.5/osx.10.10-x64` in the example above). However, the runtime target will also be identified by name in the `runtimeOptions` section, so that `corehost` need not parse and understand target names.
+There will always be two targets in the `[appname].runtimeconfig.json` file: A compilation target, and a runtime target. The compilation target will be named with the framework name used for the compilation (`.NETStandardApp,Version=v1.5` in the example above). The runtime target will be named with the framework name and runtime identifier used to execute the application (`.NETStandardApp,Version=v1.5/osx.10.10-x64` in the example above). However, the runtime target will also be identified by name in the `runtimeOptions` section, so that the host does not need to parse and understand target names.
The content of each target property in the JSON is a JSON object. Each property of that JSON object represents a single dependency required by the application when compiled for/run on that target. The name of the property contains the ID and Version of the dependency in the form `[Id]/[Version]`. The content of the property is another JSON object containing metadata about the dependency.
-The `type` property of a dependency object defines what kind of entity satisfied the dependency. Possible values include `project` and `package` (further comments on dependency types below).
-
-**Open Question:** `type` is also present in the `libraries` section. We don't really need it in both. It's in both now because the lock file does that and we want the formats to be similar. Should we remove it?
-
The `dependencies` property of a dependency object defines the ID and Version of direct dependencies of this node. It is a JSON object where the property names are the ID of the dependency and the content of each property is the Version of the dependency.
The `runtime` property of a dependency object lists the relative paths to Managed Assemblies required to be available at runtime in order to satisfy this dependency. The paths are relative to the location of the Dependency (see below for further details on locating a dependency).
@@ -212,7 +161,7 @@ The `native` property of a dependency object lists the relative paths to Native
In compilation targets, the `runtime`, `resources` and `native` properties of a dependency are omitted, because they are not relevant to compilation. Similarly, in runtime targets, the `compile` property is omitted, because it is not relevant to runtime.
-Only dependencies with a `type` value of `package` should be considered by `corehost`. There may be other items, used for other purposes (for example, Projects, Reference Assemblies, etc.
+Only dependencies with a `type` value of `package` should be considered by the host. There may be other items, used for other purposes (for example, Projects, Reference Assemblies, etc.
### `libraries` Section (`.deps.json`)
@@ -222,78 +171,27 @@ This section contains a union of all the dependencies found in the various targe
The file is read by two different components:
-* `corehost` uses it to determine what to place on the TPA and Native Library Search Path lists, as well as what runtime settings to apply (GC type, etc.). See [the `corehost` spec](corehost.md).
+* The host uses it to determine what to place on the TPA and Native Library Search Path lists, as well as what runtime settings to apply (GC type, etc.). See [the host spec](corehost.md).
* `Microsoft.Extensions.DependencyModel` uses it to allow a running managed application to query various data about it's dependencies. For example:
* To find all dependencies that depend on a particular package (used by ASP.NET MVC and other plugin-based systems to identify assemblies that should be searched for possible plugin implementations)
* To determine the reference assemblies used by the application when it was compiled in order to allow runtime compilation to use the same reference assemblies (used by ASP.NET Razor to compile views)
* To determine the compilation settings used by the application in order to allow runtime compilation to use the same settings (also used by ASP.NET Razor views).
-
+
## Opt-In Compilation Data
-Some of the sections in the `.deps.json` file contain data used for runtime compilation. This data is not provided in the file by default. Instead, a project.json setting `preserveCompilationContext` must be set to true in order to ensure this data is added. Without this setting, the `compilationOptions` will not be present in the file, and the `targets` section will contain only the runtime target. For example, if the `preserveCompilationContext` setting was not present in the `project.json` that generated the above example, the `.deps.json` file would only contain the following content:
+Some of the sections in the `.deps.json` file contain data used for runtime compilation. This data is not provided in the file by default. Instead, a project.json setting `preserveCompilationContext` must be set to true in order to ensure this data is added. Without this setting, the `compilationOptions` will not be present in the file, and the `targets` section will contain only the runtime target.
-```json
-{
- "runtimeTarget": {
- "name": ".NETStandardApp,Version=v1.5/osx.10.10-x64",
- "portable": false
- },
- "targets": {
- ".NETStandardApp,Version=v1.5/osx.10.10-x64": {
- "MyApp/1.0": {
- "dependencies": {
- "AspNet.Mvc": "1.0.0"
- }
- },
- "System.Foo/1.0.0": {
- "runtime": {
- "lib/dnxcore50/System.Foo.dll": { }
- }
- },
- "System.Banana/1.0.0": {
- "dependencies": {
- "System.Foo": "1.0.0"
- },
- "runtime": {
- "lib/dnxcore50/System.Banana.dll": { }
- },
- "resources": {
- "lib/dnxcore50/fr-FR/System.Banana.resources.dll": { "locale": "fr-FR" }
- },
- "native": {
- "runtimes/osx.10.10-x64/native/libbananahelper.dylib": { }
- }
- }
- }
- },
- "libraries": {
- "MyApp/1.0": {
- "type": "project"
- },
- "System.Foo/1.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "[base64 string]"
- },
- "System.Banana/1.0": {
- "type": "package",
- "sha512": "[base64 string]"
- }
- }
-}
-```
+## Framework-dependent Deployment Model
-## Portable Deployment Model
+An application can be deployed in a "framework-dependent" deployment model. In this case, the RID-specific assets of packages are published within a folder structure that preserves the RID metadata. However the host does not use this folder structure, rather it reads data from the `.deps.json` file. Also, during deployment, the `.exe` file (`apphost.exe` renamed) is not deployed by default.
-An application can be deployed in a "portable" deployment model. In this case, the RID-specific assets of packages are published within a folder structure that preserves the RID metadata. However, `corehost` does not use this folder structure, rather it reads data from the `.deps.json` file. Also, during deployment, the `.exe` file (`corehost` renamed) is not deployed.
-
-In the portable deployment model, the `*.runtimeConfig.json` file will contain the `runtimeOptions.framework` section:
+In the framework-dependent deployment model, the `*.runtimeConfig.json` file will contain the `runtimeOptions.framework` section:
```json
{
"runtimeOptions": {
"framework": {
- "name": "NETCore.App",
+ "name": "Microsoft.NETCore.App",
"version": "1.0.1"
}
}
@@ -336,11 +234,11 @@ The shared framework's deps file will also contain a `runtimes` section defining
}
```
-The host will have a RID embedded in it during compilation (for example, `win10-x64` for Windows 64-bit). It will look up the corresponding entry in the `runtimes` section to identify what the fallback list is for `win10-x64`. The fallbacks are identified from most-specific to least-specific. In the case of `win10-x64` and the example above, the fallback list is: `"win10-x64", "win10", "win81-x64", "win81", "win8-x64", "win8", "win7-x64", "win7", "win-x64", "win", "any", "base"` (note that an exact match on the RID itself is the first preference, followed by the first item in the fallback list, then the next item, and so on).
+The host will detect the RID at runtime (for example, `win10-x64` for Windows 64-bit). It will look up the corresponding entry in the `runtimes` section to identify what the fallback list is for `win10-x64`. The fallbacks are identified from most-specific to least-specific. In the case of `win10-x64` and the example above, the fallback list is: `"win10-x64", "win10", "win81-x64", "win81", "win8-x64", "win8", "win7-x64", "win7", "win-x64", "win", "any", "base"` (note that an exact match on the RID itself is the first preference, followed by the first item in the fallback list, then the next item, and so on).
-In the app-local deps file for a `portable` application, the package entries may have an additional `runtimeTargets` section detailing RID-specific assets. The `corehost` application should use this data, along with the current RID and the RID fallback data defined in the `runtimes` section of the shared framework deps file to select one **and only one** RID value out of each package individually. The most specific RID present within the package should always be selected.
+In the app-local deps file for a `framework-dependent` application, the package entries may have an additional `runtimeTargets` section detailing RID-specific assets. The host should use this data, along with the current RID and the RID fallback data defined in the `runtimes` section of the shared framework deps file to select one **and only one** RID value out of each package individually. The most specific RID present within the package should always be selected.
-Consider `corehost` built for `ubuntu.14.04-x64` and the following snippet from an app-local deps file (some sections removed for brevity).
+Consider an application built for `ubuntu.14.04-x64` and the following snippet from an app-local deps file (some sections removed for brevity).
```json
{
@@ -389,3 +287,52 @@ When setting up the TPA and native library lists, it will do the following for t
Note one important aspect about asset resolution: The resolution scope is **per-package**, **not per-application**, **nor per-asset**. For each individual package, the most appropriate RID is selected, and **all** assets taken from that package must match the selected RID exactly. For example, if a package provides both a `linux-x64` and a `unix` RID (in the `ubuntu.14.04-x64` example above), **only** the `linux-x64` asset would be selected for that package. However, if a different package provides only a `unix` RID, then the asset from the `unix` RID would be selected.
The path to a runtime-specific asset is resolved in the same way as a normal asset (first check Servicing, then Package Cache, App-Local, Global Packages Location, etc.) with **one exception**. When searching app-local, rather than just looking for the simple file name in the app-local directory, a runtime-specific asset is expected to be located in a subdirectory matching the relative path information for that asset in the lock file. So the `native` `sni.dll` asset for `win7-x64` in the `System.Data.SqlClient` example above would be located at `APPROOT/runtimes/win7-x64/native/sni.dll`, rather than the normal app-local path of `APPROOT/sni.dll`.
+
+## Opt-In [appname].runtimeconfig.json Explicit Overrides for Framework Settings
+In order to address potential issues with compatibility, an application can override a framework's runtimeconfig.json settings. This should only be done with the understanding that any settings specified here have unintended consequences and may prevent future upgrade \ roll-forward compatibility. The settings include `version`, `rollForwardOnNoCandidateFx` and `applyPatches`.
+
+As an example, assume the following framework layering:
+- Application
+- Microsoft.AspNetCore.All
+- Microsoft.AspNetCore.App
+- Microsoft.NetCore.App
+
+Except for Microsoft.NetCore.App (since it does not have a lower-level framework), each layer has a runtimeconfig.json setting specifying a single lower-layer framework's `name`, `version` and optional `rollForwardOnNoCandidateFx` and `applyPatches`.
+
+The normal hierarchy processing for most knobs, such as `rollForwardOnNoCandidateFx`:
+ - a) Default value determined by the framework (e.g. roll-forward on [Minor])
+ - b) Environment variable override (e.g. `DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX`)
+ - c) Each layer's `runtimeOptions` override setting in its runtimeconfig.json, starting with app (e.g. `rollForwardOnNoCandidateFx`). Lower layers can override this.
+ - d) The app's `additionalFrameworks` override section in `[appname].runtimeconfig.json` which specifies knobs per-framework.
+ - e) A `--` command line value such as `--roll-forward-on-no-candidate-fx`
+
+In a hypothetical example, `Microsoft.AspNetCore.App` turns on the ability via mechanism `c` above to roll-forward `Microsoft.NetCore.App` on [major] releases by specifying `rollForwardOnNoCandidateFx = 2` in its runtimeconfig.json. For example:
+```json
+{
+ "runtimeOptions": {
+ "framework": {
+ "name": "Microsoft.NetCore.App",
+ "version": "2.2.0"
+ },
+ "rollForwardOnNoCandidateFx": "2"
+ }
+}
+```
+
+However, if that behavior is not wanted by the app, the app has the option of overriding. This cannot be done by the same mechanism `c` because the app's runtimeconfig settings would be overridden by the sample above since the sample is in a lower layer. Thus to override the setting, mechanism `d` is used. An example of the `additionalFrameworks` section for mechanism `d`:
+```json
+{
+ "runtimeOptions": {
+ "framework": {
+ "name": "Microsoft.AspNetCore.All",
+ "version": "1.0.1"
+ },
+ "additionalFrameworks": [
+ {
+ "name": "Microsoft.AspNetCore.App",
+ "rollForwardOnNoCandidateFx": "1",
+ }
+ ]
+ }
+}
+```
From 625b9d4963a1420f19c70d3eeaa93222dd85aa73 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 4 Jun 2018 13:06:02 -0700
Subject: [PATCH 17/37] Updating signing project to use new intermediate
directory (int).
---
build/Signing.proj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/Signing.proj b/build/Signing.proj
index f77406db0..0823bb62e 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -22,12 +22,12 @@
- $(BaseOutputDirectory)/intermediate/MSBuildExtensionsLayout/MSBuildSdkResolver
+ $(IntermediateDirectory)/MSBuildExtensionsLayout/MSBuildSdkResolver
$(BaseOutputDirectory)
- $(BaseOutputDirectory)/intermediate
+ $(IntermediateDirectory)
From cbaaece72c661df74e21fa7e5eb696fbb2a390bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer?=
Date: Thu, 7 Jun 2018 18:18:34 +0200
Subject: [PATCH 18/37] LOC CHECKIN | dotnet/cli master | 20180607
---
.../xlf/LocalizableStrings.cs.xlf | 4 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.es.xlf | 4 +-
.../xlf/LocalizableStrings.fr.xlf | 4 +-
.../xlf/LocalizableStrings.it.xlf | 6 +-
.../xlf/LocalizableStrings.ja.xlf | 4 +-
.../xlf/LocalizableStrings.ko.xlf | 4 +-
.../xlf/LocalizableStrings.pl.xlf | 6 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +--
.../xlf/LocalizableStrings.ru.xlf | 4 +-
.../xlf/LocalizableStrings.tr.xlf | 6 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 6 +-
.../BuildServer/xlf/LocalizableStrings.cs.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.de.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.es.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.fr.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.it.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.ja.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.ko.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.pl.xlf | 2 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.ru.xlf | 2 +-
.../BuildServer/xlf/LocalizableStrings.tr.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.cs.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.de.xlf | 10 +--
.../CommandLine/xlf/LocalizableStrings.es.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.fr.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.it.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.ja.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.ko.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.pl.xlf | 2 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.ru.xlf | 2 +-
.../CommandLine/xlf/LocalizableStrings.tr.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 2 +-
.../xlf/LocalizableStrings.cs.xlf | 14 ++---
.../xlf/LocalizableStrings.de.xlf | 14 ++---
.../xlf/LocalizableStrings.es.xlf | 16 ++---
.../xlf/LocalizableStrings.fr.xlf | 14 ++---
.../xlf/LocalizableStrings.it.xlf | 14 ++---
.../xlf/LocalizableStrings.ja.xlf | 14 ++---
.../xlf/LocalizableStrings.ko.xlf | 14 ++---
.../xlf/LocalizableStrings.pl.xlf | 14 ++---
.../xlf/LocalizableStrings.pt-BR.xlf | 14 ++---
.../xlf/LocalizableStrings.ru.xlf | 14 ++---
.../xlf/LocalizableStrings.tr.xlf | 14 ++---
.../xlf/LocalizableStrings.zh-Hans.xlf | 14 ++---
.../xlf/LocalizableStrings.zh-Hant.xlf | 14 ++---
.../xlf/LocalizableStrings.cs.xlf | 8 +--
.../xlf/LocalizableStrings.de.xlf | 8 +--
.../xlf/LocalizableStrings.es.xlf | 8 +--
.../xlf/LocalizableStrings.fr.xlf | 8 +--
.../xlf/LocalizableStrings.it.xlf | 8 +--
.../xlf/LocalizableStrings.ja.xlf | 8 +--
.../xlf/LocalizableStrings.ko.xlf | 8 +--
.../xlf/LocalizableStrings.pl.xlf | 8 +--
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +--
.../xlf/LocalizableStrings.ru.xlf | 8 +--
.../xlf/LocalizableStrings.tr.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hans.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hant.xlf | 8 +--
.../xlf/LocalizableStrings.cs.xlf | 12 ++--
.../xlf/LocalizableStrings.de.xlf | 12 ++--
.../xlf/LocalizableStrings.es.xlf | 14 ++---
.../xlf/LocalizableStrings.fr.xlf | 12 ++--
.../xlf/LocalizableStrings.it.xlf | 12 ++--
.../xlf/LocalizableStrings.ja.xlf | 12 ++--
.../xlf/LocalizableStrings.ko.xlf | 12 ++--
.../xlf/LocalizableStrings.pl.xlf | 12 ++--
.../xlf/LocalizableStrings.pt-BR.xlf | 12 ++--
.../xlf/LocalizableStrings.ru.xlf | 12 ++--
.../xlf/LocalizableStrings.tr.xlf | 12 ++--
.../xlf/LocalizableStrings.zh-Hans.xlf | 12 ++--
.../xlf/LocalizableStrings.zh-Hant.xlf | 12 ++--
.../shutdown/xlf/LocalizableStrings.cs.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.de.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.es.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.fr.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.it.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.ja.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.ko.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.pl.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.pt-BR.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.ru.xlf | 6 +-
.../shutdown/xlf/LocalizableStrings.tr.xlf | 6 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 6 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 6 +-
.../xlf/LocalizableStrings.cs.xlf | 8 +--
.../xlf/LocalizableStrings.de.xlf | 8 +--
.../xlf/LocalizableStrings.es.xlf | 8 +--
.../xlf/LocalizableStrings.fr.xlf | 8 +--
.../xlf/LocalizableStrings.it.xlf | 8 +--
.../xlf/LocalizableStrings.ja.xlf | 8 +--
.../xlf/LocalizableStrings.ko.xlf | 8 +--
.../xlf/LocalizableStrings.pl.xlf | 8 +--
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +--
.../xlf/LocalizableStrings.ru.xlf | 8 +--
.../xlf/LocalizableStrings.tr.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hans.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hant.xlf | 8 +--
.../dotnet-help/xlf/LocalizableStrings.cs.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.de.xlf | 61 +++++++++----------
.../dotnet-help/xlf/LocalizableStrings.es.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.fr.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.it.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.ja.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.ko.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.pl.xlf | 60 +++++++++---------
.../xlf/LocalizableStrings.pt-BR.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.ru.xlf | 60 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.tr.xlf | 60 +++++++++---------
.../xlf/LocalizableStrings.zh-Hans.xlf | 60 +++++++++---------
.../xlf/LocalizableStrings.zh-Hant.xlf | 60 +++++++++---------
.../xlf/LocalizableStrings.cs.xlf | 2 +-
.../xlf/LocalizableStrings.de.xlf | 6 +-
.../xlf/LocalizableStrings.es.xlf | 2 +-
.../xlf/LocalizableStrings.fr.xlf | 2 +-
.../xlf/LocalizableStrings.it.xlf | 2 +-
.../xlf/LocalizableStrings.ja.xlf | 2 +-
.../xlf/LocalizableStrings.ko.xlf | 2 +-
.../xlf/LocalizableStrings.pl.xlf | 2 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 2 +-
.../xlf/LocalizableStrings.ru.xlf | 2 +-
.../xlf/LocalizableStrings.tr.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.cs.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.de.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.es.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.fr.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.it.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.ja.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.ko.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.pl.xlf | 2 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.ru.xlf | 2 +-
.../dotnet-list/xlf/LocalizableStrings.tr.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 2 +-
.../xlf/LocalizableStrings.cs.xlf | 8 ++-
.../xlf/LocalizableStrings.de.xlf | 8 ++-
.../xlf/LocalizableStrings.es.xlf | 10 +--
.../xlf/LocalizableStrings.fr.xlf | 8 ++-
.../xlf/LocalizableStrings.it.xlf | 8 ++-
.../xlf/LocalizableStrings.ja.xlf | 8 ++-
.../xlf/LocalizableStrings.ko.xlf | 8 ++-
.../xlf/LocalizableStrings.pl.xlf | 8 ++-
.../xlf/LocalizableStrings.pt-BR.xlf | 8 ++-
.../xlf/LocalizableStrings.ru.xlf | 8 ++-
.../xlf/LocalizableStrings.tr.xlf | 8 ++-
.../xlf/LocalizableStrings.zh-Hans.xlf | 8 ++-
.../xlf/LocalizableStrings.zh-Hant.xlf | 8 ++-
.../dotnet-pack/xlf/LocalizableStrings.cs.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.de.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.es.xlf | 10 +--
.../dotnet-pack/xlf/LocalizableStrings.fr.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.it.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.ja.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.ko.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.pl.xlf | 8 +--
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.ru.xlf | 8 +--
.../dotnet-pack/xlf/LocalizableStrings.tr.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hans.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hant.xlf | 8 +--
.../xlf/LocalizableStrings.cs.xlf | 15 ++---
.../xlf/LocalizableStrings.de.xlf | 15 ++---
.../xlf/LocalizableStrings.es.xlf | 15 ++---
.../xlf/LocalizableStrings.fr.xlf | 15 ++---
.../xlf/LocalizableStrings.it.xlf | 15 ++---
.../xlf/LocalizableStrings.ja.xlf | 15 ++---
.../xlf/LocalizableStrings.ko.xlf | 15 ++---
.../xlf/LocalizableStrings.pl.xlf | 15 ++---
.../xlf/LocalizableStrings.pt-BR.xlf | 15 ++---
.../xlf/LocalizableStrings.ru.xlf | 15 ++---
.../xlf/LocalizableStrings.tr.xlf | 15 ++---
.../xlf/LocalizableStrings.zh-Hans.xlf | 15 ++---
.../xlf/LocalizableStrings.zh-Hant.xlf | 17 +++---
.../xlf/LocalizableStrings.cs.xlf | 4 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.es.xlf | 4 +-
.../xlf/LocalizableStrings.fr.xlf | 8 +--
.../xlf/LocalizableStrings.it.xlf | 4 +-
.../xlf/LocalizableStrings.ja.xlf | 4 +-
.../xlf/LocalizableStrings.ko.xlf | 4 +-
.../xlf/LocalizableStrings.pl.xlf | 4 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 4 +-
.../xlf/LocalizableStrings.ru.xlf | 4 +-
.../xlf/LocalizableStrings.tr.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 4 +-
.../xlf/LocalizableStrings.cs.xlf | 8 +--
.../xlf/LocalizableStrings.de.xlf | 8 +--
.../xlf/LocalizableStrings.es.xlf | 8 +--
.../xlf/LocalizableStrings.fr.xlf | 10 +--
.../xlf/LocalizableStrings.it.xlf | 8 +--
.../xlf/LocalizableStrings.ja.xlf | 8 +--
.../xlf/LocalizableStrings.ko.xlf | 8 +--
.../xlf/LocalizableStrings.pl.xlf | 8 +--
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +--
.../xlf/LocalizableStrings.ru.xlf | 8 +--
.../xlf/LocalizableStrings.tr.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hans.xlf | 8 +--
.../xlf/LocalizableStrings.zh-Hant.xlf | 8 +--
.../xlf/LocalizableStrings.cs.xlf | 15 ++---
.../xlf/LocalizableStrings.de.xlf | 17 +++---
.../xlf/LocalizableStrings.es.xlf | 15 ++---
.../xlf/LocalizableStrings.fr.xlf | 15 ++---
.../xlf/LocalizableStrings.it.xlf | 15 ++---
.../xlf/LocalizableStrings.ja.xlf | 15 ++---
.../xlf/LocalizableStrings.ko.xlf | 15 ++---
.../xlf/LocalizableStrings.pl.xlf | 15 ++---
.../xlf/LocalizableStrings.pt-BR.xlf | 15 ++---
.../xlf/LocalizableStrings.ru.xlf | 15 ++---
.../xlf/LocalizableStrings.tr.xlf | 15 ++---
.../xlf/LocalizableStrings.zh-Hans.xlf | 15 ++---
.../xlf/LocalizableStrings.zh-Hant.xlf | 15 ++---
.../dotnet-run/xlf/LocalizableStrings.cs.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.de.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.es.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.fr.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.it.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.ja.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.ko.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.pl.xlf | 4 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.ru.xlf | 4 +-
.../dotnet-run/xlf/LocalizableStrings.tr.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.cs.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.de.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.es.xlf | 24 ++++----
.../dotnet-sln/xlf/LocalizableStrings.fr.xlf | 26 ++++----
.../dotnet-sln/xlf/LocalizableStrings.it.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.ja.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.ko.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.pl.xlf | 20 +++---
.../xlf/LocalizableStrings.pt-BR.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.ru.xlf | 20 +++---
.../dotnet-sln/xlf/LocalizableStrings.tr.xlf | 20 +++---
.../xlf/LocalizableStrings.zh-Hans.xlf | 20 +++---
.../xlf/LocalizableStrings.zh-Hant.xlf | 20 +++---
.../xlf/LocalizableStrings.cs.xlf | 16 ++---
.../xlf/LocalizableStrings.de.xlf | 16 ++---
.../xlf/LocalizableStrings.es.xlf | 16 ++---
.../xlf/LocalizableStrings.fr.xlf | 18 +++---
.../xlf/LocalizableStrings.it.xlf | 16 ++---
.../xlf/LocalizableStrings.ja.xlf | 16 ++---
.../xlf/LocalizableStrings.ko.xlf | 16 ++---
.../xlf/LocalizableStrings.pl.xlf | 16 ++---
.../xlf/LocalizableStrings.pt-BR.xlf | 16 ++---
.../xlf/LocalizableStrings.ru.xlf | 16 ++---
.../xlf/LocalizableStrings.tr.xlf | 16 ++---
.../xlf/LocalizableStrings.zh-Hans.xlf | 16 ++---
.../xlf/LocalizableStrings.zh-Hant.xlf | 16 ++---
.../dotnet-test/xlf/LocalizableStrings.cs.xlf | 51 ++++++++--------
.../dotnet-test/xlf/LocalizableStrings.de.xlf | 61 +++++++++----------
.../dotnet-test/xlf/LocalizableStrings.es.xlf | 51 ++++++++--------
.../dotnet-test/xlf/LocalizableStrings.fr.xlf | 51 ++++++++--------
.../dotnet-test/xlf/LocalizableStrings.it.xlf | 51 ++++++++--------
.../dotnet-test/xlf/LocalizableStrings.ja.xlf | 55 ++++++++---------
.../dotnet-test/xlf/LocalizableStrings.ko.xlf | 57 +++++++++--------
.../dotnet-test/xlf/LocalizableStrings.pl.xlf | 51 ++++++++--------
.../xlf/LocalizableStrings.pt-BR.xlf | 59 +++++++++---------
.../dotnet-test/xlf/LocalizableStrings.ru.xlf | 55 ++++++++---------
.../dotnet-test/xlf/LocalizableStrings.tr.xlf | 57 +++++++++--------
.../xlf/LocalizableStrings.zh-Hans.xlf | 53 ++++++++--------
.../xlf/LocalizableStrings.zh-Hant.xlf | 59 +++++++++---------
.../install/xlf/LocalizableStrings.cs.xlf | 22 +++----
.../install/xlf/LocalizableStrings.de.xlf | 22 +++----
.../install/xlf/LocalizableStrings.es.xlf | 28 ++++-----
.../install/xlf/LocalizableStrings.fr.xlf | 22 +++----
.../install/xlf/LocalizableStrings.it.xlf | 24 ++++----
.../install/xlf/LocalizableStrings.ja.xlf | 22 +++----
.../install/xlf/LocalizableStrings.ko.xlf | 22 +++----
.../install/xlf/LocalizableStrings.pl.xlf | 22 +++----
.../install/xlf/LocalizableStrings.pt-BR.xlf | 22 +++----
.../install/xlf/LocalizableStrings.ru.xlf | 22 +++----
.../install/xlf/LocalizableStrings.tr.xlf | 22 +++----
.../xlf/LocalizableStrings.zh-Hans.xlf | 22 +++----
.../xlf/LocalizableStrings.zh-Hant.xlf | 22 +++----
.../list/xlf/LocalizableStrings.cs.xlf | 8 +--
.../list/xlf/LocalizableStrings.de.xlf | 8 +--
.../list/xlf/LocalizableStrings.es.xlf | 8 +--
.../list/xlf/LocalizableStrings.fr.xlf | 8 +--
.../list/xlf/LocalizableStrings.it.xlf | 8 +--
.../list/xlf/LocalizableStrings.ja.xlf | 8 +--
.../list/xlf/LocalizableStrings.ko.xlf | 8 +--
.../list/xlf/LocalizableStrings.pl.xlf | 8 +--
.../list/xlf/LocalizableStrings.pt-BR.xlf | 8 +--
.../list/xlf/LocalizableStrings.ru.xlf | 8 +--
.../list/xlf/LocalizableStrings.tr.xlf | 8 +--
.../list/xlf/LocalizableStrings.zh-Hans.xlf | 8 +--
.../list/xlf/LocalizableStrings.zh-Hant.xlf | 8 +--
.../uninstall/xlf/LocalizableStrings.cs.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.de.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.es.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.fr.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.it.xlf | 12 ++--
.../uninstall/xlf/LocalizableStrings.ja.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.ko.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.pl.xlf | 10 +--
.../xlf/LocalizableStrings.pt-BR.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.ru.xlf | 10 +--
.../uninstall/xlf/LocalizableStrings.tr.xlf | 10 +--
.../xlf/LocalizableStrings.zh-Hans.xlf | 10 +--
.../xlf/LocalizableStrings.zh-Hant.xlf | 10 +--
.../update/xlf/LocalizableStrings.cs.xlf | 18 +++---
.../update/xlf/LocalizableStrings.de.xlf | 18 +++---
.../update/xlf/LocalizableStrings.es.xlf | 18 +++---
.../update/xlf/LocalizableStrings.fr.xlf | 18 +++---
.../update/xlf/LocalizableStrings.it.xlf | 20 +++---
.../update/xlf/LocalizableStrings.ja.xlf | 18 +++---
.../update/xlf/LocalizableStrings.ko.xlf | 18 +++---
.../update/xlf/LocalizableStrings.pl.xlf | 18 +++---
.../update/xlf/LocalizableStrings.pt-BR.xlf | 18 +++---
.../update/xlf/LocalizableStrings.ru.xlf | 18 +++---
.../update/xlf/LocalizableStrings.tr.xlf | 18 +++---
.../update/xlf/LocalizableStrings.zh-Hans.xlf | 18 +++---
.../update/xlf/LocalizableStrings.zh-Hant.xlf | 18 +++---
.../xlf/CommonLocalizableStrings.cs.xlf | 24 ++++----
.../xlf/CommonLocalizableStrings.de.xlf | 38 ++++++------
.../xlf/CommonLocalizableStrings.es.xlf | 38 ++++++------
.../xlf/CommonLocalizableStrings.fr.xlf | 30 ++++-----
.../xlf/CommonLocalizableStrings.it.xlf | 44 ++++++-------
.../xlf/CommonLocalizableStrings.ja.xlf | 30 ++++-----
.../xlf/CommonLocalizableStrings.ko.xlf | 36 +++++------
.../xlf/CommonLocalizableStrings.pl.xlf | 32 +++++-----
.../xlf/CommonLocalizableStrings.pt-BR.xlf | 22 +++----
.../xlf/CommonLocalizableStrings.ru.xlf | 24 ++++----
.../xlf/CommonLocalizableStrings.tr.xlf | 26 ++++----
.../xlf/CommonLocalizableStrings.zh-Hans.xlf | 24 ++++----
.../xlf/CommonLocalizableStrings.zh-Hant.xlf | 28 ++++-----
src/dotnet/xlf/LocalizableStrings.cs.xlf | 2 +-
src/dotnet/xlf/LocalizableStrings.de.xlf | 12 ++--
src/dotnet/xlf/LocalizableStrings.es.xlf | 6 +-
src/dotnet/xlf/LocalizableStrings.it.xlf | 10 +--
src/dotnet/xlf/LocalizableStrings.ja.xlf | 6 +-
src/dotnet/xlf/LocalizableStrings.ko.xlf | 4 +-
src/dotnet/xlf/LocalizableStrings.pt-BR.xlf | 13 ++--
src/dotnet/xlf/LocalizableStrings.ru.xlf | 2 +-
src/dotnet/xlf/LocalizableStrings.zh-Hans.xlf | 2 +-
src/dotnet/xlf/LocalizableStrings.zh-Hant.xlf | 4 +-
348 files changed, 2433 insertions(+), 2392 deletions(-)
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
index fef05f8fa..0727cc1d8 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
@@ -64,10 +64,10 @@ Tuto chybu můžete opravit pomocí některé z těchto možností:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ 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 tool install dotnet-dev-certs -g --version 2.1.0-preview1-final a potom dotnet-dev-certs https --trust.
+Pokud chcete certifikátu důvěřovat, spusťte dotnet dev-certs https --trust (platí jenom pro Windows a macOS). Informace o vytvoření vztahu důvěryhodnosti na jiných platformách najdete v dokumentaci k příslušné platformě.
Další informace o konfiguraci protokolu HTTPS najdete na webu https://go.microsoft.com/fwlink/?linkid=848054.
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
index 66f168ce1..bbf098d7a 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
@@ -64,10 +64,10 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ 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 tool install dotnet-dev-certs -g --version 2.1.0-preview1-final" und anschließend "dotnet-dev-certs https --trust" ausführen.
+Um dem Zertifikat zu vertrauen, führen Sie "dotnet dev-certs https --trust" aus (nur Windows und macOS). Informationen zum Einrichten einer Vertrauensstellung auf anderen Plattformen finden Sie in der Dokumentation zur jeweiligen Plattform.
Weitere Informationen zur Konfiguration von HTTPS finden Sie unter https://go.microsoft.com/fwlink/?linkid=848054.
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
index 92ba74e98..c3dccb892 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
@@ -63,10 +63,10 @@ Estas son algunas opciones para corregir este error:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ 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 tool install dotnet-dev-certs -g --version 2.1.0-preview1-final" y, después, ejecute "dotnet-dev-certs https --trust".
+Para confiar en el certificado, ejecute "dotnet dev-certs https --trust (solo Windows y macOS). Para establecer la confianza en otras plataformas, consulte la documentación específica de la plataforma.
Para obtener más información sobre la configuración HTTPS, vea https://go.microsoft.com/fwlink/?linkid=848054.
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
index 87b7b520b..3dba1c561 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
@@ -64,10 +64,10 @@ Voici quelques options pour corriger cette erreur :
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ ASP.NET Core
------------
Installation réussie du certificat de développement HTTPS ASP.NET Core.
-Pour approuver le certificat (Windows et macOS uniquement), installez d'abord l'outil dev-certs en exécutant 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final', puis exécutez 'dotnet-dev-certs https --trust'.
+Pour approuver le certificat, exécutez 'dotnet dev-certs https --trust' (Windows et macOS uniquement). Pour établir une relation d'approbation sur d'autres plateformes, consultez la documentation spécifique à la plateforme.
Pour plus d'informations sur la configuration du protocole HTTPS, consultez https://go.microsoft.com/fwlink/?linkid=848054.
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
index 4c7b616b3..9c76e2fb4 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
@@ -64,10 +64,10 @@ Ecco alcune opzioni per correggere questo errore:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
-------------
+ 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 tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' e quindi eseguire 'dotnet-dev-certs https --trust'.
+Per considerare attendibile il certificato, eseguire 'dotnet dev-certs https --trust' (solo per Windows e macOS). Per l'attendibilità su altre piattaforme, fare riferimento alla documentazione specifica della piattaforma.
Per altre informazioni sulla configurazione di HTTPS, vedere https://go.microsoft.com/fwlink/?linkid=848054.
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
index 6db3102f3..679a79f7b 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
@@ -64,10 +64,10 @@ Here are some options to fix this error:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ ASP.NET Core
------------
ASP.NET Core HTTPS 開発証明書が正常にインストールされました。
-証明書を信頼する (Windows および macOS のみ) には、まず 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' を実行して dev-certs ツールをインストールし、次に 'dotnet-dev-certs https --trust' を実行します。
+証明書を信頼するには、'dotnet dev-certs https --trust' (Windows および macOS のみ) を実行します。その他のプラットフォームで信頼を確立するには、プラットフォーム固有のドキュメントをご覧ください。
HTTPS を構成する方法の詳細については、https://go.microsoft.com/fwlink/?linkid=848054 をご覧ください。
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
index 437834ee8..acbdb92f7 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
@@ -64,10 +64,10 @@ Here are some options to fix this error:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ ASP.NET Core
------------
ASP.NET Core HTTPS 개발 인증서를 설치했습니다.
-인증서를 신뢰하려면(Windows 및 macOS만 해당) 먼저 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final'을 실행하여 dev-certs 도구를 설치한 다음, 'dotnet-dev-certs https --trust'를 실행하세요.
+인증서를 신뢰하려면 'dotnet dev-certs https --trust'(Windows 및 macOS만)를 실행합니다. 다른 플랫폼에서 신뢰를 설정하는 방법에 대해서는 플랫폼별 설명서를 참조하세요.
HTTPS 구성에 대한 자세한 내용은 https://go.microsoft.com/fwlink/?linkid=848054를 참조하세요.
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
index 1a36eef5f..8305861bd 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
@@ -64,11 +64,11 @@ Oto kilka opcji naprawiania tego błędu:
Successfully installed the ASP.NET Core HTTPS Development Certificate.
To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
- ASP.NET Core
+ 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 tool install dotnet-dev-certs -g --version 2.1.0-preview1-final”, a następnie uruchom polecenie „dotnet-dev-certs https --trust”.
-Aby uzyskać więcej informacji dotyczących konfigurowania protokołu HTTPS, zobacz https://go.microsoft.com/fwlink/?linkid=848054.
+Aby ufać temu certyfikatowi, uruchom polecenie „dotnet dev-certs https --trust” (dotyczy tylko systemów Windows i macOS). Aby nawiązać relację zaufania na innych platformach, zapoznaj się z dokumentacją specyficzną dla danej platformy.
+Aby uzyskać więcej informacji na temat konfigurowania protokołu HTTPS, zobacz https://go.microsoft.com/fwlink/?linkid=848054.
.NET modify solution file command
- Comando de .NET para modificar el archivo de la solución
+ Comando de .NET para modificar el archivo de solución
Command to add, remove, and list projects from the solution (SLN) file.
- Comando para agregar, quitar y enumerar proyectos desde el archivo de la solución (SLN).
+ Comando para agregar, quitar y enumerar proyectos desde el archivo de solución (SLN).
@@ -19,12 +19,12 @@
Add one or more projects to a solution file.
- Comando de .NET para agregar proyectos a un archivo de la solución
+ Agrega uno o varios proyectos a un archivo de solución.
Remove one or more projects from a solution file.
- Comando de .NET para quitar proyectos de un archivo de la solución
+ Quita uno o varios proyectos de un archivo de solución.
@@ -34,7 +34,7 @@
List all projects in a solution file.
- Comando de .NET para enumerar proyectos en un archivo de la solución
+ Enumera todos los proyectos de la solución.
@@ -44,37 +44,37 @@
SLN_FILE
- SLN_FILE
+ SLN_FILE
The solution file to operate on. If not specified, the command will search the current directory for one.
- The solution file to operate on. If not specified, the command will search the current directory for one.
+ El archivo de solución sobre el que se va a operar. Si no se especifica, el comando buscará uno en el directorio actual.
PROJECT_PATH
- PROJECT_PATH
+ PROJECT_PATH
The paths to the projects to add to the solution.
- The paths to the projects to add to the solution.
+ Las rutas a los proyectos para agregar la solución.
PROJECT_PATH
- PROJECT_PATH
+ PROJECT_PATH
The paths to the projects to from from the solution.
- The paths to the projects to from from the solution.
+ Las rutas a los proyectos desde la solución.
List tools installed in the current development environment.
- Vypíše nástroje nainstalované v aktuálním vývojovém prostředí.
+ Vypíše nástroje nainstalované v aktuálním vývojovém prostředí.
List tools in the current user's tools directory.
- Vypsat nástroje všech uživatelů
+ Vypíše nástroje v adresáři nástrojů aktuálního uživatele.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ Adresář obsahující nástroje, které se mají vypsat
List tools installed in the current development environment.
- Hiermit werden die in der aktuellen Entwicklungsumgebung installierten Tools aufgelistet.
+ Hiermit werden die in der aktuellen Entwicklungsumgebung installierten Tools aufgelistet.
List tools in the current user's tools directory.
- Hiermit werden benutzerweite Tools aufgelistet.
+ Hiermit werden Tools im Toolverzeichnis des aktuellen Benutzers aufgelistet.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ Das Verzeichnis, das die aufzulistenden Tools enthält.
List tools installed in the current development environment.
- Enumera las herramientas instaladas en el entorno de desarrollo actual.
+ Enumera las herramientas instaladas en el entorno de desarrollo actual.
List tools in the current user's tools directory.
- Enumera las herramientas para todos los usuarios.
+ Enumera las herramientas del directorio de herramientas del usuario actual.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ El directorio que contiene las herramientas que se van a enumerar.
List tools installed in the current development environment.
- Liste les outils installés dans l'environnement de développement actuel.
+ Listez les outils installés dans l'environnement de développement actuel.
List tools in the current user's tools directory.
- Listez les outils pour tous les utilisateurs.
+ Listez les outils du répertoire des outils de l'utilisateur actuel.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ Répertoire contenant les outils à lister.
List tools installed in the current development environment.
- Elenca gli strumenti installati nell'ambiente di sviluppo corrente.
+ Elenca gli strumenti installati nell'ambiente di sviluppo corrente.
List tools in the current user's tools directory.
- Elenca gli strumenti a livello di utente.
+ Elenca gli strumenti presenti nella directory degli strumenti dell'utente corrente.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PERCORSO
The directory containing the tools to list.
- The directory containing the tools to list.
+ Directory contenente gli strumenti da elencare.
List tools installed in the current development environment.
- 現在の開発環境にインストールされているツールを一覧表示します。
+ 現在の開発環境にインストールされているツールを一覧表示します。
List tools in the current user's tools directory.
- ユーザー全体のツールを一覧表示します。
+ 現在のユーザーのツール ディレクトリにあるツールを一覧表示します。
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ 一覧表示するツールが入っているディレクトリ。
List tools installed in the current development environment.
- 현재 개발 환경에 설치된 도구를 나열합니다.
+ 현재 개발 환경에 설치된 도구를 나열합니다.
List tools in the current user's tools directory.
- 사용자 전체 도구를 나열합니다.
+ 현재 사용자의 도구 디렉터리에 있는 도구를 나열합니다.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ 나열할 도구를 포함하는 디렉터리입니다.
List tools installed in the current development environment.
- Wyświetla listę narzędzi zainstalowanych w bieżącym środowisku deweloperskim.
+ Wyświetl listę narzędzi zainstalowanych w bieżącym środowisku deweloperskim.
List tools in the current user's tools directory.
- Wyświetl listę narzędzi użytkownika.
+ Wyświetl listę narzędzi z katalogu narzędzi bieżącego użytkownika.
@@ -49,12 +49,12 @@
PATH
- PATH
+ ŚCIEŻKA
The directory containing the tools to list.
- The directory containing the tools to list.
+ Katalog zawierający narzędzia do wyświetlenia na liście.
List tools installed in the current development environment.
- Lista as ferramentas instaladas no ambiente de desenvolvimento atual.
+ Liste as ferramentas instaladas no ambiente de desenvolvimento atual.
List tools in the current user's tools directory.
- Listar as ferramentas para todo o usuário.
+ Liste as ferramentas no diretório de ferramentas do usuário atual.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ O diretório que contém as ferramentas a serem listadas.
List tools installed in the current development environment.
- Перечисляет установленные инструменты в текущей среде разработки.
+ Вывод списка инструментов, установленных в текущей среде разработки.
List tools in the current user's tools directory.
- Перечисление пользовательских инструментов.
+ Вывод списка инструментов в каталоге инструментов текущего пользователя.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ Каталог, содержащий перечисляемые инструменты.
List tools installed in the current development environment.
- Geçerli geliştirme ortamında yüklü araçları listeler.
+ Geçerli geliştirme ortamında yüklü araçları listeler.
List tools in the current user's tools directory.
- Kullanıcıya yönelik araçları listeleyin.
+ Geçerli kullanıcının araçlar dizinindeki araçları listeler.
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ Listelenecek aracı içeren dizin.
List tools installed in the current development environment.
- 列出当前开发环境中的已安装工具。
+ 列出当前开发环境中的已安装工具。
List tools in the current user's tools directory.
- 列出用户范围工具。
+ 列出当前用户工具目录中的工具。
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ 包含要列出的工具的目录。
List tools installed in the current development environment.
- 列出目前開發環境中安裝的工具。
+ 列出目前開發環境中所安裝的工具。
List tools in the current user's tools directory.
- 列出全體使用者工具。
+ 列出目前使用者工具目錄中的工具。
@@ -49,12 +49,12 @@
PATH
- PATH
+ PATH
The directory containing the tools to list.
- The directory containing the tools to list.
+ 包含要列出之工具的目錄。
The NuGet Package Id of the tool to uninstall.
- ID balíčku NuGet nástroje, který se má odinstalovat
+ ID balíčku NuGet nástroje, který se má odinstalovat
Uninstall a tool from the current development environment.
- Odinstaluje nástroj.
+ Odinstaluje nástroj z aktuálního vývojového prostředí.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Odinstalovat pro všechny uživatele
+ Odinstaluje nástroj z adresáře nástrojů aktuálního uživatele.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Adresář obsahující nástroj, který se má odinstalovat
The NuGet Package Id of the tool to uninstall.
- NuGet-Paket-ID des Tools, das deinstalliert werden soll.
+ Die NuGet-Paket-ID des Tools, das deinstalliert werden soll.
Uninstall a tool from the current development environment.
- Hiermit wird ein Tool deinstalliert.
+ Hiermit wird ein Tool in der aktuellen Entwicklungsumgebung deinstalliert.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Benutzerweite Deinstallation.
+ Hiermit wird das Tool im Toolverzeichnis des aktuellen Benutzers deinstalliert.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Das Verzeichnis, das das zu deinstallierende Tool enthält.
The NuGet Package Id of the tool to uninstall.
- Id. del paquete de NuGet de la herramienta que se desinstalará.
+ El id. del paquete de NuGet de la herramienta que se desinstalará.
Uninstall a tool from the current development environment.
- Desinstala una herramienta.
+ Desinstala una herramienta del entorno de desarrollo actual.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Desinstale para todos los usuarios.
+ Desinstala la herramienta del directorio de herramientas del usuario actual.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ El directorio que contiene la herramienta que se va a instalar.
The NuGet Package Id of the tool to uninstall.
- ID de package NuGet de l'outil à désinstaller.
+ ID de package NuGet de l'outil à désinstaller.
Uninstall a tool from the current development environment.
- Désinstalle un outil.
+ Désinstallez un outil de l'environnement de développement actuel.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Effectuez la désinstallation pour tous les utilisateurs.
+ Désinstallez l'outil du répertoire des outils de l'utilisateur actuel.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Répertoire contenant l'outil à désinstaller.
The NuGet Package Id of the tool to uninstall.
- ID pacchetto NuGet dello strumento da disinstallare.
+ ID pacchetto NuGet dello strumento da disinstallare.
Uninstall a tool from the current development environment.
- Disinstalla uno strumento.
+ Disinstalla uno strumento dall'ambiente di sviluppo corrente.
PACKAGE_ID
- PACKAGE_ID
+ ID_PACCHETTO
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Esegue la disinstallazione a livello di utente.
+ Disinstalla lo strumento dalla directory degli strumenti dell'utente corrente.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PERCORSO
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Directory contenente lo strumento da disinstallare.
The NuGet Package Id of the tool to uninstall.
- アンインストールするツールの NuGet パッケージ ID。
+ アンインストールするツールの NuGet パッケージ ID。
Uninstall a tool from the current development environment.
- ツールをアンインストールします。
+ 現在の開発環境からツールをアンインストールします。
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- ユーザー全体でアンインストールします。
+ 現在のユーザーのツール ディレクトリからツールをアンインストールします。
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ アンインストールするツールが入っているディレクトリ。
The NuGet Package Id of the tool to uninstall.
- 제거할 도구의 NuGet 패키지 ID입니다.
+ 제거할 도구의 NuGet 패키지 ID입니다.
Uninstall a tool from the current development environment.
- 도구를 제거합니다.
+ 현재 개발 환경에서 도구를 제거합니다.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- 사용자 전체 도구를 제거합니다.
+ 현재 사용자의 도구 디렉터리에서 도구를 제거합니다.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ 제거할 도구를 포함하는 디렉터리입니다.
The NuGet Package Id of the tool to uninstall.
- Identyfikator pakietu NuGet narzędzia do odinstalowania.
+ Identyfikator pakietu NuGet narzędzia do odinstalowania.
Uninstall a tool from the current development environment.
- Odinstalowuje narzędzie.
+ Odinstaluj narzędzie z bieżącego środowiska deweloperskiego.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Odinstaluj dla użytkownika.
+ Odinstaluj narzędzie z katalogu narzędzi bieżącego użytkownika.
@@ -64,12 +64,12 @@
PATH
- PATH
+ ŚCIEŻKA
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Katalog zawierający narzędzie do odinstalowania.
The NuGet Package Id of the tool to uninstall.
- A ID do pacote NuGet da ferramenta a ser desinstalada.
+ A ID do pacote do NuGet da ferramenta a ser desinstalada.
Uninstall a tool from the current development environment.
- Desinstala uma ferramenta.
+ Desinstalar uma ferramenta do ambiente de desenvolvimento atual.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Desinstale para todo o usuário.
+ Desinstalar a ferramenta do diretório de ferramentas do usuário atual.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ O diretório que contém a ferramenta a ser desinstalada.
The NuGet Package Id of the tool to uninstall.
- Идентификатор пакета NuGet удаляемого инструмента.
+ Идентификатор пакета NuGet удаляемого инструмента.
Uninstall a tool from the current development environment.
- Удаляет инструмент.
+ Удаление инструмента из текущей среды разработки.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Удаление на уровне пользователя.
+ Удаление инструмента из каталога инструментов текущего пользователя.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Каталог, содержащий удаляемый инструмент.
The NuGet Package Id of the tool to uninstall.
- Kaldırılacak aracın NuGet Paket Kimliği.
+ Kaldırılacak aracın NuGet Paket Kimliği.
Uninstall a tool from the current development environment.
- Bir aracı kaldırır.
+ Bir aracı geçerli geliştirme ortamından kaldırır.
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- Kullanıcı için kaldırın.
+ Aracı geçerli kullanıcının araçlar dizininden kaldırır.
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ Kaldırılacak aracı içeren dizin.
The NuGet Package Id of the tool to uninstall.
- 要卸载的工具的 NuGet 包 ID。
+ 要卸载的工具的 NuGet 包 ID。
Uninstall a tool from the current development environment.
- 卸载工具。
+ 从当前开发环境中卸载工具。
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- 卸载用户范围。
+ 从当前用户的工具目录中卸载该工具。
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ 包含要卸载的工具的目录。
The NuGet Package Id of the tool to uninstall.
- 要解除安裝之工具的 NuGet 套件識別碼。
+ 要解除安裝之工具的 NuGet 套件識別碼。
Uninstall a tool from the current development environment.
- 將工具解除安裝。
+ 從目前的開發環境中,解除安裝工具。
@@ -24,7 +24,7 @@
Uninstall the tool from the current user's tools directory.
- 為全部使用者解除安裝。
+ 從目前使用者的工具目錄,解除安裝工具。
@@ -64,12 +64,12 @@
PATH
- PATH
+ PATH
The directory containing the tool to uninstall.
- The directory containing the tool to uninstall.
+ 包含要解除安裝之工具的目錄。
PACKAGE_ID
- PACKAGE_ID
+ ID_PACCHETTO
The NuGet Package Id of the tool to update.
- ID pacchetto NuGet dello strumento da aggiornare.
+ ID pacchetto NuGet dello strumento da aggiornare.
@@ -24,7 +24,7 @@
Update a tool to the latest stable version.
- Aggiorna uno strumento all'ultima versione stabile per l'uso.
+ Aggiorna uno strumento all'ultima versione stabile.
@@ -49,7 +49,7 @@
Update the tool in the current user's tools directory.
- Esegue l'aggiornamento a livello di utente.
+ Aggiorna lo strumento nella directory degli strumenti dell'utente corrente.
@@ -89,32 +89,32 @@
Add an additional NuGet package source to use during the update.
- Add an additional NuGet package source to use during the update.
+ Aggiunge un'altra origine pacchetto NuGet da usare durante l'aggiornamento.
SOURCE
- SOURCE
+ ORIGINE
FILE
- FILE
+ FILE
FRAMEWORK
- FRAMEWORK
+ FRAMEWORK
PATH
- PATH
+ PERCORSO
The directory containing the tool to update.
- The directory containing the tool to update.
+ Directory contenente lo strumento da aggiornare.