From 44c6409fddb9b1d292ecb228276aac490e6ddba2 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Mon, 8 May 2017 22:52:30 -0700 Subject: [PATCH] Temporary workaround to fix the PSVersion issue in beta.1 release (#3740) --- build.psm1 | 5 ++++- src/System.Management.Automation/engine/PSVersionInfo.cs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.psm1 b/build.psm1 index 496f46ae7..7da043c1a 100644 --- a/build.psm1 +++ b/build.psm1 @@ -158,7 +158,10 @@ function Start-PSBuild { } # save Git description to file for PowerShell to include in PSVersionTable - git --git-dir="$PSScriptRoot/.git" describe --dirty --abbrev=60 > "$psscriptroot/powershell.version" + #git --git-dir="$PSScriptRoot/.git" describe --dirty --abbrev=60 > "$psscriptroot/powershell.version" + + # temporary hack to resolve the version issue + "v6.0.0-beta.1" > "$psscriptroot/powershell.version" # create the telemetry flag file $null = new-item -force -type file "$psscriptroot/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY" diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs index 447534e5f..b194becec 100644 --- a/src/System.Management.Automation/engine/PSVersionInfo.cs +++ b/src/System.Management.Automation/engine/PSVersionInfo.cs @@ -47,7 +47,7 @@ namespace System.Management.Automation private static Version s_psV4Version = new Version(4, 0); private static Version s_psV5Version = new Version(5, 0); private static Version s_psV51Version = new Version(5, 1, NTVerpVars.PRODUCTBUILD, NTVerpVars.PRODUCTBUILD_QFE); - private static SemanticVersion s_psV6Version = new SemanticVersion(6, 0, 0, "alpha"); + private static SemanticVersion s_psV6Version = new SemanticVersion(6, 0, 0, "beta"); /// /// A constant to track current PowerShell Edition