Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a8be633
Bump packages to rc3-23729
andyleejordan Feb 1, 2016
c7fb9d2
Add System.Diagnostics.Process dependency
andyleejordan Feb 1, 2016
3e1cdb7
Decrease failed test threshold to 11
andyleejordan Feb 1, 2016
172ddc6
Refactor project.json dependencies
andyleejordan Feb 2, 2016
92127e4
Uses spaces instead of tabs in project.json files
andyleejordan Feb 2, 2016
b4f8d52
Add dnx451 to project.json files
Feb 2, 2016
989b59c
Add Microsoft.PowerShell.ConsoleHost
andyleejordan Feb 2, 2016
bd79884
Update AssemblyInfo files for FullCLR build
andyleejordan Feb 2, 2016
c835106
Add file superset to Utility and Automation
andyleejordan Feb 2, 2016
3915332
Add CMake project to build Windows powershell.exe
Feb 3, 2016
0d2d961
Add build.FullCLR.ps1 script
Feb 3, 2016
b243976
Build Full and Core PowerShell on AppVeyor
Feb 3, 2016
75eba6f
Remove Computer.cs from Commands.Management
andyleejordan Feb 2, 2016
ef1c718
Use --configuration Linux for CorePS build
andyleejordan Feb 2, 2016
3cfa68c
Remove executable bit from build.ps1
andyleejordan Feb 2, 2016
801b347
Add ImplicitRemotingCommands and WebCmdlet to known issues
andyleejordan Feb 2, 2016
f1dc37b
Bump monad and windows-build submodules
andyleejordan Feb 2, 2016
9cfe821
Add NOETW preprocessor definition to Automation
andyleejordan Feb 3, 2016
d31647f
Bump monad submodule with use of NOETW
andyleejordan Feb 3, 2016
a4fd572
Revert "Skip BufferSize when not interactive"
andyleejordan Feb 3, 2016
15e2ede
Bring back BufferWidth and BufferHeight
andyleejordan Jan 18, 2016
29349c0
Bump monad version to include UsesCodeSignedAssemblies() fix
Feb 3, 2016
bea156b
Move Travis CI notifications to PSCore Slack #ci channel
andyleejordan Feb 3, 2016
3d4509b
Add AppVeyor notifications to PSCore Slack #ci channel
andyleejordan Feb 3, 2016
48ae539
Add strong-name signature to Microsoft.Management.Infrastructure
Feb 3, 2016
17d6ee4
Add PowerShellGithubDev.psm1 module to run FullCLR powershell
Feb 3, 2016
f42cf59
Fix guard in MMI's AssemblyInfo
andyleejordan Feb 3, 2016
89d6201
Set Pester error threshold to 0
andyleejordan Feb 3, 2016
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ script:
- ./pester.sh
notifications:
slack:
secure: HcQNRw6q1YfgEE0VLEKby6tImtdvv2rP1raurZZxgKMkOaMC0NIAn6KrMmElnrJaEDnmi2vIFaKJV9YH+W+SWjReHxFbqbD9dF5dy3S1bg7GQPZXvx033INxrpgho0VcgcwCzljPzLZpzA3aTaD2yH54UlV4RHQjDd1Ks6x2K1LAIPpiHj5dWXwZ/aXcWlaBAhW38w/xcu9L+U7gzyeptg/nWDq05KanddSm3oAAUwWXlQeVZoSJV01WjqngRR6z9p5dHSRuQQXvFsHxEpphgrk6vbgyMpWpRut2LsPNMsWBz448ao5pT82Pbd808o2Psm7oS3OMBHr6wsxOPIlPLTu+ye6RbeDo75gbk+12rA6F3fokb+rZmAbmXtBETh1S5HUKfmufFElSPnTdxaJI3cGv5YvBvn198oXQV2aEa6ac+BgknS+++ZLg8SaRbggGJNVqbkGfCL810xEbd8MxUp3YbfQlAOLPWTjb3rfR6at8sDE0LrFO7VxIEgL0jYQbGDbo4SECraRAZTOIW7JfLagg24sOH7cdkXP9TOn3D9XDi/5Rxyo2PFYYFZrGVOaxG4+y61BwqWhxRyAoWXghhTPDoEcIYNG13ZHWu4HE9/sQ9XOOw0UehMAdxuOBfnNoOAdWTWBVpO+M+yKGqrN1aQ+krMlRjB272uVh0Vy/IvM=
secure: sKYd4n61+ZFzGZuWGUl8V1kN0NM16wRVOFVlNhlFCwnkrEsKROb++EvXf5uwnKuzxkhEjvPWO+UFgeshQDoR93y4s5YLfhC5JupK4nUzjPzWs208KTrh8u/x9MY8X6Ojxi85EEAiku5GzMoMlkucSStZUYwbIfnelzqdw8uoRwmm2MW4XCPwsuEuDUVghyiva0Mdx1G6MopCrK8T96WywJXT3chhfZQgVt+sQCBt9g+2kjDaObKrzG0P07IVK43ZpDgnu6AoxlyBzIx9mJH2Oa/tki3/kTO72Wcp3ps3qvmiStADamzVKR9p1VlWCLWAd6VOehxuByCGEyujpzk135Wud2DZYO+8LD6inZVhFe3Wt5pCU9BDXZppiATfMCqgXEH7nK54pEn79yHcjthRJ2+Z9ot7As2fu3RSBmTAi8nRP0fxRyX/jctR3S6P0qt0y1ynx9nzBfhmhPQW0PMVazWS/nruQIvK/3iiYXjZxM5bBwIvabmwV00EYeTdbL6ufXWNgQcG1ZWkDsi2I3vst/ytUbHwaFYg83bXWpxg9DCzJeWLVUvE5/3NfBxRAuCTot/fgTEA9IYScvrlL7Q/bT0cOt0vEM98MPf1UO+WP85uxhsRgHtwDEo+jMaL6ZFkPhlV6mmmED4NdY2//a571cLNXdnuMAze5O3TWGBG53g=
34 changes: 34 additions & 0 deletions KNOWNISSUES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
# Known Issues

