From 5ae546d74564243097a53ea512e95c8e769a7ca8 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Mon, 30 Jan 2017 16:42:37 -0800 Subject: [PATCH 1/2] Update projects and build script to .NET SDK 1.0.0-rc3 --- PowerShellEditorServices.Common.props | 4 +- PowerShellEditorServices.build.ps1 | 10 +---- PowerShellEditorServices.sln | 32 +-------------- global.json | 5 --- ...ellEditorServices.Channel.WebSocket.csproj | 20 +--------- .../PowerShellEditorServices.Host.csproj | 40 ++----------------- .../PowerShellEditorServices.Protocol.csproj | 21 ++-------- .../PowerShellEditorServices.csproj | 18 +-------- ...itorServices.Test.Channel.WebSocket.csproj | 28 ++----------- .../PowerShellEditorServices.Test.Host.csproj | 14 +------ ...erShellEditorServices.Test.Protocol.csproj | 17 +------- ...owerShellEditorServices.Test.Shared.csproj | 20 +--------- .../PowerShellEditorServices.Test.csproj | 22 +--------- 13 files changed, 21 insertions(+), 230 deletions(-) delete mode 100644 global.json diff --git a/PowerShellEditorServices.Common.props b/PowerShellEditorServices.Common.props index acd512c53..87b16e836 100644 --- a/PowerShellEditorServices.Common.props +++ b/PowerShellEditorServices.Common.props @@ -1,6 +1,4 @@ - - - + 0.9.0 beta diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1 index a9aebcd15..4a0060009 100644 --- a/PowerShellEditorServices.build.ps1 +++ b/PowerShellEditorServices.build.ps1 @@ -21,13 +21,7 @@ if ($PSVersionTable.PSEdition -ne "Core") { task SetupDotNet -Before Restore, Clean, Build, BuildHost, Test, TestPowerShellApi, PackageNuGet { # Fetch the SDK version from global.json - $globalJson = Get-Content $PSScriptRoot/global.json | ConvertFrom-Json - $requiredSdkVersion = $globalJson.sdk.version - - # Alternative versions: - # "version": "1.0.0-rc4-004598" - # "version": "1.0.0-rc3-004517" - # "version": "1.0.0-preview4-004233" + $requiredSdkVersion = "1.0.0-rc3-004530" $needsInstall = $true $dotnetPath = "$PSScriptRoot/.dotnet" @@ -62,7 +56,7 @@ task SetupDotNet -Before Restore, Clean, Build, BuildHost, Test, TestPowerShellA # Download the official installation script and run it $installScriptPath = "$([System.IO.Path]::GetTempPath())dotnet-install.$installScriptExt" - Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview4/scripts/obtain/dotnet-install.$installScriptExt" -OutFile $installScriptPath + Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-rc3/scripts/obtain/dotnet-install.$installScriptExt" -OutFile $installScriptPath $env:DOTNET_INSTALL_DIR = "$PSScriptRoot/.dotnet" if (!$script:IsUnix) { diff --git a/PowerShellEditorServices.sln b/PowerShellEditorServices.sln index 542e222c5..e5fa22c47 100644 --- a/PowerShellEditorServices.sln +++ b/PowerShellEditorServices.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25928.0 +VisualStudioVersion = 15.0.26127.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F594E7FD-1E72-4E51-A496-B019C2BA3180}" EndProject @@ -26,10 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Pr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Protocol", "test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj", "{E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Channel.WebSocket", "src\PowerShellEditorServices.Channel.WebSocket\PowerShellEditorServices.Channel.WebSocket.csproj", "{A6663F64-3C3D-461F-8A05-0CC4CA7A9945}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Test.Channel.WebSocket", "test\PowerShellEditorServices.Test.Channel.WebSocket\PowerShellEditorServices.Test.Channel.WebSocket.csproj", "{9D98120C-9601-4678-AD50-EF2808DABAC9}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -124,30 +120,6 @@ Global {E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x64.Build.0 = Release|Any CPU {E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x86.ActiveCfg = Release|Any CPU {E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4}.Release|x86.Build.0 = Release|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x64.ActiveCfg = Debug|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x64.Build.0 = Debug|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x86.ActiveCfg = Debug|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Debug|x86.Build.0 = Debug|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|Any CPU.Build.0 = Release|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x64.ActiveCfg = Release|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x64.Build.0 = Release|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x86.ActiveCfg = Release|Any CPU - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945}.Release|x86.Build.0 = Release|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x64.Build.0 = Debug|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x86.ActiveCfg = Debug|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Debug|x86.Build.0 = Debug|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|Any CPU.Build.0 = Release|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x64.ActiveCfg = Release|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x64.Build.0 = Release|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x86.ActiveCfg = Release|Any CPU - {9D98120C-9601-4678-AD50-EF2808DABAC9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -160,7 +132,5 @@ Global {6A20B9E9-DE66-456E-B4F5-ACFD1A95C3CA} = {422E561A-8118-4BE7-A54F-9309E4F03AAE} {F8A0946A-5D25-4651-8079-B8D5776916FB} = {F594E7FD-1E72-4E51-A496-B019C2BA3180} {E3A5CF5D-6E41-44AC-AE0A-4C227E4BACD4} = {422E561A-8118-4BE7-A54F-9309E4F03AAE} - {A6663F64-3C3D-461F-8A05-0CC4CA7A9945} = {F594E7FD-1E72-4E51-A496-B019C2BA3180} - {9D98120C-9601-4678-AD50-EF2808DABAC9} = {422E561A-8118-4BE7-A54F-9309E4F03AAE} EndGlobalSection EndGlobal diff --git a/global.json b/global.json deleted file mode 100644 index 4b03addc8..000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-preview4-004233" - } -} \ No newline at end of file diff --git a/src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj b/src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj index b6987b621..1a13e55d6 100644 --- a/src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj +++ b/src/PowerShellEditorServices.Channel.WebSocket/PowerShellEditorServices.Channel.WebSocket.csproj @@ -1,20 +1,13 @@ - + PowerShell Editor Services WebSocket Protocol Channel - net451;netstandard1.6 + net451 Microsoft.PowerShell.EditorServices.Channel.WebSocket $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - - @@ -24,13 +17,6 @@ 9.0.1 - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - @@ -48,6 +34,4 @@ - - diff --git a/src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj b/src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj index c200a4f9a..659839153 100644 --- a/src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj +++ b/src/PowerShellEditorServices.Host/PowerShellEditorServices.Host.csproj @@ -1,6 +1,6 @@ - - - + + + PowerShell Editor Services Host Process Provides a process for hosting the PowerShell Editor Services library exposed by a JSON message protocol. @@ -9,12 +9,6 @@ $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - @@ -24,13 +18,6 @@ 9.0.1 - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - 6.0.0-alpha13 @@ -44,25 +31,4 @@ - - - - diff --git a/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj b/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj index bc52c4299..59f89c35f 100644 --- a/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj +++ b/src/PowerShellEditorServices.Protocol/PowerShellEditorServices.Protocol.csproj @@ -1,6 +1,6 @@ - - - + + + PowerShell Editor Services Host Protocol Library Provides message types and client/server APIs for the PowerShell Editor Services JSON protocol. @@ -9,12 +9,6 @@ $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - @@ -23,13 +17,6 @@ 9.0.1 - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - 6.0.0-alpha13 @@ -43,6 +30,4 @@ - - diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj index db3e04874..1d716b29d 100644 --- a/src/PowerShellEditorServices/PowerShellEditorServices.csproj +++ b/src/PowerShellEditorServices/PowerShellEditorServices.csproj @@ -1,6 +1,5 @@ - + - PowerShell Editor Services Provides common PowerShell editor capabilities as a .NET library. @@ -10,9 +9,6 @@ - - - Microsoft.PowerShell.EditorServices.Extensions.CmdletInterface.ps1 @@ -38,16 +34,6 @@ bin\$(TargetFramework)\$(Configuration)\Microsoft.PowerShell.EditorServices.xml --> - - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - - - $(DefineConstants);RELEASE - - diff --git a/test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj b/test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj index 12138d03d..4f3a02d28 100644 --- a/test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj +++ b/test/PowerShellEditorServices.Test.Channel.WebSocket/PowerShellEditorServices.Test.Channel.WebSocket.csproj @@ -1,19 +1,12 @@ - + - net451;netstandard1.6 + net451 Microsoft.PowerShell.EditorServices.Test.Channel.WebSocket $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - - @@ -23,21 +16,10 @@ - - 15.0.0-* - + - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - - - 6.0.0-alpha13 - + @@ -58,6 +40,4 @@ - - diff --git a/test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj b/test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj index dd239a4b1..cc8cbafd1 100644 --- a/test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj +++ b/test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj @@ -1,4 +1,4 @@ - + @@ -8,9 +8,6 @@ - - - PreserveNewest @@ -29,13 +26,6 @@ - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - 6.0.0-alpha13 @@ -49,6 +39,4 @@ - - diff --git a/test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj b/test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj index 105a43556..b4c7eb84b 100644 --- a/test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj +++ b/test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj @@ -1,4 +1,4 @@ - + @@ -7,12 +7,6 @@ $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - @@ -25,13 +19,6 @@ - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - 6.0.0-alpha13 @@ -45,6 +32,4 @@ - - diff --git a/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj b/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj index d25cd68a4..a492b75ec 100644 --- a/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj +++ b/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -8,26 +8,10 @@ $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - - - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - - - $(DefineConstants);CoreCLR @@ -36,6 +20,4 @@ - - diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj index c9f83fa3e..52bdd909f 100644 --- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj +++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj @@ -1,4 +1,4 @@ - + @@ -7,12 +7,6 @@ $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - - @@ -25,21 +19,9 @@ - - 1.0.0-alpha-20161104-2 - All - - - 1.6.1 - 6.0.0-alpha13 - - - @@ -52,6 +34,4 @@ - - From d002a2dfdb66e841eb5770e856848f4715db802b Mon Sep 17 00:00:00 2001 From: David Wilson Date: Mon, 30 Jan 2017 17:34:09 -0800 Subject: [PATCH 2/2] Add AppVeyor environment vars to speed up CI builds This change adds a couple of environment variables to speed up AppVeyor CI builds: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true: Don't download unneeded packages - DOTNET_CLI_TELEMETRY_OPTOUT=true: Don't send telemetry This information was gained from this blog post: http://rehansaeed.com/cross-platform-devops-net-core/ --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 8fc84c7da..7e2f4f0a4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,6 +8,10 @@ branches: - master - develop +environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Don't download unneeded packages + DOTNET_CLI_TELEMETRY_OPTOUT: true # Don't send telemetry + install: - ps: | Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null