From d4a4424b77bc267c494a4a9592b2a40b9fe7d4a1 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 17 Jan 2018 16:41:02 -0800 Subject: [PATCH 01/42] Updating the branding of the CLI to 2.1.5 --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 34d574a42..bed763526 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.4 + Microsoft .NET Core SDK - 2.1.5 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.5 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 6a2b2f136..8d620f540 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 4 + 5 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index f130fe0a4..429b3589e 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.4
    • +
  • .NET Core SDK 2.1.5
  • .NET Core Runtime 2.0.5
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index cb379de96..04cd201ae 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.4 + • .NET Core SDK 2.1.5 • .NET Core Runtime 2.0.5 • Runtime Package Store From 3c1911bd67a2607f085d8f28052c2f6676f6ffac Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 18 Jan 2018 11:10:25 -0800 Subject: [PATCH 02/42] Update runtime and branding to 2.0.6. --- build/Branding.props | 2 +- build/DependencyVersions.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index bed763526..817c9c19e 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.5 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.5 + Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e8067df98..887b7449b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.5 + 2.0.6-servicing-26118-01 $(MicrosoftNETCoreAppPackageVersion) 15.5.180 $(MicrosoftBuildPackageVersion) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index 429b3589e..67e1efa78 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.5
    • -
  • .NET Core Runtime 2.0.5
    • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 04cd201ae..0b3ccbd6e 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -51,7 +51,7 @@ The following were installed at [DOTNETHOME] • .NET Core SDK 2.1.5 - • .NET Core Runtime 2.0.5 + • .NET Core Runtime 2.0.6 • Runtime Package Store This product collects usage data diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 01967abfc..273605674 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.5"); + result.Args.Should().Contain("--fx-version 2.0.6-servicing-26118-01"); } [Fact] From 603240f26dcc38f53ed48faa743af970b9afa9be Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Thu, 18 Jan 2018 12:15:22 -0800 Subject: [PATCH 03/42] Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e8067df98..15edc2e98 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 15.5.0-preview-62507-01 + 15.5.0-preview-62518-04 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From e752f2ace401a3d95fbe888da6f05e1dc96bd0b5 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Sun, 21 Jan 2018 19:19:25 -0800 Subject: [PATCH 04/42] Fix Windows servicing builds. The Windows servicing builds require a unique package source name in the NuGet configuration file when passing in multiple package sources. --- build/NugetConfigFile.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index ae5e96175..c37260b8e 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -50,7 +50,7 @@ Date: Mon, 22 Jan 2018 15:26:02 -0800 Subject: [PATCH 05/42] Update to consume aspnetcore 2.0.6-10007 --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 887b7449b..a42173149 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -60,14 +60,14 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.5 + 2.0.6 notimestamp - 2.0.5 + 2.0.6 rtm - 2.0.5 - 155 + 2.0.6 + 10007 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 7cba11483e579e7789fab0ecd647641c93e2a030 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 22 Jan 2018 16:09:46 -0800 Subject: [PATCH 06/42] Add 2.0.5 ASP.NET store to native installers. --- build/package/Installer.DEB.proj | 4 ++++ build/package/Installer.DEB.targets | 6 ++++++ build/package/Installer.RPM.targets | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index ce2a2e27d..b73ac733e 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -27,6 +27,7 @@ + @@ -90,6 +91,7 @@ + @@ -113,6 +115,7 @@ + @@ -128,6 +131,7 @@ + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 9224596be..f4cfc11a2 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -38,6 +38,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-2.0.5 $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -127,8 +128,10 @@ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) + $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index e987eb530..04d79e051 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -55,6 +55,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-2.0.5 $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -189,8 +190,10 @@ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + @@ -239,6 +245,7 @@ + @@ -255,6 +262,7 @@ + From e5ac8244c31b61f2609585813dee2a0103e7bb66 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 23 Jan 2018 07:48:14 -0800 Subject: [PATCH 07/42] Making a document only commit to trigger another build of the CLI. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8807beaa1..e6d7174b4 100644 --- a/README.md +++ b/README.md @@ -226,4 +226,3 @@ License ------- By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula). - From 067f98e7e9e7ab07c682a3acbf960365493a0bff Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 24 Jan 2018 21:47:05 -0800 Subject: [PATCH 08/42] Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 15edc2e98..bb75c1ba2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.0-beta3-20171110-312 + 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.0-beta3-20171117-314 From 88f10b47eec6197e282d313d843e07cb95376fed Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 25 Jan 2018 13:01:48 -0800 Subject: [PATCH 09/42] Update to consume aspnetcore 2.0.6-10008 timestamp build --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c07a6d6cd..e92cf96d9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -60,14 +60,14 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.6 + 2.0.6-rtm-10008 - notimestamp + timestamped 2.0.6 rtm 2.0.6 - 10007 + 10008 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 264f9a8d3f52fd0e538aedea344efb645a85a87c Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 25 Jan 2018 14:45:17 -0800 Subject: [PATCH 10/42] Update to consume aspnetcore 2.0.6-10008 notimestamp build --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e92cf96d9..1b94546f6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -60,9 +60,9 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.6-rtm-10008 + 2.0.6 - timestamped + notimestamp 2.0.6 rtm From f3b111d2c23d029707aca2cd1de3c2501d3baad3 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Fri, 26 Jan 2018 14:09:31 -0800 Subject: [PATCH 11/42] Build trigger commit. This is an empty commit to trigger the build. From c8c08433a70767ffd4d3c3d13e29aee6649527f0 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 13 Feb 2018 16:19:35 -0800 Subject: [PATCH 12/42] Update the branding of the CLI to 2.1.101 --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 3d0b29db1..0efef3910 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.100 + Microsoft .NET Core SDK - 2.1.101 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 27be01588..0c5329895 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 100 + 101 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index c7644d4e9..152269d1e 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.100
    • +
  • .NET Core SDK 2.1.101
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 94b9d6efc..ec6a3d7bd 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.100 + • .NET Core SDK 2.1.101 • .NET Core Runtime 2.0.6 • Runtime Package Store From 3547a1227cf8e3b79a9f3c5f4ddba0ee3e02c019 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 13 Feb 2018 17:32:52 -0800 Subject: [PATCH 13/42] Update AspNetCore version --- build/DependencyVersions.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1b94546f6..abd8ac479 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -61,13 +61,15 @@ $(MicrosoftNETCoreAppPackageVersion) 2.0.6 - + notimestamp + 2.0.6 rtm 2.0.6 - 10008 + 10010 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 32eeb5ddd58fc4956f9fce1834b47ebd72a23ccb Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 13 Feb 2018 18:54:35 -0800 Subject: [PATCH 14/42] Updating runtime to 2.0.6. --- build/DependencyVersions.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index abd8ac479..cf64ae9f9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.6-servicing-26118-01 + 2.0.6 $(MicrosoftNETCoreAppPackageVersion) 15.5.180 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 273605674..4333b887c 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.6-servicing-26118-01"); + result.Args.Should().Contain("--fx-version 2.0.6"); } [Fact] From c618b6fcbb27c12b050f9e4d722cc1aa91c2dab7 Mon Sep 17 00:00:00 2001 From: jagarg Date: Fri, 16 Feb 2018 18:44:31 +0530 Subject: [PATCH 15/42] Updating TestPlatform to 15.6 RTM --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c84117304..aac8fab36 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -40,7 +40,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.6.0-preview-20180109-01 + 15.6.0 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From 9c6da08d66195ae49ef17c367cae9cbca00b6aa9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 20 Feb 2018 14:37:16 -0800 Subject: [PATCH 16/42] Update to consume aspnetcore 2.0.6-10011 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b0ca74d70..eb98a4cf9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -67,7 +67,7 @@ 2.0.6 rtm 2.0.6 - 10010 + 10011 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 78efe50e65c763dd536f51eb5e0392701f79f0c7 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 27 Feb 2018 12:41:58 -0800 Subject: [PATCH 17/42] Update to the 15.6 RTM version of the test SDK in templates --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ee7471984..e172d76a0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -19,7 +19,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.0-beta3-20171110-312 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + 1.0.1-beta3-20180227-1423531 1.0.0-beta3-20171117-314 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 90eed38b2d018323330bc27b25c27990209ceb80 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Mon, 12 Mar 2018 15:48:04 -0700 Subject: [PATCH 18/42] Insert NuGet Build 4.7.0-preview1.4982 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7e99e6424..e50a60935 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview1-4927 + 4.7.0-preview1.4982 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c311381ab35ea20139b145ae1625107e2f615582 Mon Sep 17 00:00:00 2001 From: "Rohit Agrawal (NUGET)" Date: Mon, 12 Mar 2018 18:41:56 -0700 Subject: [PATCH 19/42] add nuget-build myget feed as source --- build/NugetConfigFile.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index ae5e96175..5011d13d0 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -22,7 +22,7 @@ - + From b197f75b45d78c784213a23c86a75eb989fa496f Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 13 Mar 2018 16:42:22 -0700 Subject: [PATCH 20/42] Update Roslyn to 2.7.0-beta3-62707-11 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b7a363bc0..585f31f59 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180213-0 - 2.7.0-beta3-62615-05 + 2.7.0-beta3-62707-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.100-preview-62617-01 From b724d8be123c78a11c0855779adbc24c00adceea Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 13 Mar 2018 16:59:13 -0700 Subject: [PATCH 21/42] Remove cli-deps from sources. This commit removes cli-deps from sources. --- build/NugetConfigFile.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index c37260b8e..82ffa6488 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -22,7 +22,6 @@ - From 80978d689b90e9c5967f53288837bfc08cd4478d Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 13 Mar 2018 18:05:41 -0700 Subject: [PATCH 22/42] Updating the branding of the CLI to 2.1.102. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 0efef3910..9aca26181 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.101 + Microsoft .NET Core SDK - 2.1.102 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 0c5329895..d6c9dadce 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 101 + 102 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index 152269d1e..9d1002bdf 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.101
    • +
  • .NET Core SDK 2.1.102
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index ec6a3d7bd..70007ca70 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.101 + • .NET Core SDK 2.1.102 • .NET Core Runtime 2.0.6 • Runtime Package Store From 2e7d92be25ce8ba0e5aa56c9e687bcc2710b6f03 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 13 Mar 2018 18:09:31 -0700 Subject: [PATCH 23/42] Updating the SDK version to 2.1.100-preview-62714-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 134a1384e..e1590c001 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.7.0-beta3-62615-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.100-preview-62617-01 + 2.1.100-preview-62714-01 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From 8fd0e7317d434f53ffb0b6b2334657e30efe5d77 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 13 Mar 2018 20:26:51 -0700 Subject: [PATCH 24/42] Updating Roslyn to 2.8.0-beta2-62713-11 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 38e5ba64a..06e2946e3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180213-0 - 2.7.0-beta3-62707-11 + 2.8.0-beta2-62713-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.100-preview-62714-01 From b0acac94b8d8544f56ebadaf1e620a2ec19550fb Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 15 Mar 2018 17:08:38 -0700 Subject: [PATCH 25/42] Update SDK to 2.1.200-preview-62715-08 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 06e2946e3..7c82fd2dd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta2-62713-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.100-preview-62714-01 + 2.1.200-preview-62715-08 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From eeca22fc714cdd33400ef5098cb271006841cf43 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 15 Mar 2018 21:23:22 -0700 Subject: [PATCH 26/42] Updating the SDK to 2.1.200-preview-62716-04 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7c82fd2dd..2efeeda5b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta2-62713-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62715-08 + 2.1.200-preview-62716-04 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From e2c3f7e3d4821aebfd8d6b75a94fa0cf297bc106 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 16 Mar 2018 13:32:07 -0700 Subject: [PATCH 27/42] Updating the SDK to 2.1.200-preview-62716-06. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2efeeda5b..bee3fcc95 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta2-62713-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62716-04 + 2.1.200-preview-62716-06 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From bca991fddb16f1bfe51b23746260dbf341380910 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 16 Mar 2018 17:57:25 -0700 Subject: [PATCH 28/42] Update SDK to 2.1.200-preview-62717-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index bee3fcc95..745bdee58 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta2-62713-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62716-06 + 2.1.200-preview-62717-01 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From f557859feb4fcc4c430039d31b0e772f4306cd4f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 20 Mar 2018 14:22:54 -0700 Subject: [PATCH 29/42] Updating NuGet to 4.6.1-rtm-5019 --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5d63d37e1..c4aa6ec25 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.0-rtm-4918 + 4.6.1-rtm-5019 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 82ffa6488..1155c016a 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -31,6 +31,7 @@ + ]]> From 58703f72ae9301032145d574f4cc9c6c60d71bf6 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 20 Mar 2018 14:29:43 -0700 Subject: [PATCH 30/42] Updating the branding of the CLI to 2.1.103. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 9aca26181..afdf7976b 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.102 + Microsoft .NET Core SDK - 2.1.103 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index d6c9dadce..b7a218a68 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 102 + 103 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index 9d1002bdf..e9933650d 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.102
    • +
  • .NET Core SDK 2.1.103
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 70007ca70..d21ee9fc4 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.102 + • .NET Core SDK 2.1.103 • .NET Core Runtime 2.0.6 • Runtime Package Store From 9b0e592e300b113e4494b3b8feb3712d4e25ef38 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 20 Mar 2018 23:33:21 -0700 Subject: [PATCH 31/42] Update SDK to 2.1.100-preview-62721-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c4aa6ec25..3c401e883 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.7.0-beta3-62707-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.100-preview-62714-01 + 2.1.100-preview-62721-01 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From 510cff49d8b6292cc8a5d093019b3e1a1686f238 Mon Sep 17 00:00:00 2001 From: Rakesh Ranjan Singh Date: Mon, 26 Mar 2018 11:28:06 -0700 Subject: [PATCH 32/42] Enabling ubuntu.18.04,opensuse.42.3 and fedora.27 in dotnet-install script --- scripts/obtain/dotnet-install.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 00a42d872..c3eaa295c 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -79,6 +79,10 @@ get_legacy_os_name_from_platform() { echo "fedora.23" return 0 ;; + "fedora.27") + echo "fedora.27" + return 0 + ;; "fedora.24") echo "fedora.24" return 0 @@ -91,6 +95,10 @@ get_legacy_os_name_from_platform() { echo "opensuse.42.1" return 0 ;; + "opensuse.42.3") + echo "opensuse.42.3" + return 0 + ;; "rhel.7"*) echo "rhel" return 0 @@ -107,6 +115,10 @@ get_legacy_os_name_from_platform() { echo "ubuntu.16.10" return 0 ;; + "ubuntu.18.04") + echo "ubuntu.18.04" + return 0 + ;; "alpine.3.4.3") echo "alpine" return 0 From 76d4824c399ee251ee5b2d43901fdc8532b9f872 Mon Sep 17 00:00:00 2001 From: William Lee Date: Mon, 26 Mar 2018 12:50:09 -0700 Subject: [PATCH 33/42] Add xml setting version warning (#8860) --- src/dotnet/CommonLocalizableStrings.resx | 9 ++ src/dotnet/ToolPackage/IToolPackage.cs | 2 + src/dotnet/ToolPackage/ToolConfiguration.cs | 6 +- .../DotNetCliTool.cs | 3 + .../ToolConfigurationDeserializer.cs | 35 +++++- src/dotnet/ToolPackage/ToolPackageInstance.cs | 108 +++++++++++------- .../dotnet-tool/install/ToolInstallCommand.cs | 5 + .../xlf/CommonLocalizableStrings.cs.xlf | 15 +++ .../xlf/CommonLocalizableStrings.de.xlf | 15 +++ .../xlf/CommonLocalizableStrings.es.xlf | 15 +++ .../xlf/CommonLocalizableStrings.fr.xlf | 15 +++ .../xlf/CommonLocalizableStrings.it.xlf | 15 +++ .../xlf/CommonLocalizableStrings.ja.xlf | 15 +++ .../xlf/CommonLocalizableStrings.ko.xlf | 15 +++ .../xlf/CommonLocalizableStrings.pl.xlf | 15 +++ .../xlf/CommonLocalizableStrings.pt-BR.xlf | 15 +++ .../xlf/CommonLocalizableStrings.ru.xlf | 15 +++ .../xlf/CommonLocalizableStrings.tr.xlf | 15 +++ .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 15 +++ .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 15 +++ .../DotnetToolSettingsGolden.xml | 2 +- .../DotnetToolSettingsMajorHigherVersion.xml | 6 + .../DotnetToolSettingsMissingVersion.xml | 6 + .../Microsoft.DotNet.ToolPackage.Tests.csproj | 6 + .../SampleGlobalTool/DotnetToolSettings.xml | 4 +- .../ToolConfigurationDeserializerTests.cs | 24 ++++ .../ToolPackageInstallerMock.cs | 10 +- .../ToolPackageMock.cs | 7 +- .../CommandTests/ToolInstallCommandTests.cs | 31 +++++ 29 files changed, 412 insertions(+), 47 deletions(-) create mode 100644 test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMajorHigherVersion.xml create mode 100644 test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMissingVersion.xml diff --git a/src/dotnet/CommonLocalizableStrings.resx b/src/dotnet/CommonLocalizableStrings.resx index ad6125977..e06ee07c0 100644 --- a/src/dotnet/CommonLocalizableStrings.resx +++ b/src/dotnet/CommonLocalizableStrings.resx @@ -628,4 +628,13 @@ setx PATH "%PATH%;{0}" The command name '{0}' cannot begin with a leading dot (.). + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + diff --git a/src/dotnet/ToolPackage/IToolPackage.cs b/src/dotnet/ToolPackage/IToolPackage.cs index c769b002d..ebf351487 100644 --- a/src/dotnet/ToolPackage/IToolPackage.cs +++ b/src/dotnet/ToolPackage/IToolPackage.cs @@ -18,6 +18,8 @@ namespace Microsoft.DotNet.ToolPackage IReadOnlyList Commands { get; } + IEnumerable Warnings { get; } + void Uninstall(); } } diff --git a/src/dotnet/ToolPackage/ToolConfiguration.cs b/src/dotnet/ToolPackage/ToolConfiguration.cs index fe6eeb2a9..bcb11c4e5 100644 --- a/src/dotnet/ToolPackage/ToolConfiguration.cs +++ b/src/dotnet/ToolPackage/ToolConfiguration.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using Microsoft.DotNet.Tools; @@ -12,7 +13,8 @@ namespace Microsoft.DotNet.ToolPackage { public ToolConfiguration( string commandName, - string toolAssemblyEntryPoint) + string toolAssemblyEntryPoint, + IEnumerable warnings = null) { if (string.IsNullOrWhiteSpace(commandName)) { @@ -32,6 +34,7 @@ namespace Microsoft.DotNet.ToolPackage CommandName = commandName; ToolAssemblyEntryPoint = toolAssemblyEntryPoint; + Warnings = warnings ?? new List(); } private void EnsureNoInvalidFilenameCharacters(string commandName) @@ -60,5 +63,6 @@ namespace Microsoft.DotNet.ToolPackage public string CommandName { get; } public string ToolAssemblyEntryPoint { get; } + public IEnumerable Warnings { get; } } } diff --git a/src/dotnet/ToolPackage/ToolConfigurationDeserialization/DotNetCliTool.cs b/src/dotnet/ToolPackage/ToolConfigurationDeserialization/DotNetCliTool.cs index 91fd9fde4..99bc2ff10 100644 --- a/src/dotnet/ToolPackage/ToolConfigurationDeserialization/DotNetCliTool.cs +++ b/src/dotnet/ToolPackage/ToolConfigurationDeserialization/DotNetCliTool.cs @@ -9,5 +9,8 @@ namespace Microsoft.DotNet.ToolPackage.ToolConfigurationDeserialization { [XmlArrayItem("Command", IsNullable = false)] public DotNetCliToolCommand[] Commands { get; set; } + + [XmlAttribute(AttributeName = "Version")] + public string Version { get; set; } } } diff --git a/src/dotnet/ToolPackage/ToolConfigurationDeserializer.cs b/src/dotnet/ToolPackage/ToolConfigurationDeserializer.cs index 7d943c36e..c2319e13a 100644 --- a/src/dotnet/ToolPackage/ToolConfigurationDeserializer.cs +++ b/src/dotnet/ToolPackage/ToolConfigurationDeserializer.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Collections.Generic; using System.IO; using System.Xml; using System.Xml.Serialization; @@ -12,6 +13,10 @@ namespace Microsoft.DotNet.ToolPackage { internal static class ToolConfigurationDeserializer { + // The supported tool configuration schema version. + // This should match the schema version in the GenerateToolsSettingsFile task from the SDK. + private const int SupportedVersion = 1; + public static ToolConfiguration Deserialize(string pathToXml) { var serializer = new XmlSerializer(typeof(DotNetCliTool)); @@ -43,6 +48,8 @@ namespace Microsoft.DotNet.ToolPackage ex); } + List warnings = GenerateWarningAccordingToVersionAttribute(dotNetCliTool); + if (dotNetCliTool.Commands.Length != 1) { throw new ToolConfigurationException(CommonLocalizableStrings.ToolSettingsMoreThanOneCommand); @@ -59,7 +66,33 @@ namespace Microsoft.DotNet.ToolPackage return new ToolConfiguration( dotNetCliTool.Commands[0].Name, - dotNetCliTool.Commands[0].EntryPoint); + dotNetCliTool.Commands[0].EntryPoint, + warnings); + } + + private static List GenerateWarningAccordingToVersionAttribute(DotNetCliTool dotNetCliTool) + { + List warnings = new List(); + if (string.IsNullOrWhiteSpace(dotNetCliTool.Version)) + { + warnings.Add(CommonLocalizableStrings.FormatVersionIsMissing); + } + else + { + if (!int.TryParse(dotNetCliTool.Version, out int version)) + { + warnings.Add(CommonLocalizableStrings.FormatVersionIsMalformed); + } + else + { + if (version > SupportedVersion) + { + warnings.Add(CommonLocalizableStrings.FormatVersionIsHigher); + } + } + } + + return warnings; } } } diff --git a/src/dotnet/ToolPackage/ToolPackageInstance.cs b/src/dotnet/ToolPackage/ToolPackageInstance.cs index 74b092109..4dd9733fb 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstance.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstance.cs @@ -13,23 +13,7 @@ namespace Microsoft.DotNet.ToolPackage // This is named "ToolPackageInstance" because "ToolPackage" would conflict with the namespace internal class ToolPackageInstance : IToolPackage { - private IToolPackageStore _store; - private Lazy> _commands; - - public ToolPackageInstance( - IToolPackageStore store, - PackageId id, - NuGetVersion version, - DirectoryPath packageDirectory) - { - _store = store ?? throw new ArgumentNullException(nameof(store)); - _commands = new Lazy>(GetCommands); - - Id = id; - Version = version ?? throw new ArgumentNullException(nameof(version)); - PackageDirectory = packageDirectory; - } - + public IEnumerable Warnings => _toolConfiguration.Value.Warnings; public PackageId Id { get; private set; } public NuGetVersion Version { get; private set; } @@ -44,13 +28,36 @@ namespace Microsoft.DotNet.ToolPackage } } + private const string AssetsFileName = "project.assets.json"; + private const string ToolSettingsFileName = "DotnetToolSettings.xml"; + + private IToolPackageStore _store; + private Lazy> _commands; + private Lazy _toolConfiguration; + + public ToolPackageInstance( + IToolPackageStore store, + PackageId id, + NuGetVersion version, + DirectoryPath packageDirectory) + { + _store = store ?? throw new ArgumentNullException(nameof(store)); + _commands = new Lazy>(GetCommands); + + Id = id; + Version = version ?? throw new ArgumentNullException(nameof(version)); + PackageDirectory = packageDirectory; + _toolConfiguration = new Lazy(GetToolConfiguration); + } + public void Uninstall() { var rootDirectory = PackageDirectory.GetParentPath(); string tempPackageDirectory = null; TransactionalAction.Run( - action: () => { + action: () => + { try { if (Directory.Exists(PackageDirectory.Value)) @@ -78,13 +85,15 @@ namespace Microsoft.DotNet.ToolPackage ex); } }, - commit: () => { + commit: () => + { if (tempPackageDirectory != null) { Directory.Delete(tempPackageDirectory, true); } }, - rollback: () => { + rollback: () => + { if (tempPackageDirectory != null) { Directory.CreateDirectory(rootDirectory.Value); @@ -95,31 +104,13 @@ namespace Microsoft.DotNet.ToolPackage private IReadOnlyList GetCommands() { - const string AssetsFileName = "project.assets.json"; - const string ToolSettingsFileName = "DotnetToolSettings.xml"; - try { var commands = new List(); var lockFile = new LockFileFormat().Read(PackageDirectory.WithFile(AssetsFileName).Value); - var library = FindLibraryInLockFile(lockFile); - var dotnetToolSettings = FindItemInTargetLibrary(library, ToolSettingsFileName); - if (dotnetToolSettings == null) - { - throw new ToolConfigurationException( - CommonLocalizableStrings.MissingToolSettingsFile); - } - - var toolConfigurationPath = - PackageDirectory - .WithSubDirectories( - Id.ToString(), - library.Version.ToNormalizedString()) - .WithFile(dotnetToolSettings.Path); - - var configuration = ToolConfigurationDeserializer.Deserialize(toolConfigurationPath.Value); + ToolConfiguration configuration = _toolConfiguration.Value; var entryPointFromLockFile = FindItemInTargetLibrary(library, configuration.ToolAssemblyEntryPoint); if (entryPointFromLockFile == null) { @@ -152,6 +143,44 @@ namespace Microsoft.DotNet.ToolPackage } } + private ToolConfiguration GetToolConfiguration() + { + try + { + var lockFile = new LockFileFormat().Read(PackageDirectory.WithFile(AssetsFileName).Value); + var library = FindLibraryInLockFile(lockFile); + return DeserializeToolConfiguration(ToolSettingsFileName, library); + } + catch (Exception ex) when (ex is UnauthorizedAccessException || ex is IOException) + { + throw new ToolConfigurationException( + string.Format( + CommonLocalizableStrings.FailedToRetrieveToolConfiguration, + ex.Message), + ex); + } + } + + private ToolConfiguration DeserializeToolConfiguration(string ToolSettingsFileName, LockFileTargetLibrary library) + { + var dotnetToolSettings = FindItemInTargetLibrary(library, ToolSettingsFileName); + if (dotnetToolSettings == null) + { + throw new ToolConfigurationException( + CommonLocalizableStrings.MissingToolSettingsFile); + } + + var toolConfigurationPath = + PackageDirectory + .WithSubDirectories( + Id.ToString(), + library.Version.ToNormalizedString()) + .WithFile(dotnetToolSettings.Path); + + var configuration = ToolConfigurationDeserializer.Deserialize(toolConfigurationPath.Value); + return configuration; + } + private LockFileTargetLibrary FindLibraryInLockFile(LockFile lockFile) { return lockFile @@ -166,5 +195,6 @@ namespace Microsoft.DotNet.ToolPackage ?.ToolsAssemblies ?.SingleOrDefault(t => LockFileMatcher.MatchesFile(t, targetRelativeFilePath)); } + } } diff --git a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs index 0977cd066..42bcb8790 100644 --- a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs @@ -148,6 +148,11 @@ namespace Microsoft.DotNet.Tools.Tool.Install scope.Complete(); } + foreach (string w in package.Warnings) + { + _reporter.WriteLine(w.Yellow()); + } + if (_global) { _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index 530f7b87b..1ad8c87ba 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" Příkaz {0} obsahuje úvodní tečku. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index df86a678e..fd08ba0ae 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" Der Befehl "{0}" weist einen vorangestellten Punkt auf. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index eeeaf4677..ff8efe426 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" El comando "{0}" tiene un punto al principio. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 185d6ba1f..30ba594d4 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" La commande '{0}' commence par un point. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index 6614c8b26..73a334fac 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" Il comando '{0}' presenta un punto iniziale. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 9d3518995..923244e61 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" コマンド '{0}' の先頭にドットがあります。 + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index db044c92a..b8769753f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" 명령 '{0}' 앞에 점이 있습니다. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index de47d9779..e06525415 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" Polecenie „{0}” zawiera kropkę na początku. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index dc7b67b8e..5bac8fb07 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" O comando '{0}' tem um ponto à esquerda. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index 73111d0eb..a356ca731 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" В начале команды "{0}" стоит точка. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index 3f6a52a12..5cd7faabb 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" '{0}' komutunun başında nokta var. + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index 8729ab7fb..c0f3a3706 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" 命令“{0}”有一个前导点。 + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index a93c4900e..c8312b3c9 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -863,6 +863,21 @@ setx PATH "%PATH%;{0}" 命令 '{0}' 的開頭有一個點 (.)。 + + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + + + + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + + + + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsGolden.xml b/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsGolden.xml index cd4f20107..7b3ae9d5d 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsGolden.xml +++ b/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsGolden.xml @@ -1,5 +1,5 @@  - + diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMajorHigherVersion.xml b/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMajorHigherVersion.xml new file mode 100644 index 000000000..f74b863d8 --- /dev/null +++ b/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMajorHigherVersion.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMissingVersion.xml b/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMissingVersion.xml new file mode 100644 index 000000000..cd4f20107 --- /dev/null +++ b/test/Microsoft.DotNet.ToolPackage.Tests/DotnetToolSettingsMissingVersion.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj b/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj index c5d027749..27ff23b4b 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj +++ b/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj @@ -34,6 +34,12 @@ Always + + Always + + + Always + diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/DotnetToolSettings.xml b/test/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/DotnetToolSettings.xml index b9c18a1e7..92142c78d 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/DotnetToolSettings.xml +++ b/test/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/DotnetToolSettings.xml @@ -1,5 +1,5 @@ - - + + diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/ToolConfigurationDeserializerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolConfigurationDeserializerTests.cs index 1d141311e..c102bb9ca 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolConfigurationDeserializerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolConfigurationDeserializerTests.cs @@ -41,6 +41,30 @@ namespace Microsoft.DotNet.ToolPackage.Tests .Contain(CommonLocalizableStrings.ToolSettingsMissingCommandName); } + [Fact] + public void GivenMissingVersionItHasWarningReflectIt() + { + ToolConfiguration toolConfiguration = ToolConfigurationDeserializer.Deserialize("DotnetToolSettingsMissingVersion.xml"); + + toolConfiguration.Warnings.First().Should().Be(CommonLocalizableStrings.FormatVersionIsMissing); + } + + [Fact] + public void GivenMajorHigherVersionItHasWarningReflectIt() + { + ToolConfiguration toolConfiguration = ToolConfigurationDeserializer.Deserialize("DotnetToolSettingsMajorHigherVersion.xml"); + + toolConfiguration.Warnings.First().Should().Be(CommonLocalizableStrings.FormatVersionIsHigher); + } + + [Fact] + public void GivenMinorHigherVersionItHasNoWarning() + { + ToolConfiguration toolConfiguration = ToolConfigurationDeserializer.Deserialize("DotnetToolSettingsGolden.xml"); + + toolConfiguration.Warnings.Should().BeEmpty(); + } + [Fact] public void GivenInvalidCharAsFileNameItThrows() { diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs index 539205cca..facc85132 100644 --- a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs +++ b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs @@ -22,17 +22,20 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks private readonly IProjectRestorer _projectRestorer; private readonly IFileSystem _fileSystem; private readonly Action _installCallback; + private readonly Dictionary> _warningsMap; public ToolPackageInstallerMock( IFileSystem fileSystem, IToolPackageStore store, IProjectRestorer projectRestorer, - Action installCallback = null) + Action installCallback = null, + Dictionary> warningsMap = null) { _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem)); _store = store ?? throw new ArgumentNullException(nameof(store)); _projectRestorer = projectRestorer ?? throw new ArgumentNullException(nameof(projectRestorer)); _installCallback = installCallback; + _warningsMap = warningsMap ?? new Dictionary>(); } public IToolPackage InstallPackage(PackageId packageId, @@ -86,7 +89,10 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks _fileSystem.Directory.Move(stageDirectory.Value, packageDirectory.Value); rollbackDirectory = packageDirectory.Value; - return new ToolPackageMock(_fileSystem, packageId, version, packageDirectory); + IEnumerable warnings = null; + _warningsMap.TryGetValue(packageId, out warnings); + + return new ToolPackageMock(_fileSystem, packageId, version, packageDirectory, warnings: warnings); }, rollback: () => { if (rollbackDirectory != null && _fileSystem.Directory.Exists(rollbackDirectory)) diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageMock.cs index 6ad826441..565e140e4 100644 --- a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageMock.cs +++ b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageMock.cs @@ -17,13 +17,15 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks private IFileSystem _fileSystem; private Lazy> _commands; private Action _uninstallCallback; + private IEnumerable _warnings; public ToolPackageMock( IFileSystem fileSystem, PackageId id, NuGetVersion version, DirectoryPath packageDirectory, - Action uninstallCallback = null) + Action uninstallCallback = null, + IEnumerable warnings = null) { _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem)); Id = id; @@ -31,6 +33,7 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks PackageDirectory = packageDirectory; _commands = new Lazy>(GetCommands); _uninstallCallback = uninstallCallback; + _warnings = warnings ?? new List(); } public PackageId Id { get; private set; } @@ -47,6 +50,8 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks } } + public IEnumerable Warnings => _warnings; + public void Uninstall() { var rootDirectory = PackageDirectory.GetParentPath(); diff --git a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs index 89ea673d2..65ea11d13 100644 --- a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs @@ -137,6 +137,37 @@ namespace Microsoft.DotNet.Tests.Commands _reporter.Lines.First().Should().Be(EnvironmentPathInstructionMock.MockInstructionText); } + [Fact] + public void WhenRunWithPackageIdPackageFormatIsNotFullySupportedItShouldShowPathInstruction() + { + const string Warning = "WARNING"; + var injectedWarnings = new Dictionary>() + { + [new PackageId(PackageId)] = new List() { Warning } + }; + + var toolPackageInstaller = new ToolPackageInstallerMock( + fileSystem: _fileSystem, + store: _toolPackageStore, + projectRestorer: new ProjectRestorerMock( + fileSystem: _fileSystem, + reporter: _reporter), + warningsMap: injectedWarnings); + + var installToolCommand = new ToolInstallCommand( + _appliedCommand, + _parseResult, + (_) => (_toolPackageStore, toolPackageInstaller), + _createShellShimRepository, + _environmentPathInstructionMock, + _reporter); + + installToolCommand.Execute().Should().Be(0); + + _reporter.Lines.First().Should().Be(Warning.Yellow()); + _reporter.Lines.Skip(1).First().Should().Be(EnvironmentPathInstructionMock.MockInstructionText); + } + [Fact] public void GivenFailedPackageInstallWhenRunWithPackageIdItShouldFail() { From 01c11876b035718620c505e90ddc4f7a6c918862 Mon Sep 17 00:00:00 2001 From: William Lee Date: Mon, 26 Mar 2018 16:24:36 -0700 Subject: [PATCH 34/42] Better error message to guide user when there is only preview version in the feed (#8905) --- .../commands/dotnet-tool/install/LocalizableStrings.resx | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.cs.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.de.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.es.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.fr.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.it.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.ja.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.ko.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.pl.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.ru.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.tr.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf | 6 ++++-- .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf | 6 ++++-- 14 files changed, 56 insertions(+), 28 deletions(-) diff --git a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx index c970ea1cf..9f60c822f 100644 --- a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx @@ -161,7 +161,9 @@ Tool '{1}' (version '{2}') was successfully installed. The settings file in the tool's NuGet package is invalid: {0} - Tool '{0}' failed to install. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> Tool '{0}' failed to install. Please contact the tool author for assistance. @@ -187,4 +189,4 @@ Tool '{1}' (version '{2}') was successfully installed. Location where the tool will be installed. - + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index 019e0c5c4..033a6f76f 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -60,8 +60,10 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. - Tool '{0}' failed to install. - Nástroj {0} se nepodařilo nainstalovat. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Nástroj {0} se nepodařilo nainstalovat. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index 58227cfb8..c69f5c2f2 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -60,8 +60,10 @@ Das Tool "{1}" (Version "{2}") wurde erfolgreich installiert. - Tool '{0}' failed to install. - Fehler bei der Installation des Tools "{0}". + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Fehler bei der Installation des Tools "{0}". diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index 774e3968c..20fa6a4d6 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -60,8 +60,10 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. - Tool '{0}' failed to install. - No se pudo instalar la herramienta “{0}”. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + No se pudo instalar la herramienta “{0}”. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index cdf3f021c..3b6af9932 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -60,8 +60,10 @@ L'outil '{1}' (version '{2}') a été installé. - Tool '{0}' failed to install. - Impossible d'installer l'outil '{0}'. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Impossible d'installer l'outil '{0}'. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index c42d1cc40..331b72184 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -60,8 +60,10 @@ Lo strumento '{1}' (versione '{2}') è stato installato. - Tool '{0}' failed to install. - Non è stato possibile installare lo strumento '{0}'. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Non è stato possibile installare lo strumento '{0}'. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index 9fa3c5928..a3a22c7ca 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -60,8 +60,10 @@ Tool '{1}' (version '{2}') was successfully installed. - Tool '{0}' failed to install. - ツール '{0}' をインストールできませんでした。 + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + ツール '{0}' をインストールできませんでした。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index e7d4dbd9e..a6c052aa8 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -60,8 +60,10 @@ Tool '{1}' (version '{2}') was successfully installed. - Tool '{0}' failed to install. - '{0}' 도구를 설치하지 못했습니다. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + '{0}' 도구를 설치하지 못했습니다. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index 2d7d4f93f..1247d7488 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -60,8 +60,10 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). - Tool '{0}' failed to install. - Zainstalowanie narzędzia „{0}” nie powiodło się. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Zainstalowanie narzędzia „{0}” nie powiodło się. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index 0dc50e9a1..b680aa49a 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -60,8 +60,10 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. - Tool '{0}' failed to install. - Não foi possível instalar a ferramenta '{0}'. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Não foi possível instalar a ferramenta '{0}'. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 42eb6fd3d..0cacba338 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -60,8 +60,10 @@ Tool '{1}' (version '{2}') was successfully installed. - Tool '{0}' failed to install. - Не удалось установить инструмент "{0}". + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + Не удалось установить инструмент "{0}". diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index 2bd6bf5bb..a959e81f8 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -60,8 +60,10 @@ Tool '{1}' (version '{2}') was successfully installed. - Tool '{0}' failed to install. - '{0}' aracı yüklenemedi. + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + '{0}' aracı yüklenemedi. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index 63d1210de..abe652ee9 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -60,8 +60,10 @@ Tool '{1}' (version '{2}') was successfully installed. - Tool '{0}' failed to install. - 工具“{0}”安装失败。 + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + 工具“{0}”安装失败。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index 48bd8e3e5..c5b61c0fd 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -60,8 +60,10 @@ Tool '{1}' (version '{2}') was successfully installed. - Tool '{0}' failed to install. - 工具 '{0}' 無法安裝。 + Tool '{0}' failed to install. You may need to specify the version using + + dotnet tool install -g t-rex --version <version> + 工具 '{0}' 無法安裝。 From 52b2e4c733ba6b6cf5fb837e1a3d4ac8b8bf290d Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 27 Mar 2018 09:28:10 -0700 Subject: [PATCH 35/42] Update AspNetCore version to 2.1.0-preview2-30475 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7e0051e2a..1d056c9c9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0-preview2-30431 + 2.1.0-preview2-30475 2.1.0-preview2-26314-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000124 From 485638376d20426a382705b9c546b47bea0da206 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 27 Mar 2018 20:02:41 +0000 Subject: [PATCH 36/42] Fix an 'unbound variable' warning. --- scripts/obtain/dotnet-install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index c3eaa295c..55de51b91 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -157,13 +157,13 @@ get_linux_platform_name() { get_current_os_name() { eval $invocation - linux_platform_name="unknown" local uname=$(uname) if [ "$uname" = "Darwin" ]; then echo "osx" return 0 elif [ "$uname" = "Linux" ]; then + local linux_platform_name linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; } if [[ $linux_platform_name == "rhel.6" || $linux_platform_name == "alpine.3.6" ]]; then @@ -582,9 +582,10 @@ copy_files_or_dirs_from_list() { local root_path="$(remove_trailing_slash "$1")" local out_path="$(remove_trailing_slash "$2")" local override="$3" + local osname="$(get_current_os_name)" local override_switch=$( if [ "$override" = false ]; then - if [[ $linux_platform_name == 'alpine'* ]]; then + if [[ "$osname" == 'alpine'* ]]; then printf -- "-u"; else printf -- "-n"; From 80eb07bb0d4c5052636df12cc6ea53adbdf17b88 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 27 Mar 2018 18:29:31 -0500 Subject: [PATCH 37/42] MSBuild 15.7.127.34537 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1d056c9c9..023994570 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.1.0-preview2-30475 2.1.0-preview2-26314-02 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000124 + 15.7.0-preview-000127 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 3e575f7a7b8d5df2321ed8fcc4e44808f62ab9af Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 26 Mar 2018 22:34:29 -0700 Subject: [PATCH 38/42] Prevent default item globbing when evaluating run properties. When `dotnet run` is executed, a project evaluation occurs to obtain properties related to running the target executable. Currently, this evaluation causes the default item globs to be evaluated. For project directories containing a large number of files, this can be a bit performance hit since the globbing happens twice: once for the build and again for evaluating the run properties. This commit prevents the globbing from taking place when evaluating the run properties. Fixes #8103. --- src/Microsoft.DotNet.Cli.Utils/Constants.cs | 1 + src/dotnet/commands/dotnet-run/RunCommand.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/Constants.cs b/src/Microsoft.DotNet.Cli.Utils/Constants.cs index ad5d5111d..81d485e11 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Constants.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Constants.cs @@ -18,6 +18,7 @@ namespace Microsoft.DotNet.Cli.Utils public static readonly string MSBUILD_EXE_PATH = "MSBUILD_EXE_PATH"; public static readonly string MSBuildExtensionsPath = "MSBuildExtensionsPath"; + public static readonly string EnableDefaultItems = "EnableDefaultItems"; public static readonly string ProjectArgumentName = ""; public static readonly string SolutionArgumentName = ""; diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs index 8534c39d1..5969fdcab 100644 --- a/src/dotnet/commands/dotnet-run/RunCommand.cs +++ b/src/dotnet/commands/dotnet-run/RunCommand.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Exceptions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools; @@ -184,6 +184,9 @@ namespace Microsoft.DotNet.Tools.Run { var globalProperties = new Dictionary { + // This property disables default item globbing to improve performance + // This should be safe because we are not evaluating items, only properties + { Constants.EnableDefaultItems, "false" }, { Constants.MSBuildExtensionsPath, AppContext.BaseDirectory } }; @@ -197,7 +200,7 @@ namespace Microsoft.DotNet.Tools.Run globalProperties.Add("TargetFramework", Framework); } - Project project = new Project(Project, globalProperties, null); + var project = new ProjectInstance(Project, globalProperties, null); string runProgram = project.GetPropertyValue("RunCommand"); if (string.IsNullOrEmpty(runProgram)) @@ -220,7 +223,7 @@ namespace Microsoft.DotNet.Tools.Run .WorkingDirectory(runWorkingDirectory); } - private void ThrowUnableToRunError(Project project) + private void ThrowUnableToRunError(ProjectInstance project) { string targetFrameworks = project.GetPropertyValue("TargetFrameworks"); if (!string.IsNullOrEmpty(targetFrameworks)) From 1043231a4e78f2268cf9c36f0d800def03b721c6 Mon Sep 17 00:00:00 2001 From: William Lee Date: Wed, 28 Mar 2018 17:46:34 -0700 Subject: [PATCH 39/42] Fix wrong instruction (#8922) --- src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx index 9f60c822f..af448e1e9 100644 --- a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx @@ -163,7 +163,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Tool '{0}' failed to install. Please contact the tool author for assistance. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index 033a6f76f..6d683ff31 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -62,7 +62,7 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Nástroj {0} se nepodařilo nainstalovat. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index c69f5c2f2..c96dd1df9 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -62,7 +62,7 @@ Das Tool "{1}" (Version "{2}") wurde erfolgreich installiert. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Fehler bei der Installation des Tools "{0}". diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index 20fa6a4d6..1978faa6f 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -62,7 +62,7 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> No se pudo instalar la herramienta “{0}”. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index 3b6af9932..fb105c682 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -62,7 +62,7 @@ L'outil '{1}' (version '{2}') a été installé. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Impossible d'installer l'outil '{0}'. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index 331b72184..972f85489 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -62,7 +62,7 @@ Lo strumento '{1}' (versione '{2}') è stato installato. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Non è stato possibile installare lo strumento '{0}'. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index a3a22c7ca..d04d679cd 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -62,7 +62,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> ツール '{0}' をインストールできませんでした。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index a6c052aa8..36543e273 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -62,7 +62,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> '{0}' 도구를 설치하지 못했습니다. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index 1247d7488..57ac9d21f 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -62,7 +62,7 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Zainstalowanie narzędzia „{0}” nie powiodło się. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index b680aa49a..961c58a9a 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -62,7 +62,7 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Não foi possível instalar a ferramenta '{0}'. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 0cacba338..f953077a3 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -62,7 +62,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> Не удалось установить инструмент "{0}". diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index a959e81f8..f596ce661 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -62,7 +62,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> '{0}' aracı yüklenemedi. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index abe652ee9..ede31a8f7 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -62,7 +62,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> 工具“{0}”安装失败。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index c5b61c0fd..3c41fffe8 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -62,7 +62,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. You may need to specify the version using - dotnet tool install -g t-rex --version <version> + dotnet tool install -g {0} --version <version> 工具 '{0}' 無法安裝。 From f496a9bb18be39255d07c99097aacd2a7dbaa467 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 10:37:38 -0700 Subject: [PATCH 40/42] Updating windows msi code to use variables for the SDK and Runtime brandings. --- build/package/Installer.MSI.targets | 4 +++- packaging/windows/clisdk/bundle.wxl | 6 +++--- packaging/windows/clisdk/bundle.wxs | 3 +++ packaging/windows/clisdk/generatebundle.ps1 | 6 +++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 22d6adf38..96f9a27cb 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -154,7 +154,9 @@ '$(SimpleVersion)' '$(NugetVersion)' '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' - '$(Architecture)'" /> + '$(Architecture)' + '$(SharedFrameworkVersion)' + '$(AspNetCoreRuntimePackageVersion)'" /> The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.300 - • .NET Core Runtime 2.1.0 - • ASP.NET Core Runtime 2.1.0 + • .NET Core SDK [DOTNETSDKVERSION] + • .NET Core Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] This product collects usage data • More information and opt-out https://aka.ms/dotnet-cli-telemetry diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index 5e6936af7..aeae3aad9 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -24,6 +24,9 @@ + + + diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1 index 8b53d9591..a2b166baf 100644 --- a/packaging/windows/clisdk/generatebundle.ps1 +++ b/packaging/windows/clisdk/generatebundle.ps1 @@ -14,7 +14,9 @@ param( [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$Architecture + [Parameter(Mandatory=$true)][string]$Architecture, + [Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion, + [Parameter(Mandatory=$true)][string]$AspNetCoreVersion ) . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1" @@ -43,6 +45,8 @@ function RunCandleForBundle -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" ` -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" ` -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" ` + -dDotNetRuntimeVersion="$DotNetRuntimeVersion" ` + -dAspNetCoreVersion="$AspNetCoreVersion" ` -arch "$Architecture" ` -ext WixBalExtension.dll ` -ext WixUtilExtension.dll ` From b09b6bff26fa1f278918cfbf6de46f1c63c65c57 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 20:57:45 -0700 Subject: [PATCH 41/42] Generating the conclusion.html files dynamically so that we don't need to set the version in them everytime our branding changes. --- build/package/Installer.DEB.proj | 8 ++-- build/package/Installer.MSI.targets | 4 +- build/package/Installer.PKG.targets | 30 +++++++++++--- build/package/Installer.RPM.targets | 4 +- build/publish/Badge.targets | 8 ++-- .../dotnet-cli-build/ReplaceFileContents.cs | 41 ++++++++++++++----- .../clisdk/resources/cs.lproj/conclusion.html | 6 +-- .../clisdk/resources/de.lproj/conclusion.html | 6 +-- .../clisdk/resources/en.lproj/conclusion.html | 6 +-- .../clisdk/resources/es.lproj/conclusion.html | 6 +-- .../clisdk/resources/fr.lproj/conclusion.html | 6 +-- .../clisdk/resources/it.lproj/conclusion.html | 6 +-- .../clisdk/resources/ja.lproj/conclusion.html | 6 +-- .../clisdk/resources/ko.lproj/conclusion.html | 6 +-- .../clisdk/resources/pl.lproj/conclusion.html | 6 +-- .../resources/pt-br.lproj/conclusion.html | 6 +-- .../clisdk/resources/ru.lproj/conclusion.html | 6 +-- .../clisdk/resources/tr.lproj/conclusion.html | 6 +-- .../resources/zh-hans.lproj/conclusion.html | 6 +-- .../resources/zh-hant.lproj/conclusion.html | 6 +-- src/redist/redist.csproj | 4 +- 21 files changed, 111 insertions(+), 72 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index f8c741964..0e516f440 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -53,8 +53,8 @@ + '$(MicrosoftNETCoreAppPackageVersion)' + '$(AspNetCoreVersion)'" /> $(SdkPkgScriptsDirectory)/postinstall $(PkgIntermediateDirectory)/scripts $(SdkPkgDestinationScriptsDirectory)/postinstall - $(SdkPkgSourcesRootDirectory)/resources + $(PkgIntermediateDirectory)/resources $(SdkPkgSourcesRootDirectory)/Distribution-Template $(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml @@ -61,6 +61,16 @@ $(SdkVersion) + + + $(SdkVersion) + + + $(MicrosoftNETCoreAppPackageVersion) + + + $(AspNetCoreVersion) + @@ -69,6 +79,8 @@ + + @@ -77,7 +89,7 @@ - + @@ -91,11 +103,17 @@ DestinationFiles="@(AspNetRuntimeFilesInput->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" /> + + @@ -130,8 +148,8 @@ diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 115d6070f..9302cf5ea 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -104,8 +104,8 @@ - @@ -21,8 +21,8 @@ diff --git a/build_projects/dotnet-cli-build/ReplaceFileContents.cs b/build_projects/dotnet-cli-build/ReplaceFileContents.cs index b0baf4179..130550aba 100644 --- a/build_projects/dotnet-cli-build/ReplaceFileContents.cs +++ b/build_projects/dotnet-cli-build/ReplaceFileContents.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Linq; using System.Text.RegularExpressions; using Microsoft.Build.Utilities; using Microsoft.Build.Framework; @@ -28,10 +29,10 @@ namespace Microsoft.DotNet.Cli.Build public class ReplaceFileContents : Task { [Required] - public string InputFile { get; set; } + public ITaskItem[] InputFiles { get; set; } [Required] - public string DestinationFile { get; set; } + public ITaskItem[] DestinationFiles { get; set; } public ITaskItem[] ReplacementItems { get; set; } @@ -55,19 +56,36 @@ namespace Microsoft.DotNet.Cli.Build throw new Exception($"Expected {nameof(ReplacementPatterns)} (length {ReplacementPatterns.Length}) and {nameof(ReplacementStrings)} (length {ReplacementStrings.Length}) to have the same length."); } - if (!File.Exists(InputFile)) + if (InputFiles.Length != DestinationFiles.Length) { - throw new FileNotFoundException($"Expected file {InputFile} was not found."); + throw new Exception($"Expected {nameof(InputFiles)} (length {InputFiles.Length}) and {nameof(DestinationFiles)} (length {DestinationFiles.Length}) to have the same length."); } - string inputFileText = File.ReadAllText(InputFile); - string outputFileText = ReplacePatterns(inputFileText); + var filesNotFound = InputFiles.Where(i => !File.Exists(i.ItemSpec)).Select(i => i.ItemSpec); + if (filesNotFound.Any()) + { + var filesNotFoundString = string.Join(",", filesNotFound); + throw new FileNotFoundException($"Expected files where not found: {filesNotFoundString}"); + } - WriteOutputFile(outputFileText); + Log.LogMessage(MessageImportance.High, $"ReplacingContents for `{InputFiles.Length}` files."); + + for (var i = 0; i < InputFiles.Length; i++) + { + ReplaceContents(InputFiles[i].ItemSpec, DestinationFiles[i].ItemSpec); + } return true; } + public void ReplaceContents(string inputFile, string destinationFile) + { + string inputFileText = File.ReadAllText(inputFile); + string outputFileText = ReplacePatterns(inputFileText); + + WriteOutputFile(destinationFile, outputFileText); + } + public string ReplacePatterns(string inputFileText) { var outText = inputFileText; @@ -92,15 +110,18 @@ namespace Microsoft.DotNet.Cli.Build return outText; } - public void WriteOutputFile(string outputFileText) + public void WriteOutputFile(string destinationFile, string outputFileText) { - var destinationDirectory = Path.GetDirectoryName(DestinationFile); + var destinationDirectory = Path.GetDirectoryName(destinationFile); + Log.LogMessage(MessageImportance.High, $"Destination Directory: {destinationDirectory}"); if (!Directory.Exists(destinationDirectory)) { + Log.LogMessage(MessageImportance.High, $"Destination Directory `{destinationDirectory}` does not exist. Creating..."); Directory.CreateDirectory(destinationDirectory); } - File.WriteAllText(DestinationFile, outputFileText); + Log.LogMessage(MessageImportance.High, $"Writing file: {destinationFile}"); + File.WriteAllText(destinationFile, outputFileText); } } } diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index 7d91816fd..03fc060e4 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,9 +7,9 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.300
    • -
  • .NET Core Runtime 2.1.0
    • -
  • ASP.NET Core Runtime 2.1.0
    • +
  • .NET Core SDK {DOTNETSDKVERSION}
    • +
  • .NET Core Runtime {DOTNETRUNTIMEVERSION}
    • +
  • ASP.NET Core Runtime {ASPNETCOREVERSION}

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 65bd1e2a9..cd3ca221e 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -356,8 +356,8 @@ "version": "$(MicrosoftNETCoreAppPackageVersion)" From d26719d8de8029cbdaf31c724e264ed8acd3d89c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 21:21:10 -0700 Subject: [PATCH 42/42] Modifying branding.props to no longer have the version there manually updated. With this last change, updating the CLI version should require changes only in the Version.props file. --- build/Branding.props | 2 +- build/Version.props | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 282dae5b7..a13a74294 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,7 +1,7 @@ cli - Microsoft .NET Core SDK 2.1.300 - Preview + Microsoft .NET Core SDK $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime 2.1.0 - Preview Microsoft .NET Core Host 2.1.0 - Preview diff --git a/build/Version.props b/build/Version.props index 2f23c68c8..c8dd4c795 100644 --- a/build/Version.props +++ b/build/Version.props @@ -5,18 +5,20 @@ 300 preview3 - $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) - $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) - $(VersionMajor).$(VersionMinor).$(VersionPatch) + $(VersionMajor).$(VersionMinor).$(VersionPatch) + $(CliVersionNoSuffix)-$(ReleaseSuffix) + $(CliVersionNoSuffix) - $(ReleaseSuffix) + $(CliVersionNoSuffix).$(CommitCount) + $(CliVersionNoSuffix) - $(ReleaseSuffix)-$(CommitCount) + $(ReleaseSuffix)-$(CommitCount) - $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)-$(CommitCount) + $(CliVersionNoSuffix)-$(ReleaseSuffix)-$(CommitCount) - $(FullNugetVersion) - $(VersionMajor).$(VersionMinor).$(VersionPatch) + $(FullNugetVersion) + $(CliVersionNoSuffix) $(NugetVersion) - $(NugetVersion) + $(NugetVersion)