## `Computer.cs`

The file `monad/src/commands/management/Computer.cs` has been removed
temporarily from `Microsoft.PowerShell.Commands.Management` because we
cannot resolve `Microsoft.WSMan.Management` for FullCLR builds. This must be
fixed ASAP.

## `ImplicitRemotingCommands.cs`

The file `monad\src\commands\utility\ImplicitRemotingCommands.cs` has been
removed temporarily from `Microsoft.PowerShell.Commands.Utility` because it
does not build on Core PowerShell, and cannot be guarded with preprocessor
directives due to the use of here-strings that contain lines starting with `#`,
which breaks the preprocessor.

## `WebCmdlet`

All files in `monad\src\commands\utility\WebCmdlet` have been removed from
`Microsoft.PowerShell.Commands.Utility` because we cannot resolve `mshtml.dll`
as a framework assembly.

## `Microsoft.Management.Infrastructure.Native`

Windows builds currently use the native stub; this should be replaced with
actual compilation of the managed C++ library on Windows (with the stub used on
Linux).

## CorePS Eventing Library

The Eventing library reimplementation for Core PowerShell does not exist on
Linux, and so the ETW stub is used via a `#if LINUX` guard. On Windows, this
library now exists, but its build needs to be ported to .NET CLI. Until then,
the stub is also used with a `#if ETW` guard.

## xUnit

The xUnit tests cannot currently be run; we are working to integrate the
Expand Down
46 changes: 46 additions & 0 deletions PowerShellGithubDev.psm1
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
function Start-DevPSGithub
{
param(
[switch]$ZapDisable,
[string[]]$ArgumentList = '',
[switch]$LoadProfile,
[string]$binDir = "$PSScriptRoot\binFull"
)

try
{
if ($LoadProfile -eq $false)
{
$ArgumentList += '-noprofile'
}

$env:DEVPATH = $binDir
if ($ZapDisable)
{
$env:COMPLUS_ZapDisable = 1
}

if (!(Test-Path $binDir\powershell.exe.config))
{
$configContents = @"
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<runtime>
<developmentMode developerInstallation="true"/>
</runtime>
</configuration>
"@
$configContents | Out-File -Encoding Ascii $binDir\powershell.exe.config
}

Start-Process -FilePath $binDir\powershell.exe -ArgumentList "$ArgumentList"
}
finally
{
ri env:DEVPATH
if ($ZapDisable)
{
ri env:COMPLUS_ZapDisable
}
}
}
11 changes: 10 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ environment:
priv_key:
secure: <encryped-value>

notifications:
- provider: Slack
incoming_webhook:
secure: bwwXBTeJBtRFea6FSQKzVENLwL0AOeusUSUFIh/TeHA4y0UFk7bC9+OcxgZW+YfIC0VZyTpZClJHlPFFHSgiQs4g9om17RxzJEeq4EjsW5g=

install:
- ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
- ps: $fileContent += $env:priv_key.Replace(' ', "`n")
Expand All @@ -16,6 +21,7 @@ build_script:
- ps: Set-Alias -Name dotnet -Value "$pwd\dotnet\bin\dotnet.exe"
- ps: dotnet restore
- ps: .\build.ps1
- ps: .\build.fullCLR.ps1

