From 7299ec1f0a5c4f7ca7556b9fe70a4fccde1728bb Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Tue, 14 Mar 2017 17:14:53 -0700
Subject: [PATCH 001/104] Updating the CLI branding to 1.0.2 and updating the
msbuild version.
---
branchinfo.txt | 2 +-
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
build/Microsoft.DotNet.Cli.Monikers.props | 2 +-
dir.props | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/branchinfo.txt b/branchinfo.txt
index 5628321e1..90286b00f 100644
--- a/branchinfo.txt
+++ b/branchinfo.txt
@@ -3,7 +3,7 @@
# Each line is expected to be in the format "[Name]=[Value]".
MAJOR_VERSION=1
MINOR_VERSION=0
-PATCH_VERSION=1
+PATCH_VERSION=2
RELEASE_SUFFIX=rc4
CHANNEL=rel-1.0.1
BRANCH_NAME=rel/1.0.1
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 3369877cc..01dd947ab 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -2,7 +2,7 @@
1.1.1
- 15.1.548
+ 15.1.10122.0.0-rc5-61427-041.0.0-alpha-20170224-64.0.0-rtm-2283
diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props
index 83a2063ae..756fa9f1b 100644
--- a/build/Microsoft.DotNet.Cli.Monikers.props
+++ b/build/Microsoft.DotNet.Cli.Monikers.props
@@ -1,7 +1,7 @@
- .NET Core SDK 1.0.1
+ .NET Core SDK 1.0.2Microsoft .NET Core 1.1.1 - RuntimeMicrosoft .NET Core 1.1.0 - HostMicrosoft .NET Core 1.1.0 - Host FX Resolver
diff --git a/dir.props b/dir.props
index f906e8849..0c25d5e87 100644
--- a/dir.props
+++ b/dir.props
@@ -13,6 +13,6 @@
true
- 1.0.1
+ 1.0.2
From 13cf65ea8fc9c5a8a82c3b8552c4a975407fd3b7 Mon Sep 17 00:00:00 2001
From: Omair Majid
Date: Fri, 20 Jan 2017 17:19:35 -0500
Subject: [PATCH 002/104] dotnet-install should identify all RHEL 7.x as RHEL
New RHEL minor versions are compatible with previous RHEL minor
versions. They also replace them: all users using RHEL 7.n are migrated
to RHEL 7.(n+1) by a simple yum upgrade. So just treat all RHEL 7.x
version as RHEL.
This only holds true for minor versions. RHEL 7 is not compatible with
RHEL 6. But since .NET Core only supports RHEL 7, this shouldn't matter.
---
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 7f6f86956..89ad61b66 100755
--- a/scripts/obtain/dotnet-install.sh
+++ b/scripts/obtain/dotnet-install.sh
@@ -92,7 +92,7 @@ get_current_os_name() {
echo "opensuse.42.1"
return 0
;;
- "rhel.7.0" | "rhel.7.1" | "rhel.7.2")
+ "rhel.7"*)
echo "rhel"
return 0
;;
From 3928c2739cefbd93ee5d3a89dfe50e0afd75a862 Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Mon, 27 Mar 2017 15:23:14 -0500
Subject: [PATCH 003/104] Make folder case consistent. This causes no build
issues (because the .csproj uses the default wildcard include), but prevents
the repo from being pushed to VSO Git.
---
.../{transforms => Transforms}/AddItemTransform.cs | 0
.../{transforms => Transforms}/AddPropertyTransform.cs | 0
.../{transforms => Transforms}/ConditionalTransform.cs | 0
.../{transforms => Transforms}/ITransform.cs | 0
.../{transforms => Transforms}/ITransformApplicator.cs | 0
.../{transforms => Transforms}/IncludeContextTransform.cs | 0
.../{transforms => Transforms}/RemoveContextTransform.cs | 0
.../{transforms => Transforms}/RemoveItemTransform.cs | 0
.../{transforms => Transforms}/TransformApplicator.cs | 0
9 files changed, 0 insertions(+), 0 deletions(-)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/AddItemTransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/AddPropertyTransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/ConditionalTransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/ITransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/ITransformApplicator.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/IncludeContextTransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/RemoveContextTransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/RemoveItemTransform.cs (100%)
rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/TransformApplicator.cs (100%)
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddItemTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddItemTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddItemTransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddItemTransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddPropertyTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddPropertyTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddPropertyTransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddPropertyTransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ConditionalTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ConditionalTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/ConditionalTransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ConditionalTransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransformApplicator.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransformApplicator.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/IncludeContextTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/IncludeContextTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/IncludeContextTransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/IncludeContextTransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveContextTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveContextTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveContextTransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveContextTransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveItemTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveItemTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveItemTransform.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveItemTransform.cs
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/TransformApplicator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/TransformApplicator.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/TransformApplicator.cs
rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/TransformApplicator.cs
From d8cc37ae00284c5024799275ae43e395a465f064 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Thu, 6 Apr 2017 13:48:20 -0700
Subject: [PATCH 004/104] Adding error code 1638 as a ignore/success error when
installing the VC_Redist.
---
packaging/windows/clisdk/bundle.wxs | 1 +
1 file changed, 1 insertion(+)
diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index e4a4fd084..32482a781 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -42,6 +42,7 @@
ProductName="$(var.Crt_ProductName)"
Size="$(var.Crt_Size)"
Version="$(var.Crt_Version)" />
+
From 158eea31277ee510bc38cfb3453cd926bc97b8d1 Mon Sep 17 00:00:00 2001
From: Livar
Date: Thu, 6 Apr 2017 15:47:35 -0700
Subject: [PATCH 005/104] Updating the patch version of the CLI to 1.0.3
---
branchinfo.txt | 2 +-
build/Microsoft.DotNet.Cli.Monikers.props | 2 +-
dir.props | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/branchinfo.txt b/branchinfo.txt
index 90286b00f..ddd9d6c34 100644
--- a/branchinfo.txt
+++ b/branchinfo.txt
@@ -3,7 +3,7 @@
# Each line is expected to be in the format "[Name]=[Value]".
MAJOR_VERSION=1
MINOR_VERSION=0
-PATCH_VERSION=2
+PATCH_VERSION=3
RELEASE_SUFFIX=rc4
CHANNEL=rel-1.0.1
BRANCH_NAME=rel/1.0.1
diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props
index 756fa9f1b..eb993cb0f 100644
--- a/build/Microsoft.DotNet.Cli.Monikers.props
+++ b/build/Microsoft.DotNet.Cli.Monikers.props
@@ -1,7 +1,7 @@
- .NET Core SDK 1.0.2
+ .NET Core SDK 1.0.3Microsoft .NET Core 1.1.1 - RuntimeMicrosoft .NET Core 1.1.0 - HostMicrosoft .NET Core 1.1.0 - Host FX Resolver
diff --git a/dir.props b/dir.props
index 0c25d5e87..f4ab7be63 100644
--- a/dir.props
+++ b/dir.props
@@ -13,6 +13,6 @@
true
- 1.0.2
+ 1.0.3
From b654c55985fe2037ef585ecf8142637bf1ce285b Mon Sep 17 00:00:00 2001
From: Davis Goodin
Date: Mon, 10 Apr 2017 17:43:47 -0500
Subject: [PATCH 006/104] Skip versions repo publish if auth not defined
---
build/publish/FinishBuild.targets | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets
index 206e131f2..f0dfad763 100644
--- a/build/publish/FinishBuild.targets
+++ b/build/publish/FinishBuild.targets
@@ -29,6 +29,7 @@
Channel="$(Channel)"
CommitHash="$(CommitHash)" />
-
+
From c62bc827873684ac3e5731c51b9dff79666fcd0a Mon Sep 17 00:00:00 2001
From: Ken Dale
Date: Mon, 20 Mar 2017 18:09:21 -0400
Subject: [PATCH 007/104] Fix README.md table
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2c52895f0..44a0bf75b 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
> want to install the latest released versions, please check out the [section above](#download-links).)
| Platform | rel/1.0.1 [![][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] |
| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum] *See Installer Note Below [tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] |
From ee8f8c9bc937ccb7c50fcc4fdce9af0be2682445 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 24 Apr 2017 12:12:47 -0700
Subject: [PATCH 008/104] Porting over a change from master that allows to
overwrite the CoreSetupBlobRootUrl.
---
build/Microsoft.DotNet.Cli.Prepare.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index acf561e95..23991910b 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -167,7 +167,7 @@
- https://dotnetcli.azureedge.net/dotnet/
+ https://dotnetcli.azureedge.net/dotnet/$(CoreSetupBlobRootUrl)$(CoreSetupChannel)$(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion)$(CoreSetupBlobRootUrlWithChannel)/Installers
From 3efaab9fbc0cd2063820fab8f3f5abf69dac28cf Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Mon, 24 Apr 2017 17:08:54 -0500
Subject: [PATCH 009/104] Add SAS tokens to core-setup download.
---
build/Microsoft.DotNet.Cli.Prepare.targets | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 23991910b..37c52ffd4 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -47,6 +47,7 @@
win7-$(Architecture)osx.10.10-x64rhel.7-x64
+ ?$(CoreSetupBlobAccessToken)
@@ -178,28 +179,28 @@
<_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive"
Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')">
- $(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName)
+ $(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam)$(CombinedSharedHostAndFrameworkArchive)$(SharedFrameworkPublishDirectory)
<_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile"
Condition="!Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
- $(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)
+ $(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(DownloadedSharedFrameworkInstallerFile)
<_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile"
Condition="!Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
- $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)
+ $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(DownloadedSharedHostInstallerFile)
<_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile"
Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
- $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)
+ $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(DownloadedHostFxrInstallerFile)
@@ -217,7 +218,7 @@
<_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
- $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)
+ $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam)$(AdditionalCombinedSharedHostAndFrameworkArchive)$(SharedFrameworkPublishDirectory)
@@ -226,21 +227,21 @@
<_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile"
Condition="!Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
- $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(AdditionalDownloadedSharedFrameworkInstallerFile)
<_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile"
Condition="!Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
- $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName)
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(AdditionalDownloadedSharedHostInstallerFile)
<_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
- $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(AdditionalDownloadedHostFxrInstallerFile)
From de7c94592dff5e8880e6300e37413c84fc35ff5d Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 24 Apr 2017 18:11:59 -0700
Subject: [PATCH 010/104] Updating the runtime framework versions for 1.0.5 and
1.1.1 and updating the CLI branding to 1.0.4.
---
branchinfo.txt | 2 +-
build.proj | 6 +++---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++--
build/Microsoft.DotNet.Cli.Monikers.props | 6 +++---
build/Microsoft.DotNet.Cli.Prepare.targets | 2 +-
build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +-
dir.props | 2 +-
.../GivenAProjectToolsCommandResolver.cs | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/branchinfo.txt b/branchinfo.txt
index ddd9d6c34..ec5a72654 100644
--- a/branchinfo.txt
+++ b/branchinfo.txt
@@ -3,7 +3,7 @@
# Each line is expected to be in the format "[Name]=[Value]".
MAJOR_VERSION=1
MINOR_VERSION=0
-PATCH_VERSION=3
+PATCH_VERSION=4
RELEASE_SUFFIX=rc4
CHANNEL=rel-1.0.1
BRANCH_NAME=rel/1.0.1
diff --git a/build.proj b/build.proj
index 2a1233295..fd7f7f235 100644
--- a/build.proj
+++ b/build.proj
@@ -19,12 +19,12 @@
release/1.1.0Microsoft.NETCore.App
- 1.1.1
+ 1.1.21.1.01.1.0
- 1.1.1
- 1.1.1
+ 1.1.2
+ 1.1.2.exe
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 01dd947ab..a34ceed0c 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,10 +1,10 @@
- 1.1.1
+ 1.1.215.1.10122.0.0-rc5-61427-04
- 1.0.0-alpha-20170224-6
+ 1.0.0-alpha-20170425-34.0.0-rtm-22831.0.0-alpha-20170130-3-28115.0.0
diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props
index eb993cb0f..197dcaa82 100644
--- a/build/Microsoft.DotNet.Cli.Monikers.props
+++ b/build/Microsoft.DotNet.Cli.Monikers.props
@@ -1,12 +1,12 @@
- .NET Core SDK 1.0.3
- Microsoft .NET Core 1.1.1 - Runtime
+ .NET Core SDK 1.0.4
+ Microsoft .NET Core 1.1.2 - RuntimeMicrosoft .NET Core 1.1.0 - HostMicrosoft .NET Core 1.1.0 - Host FX Resolver
- Microsoft .NET Core 1.0.4 - Runtime
+ Microsoft .NET Core 1.0.5 - RuntimeMicrosoft .NET Core 1.0.1 - HostMicrosoft .NET Core 1.0.1 - Host FX Resolver
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 37c52ffd4..e15fc6e35 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -144,7 +144,7 @@
preview
- 1.0.4
+ 1.0.51.0.11.0.1
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index 745b80f41..e1fafb957 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -17,7 +17,7 @@
1.6.0
- 1.1.1
+ 1.1.2$(CLI_MSBuild_Version)
diff --git a/dir.props b/dir.props
index f4ab7be63..1ed8b03c9 100644
--- a/dir.props
+++ b/dir.props
@@ -13,6 +13,6 @@
true
- 1.0.3
+ 1.0.4
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 44ce24766..21612a2a0 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -308,7 +308,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull();
- result.Args.Should().Contain("--fx-version 1.1.1");
+ result.Args.Should().Contain("--fx-version 1.1.2");
}
[Fact]
From dcff438d5adb1399b2d84dbb92c754edbe68e234 Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Tue, 25 Apr 2017 13:39:08 -0500
Subject: [PATCH 011/104] Add new variables to dockerrun.sh so they're passed
to the container.
---
scripts/dockerrun.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh
index d5caeb312..b800a0106 100755
--- a/scripts/dockerrun.sh
+++ b/scripts/dockerrun.sh
@@ -136,5 +136,12 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
-e COMMITCOUNT \
-e DROPSUFFIX \
-e RELEASESUFFIX \
+ -e CoreFxAzureContainer \
+ -e AzureAccountName \
+ -e AzureAccessToken \
+ -e VsoPassword \
+ -e ReleaseToolsGitUrl \
+ -e CoreSetupBlobRootUrl \
+ -e CoreSetupBlobAccessToken \
$DOTNET_BUILD_CONTAINER_TAG \
$BUILD_COMMAND "$@"
From f66867a7f4bc91e6cbfb1059a552eba59baae811 Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Tue, 25 Apr 2017 15:59:52 -0500
Subject: [PATCH 012/104] Fix case for variables we pass into docker.
---
scripts/dockerrun.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh
index b800a0106..897aeb907 100755
--- a/scripts/dockerrun.sh
+++ b/scripts/dockerrun.sh
@@ -136,12 +136,12 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
-e COMMITCOUNT \
-e DROPSUFFIX \
-e RELEASESUFFIX \
- -e CoreFxAzureContainer \
- -e AzureAccountName \
- -e AzureAccessToken \
- -e VsoPassword \
- -e ReleaseToolsGitUrl \
- -e CoreSetupBlobRootUrl \
- -e CoreSetupBlobAccessToken \
+ -e COREFXAZURECONTAINER \
+ -e AZUREACCOUNTNAME \
+ -e AZUREACCESSTOKEN \
+ -e VSOPASSWORD \
+ -e RELEASETOOLSGITURL \
+ -e CORESETUPBLOBROOTURL \
+ -e CORESETUPBLOBACCESSTOKEN \
$DOTNET_BUILD_CONTAINER_TAG \
$BUILD_COMMAND "$@"
From 5be74db44056c79f0e4e972f489289fdb1bff69b Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Tue, 25 Apr 2017 15:10:39 -0700
Subject: [PATCH 013/104] Conditioning the version of hostfxr on the OS,
because for Windows it actually has a different version.
---
build.proj | 3 ++-
build/Microsoft.DotNet.Cli.Prepare.targets | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build.proj b/build.proj
index fd7f7f235..0b065edbf 100644
--- a/build.proj
+++ b/build.proj
@@ -21,7 +21,8 @@
Microsoft.NETCore.App1.1.21.1.0
- 1.1.0
+ 1.1.0
+ 1.1.21.1.21.1.2
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index e15fc6e35..91acac4dd 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -146,7 +146,8 @@
preview1.0.51.0.1
- 1.0.1
+ 1.0.1
+ 1.0.5dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)
From 9ec01bdce0f3cf5c7d70f295aa5eb11e88d464d3 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Tue, 25 Apr 2017 15:25:05 -0700
Subject: [PATCH 014/104] Making the code consistent in Prepare.targets.
---
build/Microsoft.DotNet.Cli.Prepare.targets | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 91acac4dd..302b7e6c6 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -146,8 +146,8 @@
preview1.0.51.0.1
- 1.0.1
- 1.0.5
+ 1.0.1
+ 1.0.5dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)
From 8e7cd5c550165b4727f74dd97f1f61b4f25e8f4c Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Tue, 25 Apr 2017 20:38:41 -0700
Subject: [PATCH 015/104] Add a hostfxr container version, because even a 1.1.2
hostfxr is being binplaced in a 1.1.0 container.
---
build.proj | 1 +
build/Microsoft.DotNet.Cli.Prepare.targets | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build.proj b/build.proj
index 0b065edbf..37dadf33d 100644
--- a/build.proj
+++ b/build.proj
@@ -21,6 +21,7 @@
Microsoft.NETCore.App1.1.21.1.0
+ 1.1.01.1.01.1.2
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 302b7e6c6..0a47f2622 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -146,6 +146,7 @@
preview1.0.51.0.1
+ 1.0.11.0.11.0.5
@@ -201,7 +202,7 @@
<_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile"
Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
- $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)
+ $(CoreSetupInstallerBlobRootUrl)/$(HostFxrContainerVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(DownloadedHostFxrInstallerFile)
@@ -242,7 +243,7 @@
<_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
- $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrContainerVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)$(AdditionalDownloadedHostFxrInstallerFile)
From d227fff356c15965b32e16592d04e275cfbf27c3 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 26 Apr 2017 15:24:22 -0700
Subject: [PATCH 016/104] Updating SDK to 1.0.0-alpha-20170426-3.
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index a34ceed0c..7ce26b482 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -4,7 +4,7 @@
1.1.215.1.10122.0.0-rc5-61427-04
- 1.0.0-alpha-20170425-3
+ 1.0.0-alpha-20170426-34.0.0-rtm-22831.0.0-alpha-20170130-3-28115.0.0
From 615f3783c80ecaf3e355bba0a25cd5ee2785cf27 Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Thu, 27 Apr 2017 14:25:32 -0500
Subject: [PATCH 017/104] Dummy commit to kick off build.
From e5f6a150a8e9754d666c3bfb1b53ac42fe7cb5cb Mon Sep 17 00:00:00 2001
From: Mike Lorbetske
Date: Wed, 26 Apr 2017 13:40:28 -0700
Subject: [PATCH 018/104] Ingest updated template packages
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 7ce26b482..017764ed2 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -9,7 +9,7 @@
1.0.0-alpha-20170130-3-28115.0.01.0.0-beta1-20170202-111
- 1.0.0-beta1-20170223-126
+ 1.0.0-beta1-20170424-1731.0.31.0.3
From 17c160e4c21b92f66324e1e0623c8b2c5ed374a7 Mon Sep 17 00:00:00 2001
From: Mike Lorbetske
Date: Thu, 27 Apr 2017 14:14:15 -0700
Subject: [PATCH 019/104] Update template package version
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 017764ed2..e004e7f5b 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -9,7 +9,7 @@
1.0.0-alpha-20170130-3-28115.0.01.0.0-beta1-20170202-111
- 1.0.0-beta1-20170424-173
+ 1.0.0-beta1-20170427-1741.0.31.0.3
From e056c00634dd1a373cda81dabd004f4d4d001a0e Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Fri, 28 Apr 2017 15:07:39 -0500
Subject: [PATCH 020/104] Dummy commit to kick off the build.
From f983b804f82595f53f748e89f387a822b6300758 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Fri, 28 Apr 2017 22:30:21 -0700
Subject: [PATCH 021/104] Fixing a first run test that checks the version of
the mvc package. It checked for 1.0.3 and 1.1.2 and it needs to check for
1.0.4 and 1.1.3 now.
---
.../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
index b6981d924..273d4fd21 100644
--- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
+++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
@@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve
_nugetCacheFolder
.GetDirectory("microsoft.aspnetcore.mvc")
- .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" });
+ .Should().HaveDirectories(new string[] { "1.0.4", "1.1.3" });
}
private string GetDotnetVersion()
From f68d8258100295f97a510ee53ca5b76a641431c2 Mon Sep 17 00:00:00 2001
From: Enrico Sada
Date: Sun, 30 Apr 2017 21:34:00 +0200
Subject: [PATCH 022/104] bump f# sdk package version
---
build/Microsoft.DotNet.Cli.BundledSdks.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props
index 23b7ec739..cca608b6b 100644
--- a/build/Microsoft.DotNet.Cli.BundledSdks.props
+++ b/build/Microsoft.DotNet.Cli.BundledSdks.props
@@ -7,6 +7,6 @@
-
+
From a8f606c47957914ba53397376355828977032cb2 Mon Sep 17 00:00:00 2001
From: Enrico Sada
Date: Sun, 30 Apr 2017 21:39:10 +0200
Subject: [PATCH 023/104] the FSharp.NET.Sdk version `-bundled` contains only
the Sdk dir
---
build/Microsoft.DotNet.Cli.BundledSdks.proj | 3 ---
1 file changed, 3 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.proj b/build/Microsoft.DotNet.Cli.BundledSdks.proj
index a17c04fe1..4408ca0a4 100644
--- a/build/Microsoft.DotNet.Cli.BundledSdks.proj
+++ b/build/Microsoft.DotNet.Cli.BundledSdks.proj
@@ -17,9 +17,6 @@
-
-
-
From b5cd16a9e9107d314bf1fd7b4cdd288e64823148 Mon Sep 17 00:00:00 2001
From: Chris Rummel
Date: Mon, 1 May 2017 10:33:46 -0500
Subject: [PATCH 024/104] Dummy commit to kick off the build.
From 2e2fb1b2ecc0c171f2b228a5de7c43e93818a703 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 1 May 2017 19:05:52 -0700
Subject: [PATCH 025/104] Updating the msbuild, SDK and Web SDK versions.
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index e004e7f5b..4d1150c7c 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -2,11 +2,11 @@
1.1.2
- 15.1.1012
+ 15.3.0-preview-000117-012.0.0-rc5-61427-04
- 1.0.0-alpha-20170426-3
+ 1.0.0-alpha-20170502-14.0.0-rtm-2283
- 1.0.0-alpha-20170130-3-281
+ 1.0.0-alpha-20170502-2-47715.0.01.0.0-beta1-20170202-1111.0.0-beta1-20170427-174
From 0e60fea7dcce9447dc9964775af5c44492845a12 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 1 May 2017 19:38:02 -0700
Subject: [PATCH 026/104] Adding the web feed to nuget.config, as some packages
failed to mirror and we need a build ASAP.
---
NuGet.Config | 1 +
1 file changed, 1 insertion(+)
diff --git a/NuGet.Config b/NuGet.Config
index 556ee5919..f086048be 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -10,5 +10,6 @@
+
From 7727c40ffa15c79a7ef18396800f8efb3de1fe60 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Tue, 2 May 2017 11:09:20 -0700
Subject: [PATCH 027/104] Reverting the msbuild version to the release version.
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 4d1150c7c..278a6fd85 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -2,7 +2,7 @@
1.1.2
- 15.3.0-preview-000117-01
+ 15.1.10122.0.0-rc5-61427-041.0.0-alpha-20170502-14.0.0-rtm-2283
From 0241b24b4cb63991972acbb162f7046be4100e7f Mon Sep 17 00:00:00 2001
From: Livar
Date: Wed, 3 May 2017 11:14:22 -0700
Subject: [PATCH 028/104] Dummy change to force a build.
---
Documentation/ProjectJsonToCSProj.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/ProjectJsonToCSProj.md b/Documentation/ProjectJsonToCSProj.md
index 92a16f4b3..5ad36c7ed 100644
--- a/Documentation/ProjectJsonToCSProj.md
+++ b/Documentation/ProjectJsonToCSProj.md
@@ -1,4 +1,4 @@
-.NET CLI preview 3 is coming, and with it comes the .csproj project file format and msbuild engine. The team has put a lot of focus on making the transition as seamless as possible, but as with any change of this magnitude there are some gotcha's to keep in mind. This issue explains how to use the .NET CLI during this transitional period.
+.NET CLI preview 3 is here, and with it comes the .csproj project file format and msbuild engine. The team has put a lot of focus on making the transition as seamless as possible, but as with any change of this magnitude there are some gotcha's to keep in mind. This issue explains how to use the .NET CLI during this transitional period.
# Overview
Starting with @coolcsh's great post [Changes to Project.json](https://blogs.msdn.microsoft.com/dotnet/2016/05/23/changes-to-project-json/) the team has been hard at work moving the .NET command line story from project.json to msbuild. Our plan was fairly straightforward:
From 8db1275396b5c18654093c8bcd6281eae7e380cf Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 3 May 2017 11:40:52 -0700
Subject: [PATCH 029/104] Adding the access token to the lzma url.
---
build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index c251348f1..98d44bf35 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -131,7 +131,7 @@
$(IntermediateDirectory)/$(NugetPackagesArchiveName)$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma$(Product)/NuGetPackagesArchives
- $(DotnetBlobRootUrl)/$(NugetPackagesArchiveRelativeBlobUrl)/$(NugetPackagesArchiveName)
+ $(DotnetBlobRootUrl)/$(NugetPackagesArchiveRelativeBlobUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam)
\ No newline at end of file
From 4a134bbdf447a629d163114d036a89a8e97da56b Mon Sep 17 00:00:00 2001
From: Livar
Date: Thu, 4 May 2017 13:25:26 -0700
Subject: [PATCH 030/104] Dummy commit.
---
Documentation/ProjectJsonToCSProj.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/ProjectJsonToCSProj.md b/Documentation/ProjectJsonToCSProj.md
index 5ad36c7ed..3b3e404e8 100644
--- a/Documentation/ProjectJsonToCSProj.md
+++ b/Documentation/ProjectJsonToCSProj.md
@@ -60,3 +60,4 @@ When `preview2` shipped the Visual Studio new project templates included both a
We included this file by default as a future-proofing tactic. When the CLI launches it looks for this file in the current directory, or the nearest parent directory, and tries to find a matching version of itself. If an exact match is found then it is used. Otherwise, `dotnet.exe` picks the latest installed CLI. When there is no exact match AND preview3 is installed then we get into trouble because preview3 cannot reason about project.json files.
When working with `preview2` and `preview3` on the same machine we need to be sure that `preview2` projects have a global.json present and that the `version` property is set to an installed preview2 version. This will typically be `1.0.0-preview2-003121` or `1.0.0-preview2-003131`. You can check what is installed by looking in `%PROGRAM FILES%\dotnet\sdk` and checking the folder names.
+
From 7a19b8caedbdb348dbc90acd88d1eac2a3fa7572 Mon Sep 17 00:00:00 2001
From: William Li
Date: Tue, 9 May 2017 22:51:17 +0000
Subject: [PATCH 031/104] Change telemetry notice for deb
---
packaging/deb/postinst | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/packaging/deb/postinst b/packaging/deb/postinst
index aac8be85c..e2e4bd4be 100755
--- a/packaging/deb/postinst
+++ b/packaging/deb/postinst
@@ -7,9 +7,12 @@ echo "Welcome to .NET Core!
---------------------
Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
-Telemetry
+NET Core Tools Telemetry
--------------
-The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community.
-You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell.
-You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry."
+The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry."
+
su - $SUDO_USER -c "dotnet new > /dev/null 2>&1 || true"
From af3c2378040d700139c4ac3e12c93e461de21fbe Mon Sep 17 00:00:00 2001
From: William Li
Date: Sun, 7 May 2017 13:30:03 -0700
Subject: [PATCH 032/104] Unify telemetry text for windows
And move installer telemetry message to the end and
---
packaging/windows/clisdk/bundle.thm | 5 ++---
packaging/windows/clisdk/bundle.wxl | 16 ++++++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm
index f7f30c2aa..71b7ef054 100644
--- a/packaging/windows/clisdk/bundle.thm
+++ b/packaging/windows/clisdk/bundle.thm
@@ -1,6 +1,6 @@
- #(loc.Caption)
+ #(loc.Caption)
Segoe UI
Segoe UI
Segoe UI
@@ -52,7 +52,6 @@
#(loc.ProgressHeader)#(loc.ProgressLabel)#(loc.OverallProgressPackageText)
- #(loc.FirstTimeWelcomeMessage)
@@ -70,7 +69,7 @@
#(loc.SuccessHeader)
- #(loc.SuccessInstallHeader)
+ #(loc.FirstTimeWelcomeMessage)#(loc.SuccessRepairHeader)#(loc.SuccessUninstallHeader)
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index 0140bab32..326a089ae 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -31,7 +31,6 @@ Ready? Set? Let's go!
&CloseRepair Successfully CompletedUninstall Successfully Completed
- Installation Successfully CompletedSetup Successful&LaunchYou must restart your computer before you can use the software.
@@ -51,11 +50,16 @@ Ready? Set? Let's go!
&Do not close applications. A reboot will be required.&OK&Cancel
- Welcome to .NET Core!
+ Installation Successfully Completed Welcome to .NET Core!
+
Learn more about .NET Core at https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
-Telemetry:
-The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-Configuration:
-A command is running in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+
+NET Core Tools Telemetry
+
+The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
From a94644d95749a3c9e9c83e6cc7dc1a27b4d85835 Mon Sep 17 00:00:00 2001
From: William Li
Date: Mon, 8 May 2017 18:55:42 -0700
Subject: [PATCH 033/104] Unify mac telemetry note
---
.../cs.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../de.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../en.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../es.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../fr.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../it.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../ja.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../ko.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../pl.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../pt-br.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../ru.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../tr.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../zh-hans.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
.../zh-hant.lproj/firstTimeWelcomeMessage.html | 18 +++++++++---------
14 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
index af9179267..fb1e7333d 100644
--- a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
@@ -7,22 +7,22 @@
- Welcome to .NET Core!
+ Installation Successfully Completed Welcome to .NET Core!
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-
- Configuration
+ NET Core Tools Telemetry
- A command is run in the end of install process to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
+ The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
+
+
+ The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
+
+
+ The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
index fb1e7333d..013aa7290 100644
--- a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index 326a089ae..cab64f34a 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -50,7 +50,7 @@ Ready? Set? Let's go!
&Do not close applications. A reboot will be required.&OK&Cancel
- Installation Successfully Completed Welcome to .NET Core!
+ Installation Completed Successfully Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
From 303634978aaaa9a13f6c97cef2c62e1a73519e5a Mon Sep 17 00:00:00 2001
From: William Li
Date: Mon, 15 May 2017 11:48:56 -0700
Subject: [PATCH 035/104] Change to Installation completed successfully.
Welcome to .NET Core!
---
.../osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html | 2 +-
.../clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html | 2 +-
.../clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html | 2 +-
.../clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html | 2 +-
packaging/windows/clisdk/bundle.wxl | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
index 013aa7290..9b8f34d1a 100644
--- a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
@@ -7,7 +7,7 @@
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index cab64f34a..25dcd632d 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -50,7 +50,7 @@ Ready? Set? Let's go!
&Do not close applications. A reboot will be required.&OK&Cancel
- Installation Completed Successfully Welcome to .NET Core!
+ Installation completed successfully. Welcome to .NET Core!
Learn more about .NET Core at https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
From 3813c419481bc6abcd154598cf0e7d015436fdd1 Mon Sep 17 00:00:00 2001
From: William Li
Date: Mon, 15 May 2017 11:39:42 -0700
Subject: [PATCH 036/104] Add leading dot back
---
packaging/deb/postinst | 2 +-
.../osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html | 2 +-
.../clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html | 2 +-
.../osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html | 2 +-
.../clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html | 2 +-
.../clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html | 2 +-
packaging/windows/clisdk/bundle.wxl | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/packaging/deb/postinst b/packaging/deb/postinst
index e2e4bd4be..f92c16afa 100755
--- a/packaging/deb/postinst
+++ b/packaging/deb/postinst
@@ -7,7 +7,7 @@ echo "Welcome to .NET Core!
---------------------
Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
-NET Core Tools Telemetry
+.NET Core Tools Telemetry
--------------
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
index 9b8f34d1a..81144ea7f 100644
--- a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
+++ b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html
@@ -13,7 +13,7 @@
Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
- NET Core Tools Telemetry
+ .NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index 25dcd632d..e7ad81713 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -54,7 +54,7 @@ Ready? Set? Let's go!
Learn more about .NET Core at https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
-NET Core Tools Telemetry
+.NET Core Tools Telemetry
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
From 04b60dadc4c92a5111e0c92d68f6edc89a99f4b4 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 17 May 2017 16:00:49 -0700
Subject: [PATCH 037/104] Updating the branding to rel/1.1.0
---
branchinfo.txt | 8 ++++----
build/Microsoft.DotNet.Cli.Monikers.props | 2 +-
dir.props | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/branchinfo.txt b/branchinfo.txt
index ec5a72654..d138bff9b 100644
--- a/branchinfo.txt
+++ b/branchinfo.txt
@@ -2,8 +2,8 @@
# Any line that is not blank and does not start with '#' is interpreted as a variable to set
# Each line is expected to be in the format "[Name]=[Value]".
MAJOR_VERSION=1
-MINOR_VERSION=0
-PATCH_VERSION=4
+MINOR_VERSION=1
+PATCH_VERSION=0
RELEASE_SUFFIX=rc4
-CHANNEL=rel-1.0.1
-BRANCH_NAME=rel/1.0.1
+CHANNEL=rel-1.1.0
+BRANCH_NAME=rel/1.1.0
diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props
index 197dcaa82..b7bd72b9e 100644
--- a/build/Microsoft.DotNet.Cli.Monikers.props
+++ b/build/Microsoft.DotNet.Cli.Monikers.props
@@ -1,7 +1,7 @@
- .NET Core SDK 1.0.4
+ .NET Core SDK 1.1.0Microsoft .NET Core 1.1.2 - RuntimeMicrosoft .NET Core 1.1.0 - HostMicrosoft .NET Core 1.1.0 - Host FX Resolver
diff --git a/dir.props b/dir.props
index 1ed8b03c9..9cfe93b1e 100644
--- a/dir.props
+++ b/dir.props
@@ -13,6 +13,6 @@
true
- 1.0.4
+ 1.1.0
From f270ecd025886f7f9d539d038998c6fb51c58c7e Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 17 May 2017 21:06:42 -0700
Subject: [PATCH 038/104] Pinning the stage0 to the last build out of rel/1.0.1
and adding a project to download 1.0 dependencies for test assets.
---
run-build.ps1 | 4 ++--
run-build.sh | 4 ++--
tools/TestAssetsDependencies/TestAssetsDependencies.csproj | 7 +++++++
3 files changed, 11 insertions(+), 4 deletions(-)
create mode 100755 tools/TestAssetsDependencies/TestAssetsDependencies.csproj
diff --git a/run-build.ps1 b/run-build.ps1
index 74edf1b42..46e4b5ed3 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
# install the post-PJnistic stage0
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
-Write-Host "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
-Invoke-Expression "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Write-Host "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Invoke-Expression "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
diff --git a/run-build.sh b/run-build.sh
index f44a6619a..fcce351df 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -164,8 +164,8 @@ if [ $? != 0 ]; then
fi
# now execute the script
-echo "installing CLI: $dotnetInstallPath --channel \"rel-1.0.1\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
-$dotnetInstallPath --channel "rel-1.0.1" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
+echo "installing CLI: $dotnetInstallPath --version \"1.0.4\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
+$dotnetInstallPath --version "1.0.4" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
exit $?
diff --git a/tools/TestAssetsDependencies/TestAssetsDependencies.csproj b/tools/TestAssetsDependencies/TestAssetsDependencies.csproj
new file mode 100755
index 000000000..26129c334
--- /dev/null
+++ b/tools/TestAssetsDependencies/TestAssetsDependencies.csproj
@@ -0,0 +1,7 @@
+
+
+
+ netcoreapp1.0
+
+
+
From 3d80c0f22a2830c87e118417912747a976aed23a Mon Sep 17 00:00:00 2001
From: faahmad
Date: Thu, 18 May 2017 11:40:12 +0530
Subject: [PATCH 039/104] Insert new bits of testplatform.
---
build/DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 6e2132971..5ac3df41d 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -7,7 +7,7 @@
2.0.0-alpha-20170509-24.3.0-beta1-24181.0.0-rel-20170501-473
- 15.3.0-preview-20170502-03
+ 15.3.0-preview-20170517-02$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)
From 2c24c622ec5586540f0f6f92f5e431203a24294d Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 17 May 2017 23:12:14 -0700
Subject: [PATCH 040/104] Trying to fix the opensuse42 test failure, where we
tried to invoke a tool that target 1.0.4 where the 1.0 runtime is not
available.
---
.../dotnet-dependency-context-test.csproj | 2 +-
build/package/dotnet-deb-tool-consumer.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 aa4728ca9..663e061e2 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
@@ -17,7 +17,7 @@
- 1.0.4
+ $(CLI_SharedFrameworkVersion)$(DependencyModelVersion)
diff --git a/build/package/dotnet-deb-tool-consumer.csproj b/build/package/dotnet-deb-tool-consumer.csproj
index 26b7aa79d..6b84531cb 100644
--- a/build/package/dotnet-deb-tool-consumer.csproj
+++ b/build/package/dotnet-deb-tool-consumer.csproj
@@ -3,6 +3,6 @@
netcoreapp1.1
-
+
From b3ba4eaac65b8a8b29a7a825c0fc0a525081f171 Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan
Date: Thu, 18 May 2017 11:32:33 -0700
Subject: [PATCH 041/104] Updating the websdk version to 2.0.0-rel-20170518-503
---
build/DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5ac3df41d..f0e79ba63 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -6,7 +6,7 @@
2.0.0-rc4-61325-082.0.0-alpha-20170509-24.3.0-beta1-2418
- 1.0.0-rel-20170501-473
+ 2.0.0-rel-20170518-50315.3.0-preview-20170517-02$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)
From 77bdf5f7ee45075c79c1cd803d1fc4a089fd3542 Mon Sep 17 00:00:00 2001
From: Mike Lorbetske
Date: Thu, 18 May 2017 14:53:44 -0700
Subject: [PATCH 042/104] Update to SetupCrossgen dev-119 - Coherence 25098
---
NuGet.Config | 2 +-
build/BundledRuntimes.props | 3 ++-
build/DependencyVersions.props | 11 +++++-----
.../commands/dotnet-new/NewCommandShim.cs | 22 +++++--------------
.../NuGet.tempaspnetpatch.config | 2 +-
.../NuGet.tempaspnetpatch.config | 2 +-
6 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/NuGet.Config b/NuGet.Config
index 120a5daf6..6559a10f0 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -6,7 +6,7 @@
-
+
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 8abc1c555..f9d2a589a 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -38,7 +38,8 @@
$(OSName)linux
- Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(ArchiveExtension)
+ -$(AspNetCoreCoherenceTimestamp)
+ Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension)$(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName)AspNetCorePackageStoreLib$(Architecture).wixlib
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5ac3df41d..4ce7f7d6b 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -11,16 +11,17 @@
$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)
- 1.0.0-beta2-20170503-217
- 1.0.0-beta2-20170505-222
- 1.0.0-beta2-20170505-222
+ 1.0.0-beta2-20170518-237
+ 1.0.0-beta2-20170518-237
+ 1.0.0-beta2-20170518-2372.0.0-preview1-0021112.0.0-preview1-0021110.1.0-alpha-142
- 2.0.0-preview1-92
- notimestamp
+ timestamped
+ dev-119
+ preview2-25098
diff --git a/src/dotnet/commands/dotnet-new/NewCommandShim.cs b/src/dotnet/commands/dotnet-new/NewCommandShim.cs
index 6e36fd9c0..7dea29376 100644
--- a/src/dotnet/commands/dotnet-new/NewCommandShim.cs
+++ b/src/dotnet/commands/dotnet-new/NewCommandShim.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
+using System.Reflection;
using Microsoft.DotNet.Cli;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Configurer;
@@ -42,24 +43,11 @@ namespace Microsoft.DotNet.Tools.New
private static ITemplateEngineHost CreateHost()
{
- var builtIns = new Dictionary>
+ var builtIns = new AssemblyComponentCatalog(new[]
{
- { new Guid("0C434DF7-E2CB-4DEE-B216-D7C58C8EB4B3"), () => typeof(RunnableProjectGenerator) },
- { new Guid("3147965A-08E5-4523-B869-02C8E9A8AAA1"), () => typeof(BalancedNestingConfig) },
- { new Guid("3E8BCBF0-D631-45BA-A12D-FBF1DE03AA38"), () => typeof(ConditionalConfig) },
- { new Guid("A1E27A4B-9608-47F1-B3B8-F70DF62DC521"), () => typeof(FlagsConfig) },
- { new Guid("3FAE1942-7257-4247-B44D-2DDE07CB4A4A"), () => typeof(IncludeConfig) },
- { new Guid("3D33B3BF-F40E-43EB-A14D-F40516F880CD"), () => typeof(RegionConfig) },
- { new Guid("62DB7F1F-A10E-46F0-953F-A28A03A81CD1"), () => typeof(ReplacementConfig) },
- { new Guid("370996FE-2943-4AED-B2F6-EC03F0B75B4A"), () => typeof(ConstantMacro) },
- { new Guid("BB625F71-6404-4550-98AF-B2E546F46C5F"), () => typeof(EvaluateMacro) },
- { new Guid("10919008-4E13-4FA8-825C-3B4DA855578E"), () => typeof(GuidMacro) },
- { new Guid("F2B423D7-3C23-4489-816A-41D8D2A98596"), () => typeof(NowMacro) },
- { new Guid("011E8DC1-8544-4360-9B40-65FD916049B7"), () => typeof(RandomMacro) },
- { new Guid("8A4D4937-E23F-426D-8398-3BDBD1873ADB"), () => typeof(RegexMacro) },
- { new Guid("B57D64E0-9B4F-4ABE-9366-711170FD5294"), () => typeof(SwitchMacro) },
- { new Guid("10919118-4E13-4FA9-825C-3B4DA855578E"), () => typeof(CaseChangeMacro) }
- }.ToList();
+ typeof(RunnableProjectGenerator).GetTypeInfo().Assembly,
+ typeof(ConditionalConfig).GetTypeInfo().Assembly,
+ });
var preferences = new Dictionary
{
diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
index 33b9693d5..f38551286 100644
--- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
index 33b9693d5..f38551286 100644
--- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
From c02df7346607980b46b04a8e45941155e2c6321c Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan
Date: Thu, 18 May 2017 19:37:39 -0700
Subject: [PATCH 043/104] Updating the websdk version for 1.0
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 278a6fd85..793e50b0f 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -6,7 +6,7 @@
2.0.0-rc5-61427-041.0.0-alpha-20170502-14.0.0-rtm-2283
- 1.0.0-alpha-20170502-2-477
+ 1.0.0-alpha-20170516-2-50915.0.01.0.0-beta1-20170202-1111.0.0-beta1-20170427-174
From 15abd5109e6798b88b0b4c1fb1f31b80fc84a367 Mon Sep 17 00:00:00 2001
From: mlorbetske
Date: Thu, 18 May 2017 20:44:38 -0700
Subject: [PATCH 044/104] Rollback update to package versions
---
build/DependencyVersions.props | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 4ce7f7d6b..43aa99b5c 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -12,15 +12,15 @@
$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)1.0.0-beta2-20170518-237
- 1.0.0-beta2-20170518-237
- 1.0.0-beta2-20170518-237
+ 1.0.0-beta2-20170505-222
+ 1.0.0-beta2-20170505-2222.0.0-preview1-0021112.0.0-preview1-0021110.1.0-alpha-142
- timestamped
- dev-119
+ notimestamp
+ 2.0.0-preview1-92preview2-25098
From fb1f98ba79977597418c4474d51becc7b6145751 Mon Sep 17 00:00:00 2001
From: mlorbetske
Date: Thu, 18 May 2017 20:46:58 -0700
Subject: [PATCH 045/104] Rollback changes to NuGet feeds for the packages
---
NuGet.Config | 2 +-
test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config | 2 +-
test/dotnet-new.Tests/NuGet.tempaspnetpatch.config | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/NuGet.Config b/NuGet.Config
index 6559a10f0..120a5daf6 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -6,7 +6,7 @@
-
+
diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
index f38551286..33b9693d5 100644
--- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
index f38551286..33b9693d5 100644
--- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
From 846990c7cc9bd166f6f0a7641c6788062a55b9f0 Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan
Date: Thu, 18 May 2017 22:37:39 -0700
Subject: [PATCH 046/104] Updating the version
---
build/DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index f0e79ba63..6e3d6d7b7 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -6,7 +6,7 @@
2.0.0-rc4-61325-082.0.0-alpha-20170509-24.3.0-beta1-2418
- 2.0.0-rel-20170518-503
+ 2.0.0-rel-20170518-51215.3.0-preview-20170517-02$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)
From fd953738f036673690029a421388b2bd13a8a584 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Thu, 18 May 2017 21:09:09 -0700
Subject: [PATCH 047/104] Dropping a global.json when running the first run
experience with a version that matches the version of the CLI being used in
the command that triggered the first run.
---
src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
index 297909c77..246d0f462 100644
--- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
+++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
@@ -1,6 +1,7 @@
// 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.IO;
using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.Cli.Utils;
@@ -85,6 +86,14 @@ namespace Microsoft.DotNet.Configurer
{
var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath;
+ File.WriteAllText(
+ Path.Combine(workingDirectory, "global.json"),
+ $@"{{
+ ""sdk"": {{
+ ""version"":""{Product.Version}""
+ }}
+ }}");
+
succeeded &= CreateTemporaryProject(workingDirectory, templateInfo);
if (succeeded)
@@ -129,6 +138,7 @@ namespace Microsoft.DotNet.Configurer
if (commandResult.ExitCode != 0)
{
+ Reporter.Verbose.WriteLine(commandResult.StdOut);
Reporter.Verbose.WriteLine(commandResult.StdErr);
Reporter.Error.WriteLine(
From f67a72d9c4d7a7a0ab72d672374aacec718b22ab Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Fri, 19 May 2017 21:35:45 -0700
Subject: [PATCH 048/104] Making restore use a config file so that it does not
use fallback folders that may exist in the machine.
---
build/Microsoft.DotNet.Cli.Prepare.targets | 6 ++++--
.../NuGetCachePrimer.cs | 16 +++++++++++++---
.../FileWrapper.cs | 5 +++++
.../IFile.cs | 2 ++
.../GivenANuGetCachePrimer.cs | 19 +++++++++++++++++--
.../GivenANuGetCacheSentinel.cs | 5 +++++
.../Mock/FileSystemMockBuilder.cs | 6 ++++++
.../GivenThatIWantToRestoreApp.cs | 8 +++++---
8 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 0a47f2622..c241433d7 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -281,7 +281,8 @@
+ ProjectPath=""%(RestoreSrcPackagesInput.FullPath)""
+ ConfigFile="$(RepoRoot)\NuGet.Config" />
@@ -306,7 +307,8 @@
+ ProjectPath=""%(RestoreToolsPackagesInput.FullPath)""
+ ConfigFile="$(RepoRoot)\NuGet.Config" />
diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
index 246d0f462..d4718c002 100644
--- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
+++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
@@ -85,6 +85,16 @@ namespace Microsoft.DotNet.Configurer
using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory())
{
var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath;
+ var nugetConfigPath = Path.Combine(workingDirectory, "NuGet.Config");
+
+ _file.WriteAllText(
+ nugetConfigPath,
+ $@"
+
+
+
+
+");
File.WriteAllText(
Path.Combine(workingDirectory, "global.json"),
@@ -98,7 +108,7 @@ namespace Microsoft.DotNet.Configurer
if (succeeded)
{
- succeeded &= RestoreTemporaryProject(extractedPackagesArchiveDirectory, workingDirectory);
+ succeeded &= RestoreTemporaryProject(nugetConfigPath, workingDirectory);
}
}
}
@@ -118,11 +128,11 @@ namespace Microsoft.DotNet.Configurer
workingDirectory);
}
- private bool RestoreTemporaryProject(string extractedPackagesArchiveDirectory, string workingDirectory)
+ private bool RestoreTemporaryProject(string nugetConfigPath, string workingDirectory)
{
return RunCommand(
"restore",
- new[] { "-s", extractedPackagesArchiveDirectory },
+ new[] { "--configfile", nugetConfigPath },
workingDirectory);
}
diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs
index 9a71ba5d2..47de50767 100644
--- a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs
+++ b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs
@@ -40,5 +40,10 @@ namespace Microsoft.Extensions.EnvironmentAbstractions
{
}
}
+
+ public void WriteAllText(string path, string content)
+ {
+ File.WriteAllText(path, content);
+ }
}
}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs
index 3e19c63f0..d29a6bc91 100644
--- a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs
+++ b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs
@@ -22,5 +22,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions
FileOptions fileOptions);
void CreateEmptyFile(string path);
+
+ void WriteAllText(string path, string content);
}
}
\ No newline at end of file
diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
index 3268bfed2..79769e8db 100644
--- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
+++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
+using System.IO;
using FluentAssertions;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Tools.Test.Utilities.Mock;
@@ -150,12 +151,26 @@ namespace Microsoft.DotNet.Configurer.UnitTests
}
[Fact]
- public void It_uses_the_packages_archive_with_dotnet_restore()
+ public void It_writes_a_config_file_with_the_extracted_archive_as_a_package_source()
{
+ var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "NuGet.Config");
+ _fileSystemMock.File.ReadAllText(nugetConfigPath).Should().Be(
+ $@"
+
+
+
+
+");
+ }
+
+ [Fact]
+ public void It_uses_a_config_file_with_dotnet_restore()
+ {
+ var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "NuGet.Config");
_commandFactoryMock.Verify(
c => c.Create(
"restore",
- new[] { "-s", $"{PACKAGES_ARCHIVE_PATH}" },
+ new[] { "--configfile", nugetConfigPath },
null,
Constants.DefaultConfiguration),
Times.Exactly(2));
diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs
index 3971462db..992679f60 100644
--- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs
+++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs
@@ -175,6 +175,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
{
throw new NotImplementedException();
}
+
+ public void WriteAllText(string path, string content)
+ {
+ throw new NotImplementedException();
+ }
}
private class MockStream : MemoryStream
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs
index 9176cc2d8..46db578c1 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs
@@ -60,6 +60,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
private class FileMock : IFile
{
private Dictionary _files;
+
public FileMock(Dictionary files)
{
_files = files;
@@ -100,6 +101,11 @@ namespace Microsoft.Extensions.DependencyModel.Tests
{
_files.Add(path, string.Empty);
}
+
+ public void WriteAllText(string path, string content)
+ {
+ _files[path] = content;
+ }
}
private class DirectoryMock : IDirectory
diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
index cbe226760..416b8908a 100644
--- a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
+++ b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
@@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Restore.Tests
{
public class GivenThatIWantToRestoreApp : TestBase
{
+ private static string RepoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
+
[Fact]
public void ItRestoresAppToSpecificDirectory()
{
@@ -29,7 +31,7 @@ namespace Microsoft.DotNet.Restore.Tests
.Should()
.Pass();
- string args = $"--packages \"{dir}\"";
+ string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
new RestoreCommand()
.WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput(args)
@@ -56,7 +58,7 @@ namespace Microsoft.DotNet.Restore.Tests
.Should()
.Pass();
- string args = $"--packages \"{dir}\"";
+ string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
new RestoreCommand()
.WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput(args)
@@ -76,7 +78,7 @@ namespace Microsoft.DotNet.Restore.Tests
string dir = "pkgs";
string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
- string args = $"--packages \"{dir}\"";
+ string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
new RestoreCommand()
.WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput(args)
From 822b290bb636936c493cd6277a2cd54bb3def989 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Mon, 22 May 2017 09:51:30 -0700
Subject: [PATCH 049/104] Updating the global.json creation to use the IFile
interface and adding a unit test to cover it.
---
src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs | 10 +++++-----
.../GivenANuGetCachePrimer.cs | 12 ++++++++++++
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
index d4718c002..0414c5ca1 100644
--- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
+++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
@@ -96,13 +96,13 @@ namespace Microsoft.DotNet.Configurer
");
- File.WriteAllText(
+ _file.WriteAllText(
Path.Combine(workingDirectory, "global.json"),
$@"{{
- ""sdk"": {{
- ""version"":""{Product.Version}""
- }}
- }}");
+ ""sdk"": {{
+ ""version"":""{Product.Version}""
+ }}
+}}");
succeeded &= CreateTemporaryProject(workingDirectory, templateInfo);
diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
index 79769e8db..e1c8168b3 100644
--- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
+++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
@@ -163,6 +163,18 @@ namespace Microsoft.DotNet.Configurer.UnitTests
");
}
+ [Fact]
+ public void It_writes_a_global_json_file_with_the_current_cli_version()
+ {
+ var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "global.json");
+ _fileSystemMock.File.ReadAllText(nugetConfigPath).Should().Be(
+ $@"{{
+ ""sdk"": {{
+ ""version"":""{Product.Version}""
+ }}
+}}");
+ }
+
[Fact]
public void It_uses_a_config_file_with_dotnet_restore()
{
From c1933a014b185c95650fece9cf367e008d8e1971 Mon Sep 17 00:00:00 2001
From: Nick Guerrera
Date: Mon, 22 May 2017 15:17:29 -0700
Subject: [PATCH 050/104] Update dotnet/sdk version
---
build/DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 8c2b4965f..e76ffa2e9 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -5,7 +5,7 @@
15.3.0-preview-000246-052.0.0-rc4-61325-081.0.0-rc-170511-0
- 2.0.0-preview2-20170506-1
+ 2.0.0-preview2-20170522-24.3.0-preview1-25001.0.0-rel-20170501-47315.3.0-preview-20170502-03
From 4b0528110d49bda765f5150e21b8f08ae4d72edc Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Tue, 23 May 2017 23:43:39 -0700
Subject: [PATCH 051/104] Updating MSBuild to 15.3.0-preview-000246-05 to match
VS.
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 793e50b0f..7e1d7ee8d 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -2,7 +2,7 @@
1.1.2
- 15.1.1012
+ 15.3.0-preview-000246-052.0.0-rc5-61427-041.0.0-alpha-20170502-14.0.0-rtm-2283
From e8b799f04e589f008b12a20b737eea672b600f0a Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 24 May 2017 00:11:39 -0700
Subject: [PATCH 052/104] Fixing the channel for release/2.0.0.
---
build/BranchInfo.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index 5510dc8b9..0d146ab2a 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
- master
- master
+ release/2.0.0
+ release/2.0.0
From 69a460191fdec8af904f2a27d1c889b6757840bc Mon Sep 17 00:00:00 2001
From: Nick Guerrera
Date: Wed, 24 May 2017 04:01:07 -0700
Subject: [PATCH 053/104] Update dotnet/sdk version
---
build/DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index e76ffa2e9..bedf7ab97 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -5,7 +5,7 @@
15.3.0-preview-000246-052.0.0-rc4-61325-081.0.0-rc-170511-0
- 2.0.0-preview2-20170522-2
+ 2.0.0-preview2-20170524-24.3.0-preview1-25001.0.0-rel-20170501-47315.3.0-preview-20170502-03
From e6e103314cffbf5ea8ba026e26a2814568ebc13a Mon Sep 17 00:00:00 2001
From: dotnet-bot
Date: Wed, 24 May 2017 17:18:33 +0000
Subject: [PATCH 054/104] Update CoreSetup to preview2-25324-03
---
build/DependencyVersions.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5f30042ff..1c76f7a6f 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
- 2.0.0-preview2-25319-02
+ 2.0.0-preview2-25324-0315.3.0-preview-000246-052.3.0-beta2-61716-091.6.0-beta2-25304
@@ -16,8 +16,8 @@
1.0.0-beta2-20170523-2411.0.0-beta2-20170523-2411.0.0-beta2-20170523-241
- 2.0.0-preview2-25319-02
- 2.0.0-preview2-25319-02
+ 2.0.0-preview2-25324-03
+ 2.0.0-preview2-25324-030.1.0-alpha-1421.2.1-alpha-0021300.2.0
From cfe06a96cf4b61b20cba0bfcaeac3f1ddb020ee9 Mon Sep 17 00:00:00 2001
From: Nat Ayewah
Date: Wed, 24 May 2017 11:38:32 -0700
Subject: [PATCH 055/104] Update NuGet to 4.3.0-preview1-4081 and SDK to
corresponding 1.1.0 based version
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 793e50b0f..dcd82f99d 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -4,8 +4,8 @@
1.1.215.1.10122.0.0-rc5-61427-04
- 1.0.0-alpha-20170502-1
- 4.0.0-rtm-2283
+ 1.1.0-alpha-20170524-4
+ 4.3.0-preview1-40811.0.0-alpha-20170516-2-50915.0.01.0.0-beta1-20170202-111
From 86609a27fe0e62baab4f6729461dbe6e2c1aeb81 Mon Sep 17 00:00:00 2001
From: Livar
Date: Wed, 24 May 2017 14:01:01 -0700
Subject: [PATCH 056/104] Updating the links and badges for release/2.0.0
---
README.md | 119 +++++++++++++++++++++++++++++-------------------------
1 file changed, 65 insertions(+), 54 deletions(-)
diff --git a/README.md b/README.md
index 8b62f921f..f9b41f1a3 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ Looking for V1 of the .NET Core tooling?
If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download!
-> **Note:** the master branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the
+> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the
> v1 of the tools.
Found an issue?
---------------
-You can consult the [known issues page](https://github.com/dotnet/core/blob/master/cli/known-issues.md) to find out the current issues and to see the workarounds.
+You can consult the [known issues page](https://github.com/dotnet/core/blob/release/2.0.0/cli/known-issues.md) to find out the current issues and to see the workarounds.
If you don't find your issue, please file one! However, given that this is a very high-frequency repo, we've setup some [basic guidelines](Documentation/project-docs/issue-filing-guide.md) to help you. Please consult those first.
@@ -23,36 +23,39 @@ This project has adopted the code of conduct defined by the [Contributor Covenan
Build Status
------------
-|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 |
-|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
-|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8-build-badge]][debian-8-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]|
+|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 | Ubuntu 16.10 |Debian 8 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 |
+|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
+|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]|
-[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5449/badge
-[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5449
+[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6208/badge
+[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6208
-[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5450/badge
-[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5450
+[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6209/badge
+[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6209
-[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5447/badge
-[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5447
+[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6205/badge
+[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6205
-[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5448/badge
-[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5448
+[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6206/badge
+[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6206
-[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5442/badge
-[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5442
+[ubuntu-16.10-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6207/badge
+[ubuntu-16.10-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6207
-[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge
-[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445
+[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6199/badge
+[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6199
-[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5441/badge
-[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5441
+[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6203/badge
+[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6203
-[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5446/badge
-[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5446
+[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6198/badge
+[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6198
-[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5603/badge
-[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5603
+[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6204/badge
+[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6204
+
+[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6201/badge
+[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6201
Installers and Binaries
-----------------------
@@ -64,13 +67,14 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
> **Note:** please be aware that below installers are the **latest bits**. If you
> want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling).
-| Platform | master [![][version-badge]][version] |
+| Platform | release/2.0.0 [![][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] |
| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum] *See Installer Note Below [tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] |
-| **Ubuntu 16.04** | [tar.gz][ubuntu-16.04-targz] - [Checksum][ubuntu-16.04-targz-checksum] |
-| **Debian 8** | [tar.gz][debian-8-targz] - [Checksum][debian-8-targz-checksum] |
+| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum] *See Installer Note Below [tar.gz][ubuntu-16.04-targz] - [Checksum][ubuntu-16.04-targz-checksum] |
+| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum] *See Installer Note Below [tar.gz][ubuntu-16.10-targz] - [Checksum][ubuntu-16.10-targz-checksum] |
+| **Debian 8** | [tar.gz][debian-8-targz] - [Checksum][debian-8-targz-checksum] |
| **macOS** | [Installer][osx-installer] - [Checksum][osx-installer-checksum] [tar.gz][osx-targz] - [Checksum][osx-targz-checksum] |
| **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-targz-checksum] |
| **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] |
@@ -78,44 +82,51 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
*Note: 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.*
-[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version
+[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.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/master/win_x64_Release_version_badge.svg
+[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg
-[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe
-[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe.sha
-[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.zip
-[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.zip.sha
+[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe
+[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe.sha
+[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip
+[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip.sha
-[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.exe
-[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.exe.sha
-[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.zip
-[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x86.latest.zip.sha
+[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe
+[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe.sha
+[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip
+[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip.sha
-[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-ubuntu-x64.latest.deb
-[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-ubuntu-x64.latest.deb.sha
-[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu-x64.latest.tar.gz
-[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu-x64.latest.tar.gz.sha
+[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb
+[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb.sha
+[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz
+[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha
-[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz
-[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha
+[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb
+[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha
+[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz
+[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha
-[debian-8-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz
-[debian-8-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz.sha
+[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb
+[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha
+[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz
+[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha
-[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg
-[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg.sha
-[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.tar.gz
-[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.tar.gz.sha
+[debian-8-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz
+[debian-8-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz.sha
-[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-centos-x64.latest.tar.gz
-[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-centos-x64.latest.tar.gz.sha
+[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg
+[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg.sha
+[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz
+[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz.sha
-[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz
-[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz.sha
+[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz
+[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz.sha
-[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-linux-x64.latest.tar.gz
-[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-linux-x64.latest.tar.gz.sha
+[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz
+[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz.sha
+
+[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz
+[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz.sha
# Debian daily feed
From abcffdd51f15bf85f0fced1a1f9fd6556136ece9 Mon Sep 17 00:00:00 2001
From: Nat Ayewah
Date: Wed, 24 May 2017 14:20:52 -0700
Subject: [PATCH 057/104] Update NuGet to 4.3.0-preview2-4082
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index dcd82f99d..d621f76ef 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -4,8 +4,8 @@
1.1.215.1.10122.0.0-rc5-61427-04
- 1.1.0-alpha-20170524-4
- 4.3.0-preview1-4081
+ 1.1.0-alpha-20170524-5
+ 4.3.0-preview2-40821.0.0-alpha-20170516-2-50915.0.01.0.0-beta1-20170202-111
From 815923eb924d74a9e5fca28d9d9caa5fa3592da8 Mon Sep 17 00:00:00 2001
From: William Li
Date: Wed, 24 May 2017 14:36:05 -0700
Subject: [PATCH 058/104] Update CoreSetup to preview2-25324-01
---
build/DependencyVersions.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5f30042ff..fc4f62134 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
- 2.0.0-preview2-25319-02
+ 2.0.0-preview2-25324-0115.3.0-preview-000246-052.3.0-beta2-61716-091.6.0-beta2-25304
@@ -16,8 +16,8 @@
1.0.0-beta2-20170523-2411.0.0-beta2-20170523-2411.0.0-beta2-20170523-241
- 2.0.0-preview2-25319-02
- 2.0.0-preview2-25319-02
+ 2.0.0-preview2-25324-01
+ 2.0.0-preview2-25324-010.1.0-alpha-1421.2.1-alpha-0021300.2.0
From 9083e0bd068e08d797817fb7d210c84a05d601ad Mon Sep 17 00:00:00 2001
From: William Li
Date: Wed, 24 May 2017 14:43:25 -0700
Subject: [PATCH 059/104] Update documenet for enabled apt-get feeds
---
README.md | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index f9b41f1a3..edc0ac633 100644
--- a/README.md
+++ b/README.md
@@ -134,8 +134,8 @@ Newest SDK binaries for 2.0.0 in debian feed may be delayed due to external issu
## Obtaining binaries
-Add debian feed:
-
+### Add debian feed:
+Ubuntu 14.04
```
sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
@@ -144,12 +144,39 @@ sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
sudo apt-get update
```
-Install:
+Ubuntu 16.04
+```
+sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
+
+sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
+
+sudo apt-get update
+```
+
+Ubuntu 16.10
+```
+sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ yakkety main" > /etc/apt/sources.list.d/dotnetdev.list'
+
+sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
+
+sudo apt-get update
+```
+
+Debian 8
+```
+sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ jessie main" > /etc/apt/sources.list.d/dotnetdev.list'
+
+sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
+
+sudo apt-get update
+```
+
+### Install:
```
sudo apt-get install =
```
-To list available packages:
+### To list available packages:
```
apt-cache search dotnet-sdk | grep 2.0.0
```
@@ -167,17 +194,17 @@ When you have the .NET Command Line Interface installed on your OS of choice, yo
First, you will need to restore the packages:
- dotnet restore
+ dotnet restore
This will restore all of the packages that are specified in the project.json file of the given sample.
Then you can either run from source or compile the sample. Running from source is straightforward:
- dotnet run
+ dotnet run
Compiling to IL is done using:
- dotnet build
+ dotnet build
This will drop an IL assembly in `./bin/[configuration]/[framework]/[binary name]`
that you can run using `dotnet bin/[configuration]/[framework]/[binaryname.dll]`.
From e5c3791f6eb68f3f405540faa66b6fab0adf7f08 Mon Sep 17 00:00:00 2001
From: Eric Erhardt
Date: Wed, 24 May 2017 18:12:53 -0500
Subject: [PATCH 060/104] Update the runtime installer and archive file names
in response to https://github.com/dotnet/core-setup/pull/2461
---
build/BundledRuntimes.props | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 252b275f8..9d925e277 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -3,21 +3,24 @@
$(Rid)$(ProductMonikerRid)
+
+ -internal
+
- dotnet-host-$(CoreSetupRid).$(SharedHostVersion)$(InstallerExtension)
+ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension)$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)
- dotnet-hostfxr-$(CoreSetupRid).$(HostFxrVersion)$(InstallerExtension)
+ dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(CoreSetupRid)$(InstallerExtension)$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)
- dotnet-sharedframework-$(CoreSetupRid).$(SharedFrameworkVersion)$(InstallerExtension)
+ dotnet-runtime$(InstallerStartSuffix)-$(SharedFrameworkVersion)-$(CoreSetupRid)$(InstallerExtension)$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupRid)linux-x64
- dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension)
+ dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
From 61c217c6f23b6ebac8689c73deb8ee17b50300db Mon Sep 17 00:00:00 2001
From: Eric Erhardt
Date: Wed, 24 May 2017 19:36:39 -0500
Subject: [PATCH 061/104] Fix shared framework deb package name in response to
https://github.com/dotnet/core-setup/pull/2461
---
build/package/Installer.DEB.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index c4f0d1797..f34d6f8a1 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -29,7 +29,7 @@
$(SdkVersion)dotnet-dev-$(SdkDebianPackageVersion)$(SharedFrameworkVersion)
- dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)
+ dotnet-runtime-$(SharedFxDebianPackageVersion)$(SharedFxDebianPackageName.ToLower())$(HostFxrVersion)dotnet-hostfxr-$(HostFxrDebianPackageVersion)
From 75eac0c92b8a273ce9bce299d4f544c2f9932631 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 24 May 2017 16:12:11 -0700
Subject: [PATCH 062/104] Moving version validation to only when a SDK is not
overriden. Also adding a validation for the minimum MSBuild version.
---
.../MSBuildSdkResolver.cs | 45 ++++++-----
src/redist/minimumMSBuildVersion | 1 +
src/redist/redist.csproj | 6 ++
.../GivenAnMSBuildSdkResolver.cs | 76 ++++++++++++++++++-
4 files changed, 106 insertions(+), 22 deletions(-)
create mode 100644 src/redist/minimumMSBuildVersion
diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
index 4edf02190..3d16468cd 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -50,20 +50,34 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
}
msbuildSdksDir = Path.Combine(netcoreSdkDir, "Sdks");
- netcoreSdkVersion = new DirectoryInfo(netcoreSdkDir).Name;;
- }
+ netcoreSdkVersion = new DirectoryInfo(netcoreSdkDir).Name;
- if (!IsNetCoreSDKOveridden(netcoreSdkVersion) &&
- IsNetCoreSDKSmallerThanTheMinimumVersion(netcoreSdkVersion, sdkReference.MinimumVersion))
- {
- return factory.IndicateFailure(
- new[]
- {
- $"Version {netcoreSdkVersion} of the SDK is smaller than the minimum version"
- + $" {sdkReference.MinimumVersion} requested. Check that a recent enough .NET Core SDK is"
- + " installed, increase the minimum version specified in the project, or increase"
- + " the version specified in global.json."
- });
+ if (IsNetCoreSDKSmallerThanTheMinimumVersion(netcoreSdkVersion, sdkReference.MinimumVersion))
+ {
+ return factory.IndicateFailure(
+ new[]
+ {
+ $"Version {netcoreSdkVersion} of the SDK is smaller than the minimum version"
+ + $" {sdkReference.MinimumVersion} requested. Check that a recent enough .NET Core SDK is"
+ + " installed, increase the minimum version specified in the project, or increase"
+ + " the version specified in global.json."
+ });
+ }
+
+ var minimumMSBuildVersionString =
+ File.ReadAllLines(Path.Combine(netcoreSdkDir, "minimumMSBuildVersion"))[0];
+ var minimumMSBuildVersion = Version.Parse(minimumMSBuildVersionString);
+ if (context.MSBuildVersion.CompareTo(minimumMSBuildVersion) == -1)
+ {
+ return factory.IndicateFailure(
+ new[]
+ {
+ $"Version {netcoreSdkVersion} of the SDK requires at least version {minimumMSBuildVersionString}"
+ + $" of msbuild. The current available version of msbuild is {context.MSBuildVersion.ToString()}."
+ + " Change the SDK specified in global.json to an older version that requires the msbuild"
+ + " version currently available."
+ });
+ }
}
string msbuildSdkDir = Path.Combine(msbuildSdksDir, sdkReference.Name, "Sdk");
@@ -80,11 +94,6 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
return factory.IndicateSuccess(msbuildSdkDir, netcoreSdkVersion);
}
- private bool IsNetCoreSDKOveridden(string netcoreSdkVersion)
- {
- return netcoreSdkVersion == null;
- }
-
private bool IsNetCoreSDKSmallerThanTheMinimumVersion(string netcoreSdkVersion, string minimumVersion)
{
FXVersion netCoreSdkFXVersion;
diff --git a/src/redist/minimumMSBuildVersion b/src/redist/minimumMSBuildVersion
new file mode 100644
index 000000000..1e4c6b144
--- /dev/null
+++ b/src/redist/minimumMSBuildVersion
@@ -0,0 +1 @@
+15.3.246
\ No newline at end of file
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 88aba73b6..afb45015d 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -36,6 +36,12 @@
+
+
+ PreserveNewest
+
+
+
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
index ad98825b5..5fcf2172d 100644
--- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
+++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
@@ -78,6 +78,32 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
+ " specified in the project, or increase the version specified in global.json.");
}
+ [Fact]
+ public void ItReturnsNullWhenTheSDKRequiresAHigherVersionOfMSBuildThanTheOneAvailable()
+ {
+ var environment = new TestEnvironment();
+ var expected =
+ environment.CreateSdkDirectory(ProgramFiles.X64, "Some.Test.Sdk", "99.99.99", new Version(2, 0));
+ environment.CreateMuxerAndAddToPath(ProgramFiles.X64);
+
+ var resolver = environment.CreateResolver();
+ var result = (MockResult)resolver.Resolve(
+ new SdkReference("Some.Test.Sdk", null, "99.99.99"),
+ new MockContext
+ {
+ ProjectFilePath = environment.TestDirectory.FullName
+ },
+ new MockFactory());
+
+ result.Success.Should().BeFalse();
+ result.Path.Should().BeNull();
+ result.Version.Should().BeNull();
+ result.Warnings.Should().BeNullOrEmpty();
+ result.Errors.Should().Contain("Version 99.99.99 of the SDK requires at least version 2.0 of msbuild."
+ + " The current available version of msbuild is 1.0. Change the SDK specified in global.json to an older"
+ + " version that requires the msbuild version currently available.");
+ }
+
[Fact]
public void ItReturnsTheVersionIfItIsEqualToTheMinVersion()
{
@@ -147,27 +173,63 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
=> new DotNetMSBuildSdkResolver(GetEnvironmentVariable);
public DirectoryInfo GetSdkDirectory(ProgramFiles programFiles, string sdkName, string sdkVersion)
- => TestDirectory.GetDirectory(GetProgramFilesDirectory(programFiles).FullName, "dotnet", "sdk", sdkVersion, "Sdks", sdkName, "Sdk");
+ => TestDirectory.GetDirectory(
+ GetProgramFilesDirectory(programFiles).FullName,
+ "dotnet",
+ "sdk",
+ sdkVersion,
+ "Sdks",
+ sdkName,
+ "Sdk");
public DirectoryInfo GetProgramFilesDirectory(ProgramFiles programFiles)
=> TestDirectory.GetDirectory($"ProgramFiles{programFiles}");
- public DirectoryInfo CreateSdkDirectory(ProgramFiles programFiles, string sdkVersion, string sdkName)
+ public DirectoryInfo CreateSdkDirectory(
+ ProgramFiles programFiles,
+ string sdkName,
+ string sdkVersion,
+ Version minimumMSBuildVersion = null)
{
- var dir = GetSdkDirectory(programFiles, sdkVersion, sdkName);
+ var dir = GetSdkDirectory(programFiles, sdkName, sdkVersion);
dir.Create();
+
+ CreateMSBuildRequiredVersionFile(programFiles, sdkVersion, minimumMSBuildVersion);
+
return dir;
}
public void CreateMuxerAndAddToPath(ProgramFiles programFiles)
{
- var muxerDirectory = TestDirectory.GetDirectory(GetProgramFilesDirectory(programFiles).FullName, "dotnet");
+ var muxerDirectory =
+ TestDirectory.GetDirectory(GetProgramFilesDirectory(programFiles).FullName, "dotnet");
new FileInfo(Path.Combine(muxerDirectory.FullName, Muxer)).Create();
PathEnvironmentVariable = $"{muxerDirectory}{Path.PathSeparator}{PathEnvironmentVariable}";
}
+ private void CreateMSBuildRequiredVersionFile(
+ ProgramFiles programFiles,
+ string sdkVersion,
+ Version minimumMSBuildVersion)
+ {
+ if (minimumMSBuildVersion == null)
+ {
+ minimumMSBuildVersion = new Version(1, 0);
+ }
+
+ var cliDirectory = TestDirectory.GetDirectory(
+ GetProgramFilesDirectory(programFiles).FullName,
+ "dotnet",
+ "sdk",
+ sdkVersion);
+
+ File.WriteAllText(
+ Path.Combine(cliDirectory.FullName, "minimumMSBuildVersion"),
+ minimumMSBuildVersion.ToString());
+ }
+
public void CreateGlobalJson(DirectoryInfo directory, string version)
=> File.WriteAllText(directory.GetFile("global.json").FullName,
$@"{{ ""sdk"": {{ ""version"": ""{version}"" }} }}");
@@ -188,6 +250,12 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
{
public new string ProjectFilePath { get => base.ProjectFilePath; set => base.ProjectFilePath = value; }
public new string SolutionFilePath { get => base.SolutionFilePath; set => base.SolutionFilePath = value; }
+ public new Version MSBuildVersion { get => base.MSBuildVersion; set => base.MSBuildVersion = value; }
+
+ public MockContext()
+ {
+ MSBuildVersion = new Version(1, 0);
+ }
}
private sealed class MockFactory : SdkResultFactory
From 1a117568fe65df09e26c141d7d0fe85e390424ea Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 24 May 2017 17:55:18 -0700
Subject: [PATCH 063/104] Addressing code review comments by comparing the
versions differently and by changing the name of SDK to .NET Core SDK.
---
.../MSBuildSdkResolver.cs | 10 +++++-----
.../GivenAnMSBuildSdkResolver.cs | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
index 3d16468cd..c88314207 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -57,7 +57,7 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
return factory.IndicateFailure(
new[]
{
- $"Version {netcoreSdkVersion} of the SDK is smaller than the minimum version"
+ $"Version {netcoreSdkVersion} of the .NET Core SDK is smaller than the minimum version"
+ $" {sdkReference.MinimumVersion} requested. Check that a recent enough .NET Core SDK is"
+ " installed, increase the minimum version specified in the project, or increase"
+ " the version specified in global.json."
@@ -67,14 +67,14 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
var minimumMSBuildVersionString =
File.ReadAllLines(Path.Combine(netcoreSdkDir, "minimumMSBuildVersion"))[0];
var minimumMSBuildVersion = Version.Parse(minimumMSBuildVersionString);
- if (context.MSBuildVersion.CompareTo(minimumMSBuildVersion) == -1)
+ if (context.MSBuildVersion < minimumMSBuildVersion)
{
return factory.IndicateFailure(
new[]
{
- $"Version {netcoreSdkVersion} of the SDK requires at least version {minimumMSBuildVersionString}"
+ $"Version {netcoreSdkVersion} of the .NET Core SDK requires at least version {minimumMSBuildVersionString}"
+ $" of msbuild. The current available version of msbuild is {context.MSBuildVersion.ToString()}."
- + " Change the SDK specified in global.json to an older version that requires the msbuild"
+ + " Change the .NET Core SDK specified in global.json to an older version that requires the msbuild"
+ " version currently available."
});
}
@@ -110,7 +110,7 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
return true;
}
- return FXVersion.Compare(netCoreSdkFXVersion, minimumFXVersion) == -1;
+ return FXVersion.Compare(netCoreSdkFXVersion, minimumFXVersion) < 0;
}
private string ResolveNetcoreSdkDirectory(SdkResolverContext context)
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
index 5fcf2172d..6fcd01ca5 100644
--- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
+++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
@@ -73,7 +73,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
result.Path.Should().BeNull();
result.Version.Should().BeNull();
result.Warnings.Should().BeNullOrEmpty();
- result.Errors.Should().Contain("Version 99.99.99 of the SDK is smaller than the minimum version 999.99.99"
+ result.Errors.Should().Contain("Version 99.99.99 of the .NET Core SDK is smaller than the minimum version 999.99.99"
+ " requested. Check that a recent enough .NET Core SDK is installed, increase the minimum version"
+ " specified in the project, or increase the version specified in global.json.");
}
@@ -99,8 +99,8 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
result.Path.Should().BeNull();
result.Version.Should().BeNull();
result.Warnings.Should().BeNullOrEmpty();
- result.Errors.Should().Contain("Version 99.99.99 of the SDK requires at least version 2.0 of msbuild."
- + " The current available version of msbuild is 1.0. Change the SDK specified in global.json to an older"
+ result.Errors.Should().Contain("Version 99.99.99 of the .NET Core SDK requires at least version 2.0 of msbuild."
+ + " The current available version of msbuild is 1.0. Change the .NET Core SDK specified in global.json to an older"
+ " version that requires the msbuild version currently available.");
}
From db68d4505eeb0125fdd6528d79f004eaf493146b Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 24 May 2017 18:01:55 -0700
Subject: [PATCH 064/104] Pinning the MSBuild Minimum version to 15.3.0.
---
.../MSBuildSdkResolver.cs | 4 ++--
src/redist/minimumMSBuildVersion | 2 +-
.../GivenAnMSBuildSdkResolver.cs | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
index c88314207..e32684a43 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -73,8 +73,8 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
new[]
{
$"Version {netcoreSdkVersion} of the .NET Core SDK requires at least version {minimumMSBuildVersionString}"
- + $" of msbuild. The current available version of msbuild is {context.MSBuildVersion.ToString()}."
- + " Change the .NET Core SDK specified in global.json to an older version that requires the msbuild"
+ + $" of MSBuild. The current available version of MSBuild is {context.MSBuildVersion.ToString()}."
+ + " Change the .NET Core SDK specified in global.json to an older version that requires the MSBuild"
+ " version currently available."
});
}
diff --git a/src/redist/minimumMSBuildVersion b/src/redist/minimumMSBuildVersion
index 1e4c6b144..7ed6fef85 100644
--- a/src/redist/minimumMSBuildVersion
+++ b/src/redist/minimumMSBuildVersion
@@ -1 +1 @@
-15.3.246
\ No newline at end of file
+15.3.0
\ No newline at end of file
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
index 6fcd01ca5..cee6f6a2a 100644
--- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
+++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
@@ -99,9 +99,9 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
result.Path.Should().BeNull();
result.Version.Should().BeNull();
result.Warnings.Should().BeNullOrEmpty();
- result.Errors.Should().Contain("Version 99.99.99 of the .NET Core SDK requires at least version 2.0 of msbuild."
- + " The current available version of msbuild is 1.0. Change the .NET Core SDK specified in global.json to an older"
- + " version that requires the msbuild version currently available.");
+ result.Errors.Should().Contain("Version 99.99.99 of the .NET Core SDK requires at least version 2.0 of MSBuild."
+ + " The current available version of MSBuild is 1.0. Change the .NET Core SDK specified in global.json to an older"
+ + " version that requires the MSBuild version currently available.");
}
[Fact]
From 9a669ab30c815725174d5df4eede707715db4f3f Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Thu, 25 May 2017 09:47:18 -0700
Subject: [PATCH 065/104] Updating the Sdk to one that includes the error
surfacing work.
---
build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index faed8480f..bed91539b 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -4,7 +4,7 @@
1.1.215.3.0-preview-000246-052.0.0-rc5-61427-04
- 1.1.0-alpha-20170524-5
+ 1.1.0-alpha-20170525-24.3.0-preview2-40821.0.0-alpha-20170516-2-50915.0.0
From dad6ead170bbe1805666674f702d45b70ad1b1c6 Mon Sep 17 00:00:00 2001
From: Eric Erhardt
Date: Thu, 25 May 2017 11:56:55 -0500
Subject: [PATCH 066/104] update the SDK version to 2.0.0-preview2-20170524-8
---
build/DependencyVersions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 1c76f7a6f..e3d7f225d 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -6,7 +6,7 @@
2.3.0-beta2-61716-091.6.0-beta2-253041.0.0-rc-170511-0
- 2.0.0-preview2-20170524-2
+ 2.0.0-preview2-20170524-84.3.0-preview1-25002.0.0-rel-20170518-51215.3.0-preview-20170502-03
From 8b07dfa149de4c8a5d88fc892b6a7c5aa439dcf3 Mon Sep 17 00:00:00 2001
From: Livar Cunha
Date: Wed, 24 May 2017 22:51:26 -0700
Subject: [PATCH 067/104] Adding the runtime identifier option to dotnet clean.
---
.../dotnet-clean/CleanCommandParser.cs | 1 +
test/Microsoft.DotNet.Cli.Tests.sln | 15 ++++++-
.../Assertions/DirectoryInfoAssertions.cs | 16 +++++++
.../GivenDotnetCleanCleansBuildArtifacts.cs | 43 +++++++++++++++++++
.../dotnet-clean.Tests.csproj | 22 ++++++++++
5 files changed, 96 insertions(+), 1 deletion(-)
create mode 100644 test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs
create mode 100644 test/dotnet-clean.Tests/dotnet-clean.Tests.csproj
diff --git a/src/dotnet/commands/dotnet-clean/CleanCommandParser.cs b/src/dotnet/commands/dotnet-clean/CleanCommandParser.cs
index 3a78ebfa9..c88d1ede9 100644
--- a/src/dotnet/commands/dotnet-clean/CleanCommandParser.cs
+++ b/src/dotnet/commands/dotnet-clean/CleanCommandParser.cs
@@ -21,6 +21,7 @@ namespace Microsoft.DotNet.Cli
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
CommonOptions.FrameworkOption(),
+ CommonOptions.RuntimeOption(),
CommonOptions.ConfigurationOption(),
CommonOptions.VerbosityOption());
}
diff --git a/test/Microsoft.DotNet.Cli.Tests.sln b/test/Microsoft.DotNet.Cli.Tests.sln
index 370d70331..c3d64f5d7 100644
--- a/test/Microsoft.DotNet.Cli.Tests.sln
+++ b/test/Microsoft.DotNet.Cli.Tests.sln
@@ -76,9 +76,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-back-compat.Tests",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-remove-package.Tests", "dotnet-remove-package.Tests\dotnet-remove-package.Tests.csproj", "{CF517B15-B307-4660-87D5-CC036ADECD4B}"
EndProject
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSBuildSdkResolver.Tests", "Microsoft.DotNet.MSBuildSdkResolver.Tests\Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj", "{42A0CAB4-FFAD-47D4-9880-C0F4EDCF93DE}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-clean.Tests", "dotnet-clean.Tests\dotnet-clean.Tests.csproj", "{D9A582B8-1FE2-45D5-B139-0BA828FE3691}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -509,6 +510,18 @@ Global
{42A0CAB4-FFAD-47D4-9880-C0F4EDCF93DE}.Release|x64.Build.0 = Release|Any CPU
{42A0CAB4-FFAD-47D4-9880-C0F4EDCF93DE}.Release|x86.ActiveCfg = Release|Any CPU
{42A0CAB4-FFAD-47D4-9880-C0F4EDCF93DE}.Release|x86.Build.0 = Release|Any CPU
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Debug|x64.ActiveCfg = Debug|x64
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Debug|x64.Build.0 = Debug|x64
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Debug|x86.ActiveCfg = Debug|x86
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Debug|x86.Build.0 = Debug|x86
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Release|x64.ActiveCfg = Release|x64
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Release|x64.Build.0 = Release|x64
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Release|x86.ActiveCfg = Release|x86
+ {D9A582B8-1FE2-45D5-B139-0BA828FE3691}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
index 367d94d90..adb83caf2 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
@@ -191,6 +191,22 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return new AndConstraint(this);
}
+ public AndConstraint BeEmpty()
+ {
+ Execute.Assertion.ForCondition(!_dirInfo.EnumerateFileSystemInfos().Any())
+ .FailWith($"The directory {_dirInfo.FullName} is not empty.");
+
+ return new AndConstraint(this);
+ }
+
+ public AndConstraint NotBeEmpty()
+ {
+ Execute.Assertion.ForCondition(_dirInfo.EnumerateFileSystemInfos().Any())
+ .FailWith($"The directory {_dirInfo.FullName} is empty.");
+
+ return new AndConstraint(this);
+ }
+
public AndConstraint NotExist(string because = "", params object[] reasonArgs)
{
Execute.Assertion
diff --git a/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs b/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs
new file mode 100644
index 000000000..7ac4dd0e6
--- /dev/null
+++ b/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs
@@ -0,0 +1,43 @@
+// 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.IO;
+using FluentAssertions;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using Xunit;
+using System.Linq;
+
+namespace Microsoft.DotNet.Cli.Clean.Tests
+{
+ public class GivenDotnetCleanCleansBuildArtifacts : TestBase
+ {
+ [Fact]
+ public void ItCleansAProjectBuiltWithRuntimeIdentifier()
+ {
+ var testAppName = "MSBuildTestApp";
+ var testInstance = TestAssets.Get(testAppName)
+ .CreateInstance(testAppName)
+ .WithSourceFiles()
+ .WithRestoreFiles();
+
+ new BuildCommand()
+ .WithRuntime("win7-x64")
+ .WithWorkingDirectory(testInstance.Root)
+ .Execute()
+ .Should().Pass();
+
+ var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
+ var outputFolder = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.0", "win7-x64");
+
+ outputFolder.Should().NotBeEmpty();
+
+ new CleanCommand()
+ .WithWorkingDirectory(testInstance.Root)
+ .Execute("-r win7-x64")
+ .Should().Pass();
+
+ outputFolder.Should().BeEmpty();
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj
new file mode 100644
index 000000000..abdf7f324
--- /dev/null
+++ b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj
@@ -0,0 +1,22 @@
+
+
+
+
+ $(CliTargetFramework)
+ $(CLI_SharedFrameworkVersion)
+ true
+ dotnet-clean.Tests
+ $(PackageTargetFallback);dotnet5.4;portable-net451+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
From 76cf6d4c241ac94b10b5bc7d26c3a86c0e765a10 Mon Sep 17 00:00:00 2001
From: John Beisner
Date: Fri, 26 May 2017 13:29:13 -0700
Subject: [PATCH 068/104] .NET Core 2+ Naming and Versioning New file name
structure for the runtime and the CLI per:
https://github.com/dotnet/designs/issues/2 1. Branding changes 2. renaming of
assets
---
build/Branding.props | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/build/Branding.props b/build/Branding.props
index 25fc7c433..e7f4ce95d 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,10 +1,10 @@
- Microsoft .NET Core 2.0.0 - Preview 2 SDK
- Microsoft .NET Core 2.0.0 - Runtime
- Microsoft .NET Core 2.0.0 - Host
- Microsoft .NET Core 2.0.0 - Host FX Resolver
-
+ Microsoft .NET Core SDK 2.0.0 Preview 2
+ Microsoft .NET Core Runtime 2.0.0
+ Microsoft .NET Core Host 2.0.0
+ Microsoft .NET Core Host FX Resolver 2.0.0
+
Microsoft.NETCore.App$(SharedFrameworkName)
@@ -13,16 +13,16 @@
'$(Rid)' == 'fedora.24-x64' OR
'$(Rid)' == 'opensuse.42.1-x64' ">$(Rid)
$(OSName)-$(Architecture)
-
+
dotnet-sdkdotnet-sdk-debugdotnet-dev
- dotnet-sharedframework-sdk
+ dotnet-runtime-sdk
- $(ArtifactNameSdk)-$(ProductMonikerRid).$(SdkVersion)
- $(ArtifactNameSdkDebug)-$(ProductMonikerRid).$(SdkVersion)
- $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(ProductMonikerRid).$(SdkVersion)
- $(ArtifactNameCombinedFrameworkSdk)-$(ProductMonikerRid).$(SdkVersion)
+ $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)
+ $(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)
+ $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)
+ $(ArtifactNameCombinedFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)
From 7c8bf26eafcfeae6cfa4d0af68396f4264b938ca Mon Sep 17 00:00:00 2001
From: Nick Guerrera
Date: Fri, 26 May 2017 14:40:50 -0700
Subject: [PATCH 069/104] Allow resolution of SDKs without minimum msbuild
version file
---
.../MSBuildSdkResolver.cs | 19 ++++++++++++++++---
.../GivenAnMSBuildSdkResolver.cs | 8 ++++++--
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
index e32684a43..b4358a0c7 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -5,6 +5,7 @@ using Microsoft.Build.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using System.Linq;
namespace Microsoft.DotNet.MSBuildSdkResolver
{
@@ -63,9 +64,7 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
+ " the version specified in global.json."
});
}
-
- var minimumMSBuildVersionString =
- File.ReadAllLines(Path.Combine(netcoreSdkDir, "minimumMSBuildVersion"))[0];
+ string minimumMSBuildVersionString = GetMinimumMSBuildVersion(netcoreSdkDir);
var minimumMSBuildVersion = Version.Parse(minimumMSBuildVersionString);
if (context.MSBuildVersion < minimumMSBuildVersion)
{
@@ -94,6 +93,20 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
return factory.IndicateSuccess(msbuildSdkDir, netcoreSdkVersion);
}
+ private static string GetMinimumMSBuildVersion(string netcoreSdkDir)
+ {
+ string minimumVersionFilePath = Path.Combine(netcoreSdkDir, "minimumMSBuildVersion");
+ if (!File.Exists(minimumVersionFilePath))
+ {
+ // smallest version that had resolver support and also
+ // greater than or equal to the version required by any
+ // .NET Core SDK that did not have this file.
+ return "15.3.0";
+ }
+
+ return File.ReadLines(minimumVersionFilePath).First().Trim();
+ }
+
private bool IsNetCoreSDKSmallerThanTheMinimumVersion(string netcoreSdkVersion, string minimumVersion)
{
FXVersion netCoreSdkFXVersion;
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
index cee6f6a2a..73cc41a64 100644
--- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
+++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
@@ -91,6 +91,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
new SdkReference("Some.Test.Sdk", null, "99.99.99"),
new MockContext
{
+ MSBuildVersion = new Version(1, 0),
ProjectFilePath = environment.TestDirectory.FullName
},
new MockFactory());
@@ -194,7 +195,10 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
var dir = GetSdkDirectory(programFiles, sdkName, sdkVersion);
dir.Create();
- CreateMSBuildRequiredVersionFile(programFiles, sdkVersion, minimumMSBuildVersion);
+ if (minimumMSBuildVersion != null)
+ {
+ CreateMSBuildRequiredVersionFile(programFiles, sdkVersion, minimumMSBuildVersion);
+ }
return dir;
}
@@ -254,7 +258,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
public MockContext()
{
- MSBuildVersion = new Version(1, 0);
+ MSBuildVersion = new Version(15, 3, 0);
}
}
From b48b7d2ea097d6cc6c637f02001c5e1980f0be98 Mon Sep 17 00:00:00 2001
From: John Beisner
Date: Fri, 26 May 2017 15:46:56 -0700
Subject: [PATCH 070/104] .NET Core 2+ Naming and Versioning New file name
structure for the runtime and the CLI per:
https://github.com/dotnet/designs/issues/2
The renaming of assets, therefore the dotnet installation scripts must change to accommodate.
Trivial:
"Write-Host" should be "Write-Output"
---
.../update-dependencies.ps1 | 16 +-
packaging/windows/clisdk/generatebundle.ps1 | 12 +-
packaging/windows/clisdk/generatemsi.ps1 | 16 +-
packaging/windows/clisdk/generatenupkg.ps1 | 8 +-
run-build.ps1 | 24 +--
scripts/common/_utility.ps1 | 6 +-
scripts/dev-dotnet.ps1 | 2 +-
scripts/obtain/dotnet-install.ps1 | 159 +++++++++++-------
scripts/obtain/dotnet-install.sh | 33 ++--
scripts/use-dev.ps1 | 2 +-
test/Installer/testmsi.ps1 | 4 +-
11 files changed, 165 insertions(+), 117 deletions(-)
diff --git a/build_projects/update-dependencies/update-dependencies.ps1 b/build_projects/update-dependencies/update-dependencies.ps1
index 8eafc53c1..b76d10bc1 100644
--- a/build_projects/update-dependencies/update-dependencies.ps1
+++ b/build_projects/update-dependencies/update-dependencies.ps1
@@ -9,11 +9,11 @@ param(
if($Help)
{
- Write-Host "Usage: .\update-dependencies.ps1"
- Write-Host ""
- Write-Host "Options:"
- Write-Host " -Help Display this help message"
- Write-Host " -Update Update dependencies (but don't open a PR)"
+ Write-Output "Usage: .\update-dependencies.ps1"
+ Write-Output ""
+ Write-Output "Options:"
+ Write-Output " -Help Display this help message"
+ Write-Output " -Update Update dependencies (but don't open a PR)"
exit 0
}
@@ -35,7 +35,7 @@ if (!$env:DOTNET_INSTALL_DIR)
}
# Install a stage 0
-Write-Host "Installing .NET Core CLI Stage 0"
+Write-Output "Installing .NET Core CLI Stage 0"
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel "master" -Architecture $Architecture
if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
@@ -43,11 +43,11 @@ if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
# Restore the app
-Write-Host "Restoring $ProjectPath..."
+Write-Output "Restoring $ProjectPath..."
dotnet restore "$ProjectPath"
if($LASTEXITCODE -ne 0) { throw "Failed to restore" }
# Run the app
-Write-Host "Invoking App $ProjectPath..."
+Write-Output "Invoking App $ProjectPath..."
dotnet run -p "$ProjectPath" "$ProjectArgs"
if($LASTEXITCODE -ne 0) { throw "Build failed" }
diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1
index da5b4c83c..103c7a4e1 100644
--- a/packaging/windows/clisdk/generatebundle.ps1
+++ b/packaging/windows/clisdk/generatebundle.ps1
@@ -25,7 +25,7 @@ function RunCandleForBundle
$result = $true
pushd "$WixRoot"
- Write-Host Running candle for bundle..
+ Write-Output Running candle for bundle..
$AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\clisdk"
.\candle.exe -nologo `
@@ -52,7 +52,7 @@ function RunCandleForBundle
if($LastExitCode -ne 0)
{
$result = $false
- Write-Host "Candle failed with exit code $LastExitCode."
+ Write-Output "Candle failed with exit code $LastExitCode."
}
popd
@@ -64,7 +64,7 @@ function RunLightForBundle
$result = $true
pushd "$WixRoot"
- Write-Host Running light for bundle..
+ Write-Output Running light for bundle..
$AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\clisdk"
.\light.exe -nologo `
@@ -80,7 +80,7 @@ function RunLightForBundle
if($LastExitCode -ne 0)
{
$result = $false
- Write-Host "Light failed with exit code $LastExitCode."
+ Write-Output "Light failed with exit code $LastExitCode."
}
popd
@@ -98,7 +98,7 @@ if(!(Test-Path $ASPNETRuntimeWixLibFile))
throw "$ASPNETRuntimeWixLibFile not found"
}
-Write-Host "Creating dotnet Bundle at $DotnetBundleOutput"
+Write-Output "Creating dotnet Bundle at $DotnetBundleOutput"
if([string]::IsNullOrEmpty($WixRoot))
{
@@ -121,6 +121,6 @@ if(!(Test-Path $DotnetBundleOutput))
Exit -1
}
-Write-Host -ForegroundColor Green "Successfully created dotnet bundle - $DotnetBundleOutput"
+Write-Output -ForegroundColor Green "Successfully created dotnet bundle - $DotnetBundleOutput"
exit $LastExitCode
diff --git a/packaging/windows/clisdk/generatemsi.ps1 b/packaging/windows/clisdk/generatemsi.ps1
index 7e1984891..50eb80d2a 100644
--- a/packaging/windows/clisdk/generatemsi.ps1
+++ b/packaging/windows/clisdk/generatemsi.ps1
@@ -24,14 +24,14 @@ function RunHeat
$result = $true
pushd "$WixRoot"
- Write-Host Running heat..
+ Write-Output Running heat..
.\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
{
$result = $false
- Write-Host "Heat failed with exit code $LastExitCode."
+ Write-Output "Heat failed with exit code $LastExitCode."
}
popd
@@ -43,7 +43,7 @@ function RunCandle
$result = $true
pushd "$WixRoot"
- Write-Host Running candle..
+ Write-Output Running candle..
$AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\clisdk"
.\candle.exe -nologo `
@@ -64,7 +64,7 @@ function RunCandle
if($LastExitCode -ne 0)
{
$result = $false
- Write-Host "Candle failed with exit code $LastExitCode."
+ Write-Output "Candle failed with exit code $LastExitCode."
}
popd
@@ -76,7 +76,7 @@ function RunLight
$result = $true
pushd "$WixRoot"
- Write-Host Running light..
+ Write-Output Running light..
$CabCache = Join-Path $WixRoot "cabcache"
$AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\clisdk"
@@ -95,7 +95,7 @@ function RunLight
if($LastExitCode -ne 0)
{
$result = $false
- Write-Host "Light failed with exit code $LastExitCode."
+ Write-Output "Light failed with exit code $LastExitCode."
}
popd
@@ -107,7 +107,7 @@ if(!(Test-Path $inputDir))
throw "$inputDir not found"
}
-Write-Host "Creating dotnet MSI at $DotnetMSIOutput"
+Write-Output "Creating dotnet MSI at $DotnetMSIOutput"
if([string]::IsNullOrEmpty($WixRoot))
{
@@ -135,6 +135,6 @@ if(!(Test-Path $DotnetMSIOutput))
Exit -1
}
-Write-Host -ForegroundColor Green "Successfully created dotnet MSI - $DotnetMSIOutput"
+Write-Output -ForegroundColor Green "Successfully created dotnet MSI - $DotnetMSIOutput"
exit $LastExitCode
diff --git a/packaging/windows/clisdk/generatenupkg.ps1 b/packaging/windows/clisdk/generatenupkg.ps1
index 9297775a8..ca91f2e3a 100644
--- a/packaging/windows/clisdk/generatenupkg.ps1
+++ b/packaging/windows/clisdk/generatenupkg.ps1
@@ -25,7 +25,7 @@ function DownloadNugetExe
}
if (-not (Test-Path $NuGetExe)) {
- Write-Host 'Downloading nuget.exe to ' + $NuGetExe
+ Write-Output 'Downloading nuget.exe to ' + $NuGetExe
wget https://dist.nuget.org/win-x86-commandline/v3.5.0-rc1/NuGet.exe -OutFile $NuGetExe
}
}
@@ -34,7 +34,7 @@ function GenerateNupkg
{
if (-not (Test-Path $NuspecFile))
{
- Write-Host 'Error nuspec not found - $NuspecFile'
+ Write-Output 'Error nuspec not found - $NuspecFile'
}
$SdkBundlePath = [System.IO.Path]::GetFullPath($SdkBundlePath)
@@ -50,7 +50,7 @@ if(!(Test-Path $SdkBundlePath))
throw "$SdkBundlePath not found"
}
-Write-Host "Creating nupkg for Sdk installer"
+Write-Output "Creating nupkg for Sdk installer"
DownloadNugetExe
@@ -69,6 +69,6 @@ if(!(Test-Path $NupkgFile))
throw "$NupkgFile not generated"
}
-Write-Host -ForegroundColor Green "Successfully created installer nupkg - $NupkgFile"
+Write-Output -ForegroundColor Green "Successfully created installer nupkg - $NupkgFile"
exit $LastExitCode
diff --git a/run-build.ps1 b/run-build.ps1
index 61796b456..7cdfb01bd 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -16,14 +16,14 @@ param(
if($Help)
{
- Write-Host "Usage: .\build.ps1 [-Configuration ] [-Architecture ] [-NoPackage] [-Help]"
- Write-Host ""
- Write-Host "Options:"
- Write-Host " -Configuration Build the specified Configuration (Debug or Release, default: Debug)"
- Write-Host " -Architecture Build the specified architecture (x64 or x86 (supported only on Windows), default: x64)"
- Write-Host " -NoPackage Skip packaging targets"
- Write-Host " -NoBuild Skip building the product"
- Write-Host " -Help Display this help message"
+ Write-Output "Usage: .\build.ps1 [-Configuration ] [-Architecture ] [-NoPackage] [-Help]"
+ Write-Output ""
+ Write-Output "Options:"
+ Write-Output " -Configuration Build the specified Configuration (Debug or Release, default: Debug)"
+ Write-Output " -Architecture Build the specified architecture (x64 or x86 (supported only on Windows), default: x64)"
+ Write-Output " -NoPackage Skip packaging targets"
+ Write-Output " -NoBuild Skip building the product"
+ Write-Output " -Help Display this help message"
exit 0
}
@@ -80,7 +80,7 @@ $env:VSTEST_TRACE_BUILD=1
# install a stage0
$dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1"
-Write-Host "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005867"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Write-Output "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005867"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Channel ""master"" ""2.0.0-preview1-005867"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
@@ -89,7 +89,7 @@ if ($LastExitCode -ne 0)
}
-Write-Host "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
+Write-Output "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
Invoke-Expression "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
if ($LastExitCode -ne 0)
{
@@ -102,8 +102,8 @@ $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
if ($NoBuild)
{
- Write-Host "Not building due to --nobuild"
- Write-Host "Command that would be run: 'dotnet msbuild build.proj /m /p:Architecture=$Architecture $ExtraParameters'"
+ Write-Output "Not building due to --nobuild"
+ Write-Output "Command that would be run: 'dotnet msbuild build.proj /m /p:Architecture=$Architecture $ExtraParameters'"
}
else
{
diff --git a/scripts/common/_utility.ps1 b/scripts/common/_utility.ps1
index 4105d99c0..037e1854f 100644
--- a/scripts/common/_utility.ps1
+++ b/scripts/common/_utility.ps1
@@ -5,17 +5,17 @@
function header([string]$message)
{
- Write-Host -ForegroundColor Green "*** $message ***"
+ Write-Output -ForegroundColor Green "*** $message ***"
}
function info([string]$message)
{
- Write-Host -ForegroundColor Yellow "*** $message ***"
+ Write-Output -ForegroundColor Yellow "*** $message ***"
}
function error([string]$message)
{
- Write-Host -ForegroundColor Red "$message"
+ Write-Output -ForegroundColor Red "$message"
}
function setEnvIfDefault([string]$envVarName, [string]$value)
diff --git a/scripts/dev-dotnet.ps1 b/scripts/dev-dotnet.ps1
index 4728a8b7c..afcfe46d5 100644
--- a/scripts/dev-dotnet.ps1
+++ b/scripts/dev-dotnet.ps1
@@ -15,7 +15,7 @@ try {
if (Test-Path $stage2) {
$env:PATH="$stage2;$env:PATH"
} else {
- Write-Host "You don't have a dev build in the 'artifacts\$rid\stage2' folder!"
+ Write-Output "You don't have a dev build in the 'artifacts\$rid\stage2' folder!"
}
dotnet @args
diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1
index e72c5ad55..c7bd09a56 100644
--- a/scripts/obtain/dotnet-install.ps1
+++ b/scripts/obtain/dotnet-install.ps1
@@ -80,7 +80,7 @@ $VersionRegEx="/\d+\.\d+[^/]+/"
$OverrideNonVersionedFiles=$true
function Say($str) {
- Write-Host "dotnet-install: $str"
+ Write-Output "dotnet-install: $str"
}
function Say-Verbose($str) {
@@ -93,6 +93,25 @@ function Say-Invocation($Invocation) {
Say-Verbose "$command $args"
}
+function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [int]$MaxAttempts = 3, [int]$SecondsBetweenAttempts = 1) {
+ $Attempts = 0
+
+ while ($true) {
+ try {
+ return $ScriptBlock.Invoke()
+ }
+ catch {
+ $Attempts++
+ if ($Attempts -lt $MaxAttempts) {
+ Start-Sleep $SecondsBetweenAttempts
+ }
+ else {
+ throw
+ }
+ }
+ }
+}
+
function Get-Machine-Architecture() {
Say-Invocation $MyInvocation
@@ -135,52 +154,56 @@ function Load-Assembly([string] $Assembly) {
function GetHTTPResponse([Uri] $Uri)
{
- $HttpClient = $null
+ Invoke-With-Retry(
+ {
- try {
- # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet.
- Load-Assembly -Assembly System.Net.Http
-
- if(-not $ProxyAddress)
- {
- # Despite no proxy being explicitly specified, we may still be behind a default proxy
- $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
- if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))){
- $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString
- $ProxyUseDefaultCredentials = $true
- }
- }
+ $HttpClient = $null
- if($ProxyAddress){
- $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler
- $HttpClientHandler.Proxy = New-Object System.Net.WebProxy -Property @{Address=$ProxyAddress;UseDefaultCredentials=$ProxyUseDefaultCredentials}
- $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler
- }
- else {
- $HttpClient = New-Object System.Net.Http.HttpClient
- }
- # Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out
- # 10 minutes allows it to work over much slower connections.
- $HttpClient.Timeout = New-TimeSpan -Minutes 10
- $Response = $HttpClient.GetAsync($Uri).Result
- if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode)))
- {
- $ErrorMsg = "Failed to download $Uri."
- if ($Response -ne $null)
+ try {
+ # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet.
+ Load-Assembly -Assembly System.Net.Http
+
+ if(-not $ProxyAddress)
{
- $ErrorMsg += " $Response"
+ # Despite no proxy being explicitly specified, we may still be behind a default proxy
+ $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
+ if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))){
+ $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString
+ $ProxyUseDefaultCredentials = $true
+ }
}
- throw $ErrorMsg
- }
+ if($ProxyAddress){
+ $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler
+ $HttpClientHandler.Proxy = New-Object System.Net.WebProxy -Property @{Address=$ProxyAddress;UseDefaultCredentials=$ProxyUseDefaultCredentials}
+ $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler
+ }
+ else {
+ $HttpClient = New-Object System.Net.Http.HttpClient
+ }
+ # Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out
+ # 10 minutes allows it to work over much slower connections.
+ $HttpClient.Timeout = New-TimeSpan -Minutes 10
+ $Response = $HttpClient.GetAsync($Uri).Result
+ if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode)))
+ {
+ $ErrorMsg = "Failed to download $Uri."
+ if ($Response -ne $null)
+ {
+ $ErrorMsg += " $Response"
+ }
- return $Response
- }
- finally {
- if ($HttpClient -ne $null) {
- $HttpClient.Dispose()
+ throw $ErrorMsg
+ }
+
+ return $Response
}
- }
+ finally {
+ if ($HttpClient -ne $null) {
+ $HttpClient.Dispose()
+ }
+ }
+ })
}
@@ -223,10 +246,23 @@ function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$Channel,
}
}
-function Get-Download-Links([string]$AzureFeed, [string]$Channel, [string]$SpecificVersion, [string]$CLIArchitecture) {
+function Get-Download-Link([string]$AzureFeed, [string]$Channel, [string]$SpecificVersion, [string]$CLIArchitecture) {
Say-Invocation $MyInvocation
- $ret = @()
+ if ($SharedRuntime) {
+ $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-runtime-$SpecificVersion-win-$CLIArchitecture.zip"
+ }
+ else {
+ $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-dev-$SpecificVersion-win-$CLIArchitecture.zip"
+ }
+
+ Say-Verbose "Constructed primary payload URL: $PayloadURL"
+
+ return $PayloadURL
+}
+
+function Get-AltDownload-Link([string]$AzureFeed, [string]$Channel, [string]$SpecificVersion, [string]$CLIArchitecture) {
+ Say-Invocation $MyInvocation
if ($SharedRuntime) {
$PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-win-$CLIArchitecture.$SpecificVersion.zip"
@@ -235,10 +271,9 @@ function Get-Download-Links([string]$AzureFeed, [string]$Channel, [string]$Speci
$PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-dev-win-$CLIArchitecture.$SpecificVersion.zip"
}
- Say-Verbose "Constructed payload URL: $PayloadURL"
- $ret += $PayloadURL
+ Say-Verbose "Constructed alternate payload URL: $PayloadURL"
- return $ret
+ return $PayloadURL
}
function Get-User-Share-Path() {
@@ -396,13 +431,13 @@ function Prepend-Sdk-InstallRoot-To-Path([string]$InstallRoot, [string]$BinFolde
$CLIArchitecture = Get-CLIArchitecture-From-Architecture $Architecture
$SpecificVersion = Get-Specific-Version-From-Version -AzureFeed $AzureFeed -Channel $Channel -Version $Version
-$DownloadLinks = Get-Download-Links -AzureFeed $AzureFeed -Channel $Channel -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
+$DownloadLink = Get-Download-Link -AzureFeed $AzureFeed -Channel $Channel -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
+$AltDownloadLink = Get-AltDownload-Link -AzureFeed $AzureFeed -Channel $Channel -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
if ($DryRun) {
Say "Payload URLs:"
- foreach ($DownloadLink in $DownloadLinks) {
- Say "- $DownloadLink"
- }
+ Say "Primary - $DownloadLink"
+ Say "Alternate - $AltDownloadLink"
Say "Repeatable invocation: .\$($MyInvocation.MyCommand) -Version $SpecificVersion -Channel $Channel -Architecture $CLIArchitecture -InstallDir $InstallDir"
exit 0
}
@@ -420,23 +455,31 @@ if ($IsSdkInstalled) {
New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null
-$free = Get-CimInstance -Class win32_logicaldisk | where Deviceid -eq "$((Get-Item $InstallRoot).PSDrive.Name):"
-if ($free.Freespace / 1MB -le 250 ) {
- Say "there is not enough disk space on drive c:"
+$installDrive = $((Get-Item $InstallRoot).PSDrive.Name);
+Write-Output "${installDrive}:";
+$free = Get-CimInstance -Class win32_logicaldisk | where Deviceid -eq "${installDrive}:"
+if ($free.Freespace / 1MB -le 100 ) {
+ Say "There is not enough disk space on drive ${installDrive}:"
exit 0
}
-foreach ($DownloadLink in $DownloadLinks) {
+$ZipPath = [System.IO.Path]::GetTempFileName()
+Say "Downloading $DownloadLink"
+try {
+ DownloadFile -Uri $DownloadLink -OutPath $ZipPath
+}
+catch {
+ $DownloadLink = $AltDownloadLink
$ZipPath = [System.IO.Path]::GetTempFileName()
Say "Downloading $DownloadLink"
DownloadFile -Uri $DownloadLink -OutPath $ZipPath
-
- Say "Extracting zip from $DownloadLink"
- Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot
-
- Remove-Item $ZipPath
}
+Say "Extracting zip from $DownloadLink"
+Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot
+
+Remove-Item $ZipPath
+
Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath
Say "Installation finished"
diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh
index 65f70e39f..f266e2d28 100755
--- a/scripts/obtain/dotnet-install.sh
+++ b/scripts/obtain/dotnet-install.sh
@@ -398,9 +398,9 @@ construct_download_link() {
local download_link=null
if [ "$shared_runtime" = true ]; then
- download_link="$azure_feed/Runtime/$specific_version/dotnet-$osname-$normalized_architecture.$specific_version.tar.gz"
+ download_link="$azure_feed/Runtime/$specific_version/dotnet-$specific_version-$osname-$normalized_architecture.tar.gz"
else
- download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$osname-$normalized_architecture.$specific_version.tar.gz"
+ download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$specific_version-$osname-$normalized_architecture.tar.gz"
fi
echo "$download_link"
@@ -424,11 +424,20 @@ construct_alt_download_link() {
distro_specific_osname=$(get_distro_specific_os_name) || return 1
local alt_download_link=null
- if [ "$shared_runtime" = true ]; then
- alt_download_link="$azure_feed/Runtime/$specific_version/dotnet-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+ if [ "$(uname)" = "Linux" ]; then
+ if [ "$shared_runtime" = true ]; then
+ alt_download_link="$azure_feed/Runtime/$specific_version/dotnet-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+ else
+ alt_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+ fi
else
- alt_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+ if [ "$shared_runtime" = true ]; then
+ alt_download_link="$azure_feed/Runtime/$specific_version/dotnet-$osname-$normalized_architecture.$specific_version.tar.gz"
+ else
+ alt_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$osname-$normalized_architecture.$specific_version.tar.gz"
+ fi
fi
+
echo "$alt_download_link"
return 0
@@ -615,10 +624,8 @@ calculate_vars() {
download_link=$(construct_download_link $azure_feed $channel $normalized_architecture $specific_version)
say_verbose "download_link=$download_link"
- if [ "$(uname)" = "Linux" ]; then
- alt_download_link=$(construct_alt_download_link $azure_feed $channel $normalized_architecture $specific_version)
- say_verbose "alt_download_link=$alt_download_link"
- fi
+ alt_download_link=$(construct_alt_download_link $azure_feed $channel $normalized_architecture $specific_version)
+ say_verbose "alt_download_link=$alt_download_link"
install_root=$(resolve_installation_path $install_dir)
say_verbose "install_root=$install_root"
@@ -640,8 +647,8 @@ install_dotnet() {
say "Downloading link: $download_link"
download "$download_link" $zip_path || download_failed=true
- # if the download fails, download the alt_download_link [Linux only]
- if [ "$(uname)" = "Linux" ] && [ "$download_failed" = true ]; then
+ # if the download fails, download the alt_download_link
+ if [ "$download_failed" = true ]; then
say "Cannot download: $download_link"
zip_path=$(mktemp $temporary_file_template)
say_verbose "Alternate zip path: $zip_path"
@@ -768,9 +775,7 @@ check_min_reqs
calculate_vars
if [ "$dry_run" = true ]; then
say "Payload URL: $download_link"
- if [ "$(uname)" = "Linux" ]; then
- say "Alternate payload URL: $alt_download_link"
- fi
+ say "Alternate payload URL: $alt_download_link"
say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir"
exit 0
fi
diff --git a/scripts/use-dev.ps1 b/scripts/use-dev.ps1
index acd2fff86..1d7225bd6 100644
--- a/scripts/use-dev.ps1
+++ b/scripts/use-dev.ps1
@@ -12,5 +12,5 @@ if (Test-Path $stage2) {
$env:PATH="$stage2;$env:PATH"
}
} else {
- Write-Host "You don't have a dev build in the 'artifacts\win10-x64\stage2' folder!"
+ Write-Output "You don't have a dev build in the 'artifacts\win10-x64\stage2' folder!"
}
diff --git a/test/Installer/testmsi.ps1 b/test/Installer/testmsi.ps1
index 86692bc9f..198999c78 100644
--- a/test/Installer/testmsi.ps1
+++ b/test/Installer/testmsi.ps1
@@ -28,7 +28,7 @@ function CopyTestXUnitRunner([string]$destination)
Copy-Item $XUnitRunnerDir\xunit.runner.utility.desktop.dll -Destination:$destination
}
-Write-Host "Running tests for MSI installer at $inputMsi."
+Write-Output "Running tests for MSI installer at $inputMsi."
if(!(Test-Path $inputMsi))
{
@@ -65,7 +65,7 @@ try {
CopyInstaller $testBin
CopyTestXUnitRunner $testBin
- Write-Host "Running installer tests in Windows Container"
+ Write-Output "Running installer tests in Windows Container"
# --net="none" works around a networking issue on the containers on the CI machines.
# Since our installer tests don't require the network, it is fine to shut it off.
From bca531796f05a5e23f5e9918b02c4a31051ec01d Mon Sep 17 00:00:00 2001
From: mlorbetske
Date: Sat, 27 May 2017 00:14:37 -0700
Subject: [PATCH 071/104] Update to SetupCrossgen 128 - Coherence 25179
---
build/DependencyVersions.props | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index e3d7f225d..31baaef14 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -14,8 +14,8 @@
$(CLI_SharedFrameworkVersion)$(CLI_SharedFrameworkVersion)1.0.0-beta2-20170523-241
- 1.0.0-beta2-20170523-241
- 1.0.0-beta2-20170523-241
+ 1.0.0-beta2-20170526-244
+ 1.0.0-beta2-20170526-2442.0.0-preview2-25324-032.0.0-preview2-25324-030.1.0-alpha-142
@@ -24,8 +24,8 @@
timestamped
- dev-125
- preview2-25159
+ dev-128
+ preview2-25179
From b479bd900d4a99ec5293aeb0ec96a589635f00e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer?=
Date: Mon, 29 May 2017 14:57:48 +0200
Subject: [PATCH 072/104] LOC CHECKIN | cli-master | 20170529
---
.../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 | 16 ++--
.../xlf/LocalizableStrings.de.xlf | 16 ++--
.../xlf/LocalizableStrings.es.xlf | 26 +++---
.../xlf/LocalizableStrings.fr.xlf | 20 ++---
.../xlf/LocalizableStrings.it.xlf | 16 ++--
.../xlf/LocalizableStrings.ja.xlf | 16 ++--
.../xlf/LocalizableStrings.ko.xlf | 16 ++--
.../xlf/LocalizableStrings.pl.xlf | 20 ++---
.../xlf/LocalizableStrings.pt-BR.xlf | 32 ++++----
.../xlf/LocalizableStrings.ru.xlf | 32 ++++----
.../xlf/LocalizableStrings.tr.xlf | 20 ++---
.../xlf/LocalizableStrings.zh-Hans.xlf | 16 ++--
.../xlf/LocalizableStrings.zh-Hant.xlf | 36 ++++----
.../xlf/LocalizableStrings.cs.xlf | 4 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.es.xlf | 16 ++--
.../xlf/LocalizableStrings.fr.xlf | 16 ++--
.../xlf/LocalizableStrings.it.xlf | 4 +-
.../xlf/LocalizableStrings.ja.xlf | 4 +-
.../xlf/LocalizableStrings.ko.xlf | 8 +-
.../xlf/LocalizableStrings.pl.xlf | 4 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 14 ++--
.../xlf/LocalizableStrings.ru.xlf | 18 ++--
.../xlf/LocalizableStrings.tr.xlf | 14 ++--
.../xlf/LocalizableStrings.zh-Hans.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 14 ++--
.../CommandLine/xlf/LocalizableStrings.cs.xlf | 4 +-
.../CommandLine/xlf/LocalizableStrings.de.xlf | 10 +--
.../CommandLine/xlf/LocalizableStrings.es.xlf | 8 +-
.../CommandLine/xlf/LocalizableStrings.fr.xlf | 4 +-
.../CommandLine/xlf/LocalizableStrings.it.xlf | 4 +-
.../CommandLine/xlf/LocalizableStrings.ja.xlf | 4 +-
.../CommandLine/xlf/LocalizableStrings.ko.xlf | 4 +-
.../CommandLine/xlf/LocalizableStrings.pl.xlf | 4 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +-
.../CommandLine/xlf/LocalizableStrings.ru.xlf | 8 +-
.../CommandLine/xlf/LocalizableStrings.tr.xlf | 8 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 14 ++--
.../xlf/LocalizableStrings.zh-Hant.xlf | 12 +--
.../xlf/LocalizableStrings.cs.xlf | 28 +++----
.../xlf/LocalizableStrings.de.xlf | 28 +++----
.../xlf/LocalizableStrings.es.xlf | 28 +++----
.../xlf/LocalizableStrings.fr.xlf | 28 +++----
.../xlf/LocalizableStrings.it.xlf | 28 +++----
.../xlf/LocalizableStrings.ja.xlf | 28 +++----
.../xlf/LocalizableStrings.ko.xlf | 28 +++----
.../xlf/LocalizableStrings.pl.xlf | 28 +++----
.../xlf/LocalizableStrings.pt-BR.xlf | 28 +++----
.../xlf/LocalizableStrings.ru.xlf | 28 +++----
.../xlf/LocalizableStrings.tr.xlf | 28 +++----
.../xlf/LocalizableStrings.zh-Hans.xlf | 28 +++----
.../xlf/LocalizableStrings.zh-Hant.xlf | 28 +++----
.../xlf/LocalizableStrings.cs.xlf | 4 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.es.xlf | 4 +-
.../xlf/LocalizableStrings.fr.xlf | 4 +-
.../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.tr.xlf | 2 +-
.../xlf/LocalizableStrings.tr.xlf | 2 +-
.../dotnet-help/xlf/LocalizableStrings.cs.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.de.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.es.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.fr.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.it.xlf | 82 +++++++++----------
.../dotnet-help/xlf/LocalizableStrings.ja.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.ko.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.pl.xlf | 80 +++++++++---------
.../xlf/LocalizableStrings.pt-BR.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.ru.xlf | 80 +++++++++---------
.../dotnet-help/xlf/LocalizableStrings.tr.xlf | 80 +++++++++---------
.../xlf/LocalizableStrings.zh-Hans.xlf | 80 +++++++++---------
.../xlf/LocalizableStrings.zh-Hant.xlf | 80 +++++++++---------
.../xlf/LocalizableStrings.cs.xlf | 2 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.fr.xlf | 4 +-
.../xlf/LocalizableStrings.ja.xlf | 2 +-
.../xlf/LocalizableStrings.ko.xlf | 2 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 2 +-
.../xlf/LocalizableStrings.ru.xlf | 2 +-
.../xlf/LocalizableStrings.tr.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 4 +-
.../xlf/LocalizableStrings.cs.xlf | 68 +++++++--------
.../xlf/LocalizableStrings.de.xlf | 68 +++++++--------
.../xlf/LocalizableStrings.es.xlf | 76 ++++++++---------
.../xlf/LocalizableStrings.fr.xlf | 80 +++++++++---------
.../xlf/LocalizableStrings.it.xlf | 68 +++++++--------
.../xlf/LocalizableStrings.ja.xlf | 68 +++++++--------
.../xlf/LocalizableStrings.ko.xlf | 68 +++++++--------
.../xlf/LocalizableStrings.pl.xlf | 70 ++++++++--------
.../xlf/LocalizableStrings.pt-BR.xlf | 76 ++++++++---------
.../xlf/LocalizableStrings.ru.xlf | 78 +++++++++---------
.../xlf/LocalizableStrings.tr.xlf | 72 ++++++++--------
.../xlf/LocalizableStrings.zh-Hans.xlf | 70 ++++++++--------
.../xlf/LocalizableStrings.zh-Hant.xlf | 78 +++++++++---------
.../xlf/LocalizableStrings.pt-BR.xlf | 2 +-
.../xlf/LocalizableStrings.tr.xlf | 2 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 2 +-
.../dotnet-pack/xlf/LocalizableStrings.es.xlf | 2 +-
.../dotnet-pack/xlf/LocalizableStrings.pl.xlf | 2 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 4 +-
.../dotnet-pack/xlf/LocalizableStrings.ru.xlf | 2 +-
.../dotnet-pack/xlf/LocalizableStrings.tr.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 4 +-
.../xlf/LocalizableStrings.cs.xlf | 12 +--
.../xlf/LocalizableStrings.de.xlf | 12 +--
.../xlf/LocalizableStrings.es.xlf | 12 +--
.../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 | 14 ++--
.../xlf/LocalizableStrings.ru.xlf | 12 +--
.../xlf/LocalizableStrings.tr.xlf | 14 ++--
.../xlf/LocalizableStrings.zh-Hans.xlf | 12 +--
.../xlf/LocalizableStrings.zh-Hant.xlf | 16 ++--
.../xlf/LocalizableStrings.pt-BR.xlf | 8 +-
.../xlf/LocalizableStrings.cs.xlf | 4 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.es.xlf | 4 +-
.../xlf/LocalizableStrings.fr.xlf | 4 +-
.../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 | 4 +-
.../xlf/LocalizableStrings.de.xlf | 4 +-
.../xlf/LocalizableStrings.es.xlf | 4 +-
.../xlf/LocalizableStrings.fr.xlf | 4 +-
.../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 +-
.../dotnet-run/xlf/LocalizableStrings.cs.xlf | 32 ++++----
.../dotnet-run/xlf/LocalizableStrings.de.xlf | 32 ++++----
.../dotnet-run/xlf/LocalizableStrings.es.xlf | 34 ++++----
.../dotnet-run/xlf/LocalizableStrings.fr.xlf | 32 ++++----
.../dotnet-run/xlf/LocalizableStrings.it.xlf | 32 ++++----
.../dotnet-run/xlf/LocalizableStrings.ja.xlf | 32 ++++----
.../dotnet-run/xlf/LocalizableStrings.ko.xlf | 32 ++++----
.../dotnet-run/xlf/LocalizableStrings.pl.xlf | 32 ++++----
.../xlf/LocalizableStrings.pt-BR.xlf | 34 ++++----
.../dotnet-run/xlf/LocalizableStrings.ru.xlf | 34 ++++----
.../dotnet-run/xlf/LocalizableStrings.tr.xlf | 34 ++++----
.../xlf/LocalizableStrings.zh-Hans.xlf | 32 ++++----
.../xlf/LocalizableStrings.zh-Hant.xlf | 34 ++++----
.../dotnet-sln/xlf/LocalizableStrings.cs.xlf | 6 +-
.../dotnet-sln/xlf/LocalizableStrings.de.xlf | 6 +-
.../dotnet-sln/xlf/LocalizableStrings.es.xlf | 6 +-
.../dotnet-sln/xlf/LocalizableStrings.fr.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.it.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.ja.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.ko.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.pl.xlf | 4 +-
.../xlf/LocalizableStrings.pt-BR.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.ru.xlf | 4 +-
.../dotnet-sln/xlf/LocalizableStrings.tr.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hans.xlf | 4 +-
.../xlf/LocalizableStrings.zh-Hant.xlf | 6 +-
.../xlf/LocalizableStrings.cs.xlf | 52 ++++++------
.../xlf/LocalizableStrings.de.xlf | 52 ++++++------
.../xlf/LocalizableStrings.es.xlf | 52 ++++++------
.../xlf/LocalizableStrings.fr.xlf | 52 ++++++------
.../xlf/LocalizableStrings.it.xlf | 52 ++++++------
.../xlf/LocalizableStrings.ja.xlf | 52 ++++++------
.../xlf/LocalizableStrings.ko.xlf | 52 ++++++------
.../xlf/LocalizableStrings.pl.xlf | 52 ++++++------
.../xlf/LocalizableStrings.pt-BR.xlf | 52 ++++++------
.../xlf/LocalizableStrings.ru.xlf | 52 ++++++------
.../xlf/LocalizableStrings.tr.xlf | 52 ++++++------
.../xlf/LocalizableStrings.zh-Hans.xlf | 52 ++++++------
.../xlf/LocalizableStrings.zh-Hant.xlf | 52 ++++++------
.../dotnet-test/xlf/LocalizableStrings.cs.xlf | 62 +++++++-------
.../dotnet-test/xlf/LocalizableStrings.de.xlf | 62 +++++++-------
.../dotnet-test/xlf/LocalizableStrings.es.xlf | 64 ++++++++-------
.../dotnet-test/xlf/LocalizableStrings.fr.xlf | 68 +++++++--------
.../dotnet-test/xlf/LocalizableStrings.it.xlf | 62 +++++++-------
.../dotnet-test/xlf/LocalizableStrings.ja.xlf | 68 +++++++--------
.../dotnet-test/xlf/LocalizableStrings.ko.xlf | 56 +++++++------
.../dotnet-test/xlf/LocalizableStrings.pl.xlf | 56 +++++++------
.../xlf/LocalizableStrings.pt-BR.xlf | 68 +++++++--------
.../dotnet-test/xlf/LocalizableStrings.ru.xlf | 58 ++++++-------
.../dotnet-test/xlf/LocalizableStrings.tr.xlf | 64 ++++++++-------
.../xlf/LocalizableStrings.zh-Hans.xlf | 66 +++++++--------
.../xlf/LocalizableStrings.zh-Hant.xlf | 68 +++++++--------
.../xlf/CommonLocalizableStrings.cs.xlf | 54 ++++++------
.../xlf/CommonLocalizableStrings.de.xlf | 54 ++++++------
.../xlf/CommonLocalizableStrings.es.xlf | 52 ++++++------
.../xlf/CommonLocalizableStrings.fr.xlf | 54 ++++++------
.../xlf/CommonLocalizableStrings.it.xlf | 52 ++++++------
.../xlf/CommonLocalizableStrings.ja.xlf | 50 +++++------
.../xlf/CommonLocalizableStrings.ko.xlf | 48 +++++------
.../xlf/CommonLocalizableStrings.pl.xlf | 46 +++++------
.../xlf/CommonLocalizableStrings.pt-BR.xlf | 54 ++++++------
.../xlf/CommonLocalizableStrings.ru.xlf | 48 +++++------
.../xlf/CommonLocalizableStrings.tr.xlf | 54 ++++++------
.../xlf/CommonLocalizableStrings.zh-Hans.xlf | 52 ++++++------
.../xlf/CommonLocalizableStrings.zh-Hant.xlf | 62 +++++++-------
src/dotnet/xlf/LocalizableStrings.cs.xlf | 2 +-
src/dotnet/xlf/LocalizableStrings.it.xlf | 4 +-
232 files changed, 3013 insertions(+), 2987 deletions(-)
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf
index c8b89d596..ca339575a 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Chybí hlavička souboru
-
+ Nenalezena očekávaná hlavička souboru
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Chybějící verze v hlavičce souboru
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.de.xlf
index 9d0cbae6e..4c34a3625 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.de.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.de.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Dateiheader fehlt
-
+ Erwarteter Dateiheader nicht gefunden.
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Der Dateiheader enthält keine Version.
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.es.xlf
index 11b99fe4a..db0dbdc4d 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.es.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.es.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Encabezado de archivo omitido
-
+ No se encontró el encabezado de archivo esperado
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Falta la versión del encabezado de archivo
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.fr.xlf
index d9422d96e..58536cd6c 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.fr.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.fr.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- En-tête de fichier manquant
-
+ En-tête de fichier attendu introuvable
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Version manquante pour l'en-tête de fichier
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf
index 5805939a2..21c489543 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Manca l'intestazione del file
-
+ L'intestazione del file prevista non è stata trovata
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Nell'intestazione del file manca la versione
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ja.xlf
index a17eefc52..63bc89605 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ja.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ja.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- ファイル ヘッダーがありません
-
+ 予期されたファイル ヘッダーがありません
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ ファイル ヘッダーにバージョンが見つかりません
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ko.xlf
index ef4c9c6a8..3f8ba8ff3 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ko.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ko.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- 파일 헤더가 누락됨
-
+ 필요한 파일 헤더가 없음
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ 파일 헤더에 버전이 없습니다.
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pl.xlf
index 89fe0ef42..7d406ad2b 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pl.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pl.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Brak nagłówka pliku
-
+ Nie znaleziono oczekiwanego nagłówka pliku
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Brak wersji nagłówka pliku
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pt-BR.xlf
index f7fc6023c..9edf0bd2d 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.pt-BR.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Cabeçalho de arquivo ausente
-
+ Cabeçalho do arquivo esperado não encontrado
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ O cabeçalho do arquivo está sem a versão
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ru.xlf
index 58a3e674d..89e081783 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ru.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.ru.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Отсутствует заголовок файла.
-
+ Отсутствует требуемый заголовок файла
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ В заголовке файла отсутствует версия
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.tr.xlf
index acfd746d0..8257ad369 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.tr.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.tr.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- Dosya üst bilgisi eksik
-
+ Beklenen dosya üst bilgisi bulunamadı
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ Dosya üst bilgisinde sürüm eksik
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hans.xlf
index 5a81c555e..94ec07dfe 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hans.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- 缺少文件标头
-
+ 未找到必需的文件头
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ 文件头缺少版本
+
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hant.xlf
index a33947173..a86fccbc8 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.zh-Hant.xlf
@@ -15,8 +15,8 @@
Expected file header not found
- 遺漏檔案標頭
-
+ 找不到預期的檔案標頭
+ Project section not closed
@@ -55,8 +55,8 @@
File header is missing version
- File header is missing version
-
+ 檔案標頭遺漏版本
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
index 1ce8f19d6..a1fff3811 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: Soubor prefercliruntime se ignoruje, protože cílová architektura nástroje ({1}) má jinou hlavní verzi než aktuální modul runtime rozhraní příkazového řádku ({2}).
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: Soubor runtimeconfig.json nástroje {1} se nenašel.
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Projekt generátoru deps.json se nenašel.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ Spustitelný soubor příkazu {0} se nenašel. Projekt zřejmě nebyl obnoven, nebo obnovení selhalo – spusťte příkaz run `dotnet restore`.
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf
index 24b21b8a3..f00f4adb0 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: Die Datei "prefercliruntime" wird ignoriert, da das Tool-Ziellaufwerk ({1}) eine andere Hauptversion aufweist als die aktuelle CLI-Laufzeit ({2}).
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: Die Datei "runtimeconfig.json" wurde für das Tool {1} nicht gefunden.
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Das deps.json-Generatorprojekt wurde nicht gefunden.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ Der für "{0}" auszuführende Befehle wurde nicht gefunden. Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten – führen Sie "dotnet restore" aus.
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf
index 6ed18b0b5..68dc20659 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf
@@ -35,7 +35,7 @@
{0}: Looking for prefercliruntime file at `{1}`
- {0}: Buscando el archivo prefercliruntime en "{1}"
+ {0}: buscando el archivo prefercliruntime en "{1}"
@@ -45,7 +45,7 @@
{0}: Did not find a matching project {1}.
- {0}: No se encontró un proyecto coincidente {1}.
+ {0}: no se encontró un proyecto coincidente {1}.
@@ -75,7 +75,7 @@
{0}: MSBuild project path = {1}
- {0}: Ruta del proyecto MSBuild = {1}
+ {0}: ruta del proyecto MSBuild = {1}
@@ -100,7 +100,7 @@
{0}: Attempting to resolve command spec from tool {1}
- {0}: Intentando resolver especificaciones de comando desde la herramienta {1}
+ {0}: intentando resolver especificaciones de comando desde la herramienta {1}
@@ -172,7 +172,7 @@
Waiting for debugger to attach. Press ENTER to continue
- Esperando a que se asocie el depurador. Presione ENTRAR para continuar.
+ Esperando anexar el depurador. Presione ENTRAR para continuar
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: se ignorará el archivo prefercliruntime dado que la plataforma de destino de la herramienta ({1}) tiene una versión mayor que el entorno de tiempo de ejecución actual de la CLI ({2})
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: no se pudo encontrar el archivo runtimeconfig.json para la herramienta {1}
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ No se puede encontrar el proyecto de generador deps.json.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ No se encontró el comando ejecutable para "{0}". Puede que el proyecto no se haya restaurado o que la restauración no haya tenido éxito. Ejecute "dotnet restore"
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf
index 498f5afd1..ef15157ad 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf
@@ -100,7 +100,7 @@
{0}: Attempting to resolve command spec from tool {1}
- {0} : Tentative de résolution de la spécification de commande à partir de l'outil {1}
+ {0} : tentative de résolution de la spécification de commande à partir de l'outil {1}
@@ -172,7 +172,7 @@
Waiting for debugger to attach. Press ENTER to continue
- En attente de l'attachement du débogueur. Appuyez sur Entrée pour continuer
+ En attente d'attachement du débogueur. Appuyez sur ENTRÉE pour continuer
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0} : fichier prefercliruntime ignoré, car le framework cible de l'outil ({1}) a une autre version principale que celle du runtime CLI actuel ({2})
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0} : le fichier runtimeconfig.json est introuvable pour l'outil {1}
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Le projet de générateur deps.json est introuvable.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ La commande exécutable pour "{0}" est introuvable. Le projet n'a peut-être pas été restauré, ou la restauration n'a pas fonctionné - exécutez 'dotnet restore'
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf
index 1673d687a..528853424 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: il file prefercliruntime verrà ignorato perché la versione principale del framework di destinazione dello strumento ({1}) è diversa rispetto a quella del runtime corrente dell'interfaccia della riga di comando ({2})
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: il file runtimeconfig.json per lo strumento {1} non è stato trovato
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Il progetto del generatore deps.json non è stato trovato.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ L'eseguibile del comando per "{0}" non è stato trovato. È possibile che il progetto non sia stato ripristinato o che il ripristino non sia riuscito. Eseguire `dotnet restore`
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf
index b362d7f2e..17edaee2f 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: ツール ターゲット フレームワーク ({1}) のメジャー バージョンが現在の CLI ランタイム ({2}) と異なるため、prefercliruntime ファイルは無視されます。
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: ツール {1} で runtimeconfig.json ファイルが見つかりませんでした
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ deps.json ジェネレーター プロジェクトが見つかりません。
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ "{0}" で実行可能なコマンドが見つかりませんでした。プロジェクトが復元されていない可能性があるか、または復元に失敗しました。`dotnet restore` を実行します。
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf
index 1bc65e7de..c9b6ccea6 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: 도구 대상 프레임워크({1})에 현재 CLI 런타임({2})과 다른 주 버전이 있으므로 prefercliruntime 파일 무시
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: 도구 {1}에 대한 runtimeconfig.json 파일을 찾을 수 없음
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ deps.json 생성기 프로젝트를 찾을 수 없습니다.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ "{0}"에 대해 실행 가능한 명령을 찾지 못했습니다. 프로젝트가 복원되지 않았거나 복원이 실패했을 수 있습니다. 'dotnet restore'를 실행하세요.
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf
index 37daf3edb..4e1d131d0 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf
@@ -90,7 +90,7 @@
{0}: resolving commandspec from {1} Tool Libraries.
- {0}: Rozpoznawanie elementu commandspec z bibliotek narzędzi {1}.
+ {0}: Rozpoznawanie elementu commandspec z bibliotek narzędzia {1}.
@@ -172,7 +172,7 @@
Waiting for debugger to attach. Press ENTER to continue
- Trwa oczekiwanie na dołączenie debugera. Naciśnij klawisz ENTER, aby kontynuować
+ Oczekiwanie na dołączenie debugera. Naciśnij klawisz ENTER, aby kontynuować
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: plik prefercliruntime zostanie zignorowany, ponieważ wersja platforma docelowa narzędzia ({1}) różni się od wersji bieżącego środowiska uruchomieniowego interfejsu wiersza polecenia ({2})
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: nie można odnaleźć pliku runtimeconfig.json dla narzędzia {1}
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Nie można odnaleźć projektu generatora deps.json.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ Nie znaleziono pliku wykonywalnego polecenia dla elementu „{0}”. Projekt mógł nie zostać przywrócony lub przywracanie zakończyło się niepowodzeniem — uruchom polecenie „dotnet restore”
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf
index f0d700dbb..3defe6206 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf
@@ -35,7 +35,7 @@
{0}: Looking for prefercliruntime file at `{1}`
- {0}: Procurando o arquivo prefercliruntime em '{1}'
+ {0}: procurando o arquivo prefercliruntime em '{1}'
@@ -45,7 +45,7 @@
{0}: Did not find a matching project {1}.
- {0}: Não encontrou um projeto {1} correspondente.
+ {0}: não encontrou um projeto {1} correspondente.
@@ -75,7 +75,7 @@
{0}: MSBuild project path = {1}
- {0}: Caminho de projeto do MSBuild = {1}
+ {0}: caminho de projeto do MSBuild = {1}
@@ -85,7 +85,7 @@
{0}: ProjectFactory did not find Project.
- {0}: O ProjectFactory não encontrou o Projeto.
+ {0}: ProjectFactory não encontrou o Projeto.
@@ -95,18 +95,18 @@
{0}: failed to resolve commandspec from library.
- {0}: falha ao resolver commandspec da biblioteca.
+ {0}: falha ao resolver commandspec por meio da biblioteca.{0}: Attempting to resolve command spec from tool {1}
- {0}: Tentando resolver a especificação de comando da ferramenta {1}
+ {0}: tentando resolver commandspec por meio da ferramenta {1}{0}: nuget packages root:
{1}
- {0}: raiz de pacores nuget:
+ {0}: raiz de pacotes NuGet:
{1}
@@ -172,7 +172,7 @@
Waiting for debugger to attach. Press ENTER to continue
- Esperando o depurador se conectar. Pressione ENTER para continuar
+ Aguardando o depurador anexar. Pressione ENTER para continuar
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: ignorando o arquivo prefercliruntime, uma vez que a estrutura de destino da ferramenta ({1}) tem uma versão principal diferente daquela do tempo de execução atual da CLI ({2})
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: não foi possível localizar o arquivo runtimeconfig.json para a ferramenta {1}
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Não é possível localizar o projeto do gerador deps.json.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ O comando executável para "{0}" não foi encontrado. O projeto pode não ter sido restaurado ou a restauração falhou – execute `dotnet restore`
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf
index dd9f2b023..821054bc2 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf
@@ -30,12 +30,12 @@
Unable to locate dotnet multiplexer
- Не удалось найти мультиплексор dotnet
+ Не удается найти мультиплексор dotnet.{0}: Looking for prefercliruntime file at `{1}`
- {0}: Поиск файла prefercliruntime "{1}"
+ {0}: поиск файла prefercliruntime в "{1}"
@@ -45,12 +45,12 @@
{0}: Did not find a matching project {1}.
- {0}: Не найден соответствующий проект {1}.
+ {0}: не найден подходящий проект {1}.{0}: invalid commandResolverArguments
- {0}: недопустимое значение commandResolverArguments
+ {0}: недопустимый commandResolverArguments
@@ -65,7 +65,7 @@
{0}: tool library found {1}
- {0}: найдена библиотека средств {1}
+ {0}: найдена библиотека средств {1}.
@@ -75,7 +75,7 @@
{0}: MSBuild project path = {1}
- {0}: путь проекта MSBuild = {1}
+ {0}: путь проекта MSBuild — {1}
@@ -85,7 +85,7 @@
{0}: ProjectFactory did not find Project.
- {0}: Фабрика проектов не нашла проект.
+ {0}: фабрика проектов не нашла проект.
@@ -172,7 +172,7 @@
Waiting for debugger to attach. Press ENTER to continue
- Ожидание подключения отладчика. Нажмите ВВОД, чтобы продолжить
+ Ожидание подключения отладчика. Для продолжения нажмите клавишу ВВОД.
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: файл prefercliruntime игнорируется, так как основные номера версии целевой платформы средства ({1}) и текущей среды выполнения CLI ({2}) различаются
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: не удалось найти файл runtimeconfig.json для средства {1}
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ Не удалось найти проект генератора deps.json.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ Исполняемый файл команды для "{0}" не найден. Возможно, проект не был восстановлен или его восстановление завершилось сбоем. Запустите команду "dotnet restore".
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf
index e4c4c0dce..e8546e8ce 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf
@@ -100,7 +100,7 @@
{0}: Attempting to resolve command spec from tool {1}
- {0}: {1} aracından command.spec çözümlenmeye çalışılıyor
+ {0}: {1} aracından commandspec çözümlenmeye çalışılıyor
@@ -172,7 +172,7 @@
Waiting for debugger to attach. Press ENTER to continue
- Hata ayıklayıcısının eklenmesi bekleniyor. Devam etmek için ENTER’a basın
+ Hata ayıklayıcının eklenmesi bekleniyor. Devam etmek için ENTER tuşuna basın
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: Araç hedef çerçevesi ({1}), geçerli CLI çalışma zamanından farklı bir ana sürüme ({2}) sahip olduğundan prefercliruntime dosyası yok sayılıyor
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: {1} aracı için runtimeconfig.json dosyası bulunamadı
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ deps.json oluşturucu projesi bulunamıyor.
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ "{0}" için komut yürütülebilir dosyası bulunamadı. Proje geri yüklenmemiş veya geri yükleme başarısız olmuş olabilir - `dotnet restore` çalıştırın
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf
index 7b1b39762..6551cf827 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: 忽略 prefercliruntime 文件,因为工具目标框架({1})的主要版本不是当前 CLI 运行时({2})
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: 找不到工具 {1} 的 runtimeconfig.json 文件
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ 找不到 deps.json 生成器项目。
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ 找不到可为“{0}”执行的命令。可能未还原项目或还原失败 - 运行 `dotnet restore`
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf
index c7cf3d794..a7ac1b6ad 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf
@@ -30,12 +30,12 @@
Unable to locate dotnet multiplexer
- 找不到 dotnet 多工器
+ 找不到 dotnet multiplexer{0}: Looking for prefercliruntime file at `{1}`
- {0}:正於 `{1}` 尋找 prefercliruntime 檔案
+ {0}: 正在於 `{1}` 尋找 prefercliruntime 檔
@@ -45,7 +45,7 @@
{0}: Did not find a matching project {1}.
- {0}:未找到相符的專案 {1}。
+ {0}: 未找到相符的專案 {1}。
@@ -70,22 +70,22 @@
{0}: MSBUILD_EXE_PATH = {1}
- {0}:MSBUILD_EXE_PATH = {1}
+ {0}: MSBUILD_EXE_PATH = {1}{0}: MSBuild project path = {1}
- {0}:MSBuild 專案路徑 = {1}
+ {0}: MSBuild 專案路徑 = {1}Specify which project file to use because this '{0}' contains more than one project file.
- 因為這個 '{0}' 包含多個專案檔,所以請指定要使用的專案檔。
+ 指定要使用的專案檔,因為這個 '{0}' 包含多個專案檔。{0}: ProjectFactory did not find Project.
- {0}:ProjectFactory 未找到專案。
+ {0}: ProjectFactory 未找到專案。
@@ -100,7 +100,7 @@
{0}: Attempting to resolve command spec from tool {1}
- {0}:正在嘗試從工具 {1} 解析 command spec
+ {0}: 正在嘗試從工具 {1} 解析 command spec
@@ -167,12 +167,12 @@
No executable found matching command "{0}"
- 未找到與命令 "{0}" 相符的可執行檔
+ 沒有與命令 "{0}" 相符的可執行檔Waiting for debugger to attach. Press ENTER to continue
- 正在等候偵錯工具進行連結。按 ENTER 繼續
+ 正在等候附加偵錯工具。按 ENTER 繼續進行
@@ -217,23 +217,23 @@
{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
- {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})
-
+ {0}: 因為工具目標架構 ({1}) 的主要版本與目前的 CLI 執行階段 ({2}) 不同,所以將忽略 prefercliruntime 檔案
+ {0}: Could not find runtimeconfig.json file for tool {1}
- {0}: Could not find runtimeconfig.json file for tool {1}
-
+ {0}: 找不到工具 {1} 的 runtimeconfig.json 檔案
+ Unable to find deps.json generator project.
- Unable to find deps.json generator project.
-
+ 找不到 deps.json 產生器專案。
+ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
-
+ 找不到 "{0}" 的命令可執行檔。該專案可能尚未還原或還原失敗 - 請執行 `dotnet restore`
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
index c964f8c5c..78ce8ba79 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
@@ -34,8 +34,8 @@ Běží příkaz pro počáteční naplnění vaší místní mezipaměti balí
Failed to prime the NuGet cache. {0} failed with: {1}
- Nepodařilo se vytvořit primární mezipaměť balíčku NuGet. {0} selhalo s: {1}
-
+ Nepodařilo se naplnit mezipaměť NuGet. {0} selhalo s: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
index 640f73857..128f161ca 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
@@ -34,8 +34,8 @@ Ein Befehl wird ausgeführt, um Ihren lokalen Paketcache erstmals aufzufüllen,
Failed to prime the NuGet cache. {0} failed with: {1}
- Fehler beim Vorbereiten des NuGet-Cache. Fehler von {0} mit: {1}
-
+ Fehler beim Vorbereiten des NuGet-Caches. Fehler von {0} mit: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
index c8c5fa41c..32189d1bf 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
@@ -17,25 +17,25 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te
Configuring...
-------------------
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
- Esto es .NET Core
+ Bienvenido a .NET Core
---------------------
-Más información sobre .NET Core en https://aka.ms/dotnet-docs. Use dotnet --help para ver los comandos disponibles o vaya a https://aka.ms/dotnet-cli-docs.
+Obtenga más información sobre .NET Core en https://aka.ms/dotnet-docs. Use dotnet --help para ver los comandos disponibles o vaya a https://aka.ms/dotnet-cli-docs.
Telemetría
--------------
-Las herramientas de .NET Core recopilan datos de uso para mejorar su experiencia. Los datos son anónimos y no incluyen los argumentos de la línea de comandos. Microsoft recopila y comparte los datos con la comunidad.
-Puede desactivar la telemetría estableciendo una variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en 1 utilizando su shell favorito.
-Puede leer más sobre la telemetría de las herramientas de .NET Core en https://aka.ms/dotnet-cli-telemetry.
+Las herramientas de .NET Core recopilan datos de uso con el fin de mejorar su experiencia. Los datos son anónimos y no incluyen argumentos de la línea de comandos. Microsoft recopila los datos y los comparte con la comunidad.
+Si desea optar por no participar en la telemetría, establezca una variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en 1 con el shell de su preferencia.
+Puede leer más información sobre la telemetría de las herramientas de .NET Core en https://aka.ms/dotnet-cli-telemetry.
Configurando...
-------------------
-Se está ejecutando un comando para rellenar inicialmente la memoria caché de paquetes local, para mejorar la velocidad de restauración y habilitar el acceso sin conexión. Este comando tardará hasta un minuto en completarse y solo ocurrirá una vez.
+Un comando se ejecuta para rellenar inicialmente la caché de paquete local a fin de mejorar la velocidad de restauración y permitir el acceso sin conexión. Este comando demorará hasta un minuto para completarse y solo sucederá una vez.Failed to prime the NuGet cache. {0} failed with: {1}
- No se pudo crear la caché de NuGet. Error de {0} con: {1}
-
+ No se pudo desbloquear la caché de NuGet. Error de {0} con: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
index ff33dae33..29c2c7747 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
@@ -19,23 +19,23 @@ Configuring...
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
Bienvenue dans .NET Core !
---------------------
-En savoir plus sur .NET Core à la page https://aka.ms/dotnet-docs. Utilisez dotnet --help pour voir les commandes disponibles ou accédez à la page https://aka.ms/dotnet-cli-docs.
+En savoir plus sur .NET Core @ https://aka.ms/dotnet-docs. Utilisez dotnet --help pour voir les commandes disponibles, ou accédez à https://aka.ms/dotnet-cli-docs.
Télémétrie
--------------
-Les outils .NET Core permettent de collecter les données sur l'utilisation afin d'améliorer votre expérience. Les données sont anonymes et n'incluent pas d'arguments de ligne de commande. Les données sont collectées par Microsoft et partagées avec la communauté.
-Vous pouvez vous désinscrire de la télémétrie en définissant une variable d'environnement DOTNET_CLI_TELEMETRY_OPTOUT sur 1 à l'aide de l'interpréteur de votre choix.
-Pour en savoir plus sur la télémétrie des outils .NET Core, consultez la page https://aka.ms/dotnet-cli-telemetry.
+Les outils .NET Core collectent des données d'utilisation pour améliorer votre expérience utilisateur. Ces données sont anonymes et n'incluent aucun argument de ligne de commande. Les données sont collectées par Microsoft et partagées par la communauté.
+Vous pouvez refuser l'adhésion à la télémétrie en assignant la valeur 1 à la variable d'environnement DOTNET_CLI_TELEMETRY_OPTOUT via l'interpréteur de commandes de votre choix.
+Pour plus d'informations sur la télémétrie des outils .NET Core, consultez https://aka.ms/dotnet-cli-telemetry.
-Configuration...
+Configuration en cours...
-------------------
-La commande qui est exécutée remplit initialement votre cache de package local afin d'améliorer la vitesse de restauration et d'activer l'accès hors connexion. L'exécution de cette commande dure une minute et ne se produit qu'une seule fois.
+Une commande s'exécute pour remplir votre cache de package local, améliorer la vitesse de restauration et activer l'accès hors connexion. L'exécution de cette commande peut prendre jusqu'à une minute et n'a lieu qu'une seule fois.Failed to prime the NuGet cache. {0} failed with: {1}
- Échec de la création du cache NuGet. Échec de {0} : {1}
-
+ Échec de la préparation du cache NuGet. Échec de {0} : {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
index 432cd66b5..f698081ac 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
@@ -34,8 +34,8 @@ Configurazione...
Failed to prime the NuGet cache. {0} failed with: {1}
- Non è possibile creare per la prima volta la cache NuGet. {0} non riuscito. Errore: {1}
-
+ Non è possibile inizializzare la cache NuGet. {0} non riuscito. Errore: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
index f8184dc83..675634dba 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
@@ -34,8 +34,8 @@ A command is running to initially populate your local package cache, to improve
Failed to prime the NuGet cache. {0} failed with: {1}
- プライム NuGet キャッシュを作成できませんでした。{0} は {1} で失敗しました
-
+ NuGet キャッシュを準備できませんでした。{0} は {1} で失敗しました
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
index f2aa73287..65047c43a 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
@@ -17,7 +17,7 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te
Configuring...
-------------------
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
- .NET Core를 시작합니다!
+ NET Core를 시작합니다!
---------------------
.NET Core에 대한 자세한 내용은 https://aka.ms/dotnet-docs를 참조하세요. 사용 가능한 명령을 보려면 dotnet --help를 사용하거나 https://aka.ms/dotnet-cli-docs를 방문하세요.
@@ -34,9 +34,9 @@ A command is running to initially populate your local package cache, to improve
Failed to prime the NuGet cache. {0} failed with: {1}
- 프라임 NuGet 캐시를 만들지 못했습니다. {0} 실패: {1}
-
+ NuGet 캐시를 초기화하지 못했습니다. {0} 실패: {1}
+
-
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
index 7dd51018c..9e040e1e9 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
@@ -34,8 +34,8 @@ Wykonywane jest polecenie w celu wstępnego wypełnienia lokalnej pamięci podr
Failed to prime the NuGet cache. {0} failed with: {1}
- Nie udało się utworzyć głównej pamięci podręcznej NuGet. Operacja {0} zakończyła się niepowodzeniem: {1}
-
+ Nie można utworzyć głównej pamięci podręcznej NuGet. Operacja {0} zakończyła się niepowodzeniem: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
index b4d2a0ed4..cde0e1ec6 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
@@ -19,23 +19,23 @@ Configuring...
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
Bem-vindo ao .NET Core!
---------------------
-Saiba mais sobre o .NET Core @ https://aka.ms/dotnet-docs. Use o dotnet --help para ver comandos disponíveis ou ir para https://aka.ms/dotnet-cli-docs.
+Saiba mais sobre o .NET Core em https://aka.ms/dotnet-docs. Use dotnet --help para ver os comandos disponíveis ou acesse https://aka.ms/dotnet-cli-docs.
Telemetria
--------------
-As ferramentas do .NET Core coletam dados de uso para melhorar sua experiência. Os dados são anônimos e não incluem argumentos da linha de comando. Os dados são coletados pela Microsoft e compartilhados com a comunidade.
-Você pode sair da telemetria configurando uma variável de ambiente DOTNET_CLI_TELEMETRY_OPTOUT para 1 usando seu shell favorito.
-Você pode ler mais sobre a telemeria de ferramentas do .NET Core em https://aka.ms/dotnet-cli-telemetry.
+As ferramentas do .NET Core coletam dados de uso para melhorar sua experiência. Os dados são anônimos e não incluem argumentos de linha de comando. Os dados são coletados pela Microsoft e compartilhados com a comunidade.
+É possível recusar a telemetria definindo uma variável de ambiente DOTNET_CLI_TELEMETRY_OPTOUT como 1 usando seu shell favorito.
+Leia mais sobre a telemetria das ferramentas do .NET Core em https://aka.ms/dotnet-cli-telemetry.
Configurando...
-------------------
-Um comando está sendo executado para preencher inicialmente seu cache de pacote local, para melhorar a velocidade de restauração e permitir acesso offline. Esse comando levará um minuto para ser concluído e acontecerá somente uma vez.
+Um comando está sendo executado para popular inicialmente o cache do pacote local, a fim de melhorar a velocidade de restauração e habilitar o acesso offline. Esse comando levará até um minuto para ser concluído e só ocorrerá uma vez.Failed to prime the NuGet cache. {0} failed with: {1}
- Falha ao criar principal do cache do NuGet. {0} falhou com: {1}
-
+ Falha ao preparar o cache do NuGet. {0} falhou com: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
index 3f24f76d7..f6f2f7252 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
@@ -17,25 +17,25 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te
Configuring...
-------------------
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
- Вас приветствует .NET Core!
+ Добро пожаловать в .NET Core!
---------------------
-Дополнительные сведения о .NET Core: https://aka.ms/dotnet-docs. Используйте dotnet --help, чтобы просмотреть доступные команды, или перейдите на сайт https://aka.ms/dotnet-cli-docs.
+Дополнительные сведения о .NET Core можно получить по адресу https://aka.ms/dotnet-docs. Для просмотра доступных команд используйте dotnet --help или перейдите на страницу https://aka.ms/dotnet-cli-docs.
Телеметрия
--------------
-Средства .NET Core собирают данные об использовании для повышения качества взаимодействия. Данные анонимны и не включают аргументы командной строки. Данные собирает корпорация Майкрософт и предоставляет их сообществу.
-Вы можете отказаться от телеметрии, задав переменную среды DOTNET_CLI_TELEMETRY_OPTOUT равной 1, используя предпочитаемую оболочку.
-Вы можете подробнее ознакомиться со средствами сбора телеметрии .NET Core: https://aka.ms/dotnet-cli-telemetry.
+Средства .NET Core собирают данные об использовании для улучшения взаимодействия с пользователем. Эти данные анонимны и не включают в себя аргументы командной строки. Сбор данных осуществляется корпорацией Майкрософт, которая предоставляет их сообществу.
+Вы можете явно отказаться от телеметрии, присвоив переменной среды DOTNET_CLI_TELEMETRY_OPTOUT значение 1 с помощью предпочитаемой оболочки.
+Дополнительные сведения о телеметрии в средствах .NET Core см. по адресу https://aka.ms/dotnet-cli-telemetry.
-Идет настройка...
+Настройка...
-------------------
-Выполняется команда начального заполнения локального кэша пакетов для повышения скорости восстановления и обеспечения автономного доступа. Это займет около минуты; команда выполняется только один раз.
+Выполняется команда для изначального заполнения локального кэша пакетов, повышения скорости восстановления и обеспечения автономного доступа. Ее выполнение может занять до одной минуты и имеет единоразовый характер.Failed to prime the NuGet cache. {0} failed with: {1}
- Не удалось изначально создать кэш NuGet. {0} завершился с ошибкой: {1}
-
+ Не удалось изначально создать кэш NuGet. {0} завершился с ошибкой: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
index 7e4f71713..e4930ea01 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
@@ -19,23 +19,23 @@ Configuring...
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
.NET Core’a Hoş Geldiniz!
---------------------
-.NET Core hakkında daha fazla bilgi edinmek için bkz. https://aka.ms/dotnet-docs. Kullanılabilen komutları görüntülemek için dotnet --help komutunu kullanın veya https://aka.ms/dotnet-cli-docs adresine gidin.
+.NET Core hakkında daha fazla bilgiyi https://aka.ms/dotnet-docs adresinde bulabilirsiniz. Kullanılabilir komutları görmek için dotnet --help kullanın veya https://aka.ms/dotnet-cli-docs adresine gidin.
Telemetri
--------------
-.NET Core araçları, deneyiminizi geliştirmek için kullanım verilerini toplar. Veriler anonimdir ve komut satırı bağımsız değişkenlerini içermez. Veriler Microsoft tarafından toplanır ve toplulukla paylaşılır.
-İstediğiniz kabuk içinde DOTNET_CLI_TELEMETRY_OPTOUT ortam değişkenini 1 olarak ayarlayarak telemetriyi geri çevirebilirsiniz.
-.NET Core araçlarında telemetri hakkında daha fazla bilgi edinmek için bkz. https://aka.ms/dotnet-cli-telemetry.
+.NET Core araçları, deneyiminizi iyileştirmek için kullanım verileri toplar. Veriler anonimdir ve komut satırı bağımsız değişkenlerini içermez. Veriler Microsoft tarafından toplanır ve topluluk ile paylaşılır.
+Sık kullandığınız kabuk aracılığıyla DOTNET_CLI_TELEMETRY_OPTOUT ortam değişkenini 1 değerine ayarlayarak telemetriyi geri çevirebilirsiniz.
+.NET Core araç telemetrisi hakkında daha faza bilgiyi https://aka.ms/dotnet-cli-telemetry adresinde bulabilirsiniz.
Yapılandırılıyor...
-------------------
-Geri yükleme hızını artırmak ve çevrimdışı erişimi etkinleştirmek için yerel paket önbelleğinizi başlangıçta doldurmak amacıyla bir komut çalıştırılıyor. Bu komutun tamamlanması yaklaşık bir dakika sürer ve yalnızca bir kez çalışır.
+Yerel paket önbelleğinizi başlangıçta doldurmak, geri yükleme hızını artırmak ve çevrimdışı erişimi etkinleştirmek için bir komut çalıştırılıyor. Bu komutun tamamlanması yaklaşık bir dakika sürer ve bu işlem yalnızca bir kez gerçekleştirilir.Failed to prime the NuGet cache. {0} failed with: {1}
- Birincil NuGet önbelleği oluşturulamadı. {0} şu hata ile başarısız oldu: {1}
-
+ Birincil NuGet önbelleği hazırlanamadı. {0} şu hata ile başarısız oldu: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
index ddd08f8bd..d524b7f9f 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
@@ -34,8 +34,8 @@ A command is running to initially populate your local package cache, to improve
Failed to prime the NuGet cache. {0} failed with: {1}
- 未能创建主要 NuGet 缓存。{0} 失败,错误为: {1}
-
+ 未能准备好 NuGet 缓存。{0} 失败,错误为: {1}
+
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
index 2dfebee03..829490337 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
@@ -19,23 +19,23 @@ Configuring...
A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once.
歡迎使用 .NET Core!
---------------------
-前往 https://aka.ms/dotnet-docs 深入了解 .NET Core。使用 dotnet --help 查看可用的命令,或前往 https://aka.ms/dotnet-cli-docs。
+深入了解 .NET Core @ https://aka.ms/dotnet-docs。使用 dotnet --help 查看可用的命令,或前往 https://aka.ms/dotnet-cli-docs。
遙測
--------------
-.NET Core 工具會收集使用方式資料,以改進您的體驗。資料為匿名性質,而且不會包含命令列引數。資料由 Microsoft 收集,並與社群共用。
-您可以退出宣告遙測,方法是使用您慣用的殼層,將 DOTNET_CLI_TELEMETRY_OPTOUT 環境變數設為 1。
-前往 https://aka.ms/dotnet-cli-telemetry 可以深入了解 .NET Core 工具遙測。
+.NET Core 工具會收集使用方式資料以改善您的體驗。資料為匿名且不含命令列引數。資料由 Microsoft 收集並與社群共用。
+您可選擇退出遙測,方法是使用您慣用的殼層將 DOTNET_CLI_TELEMETRY_OPTOUT 環境變數設為 1。
+您可深入閱讀 .NET Core 工具遙測 @ https://aka.ms/dotnet-cli-telemetry。
正在設定...
-------------------
-正在執行命令以初步填入您的本機套件快取,從而提升還原速度並允許離線存取。此命令最多需要一分鐘的時間完成,而且只會發生一次。
+正在執行命令以初始將您的本機套件快取填入,進而改善還原速度並啟用離線存取。此命令最多需要一分鐘完成,且只會進行一次。
Failed to prime the NuGet cache. {0} failed with: {1}
- 無法建立主要 NuGet 快取。{0} 失敗,發生: {1}
-
+ 無法備妥 NuGet 快取。{0} 失敗,發生: {1}
+
diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf
index 9788ce0aa..5b53e31ee 100644
--- a/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf
+++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf
@@ -105,8 +105,8 @@
Required value for option '{0}' was not provided.
- Required value for option '{0}' was not provided.
-
+ Nebyla zadána povinná hodnota parametru {0}.
+
diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf
index 0dbc7035b..3b222319d 100644
--- a/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf
+++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf
@@ -5,12 +5,12 @@
The last argument '{0}' accepts multiple values. No more argument can be added.
- Das letzte Argument "{0}" akzeptiert mehrere Werte. Es kann kein weiteres Argument hinzugefügt werden.
+ Das letzte Argument „{0}“ akzeptiert mehrere Werte. Es kann kein weiteres Argument mehr hinzugefügt werden.Unexpected value '{0}' for option '{1}'
- Unerwarteter Wert "{0}" für Option "{1}".
+ Unerwarteter Wert „{0}“ für Option „{1}“.
@@ -100,13 +100,13 @@
Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options.
- Alle zusätzlichen Optionen, die MSBuild übergeben werden sollen. Verfügbare Optionen siehe "dotnet msbuild -h".
+ Alle zusätzlichen Optionen, die MSBuild übergeben werden sollen. Verfügbare Optionen siehe „dotnet msbuild -h“.Required value for option '{0}' was not provided.
- Required value for option '{0}' was not provided.
-
+ Der erforderliche Wert für die Option "{0}" wurde nicht angegeben.
+
diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf
index a8f8ad3ff..580a04dee 100644
--- a/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf
+++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf
@@ -5,7 +5,7 @@
The last argument '{0}' accepts multiple values. No more argument can be added.
- El último argumento '{0}' acepta varios valores. No se pueden agregar más argumentos.
+ El último argumento "{0}" acepta varios valores. No se pueden agregar más argumentos.
@@ -100,13 +100,13 @@
Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options.
- Cualquier opción adicional que se deba pasar a MSBuild. Consulte 'dotnet msbuild -h' para conocer las opciones disponibles.
+ Toda opción adicional que se debe pasar a MSBuild. Consulte "dotnet msbuild -h" para ver las opciones disponibles.Required value for option '{0}' was not provided.
- Required value for option '{0}' was not provided.
-
+ No se ha proporcionado el valor requerido para la opción "{0}".
+
diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf
index d45d85f65..93027ad53 100644
--- a/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf
+++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf
@@ -105,8 +105,8 @@
Required value for option '{0}' was not provided.
- Required value for option '{0}' was not provided.
-
+ La valeur nécessaire pour l'option '{0}' n'a pas été fournie.
+