Minor formatting commits for Build.psm1 and csproj files (PowerShell#4630)

iSazonov · daxian-dbw · commit cdbbb7a4bb51 · 2017-08-21T15:23:52.000-07:00
diff --git 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
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
diff --git 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 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.Commands.Diagnostics project</Description>
diff --git 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 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.Commands.Management project</Description>
@@ -45,7 +45,7 @@
     <Compile Remove="gen\ManagementMshSnapInResources.cs" />
     <Compile Remove="gen\ClearRecycleBinResources.cs" />
     <Compile Remove="gen\ClipboardResources.cs" />
-    
+
     <EmbeddedResource Remove="resources\EventlogResources.resx" />
     <EmbeddedResource Remove="resources\TransactionResources.resx" />
     <EmbeddedResource Remove="resources\WebServiceResources.resx" />
diff --git 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 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.Commands.Utility project</Description>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Host</Description>
@@ -21,7 +21,7 @@
     <Compile Remove="singleshell\installer\EngineInstaller.cs" />
     <Compile Remove="singleshell\installer\MshHostMshSnapin.cs" />
     <Compile Remove="gen\HostMshSnapinResources.cs" />
-    
+
     <EmbeddedResource Remove="resources\HostMshSnapinResources.resx" />
   </ItemGroup>
 
diff --git 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 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.CoreCLR.AssemblyLoadContext project</Description>
diff --git 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 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.CoreCLR.Eventing project</Description>
diff --git a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.LocalAccounts project</Description>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell SDK metapackage</Description>
diff --git a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.PowerShell.Security project</Description>
@@ -19,7 +19,7 @@
   <ItemGroup>
     <Compile Remove="singleshell\installer\MshSecurityMshSnapin.cs" />
     <Compile Remove="gen\SecurityMshSnapinResources.cs" />
-    
+
     <EmbeddedResource Remove="resources\SecurityMshSnapinResources.resx" />
   </ItemGroup>
 
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.WSMan.Management project</Description>
diff --git a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's Microsoft.WSMan.Runtime project</Description>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core's System.Management.Automation project</Description>
@@ -122,7 +122,7 @@
     <Compile Remove="utils\perfCounters\PSPerfCountersMgr.cs" />
     <Compile Remove="gen\CoreMshSnapinResources.cs" />
     <Compile Remove="gen\ErrorPackageRemoting.cs" />
-    
+
     <EmbeddedResource Remove="resources\CoreMshSnapinResources.resx" />
     <EmbeddedResource Remove="resources\ErrorPackageRemoting.resx" />
   </ItemGroup>
diff --git a/src/powershell-unix/powershell-unix.csproj b/src/powershell-unix/powershell-unix.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell top-level project with .NET CLI host</Description>
@@ -12,7 +12,7 @@
   <ItemGroup>
     <Compile Include="..\powershell\Program.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
     <Content Include="..\Modules\Unix\**\*;..\Modules\Shared\**\*" Exclude="..\Modules\Shared\Pester\.git*;..\Modules\Shared\Pester\*.yml">
-      <Link>Modules\%(RecursiveDir)\%(FileName)%(Extension)</Link> 
+      <Link>Modules\%(RecursiveDir)\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\PowerShell.Common.props"/>  
+  <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
     <Description>PowerShell Core on Windows top-level project</Description>

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$Arch" "&" cmake "$`
`251`	`251`	`$FilesToCopy = @('pwrshplugin.dll', 'pwrshplugin.pdb')`
`252`	`252`	`$dstPath = "$PSScriptRoot\src\powershell-win-core"`
`253`	`253`	`$FilesToCopy \| ForEach-Object {`
`254`		`- $srcPath = [IO.Path]::Combine((Get-Location), "bin", $Configuration, "CoreClr/$_")`
	`254`	`+ $srcPath = [IO.Path]::Combine((Get-Location), "bin", $Configuration, "CoreClr/$_")`
`255`	`255`
`256`	`256`	`log " Copying $srcPath to $dstPath"`
`257`	`257`	`Copy-Item $srcPath $dstPath`
`@@ -364,7 +364,7 @@ function Start-PSBuild {`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`# Verify if the dotnet in-use is the required version`
`367`		`- $dotnetCLIInstalledVersion = (dotnet --version)`
	`367`	`+ $dotnetCLIInstalledVersion = (dotnet --version)`
`368`	`368`	`If ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {`
`369`	`369`	`Write-Warning @"`
`370`	`370`	`The currently installed .NET Command Line Tools is not the required version.`
`@@ -674,13 +674,13 @@ function New-PSOptions {`
`674`	`674`
`675`	`675`	`# the valid root is the root of the filesystem and the folder PowerShell`
`676`	`676`	`$RootInfo['ValidPath'] = Join-Path -Path ([system.io.path]::GetPathRoot($RootInfo.RepoPath)) -ChildPath 'PowerShell'`
`677`		`-`
	`677`	`+`
`678`	`678`	`if($RootInfo.RepoPath -ne $RootInfo.ValidPath)`
`679`	`679`	`{`
`680`	`680`	`$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!"`
`681`	`681`	`$RootInfo['IsValid'] = $false`
`682`	`682`	`}`
`683`		`- else`
	`683`	`+ else`
`684`	`684`	`{`
`685`	`685`	`$RootInfo['IsValid'] = $true`
`686`	`686`	`}`
`@@ -910,7 +910,7 @@ function Start-PSPester {`
`910`	`910`	`$count = ($lines \| measure-object).Count`
`911`	`911`	`if ($count -eq 0)`
`912`	`912`	`{`
`913`		`- sleep 1`
	`913`	`+ Start-Sleep -Seconds 1`
`914`	`914`	`}`
`915`	`915`	`else`
`916`	`916`	`{`