test_script:
- ps: |
Expand All @@ -28,12 +34,15 @@ deploy_script:
- ps: |
# Creating project artifact
$zipFilePath = Join-Path $pwd "$(Split-Path $pwd -Leaf).zip"
$zipFileFullPath = Join-Path $pwd "$(Split-Path $pwd -Leaf).FullCLR.zip"
Add-Type -assemblyname System.IO.Compression.FileSystem
[System.IO.Compression.ZipFile]::CreateFromDirectory("$pwd\bin", $zipFilePath)
[System.IO.Compression.ZipFile]::CreateFromDirectory("$pwd\binFull", $zipFileFullPath)

@(
# You can add other artifacts here
$zipFilePath
$zipFilePath,
$zipFileFullPath
) | % {
Write-Host "Pushing package $_ as Appveyor artifact"
Push-AppveyorArtifact $_
Expand Down
34 changes: 34 additions & 0 deletions build.FullCLR.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
$origPWD = $pwd
try
{
$BINFULL = "$pwd/binFull"
$BUILD = "$pwd/build"

mkdir $BINFULL -ErrorAction SilentlyContinue

# Publish PowerShell
cd src\Microsoft.PowerShell.ConsoleHost
dotnet publish --framework dnx451 --output $BINFULL

cd ..\..\src\Microsoft.PowerShell.Commands.Utility
dotnet publish --framework dnx451 --output $BINFULL

cd ..\..\src\Microsoft.PowerShell.Commands.Management
dotnet publish --framework dnx451 --output $BINFULL

# Temporary fix for dotnet publish
if (Test-Path $BINFULL/Debug/dnx451) { cp $BINFULL/Debug/dnx451/* $BINFULL }

# build native host
mkdir $build -ErrorAction SilentlyContinue
cd $build

cmake ..\src\powershell-native
msbuild powershell.sln

cp -rec Debug\* $BINFULL
}
finally
{
cd $origPWD
}
Empty file modified build.ps1
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mkdir -p $BIN/Modules
# Publish PowerShell
(
cd src/Microsoft.PowerShell.Linux.Host
dotnet publish --framework dnxcore50 --output $BIN
dotnet publish --framework dnxcore50 --output $BIN --configuration Linux
# Temporary fix for dotnet publish
[[ -d $BIN/Debug/dnxcore50 ]] && cp $BIN/Debug/dnxcore50/* $BIN
# Copy files that dotnet-publish does not currently deploy
Expand Down
4 changes: 2 additions & 2 deletions pester.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ failed_tests=$?
# XML files are not executable
chmod -x pester-tests.xml

# Exit with failure if number of failed tests exceeds threshold
[ ! $failed_tests -gt 14 ]
# Return number of failed tests as exit code (more than 0 will be an error)
exit $failed_tests
24 changes: 13 additions & 11 deletions src/Microsoft.Management.Infrastructure.Native/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
"description": "Microsoft.Management.Infrastructure.Native Stub",
"authors": [ "garretts", "andschwa" ],

"compilationOptions": { "allowUnsafe": true },

"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23712",
"System.Security.SecureString": {
"type": "build",
"version": "1.0.0-*"
}
},

"frameworks": { "dnxcore50": { } }
"frameworks": {
"dnxcore50": {
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23729",
"System.Security.SecureString": {
"type": "build",
"version": "1.0.0-*"
}
}
},
"dnx451": {
}
}
}
20 changes: 20 additions & 0 deletions src/Microsoft.Management.Infrastructure/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
using System.Runtime.CompilerServices;
using System.Reflection;

#if _CORECLR
[assembly:InternalsVisibleTo("System.Management.Automation")]
[assembly:AssemblyFileVersionAttribute("1.0.0.0")]
[assembly:AssemblyVersion("1.0.0.0")]
#else
[assembly:System.Resources.NeutralResourcesLanguage("en")]
[assembly:System.Runtime.InteropServices.ComVisible(false)]
[assembly:System.Reflection.AssemblyVersion("1.0.0.0")]
[assembly:System.Reflection.AssemblyProduct("Microsoft (R) Windows (R) Operating System")]
[assembly:System.Reflection.AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
[assembly:System.Reflection.AssemblyCompany("Microsoft Corporation")]
[assembly:System.Reflection.AssemblyFileVersion("10.0.10011.16384")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("XmlServerStore,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("System.Management.Automation,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("XmlServerStore,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.CloudInfrastructure.Test.Common,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Windows.DSC.CoreConfProviders,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Monitoring.Commands,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Management.Infrastructure.CimCmdlets,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:AssemblyKeyFileAttribute(@"..\..\src\monad\monad\src\graphicalhost\visualstudiopublic.snk")]
[assembly:System.Reflection.AssemblyDelaySign(true)]
#endif
Loading