From cdbbb7a4bb51929470a5ace096999db155a865b2 Mon Sep 17 00:00:00 2001 From: Ilya Date: Tue, 22 Aug 2017 02:23:52 +0400 Subject: [PATCH] Minor formatting commits for Build.psm1 and csproj files (#4630) --- build.psm1 | 10 +++++----- ...crosoft.Management.Infrastructure.CimCmdlets.csproj | 2 +- .../Microsoft.PowerShell.Commands.Diagnostics.csproj | 2 +- .../Microsoft.PowerShell.Commands.Management.csproj | 4 ++-- .../Microsoft.PowerShell.Commands.Utility.csproj | 2 +- .../Microsoft.PowerShell.ConsoleHost.csproj | 4 ++-- ...osoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj | 2 +- .../Microsoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.LocalAccounts.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 2 +- .../Microsoft.PowerShell.Security.csproj | 4 ++-- .../Microsoft.WSMan.Management.csproj | 2 +- .../Microsoft.WSMan.Runtime.csproj | 2 +- .../System.Management.Automation.csproj | 4 ++-- src/powershell-unix/powershell-unix.csproj | 4 ++-- src/powershell-win-core/powershell-win-core.csproj | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.psm1 b/build.psm1 index 0ad818f2ceaf..84f3913f79e0 100644 --- a/build.psm1 +++ b/build.psm1 @@ -251,7 +251,7 @@ cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$Arch" "&" cmake "$ $FilesToCopy = @('pwrshplugin.dll', 'pwrshplugin.pdb') $dstPath = "$PSScriptRoot\src\powershell-win-core" $FilesToCopy | ForEach-Object { - $srcPath = [IO.Path]::Combine((Get-Location), "bin", $Configuration, "CoreClr/$_") + $srcPath = [IO.Path]::Combine((Get-Location), "bin", $Configuration, "CoreClr/$_") log " Copying $srcPath to $dstPath" Copy-Item $srcPath $dstPath @@ -364,7 +364,7 @@ function Start-PSBuild { } # Verify if the dotnet in-use is the required version - $dotnetCLIInstalledVersion = (dotnet --version) + $dotnetCLIInstalledVersion = (dotnet --version) If ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) { Write-Warning @" The currently installed .NET Command Line Tools is not the required version. @@ -674,13 +674,13 @@ function New-PSOptions { # the valid root is the root of the filesystem and the folder PowerShell $RootInfo['ValidPath'] = Join-Path -Path ([system.io.path]::GetPathRoot($RootInfo.RepoPath)) -ChildPath 'PowerShell' - + if($RootInfo.RepoPath -ne $RootInfo.ValidPath) { $RootInfo['Warning'] = "Please ensure you repo is at the root of the file system and named 'PowerShell' (example: '$($RootInfo.ValidPath)'), when building and packaging for release!" $RootInfo['IsValid'] = $false } - else + else { $RootInfo['IsValid'] = $true } @@ -910,7 +910,7 @@ function Start-PSPester { $count = ($lines | measure-object).Count if ($count -eq 0) { - sleep 1 + Start-Sleep -Seconds 1 } else { diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj b/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj index 4a1921e0b392..bba384de1cb1 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj index e47baf5d939d..667dc977d9a5 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.Commands.Diagnostics project 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 d2b01f66e643..0c5eacc0c59f 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.Commands.Management project @@ -45,7 +45,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 27f06219da53..9062c288d14f 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.Commands.Utility project diff --git a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj index a2bf5fb2fe5d..3804b689243c 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj +++ b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj @@ -1,6 +1,6 @@  - + PowerShell Host @@ -21,7 +21,7 @@ - + diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj index a21c6ba2dfc6..5a01636dc1f5 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.CoreCLR.AssemblyLoadContext project 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 656bf5df6e8b..cd8f976f08f3 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.CoreCLR.Eventing project diff --git a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj index 4dbefb524abe..ebd69091ebe3 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj +++ b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.LocalAccounts project diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 91ff7e6e159c..97d99943bacb 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -1,6 +1,6 @@  - + PowerShell SDK metapackage diff --git a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj index 38ebd677c226..411070097c9b 100644 --- a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj +++ b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.PowerShell.Security project @@ -19,7 +19,7 @@ - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index bac96508620d..6403c25a5e55 100644 --- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj +++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.WSMan.Management project diff --git a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj index 80307f4ffd5f..8d9bac1d34d3 100644 --- a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj +++ b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's Microsoft.WSMan.Runtime project diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index a4adcdb44baf..5752719719bb 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -1,6 +1,6 @@  - + PowerShell Core's System.Management.Automation project @@ -122,7 +122,7 @@ - + diff --git a/src/powershell-unix/powershell-unix.csproj b/src/powershell-unix/powershell-unix.csproj index f46f6039324e..f3fae7671f0b 100644 --- a/src/powershell-unix/powershell-unix.csproj +++ b/src/powershell-unix/powershell-unix.csproj @@ -1,6 +1,6 @@  - + PowerShell top-level project with .NET CLI host @@ -12,7 +12,7 @@ - Modules\%(RecursiveDir)\%(FileName)%(Extension) + Modules\%(RecursiveDir)\%(FileName)%(Extension) PreserveNewest PreserveNewest diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj index c0fe6a9ca48f..de703c4c84be 100644 --- a/src/powershell-win-core/powershell-win-core.csproj +++ b/src/powershell-win-core/powershell-win-core.csproj @@ -1,6 +1,6 @@  - + PowerShell Core on Windows top-level project