From bc3ea978f40408321d66a099944131d87fe25c41 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Mon, 25 Jun 2018 10:01:29 +0500 Subject: [PATCH 1/8] [Feature] Move to dotnet 2.1.301 --- .travis.yml | 2 +- PowerShell.Common.props | 1 + appveyor.yml | 2 +- build.psm1 | 3 +++ global.json | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8dc9d4c239..a9d50a89608 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ after_success: # which is expensive and unneeded for build agents. env: global: - - CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300 + - CACHE_VERSION=netcoreapp.2.1-sdk.2.1.301 - POWERSHELL_TELEMETRY_OPTOUT=1 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 diff --git a/PowerShell.Common.props b/PowerShell.Common.props index 4caacf688eb..3cbf0bced01 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -94,6 +94,7 @@ (c) Microsoft Corporation. All rights reserved. netcoreapp2.1 + 2.1.1 Latest true diff --git a/appveyor.yml b/appveyor.yml index 11853cf87b5..a215ead15d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Purpose: ElevatedPesterTests_xUnit_Packaging -# cache version - netcoreapp.2.1-sdk.2.1.300 +# cache version - netcoreapp.2.1-sdk.2.1.301 cache: - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml' diff --git a/build.psm1 b/build.psm1 index 412e541208d..6e208b9755e 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2019,6 +2019,9 @@ function Find-Dotnet() { if (-not (precheck 'dotnet' "Still could not find 'dotnet', restoring PATH.")) { $env:PATH = $originalPath + } else { + $dotnetInfo = (dotnet --info) + Write-Log "dotnet --info: `n$dotnetInfo" } } diff --git a/global.json b/global.json index d65e3d5d314..23a846ef77e 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.1.300" + "version": "2.1.301" } } From 28202bdd2f334a4c177e6e4bdaa6417bbcbd1262 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Mon, 25 Jun 2018 14:49:02 +0500 Subject: [PATCH 2/8] [Feature] Update versions of packages --- .../Microsoft.PowerShell.Commands.Utility.csproj | 6 +++--- .../Microsoft.PowerShell.ConsoleHost.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 12 ++++++------ test/tools/WebListener/WebListener.csproj | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 593e84dceb6..ea348f89ef5 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -65,9 +65,9 @@ - - - + + + diff --git a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj index 417e21af068..01f945c202a 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj +++ b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index f8152d1a4ee..7f0f490bd08 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -16,19 +16,19 @@ - + - - - + + + - - + + diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 52a464b3693..b256708e941 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,7 +7,7 @@ - + From cc85770bfd6425b77fd221ece832a338b9c1079d Mon Sep 17 00:00:00 2001 From: iSazonov Date: Mon, 25 Jun 2018 15:45:31 +0500 Subject: [PATCH 3/8] [Feature] Update System.ServiceModel.Primitives version --- src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 7f0f490bd08..fac404978f6 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -26,7 +26,7 @@ - + From d35de90b622657daa96f49e9180bd927c651ca18 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Mon, 25 Jun 2018 17:04:46 +0500 Subject: [PATCH 4/8] Add 2.1.1 in Test.Common.props --- test/Test.Common.props | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Test.Common.props b/test/Test.Common.props index b985e8724b4..f0ad66b1ca7 100644 --- a/test/Test.Common.props +++ b/test/Test.Common.props @@ -5,6 +5,7 @@ (c) Microsoft Corporation. All rights reserved. netcoreapp2.1 + 2.1.1 true true From f339a03ea111e7a52e0f0b6bf7b5d2216b70eee6 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Mon, 25 Jun 2018 18:43:49 +0500 Subject: [PATCH 5/8] Remove unneeded components from Files.wxs --- assets/files.wxs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/assets/files.wxs b/assets/files.wxs index 9b1ac3d6998..6bec3c2cc8d 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -190,9 +190,6 @@ - - - @@ -487,9 +484,6 @@ - - - @@ -1971,7 +1965,6 @@ - @@ -2070,7 +2063,6 @@ - From d9d5380d133c23b960baa4a86041f4a67377f7d4 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Mon, 25 Jun 2018 20:15:08 +0500 Subject: [PATCH 6/8] Add new components --- assets/files.wxs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/assets/files.wxs b/assets/files.wxs index 6bec3c2cc8d..d69bf7a0a3c 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -190,6 +190,9 @@ +- + + @@ -484,6 +487,9 @@ + + + @@ -1965,6 +1971,7 @@ + @@ -2063,6 +2070,7 @@ + From 06389ed6465eb63269c810fa696ff4c44d007fe1 Mon Sep 17 00:00:00 2001 From: iSazonov Date: Tue, 26 Jun 2018 08:18:45 +0500 Subject: [PATCH 7/8] Fix case --- assets/files.wxs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/files.wxs b/assets/files.wxs index d69bf7a0a3c..b307699fccf 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -190,8 +190,8 @@ -- - + + @@ -487,8 +487,8 @@ - - + + @@ -1971,7 +1971,7 @@ - + @@ -2070,7 +2070,7 @@ - + From fa4db607baf12586371276f256b05b4e57db6097 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 28 Jun 2018 16:00:42 -0700 Subject: [PATCH 8/8] Remove the logging --- build.psm1 | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.psm1 b/build.psm1 index 6e208b9755e..412e541208d 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2019,9 +2019,6 @@ function Find-Dotnet() { if (-not (precheck 'dotnet' "Still could not find 'dotnet', restoring PATH.")) { $env:PATH = $originalPath - } else { - $dotnetInfo = (dotnet --info) - Write-Log "dotnet --info: `n$dotnetInfo" } }