diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index bb55bac74cf..947f320217d 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -6,7 +6,7 @@
6.0.0
netcoreapp2.0
- 2.0.0-preview3-25426-01
+ 2.0.0
true
true
diff --git a/appveyor.yml b/appveyor.yml
index 90497e78fca..5c2ab1fc7fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@
image: Visual Studio 2017
-# cache version - netcoreapp.2.0.0-preview3-25426-01
+# cache version - netcoreapp.2.0.0
cache:
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
diff --git a/build.psm1 b/build.psm1
index da7ff0f789d..e3ae51d387b 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2,8 +2,8 @@
# On Windows paths is separated by semicolon
$script:TestModulePathSeparator = [System.IO.Path]::PathSeparator
-$dotnetCLIChannel = "preview"
-$dotnetCLIRequiredVersion = "2.0.0-preview2-006502"
+$dotnetCLIChannel = "release"
+$dotnetCLIRequiredVersion = "2.0.0"
# Track if tags have been sync'ed
$tagsUpToDate = $false
@@ -490,12 +490,6 @@ Fix steps:
Pop-Location
}
- # add 'x' permission when building the standalone application
- # this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286
- if ($Options.Configuration -eq "Linux") {
- chmod u+x $Options.Output
- }
-
# publish netcoreapp2.0 reference assemblies
try {
Push-Location "$PSScriptRoot/src/TypeCatalogGen"
@@ -798,12 +792,6 @@ function Publish-PSTestTools {
dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
$toolPath = Join-Path -Path $tool.Path -ChildPath "bin"
- # add 'x' permission when building the standalone application
- # this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286
- if ($Options.Configuration -eq "Linux") {
- $executable = Join-Path -Path $toolPath -ChildPath "$($tool.Output)"
- chmod u+x $executable
- }
if ( $env:PATH -notcontains $toolPath ) {
$env:PATH = $toolPath+$TestModulePathSeparator+$($env:PATH)
}
@@ -1844,12 +1832,6 @@ function Start-CrossGen {
}
Write-Verbose "Matched CrossGen.exe: $crossGenPath" -Verbose
- # 'x' permission is not set for packages restored on Linux/OSX.
- # this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286
- if ($Environment.IsLinux -or $Environment.IsOSX) {
- chmod u+x $crossGenPath
- }
-
# Crossgen.exe requires the following assemblies:
# mscorlib.dll
# System.Private.CoreLib.dll
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index feb8b95fb4a..d2b01f66e64 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -70,7 +70,7 @@
-
+
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 d7c8a159322..27f06219da5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -79,7 +79,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
index 918968b80f4..a2bf5fb2fe5 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+++ b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index a7913ecc4bc..656bf5df6e8 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -25,7 +25,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index e01b135aef4..91ff7e6e159 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -17,17 +17,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index a90b0aa7488..a4adcdb44ba 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -11,13 +11,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/test/Test.Common.props b/test/Test.Common.props
index 0534a8ee24c..79f0b8fbcf8 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -5,7 +5,7 @@
(c) Microsoft Corporation. All rights reserved.
netcoreapp2.0
- 2.0.0-preview3-25426-01
+ 2.0.0
true
true