Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 4 commits into from
Aug 21, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e293fa
Fix formatting
iSazonov Jul 4, 2017
f2447d2
Fix typo in 'dotnetCLIIntalledVersion'
iSazonov Jul 4, 2017
903fdd4
Replace alias
iSazonov Aug 21, 2017
87aaf5d
Remove extra space
iSazonov Aug 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -910,7 +910,7 @@ function Start-PSPester {
$count = ($lines | measure-object).Count
if ($count -eq 0)
{
sleep 1
Start-Sleep -Seconds 1
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion ...anagement.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\PowerShell.Common.props"/>
<Import Project="..\..\PowerShell.Common.props"/>

<PropertyGroup>
<Description>PowerShell Host</Description>
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion ...Shell.CoreCLR.AssemblyLoadContext/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -19,7 +19,7 @@
<ItemGroup>
<Compile Remove="singleshell\installer\MshSecurityMshSnapin.cs" />
<Compile Remove="gen\SecurityMshSnapinResources.cs" />

<EmbeddedResource Remove="resources\SecurityMshSnapinResources.resx" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/powershell-unix/powershell-unix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/powershell-win-core/powershell-win-core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down