From b7ac882d410c849f0c4710d7374490910ed4dbce Mon Sep 17 00:00:00 2001 From: "Alexander.Shvedov" Date: Sun, 11 Dec 2016 03:51:51 +0300 Subject: [PATCH] Get rid of "!" character in Roslyn build root directory name, since Roslyn's 'Restore.cmd' script uses old school '%~dp0' thing in statement 'set RoslynRoot=%~dp0' and it badly supports special path symbols, like exclamation mark in '!roslyn' (exlamation mark got trimmed out from folder name) --- #build/Build-All.ps1 | 4 ++-- #build/Publish-All.ps1 | 2 +- .gitignore | 1 + Build-All.bat | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/#build/Build-All.ps1 b/#build/Build-All.ps1 index f1de9b2..ee98a66 100644 --- a/#build/Build-All.ps1 +++ b/#build/Build-All.ps1 @@ -162,7 +162,7 @@ try { $sourceRoot = Resolve-Path "$root\source" Write-Output " Source Root: $sourceRoot" - $roslynBuildRoot = Ensure-ResolvedPath "$root\!roslyn" + $roslynBuildRoot = Ensure-ResolvedPath "$root\roslyn_build_root" Write-Output " Roslyn Build Root: $roslynBuildRoot" $sitesBuildRoot = Ensure-ResolvedPath "$root\!sites" @@ -218,7 +218,7 @@ try { $branchFsName = $repositoryName + "-" + ($_ -replace '[/\\:_]', '-') $siteBuildRoot = Ensure-ResolvedPath "$sitesBuildRoot\$branchFsName" - $roslynBinaryRoot = Ensure-ResolvedPath "$siteBuildRoot\!roslyn" + $roslynBinaryRoot = Ensure-ResolvedPath "$siteBuildRoot\roslyn_build_root" $siteBuildTempRoot = Ensure-ResolvedPath "$siteBuildRoot\!temp" $siteCopyRoot = Ensure-ResolvedPath "$siteBuildRoot\!site" diff --git a/#build/Publish-All.ps1 b/#build/Publish-All.ps1 index 3ac9ed1..6cb012c 100644 --- a/#build/Publish-All.ps1 +++ b/#build/Publish-All.ps1 @@ -60,7 +60,7 @@ try { Write-Output "*** $_" $siteMainRoot = Resolve-Path $siteMainRoot - $siteRoslynRoot = Resolve-Path "$($_.FullName)\!roslyn" + $siteRoslynRoot = Resolve-Path "$($_.FullName)\roslyn_build_root" $branchInfo = ConvertFrom-Json ([IO.File]::ReadAllText("$siteRoslynRoot\!BranchInfo.json")) diff --git a/.gitignore b/.gitignore index 61a5a1d..424953d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ \#packages/ *.user \!* +\roslyn_build_root .vs/ node_modules/ bin/ diff --git a/Build-All.bat b/Build-All.bat index f6e42a3..97183ef 100644 --- a/Build-All.bat +++ b/Build-All.bat @@ -1,5 +1,5 @@ @echo off -mkdir !roslyn\!tools -xcopy "%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\ildasm.exe" !roslyn\!tools /Y +mkdir roslyn_build_root\!tools +xcopy "%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\ildasm.exe" roslyn_build_root\!tools /Y powershell "Set-ExecutionPolicy RemoteSigned Process; .\#build\Build-All.ps1" \ No newline at end of file