Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
Ilya 2017-08-22 02:23:52 +04:00 committed by Dongbo Wang
parent 297bba3fa1
commit cdbbb7a4bb
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.psm1
View File

@ -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
{

2
src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
View File

@ -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>

2
src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View File

@ -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>

4
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View File

@ -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" />

2
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View File

@ -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>

4
src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View File

@ -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>

2
src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj
View File

@ -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>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View File

@ -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>

2
src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
View File

@ -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>

2
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View File

@ -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>

4
src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
View File

@ -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>

2
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View File

@ -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>

2
src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
View File

@ -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>

4
src/System.Management.Automation/System.Management.Automation.csproj
View File

@ -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>

4
src/powershell-unix/powershell-unix.csproj
View File

@ -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>

2
src/powershell-win-core/powershell-win-core.csproj
View File

@ -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>