Skip to content

Update PowerShell to build with .NET Core SDK 2.1.300-rc1-008662 #6718

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 35 commits into from
May 2, 2018
Merged

Update PowerShell to build with .NET Core SDK 2.1.300-rc1-008662 #6718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b90a136
Update PowerShell to build with .NET Core SDK 2.1.300 Preview2
iSazonov Apr 24, 2018
e1893aa
Fix TypeGen
iSazonov Apr 24, 2018
eb8a491
Fix Test.Common.props
iSazonov Apr 24, 2018
6d01ec3
Fix dotnet xunit
iSazonov Apr 24, 2018
aad2298
Remove -fxversion 2.1
iSazonov Apr 24, 2018
878538f
looks like we need to move to netcoreapp2.1 with the 2.1.0 runtime
SteveL-MSFT Apr 24, 2018
9411a6f
[feature]
SteveL-MSFT Apr 25, 2018
24f434a
[Feature] Move WebListener (Microsoft.AspNetCore.All) to 2.1
iSazonov Apr 25, 2018
0ab7128
[Feature] Fix test 'Hidden Members Test'
iSazonov Apr 25, 2018
82c592f
[Feature] Fix tabcompletion test on MacOs
iSazonov Apr 25, 2018
5b0b937
[Feature] Pending authorization header test
iSazonov Apr 25, 2018
70ac19a
[feature]
SteveL-MSFT Apr 25, 2018
0117ea8
[feature]
SteveL-MSFT Apr 25, 2018
fa9e81b
[feature]
SteveL-MSFT Apr 26, 2018
95457e4
Fix packaging.psm1
iSazonov Apr 26, 2018
06590bd
Temporary pending Web cmdlet test
iSazonov Apr 26, 2018
3eb9e42
Temporary skip remoting tests
iSazonov Apr 26, 2018
09731a6
Temporary disable Files.wxs test
iSazonov Apr 26, 2018
2c3a06e
[feature]
SteveL-MSFT Apr 26, 2018
d139fe3
[feature]
SteveL-MSFT Apr 26, 2018
3e3f3ed
[feature]
SteveL-MSFT Apr 26, 2018
582fe2c
[feature]
Apr 28, 2018
89971d6
[feature]
SteveL-MSFT Apr 28, 2018
e756916
[feature]
SteveL-MSFT Apr 30, 2018
0a85f68
[feature]
Apr 30, 2018
9d58e1d
[feature]
SteveL-MSFT Apr 30, 2018
1dcba5f
[Feature] Minor cleanups
iSazonov May 1, 2018
752e133
[package] Minor update the script figuring out default Runtime
daxian-dbw May 1, 2018
d322c46
Replace netcoreapp2.0 with netcoreapp2.1 in scripts
iSazonov May 1, 2018
fcbed2d
Suppress the preview sdk warning
daxian-dbw May 1, 2018
183def7
Add comment about how to find the available properties of '_Reference…
daxian-dbw May 1, 2018
11e18bf
[feature]
SteveL-MSFT May 1, 2018
e042397
[Feature] Update NuGet package versions used in 'PackageReference' tags
daxian-dbw May 1, 2018
4956c77
[Feature] Update Files.wxs as instructed by the build failure
daxian-dbw May 2, 2018
cb41ffc
[Package] Use $script:Options.Framework to get the runtime version
daxian-dbw May 2, 2018
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ after_success:
# travis-ci will quit using the cache if an enviroment variable changes
env:
global:
- CACHE_VERSION=netcoreapp.2.0.6-sdk.2.1.4
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300-rc1-008662
- POWERSHELL_TELEMETRY_OPTOUT=1

# timeout uploading cache after 6 minutes (360 seconds)
Expand Down
4 changes: 2 additions & 2 deletions PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>

<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.6</RuntimeFrameworkVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<LangVersion>Latest</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<NeutralLanguage>en-US</NeutralLanguage>

<DelaySign>true</DelaySign>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

image: Visual Studio 2017

# cache version - netcoreapp.2.0.6-sdk.2.1.4
# cache version - netcoreapp.2.1-sdk.2.1.300-rc1-008662
cache:
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
Expand Down
48 changes: 30 additions & 18 deletions assets/files.wxs
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 24 additions & 18 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ function Start-PSBuild {
# If this parameter is not provided it will get determined automatically.
[ValidateSet("win7-x64",
"win7-x86",
"osx.10.12-x64",
"osx-x64",
"linux-x64",
"linux-arm",
"win-arm",
Expand Down Expand Up @@ -557,7 +557,7 @@ Fix steps:
Pop-Location
}

# publish netcoreapp2.0 reference assemblies
# publish netcoreapp2.1 reference assemblies
try {
Push-Location "$PSScriptRoot/src/TypeCatalogGen"
$refAssemblies = Get-Content -Path $incFileName | Where-Object { $_ -like "*microsoft.netcore.app*" } | ForEach-Object { $_.TrimEnd(';') }
Expand Down Expand Up @@ -706,15 +706,15 @@ function New-PSOptions {
[ValidateSet("Linux", "Debug", "Release", "CodeCoverage", "")]
[string]$Configuration,

[ValidateSet("netcoreapp2.0")]
[ValidateSet("netcoreapp2.1")]
[string]$Framework,

# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
[ValidateSet("",
"win7-x86",
"win7-x64",
"osx.10.12-x64",
"osx-x64",
"linux-x64",
"linux-arm",
"win-arm",
Expand Down Expand Up @@ -773,28 +773,26 @@ function New-PSOptions {
Write-Verbose "Top project directory is $Top"

if (-not $Framework) {
$Framework = "netcoreapp2.0"
$Framework = "netcoreapp2.1"
Write-Verbose "Using framework '$Framework'"
}

if (-not $Runtime) {
if ($Environment.IsLinux) {
$Runtime = "linux-x64"
} elseif ($Environment.IsMacOS) {
$Runtime = "osx-x64"
} else {
$RID = dotnet --info | ForEach-Object {
if ($_ -match "RID") {
$_ -split "\s+" | Select-Object -Last 1
}
}

if ($Environment.IsWindows) {
# We plan to release packages targetting win7-x64 and win7-x86 RIDs,
# which supports all supported windows platforms.
# So we, will change the RID to win7-<arch>
$Runtime = $RID -replace "win\d+", "win7"
} else {
$Runtime = $RID
}
# We plan to release packages targetting win7-x64 and win7-x86 RIDs,
# which supports all supported windows platforms.
# So we, will change the RID to win7-<arch>
$Runtime = $RID -replace "win\d+", "win7"
}

if (-not $Runtime) {
Expand Down Expand Up @@ -1462,10 +1460,9 @@ function Start-PSxUnit {
}
}

# '-fxversion' workaround required due to https://github.com/dotnet/cli/issues/7901#issuecomment-343323674
# Run sequential tests first, and then run the tests that can execute in parallel
dotnet xunit -fxversion 2.0.5 -configuration $Options.configuration -xml $SequentialTestResultsFile -namespace "PSTests.Sequential" -parallel none
dotnet xunit -fxversion 2.0.5 -configuration $Options.configuration -xml $ParallelTestResultsFile -namespace "PSTests.Parallel" -nobuild
dotnet xunit -configuration $Options.configuration -xml $SequentialTestResultsFile -namespace "PSTests.Sequential" -parallel none
dotnet xunit -configuration $Options.configuration -xml $ParallelTestResultsFile -namespace "PSTests.Parallel" -nobuild
}
finally {
Pop-Location
Expand Down Expand Up @@ -1927,13 +1924,19 @@ function Start-TypeGen
# Add .NET CLI tools to PATH
Find-Dotnet

# This custom target depends on 'ResolveAssemblyReferencesDesignTime', whose definition can be found in the sdk folder.
# To find the available properties of '_ReferencesFromRAR' when switching to a new dotnet sdk, follow the steps below:
# 1. create a dummy project using the new dotnet sdk.
# 2. build the dummy project with this command:
# dotnet msbuild .\dummy.csproj /t:ResolveAssemblyReferencesDesignTime /fileLogger /noconsolelogger /v:diag
# 3. search '_ReferencesFromRAR' in the produced 'msbuild.log' file. You will find the properties there.
$GetDependenciesTargetPath = "$PSScriptRoot/src/Microsoft.PowerShell.SDK/obj/Microsoft.PowerShell.SDK.csproj.TypeCatalog.targets"
$GetDependenciesTargetValue = @'
<Project>
<Target Name="_GetDependencies"
DependsOnTargets="ResolveAssemblyReferencesDesignTime">
<ItemGroup>
<_RefAssemblyPath Include="%(_ReferencesFromRAR.ResolvedPath)%3B" Condition=" '%(_ReferencesFromRAR.Type)' == 'assembly' And '%(_ReferencesFromRAR.PackageName)' != 'Microsoft.Management.Infrastructure' " />
<_RefAssemblyPath Include="%(_ReferencesFromRAR.HintPath)%3B" Condition=" '%(_ReferencesFromRAR.NuGetPackageId)' != 'Microsoft.Management.Infrastructure' "/>
Copy link
Member

@SteveL-MSFT SteveL-MSFT Apr 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@iSazonov for my own education, how did you figure out this change?

Copy link
Collaborator Author

@iSazonov iSazonov Apr 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Search "_ReferencesFromRAR" in "C:\Program Files\dotnet\sdk\2.1.300-preview2-008530" for file filter '*.t*' (targets and tasks)
    No useful results. (Although I made sure that this target still exists)
    Star monitoring 😄
  2. Run dotnet msbuild /fileLogger /noconsolelogger /verbosity:diag
  3. Search "_ReferencesFromRAR" in msbuild1.log
    Look assigned properties

Copy link
Member

@daxian-dbw daxian-dbw May 1, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to build powershell to find out this. Use a simple project that targets netcoreapp2.1, then run this:

dotnet msbuild .\temp.csproj /t:ResolveAssemblyReferencesDesignTime /fileLogger /noconsolelogger /v:diag

Then you can inspect the properties of _ReferencesFromRAR in msbuild.log. I think we should add comment here to describe this process.

Comment added. #Closed.

</ItemGroup>
<WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" />
</Target>
Expand Down Expand Up @@ -2140,7 +2143,7 @@ function Start-CrossGen {
[Parameter(Mandatory=$true)]
[ValidateSet("win7-x86",
"win7-x64",
"osx.10.12-x64",
"osx-x64",
"linux-x64",
"linux-arm",
"win-arm",
Expand Down Expand Up @@ -2215,9 +2218,12 @@ function Start-CrossGen {
throw "crossgen is not available for this platform"
}

$dotnetRuntimeVersion = $script:Options.Framework -replace 'netcoreapp'

# Get the CrossGen.exe for the correct runtime with the latest version
$crossGenPath = Get-ChildItem $script:Environment.nugetPackagesRoot $crossGenExe -Recurse | `
Where-Object { $_.FullName -match $crossGenRuntime } | `
Where-Object { $_.FullName -match $dotnetRuntimeVersion } | `
Copy link
Member

@daxian-dbw daxian-dbw May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this really necessary? I didn't try on Linux and macOS, but on Windows, the 2.1 folder is the first one after sort (I have 2.0.6, 2.0.5 and 2.0.0 runtime package installed):

PS:107> dir crossgen.exe -Recurse | ? FullName -Match win-x64 | sort -Property FullName -Descending | select -First 1

    Directory: C:\Users\dongbow\.nuget\packages\runtime.win-x64.microsoft.netcore.app\2.1.0-rc1-26423-06\tools

Mode                LastWriteTime         Length Name
----                -------------         ------ ----
-a----        4/23/2018   9:07 AM        2916176 crossgen.exe

Copy link
Member

@SteveL-MSFT SteveL-MSFT May 1, 2018 •
edited by daxian-dbw
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was happening in CI. #Closed.

Sort-Object -Property FullName -Descending | `
Select-Object -First 1 | `
ForEach-Object { $_.FullName }
Expand Down
2 changes: 1 addition & 1 deletion docs/building/macos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ We cannot do this for you in the build module due to #[847][].

Start a PowerShell session by running `pwsh`, and then use `Start-PSBuild` from the module.

After building, PowerShell will be at `./src/powershell-unix/bin/Linux/netcoreapp2.0/osx.10.12-x64/publish/powershell`.
After building, PowerShell will be at `./src/powershell-unix/bin/Linux/netcoreapp2.0/osx-x64/publish/powershell`.
Note that configuration is still `Linux`.
2 changes: 1 addition & 1 deletion docs/host-powershell/sample-dotnet2.0-powershell-crossplatform/MyApp/MyApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>MyApp</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win10-x64;linux-x64;osx.10.12-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.4"
"version": "2.1.300-rc1-008662"
}
}
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -69,7 +69,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.1" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0-rc1-26423-06" />
</ItemGroup>

</Project>
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
Expand Up @@ -24,7 +24,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.1" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.0-rc1-26423-06" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.5.0-rc1-26423-06" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.4.1" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0" />
<PackageReference Include="System.IO.Packaging" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0-rc1-26423-06" />
<!-- the following package(s) are from https://github.com/dotnet/wfc -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.4.1" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.1" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
<PackageReference Include="System.ServiceModel.Security" Version="4.4.1" />
<PackageReference Include="System.Private.ServiceModel" Version="4.4.1" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.0-rc1-26423-01" />
<PackageReference Include="System.ServiceModel.Http" Version="4.5.0-rc1-26423-01" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.0-rc1-26423-01" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.0-rc1-26423-01" />
<PackageReference Include="System.ServiceModel.Security" Version="4.5.0-rc1-26423-01" />
<PackageReference Include="System.Private.ServiceModel" Version="4.5.0-rc1-26423-01" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
</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
Expand Up @@ -9,7 +9,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.1" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0-rc1-26423-06" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResGen/ResGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x86;win7-x64;osx.10.12-x64;linux-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>

</Project>
13 changes: 6 additions & 7 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
<!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Memory" Version="4.5.0-*"/>
<PackageReference Include="System.Security.AccessControl" Version="4.4.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
<PackageReference Include="System.Security.Permissions" Version="4.4.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Security.AccessControl" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Security.Permissions" Version="4.5.0-rc1-26423-06" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0-rc1-26423-06" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
<PackageReference Include="PowerShell.Core.Instrumentation" Version="6.0.0-beta*" />
Expand Down
2 changes: 1 addition & 1 deletion src/TypeCatalogGen/TypeCatalogGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x86;win7-x64;osx.10.12-x64;linux-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down
4 changes: 3 additions & 1 deletion src/powershell-native/nativemsh/pwrshcommon/pwrshcommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,6 @@ namespace NativeMsh
"System.Configuration",
"System.ComponentModel",
"System.ComponentModel.Annotations",
"System.ComponentModel.Composition",
"System.ComponentModel.DataAnnotations",
"System.ComponentModel.EventBasedAsync",
"System.ComponentModel.Primitives",
Expand Down Expand Up @@ -732,6 +731,7 @@ namespace NativeMsh
"System.Globalization.Extensions",
"System.IO",
"System.IO.Compression",
Copy link
Member

@daxian-dbw daxian-dbw May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems System.ComponentModel.Composition.dll is gone. Then it should be removed from this list now.

Copy link
Member

@daxian-dbw daxian-dbw May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A note about Microsoft.CodeAnalysis.VisualBasic.dll we added from the Add-Type refactoring. Since we plan to remove the VB support, we shouldn't add that dll in this list.

Copy link
Member

@SteveL-MSFT SteveL-MSFT May 1, 2018 •
edited by daxian-dbw
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take care of this #Closed.

"System.IO.Compression.Brotli",
"System.IO.Compression.FileSystem",
"System.IO.Compression.ZipFile",
"System.IO.FileSystem",
Expand All @@ -743,12 +743,14 @@ namespace NativeMsh
"System.IO.MemoryMappedFiles",
"System.IO.Packaging",
"System.IO.Pipes",
"System.IO.Pipes.AccessControl",
"System.IO.UnmanagedMemoryStream",
"System.Linq",
"System.Linq.Expressions",
"System.Linq.Parallel",
"System.Linq.Queryable",
"System.Management.Automation",
"System.Memory",
"System.Net",
"System.Net.Http",
"System.Net.Http.WinHttpHandler",
Expand Down
2 changes: 1 addition & 1 deletion src/powershell-unix/powershell-unix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Description>PowerShell top-level project with .NET CLI host</Description>
<AssemblyName>pwsh</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>linux-x64;osx.10.12-x64;</RuntimeIdentifiers>
<RuntimeIdentifiers>linux-x64;osx-x64;</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
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
Expand Up @@ -37,7 +37,7 @@
<ItemGroup>
<PackageReference Include="PSDesiredStateConfiguration" Version="6.0.0-beta.8" />
<PackageReference Include="PowerShellHelpFiles" Version="1.0.0-*" />
<PackageReference Include="psrp.windows" Version="6.0.0-*" />
<PackageReference Include="psrp.windows" Version="6.1.0-*" />
</ItemGroup>

<PropertyGroup>
Expand Down
3 changes: 1 addition & 2 deletions test/Test.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>

<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.6</RuntimeFrameworkVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
4 changes: 2 additions & 2 deletions test/csharp/csharp.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<Description>PowerShell xUnit Tests</Description>
<AssemblyName>powershell-tests</AssemblyName>
<RuntimeIdentifiers>win7-x86;win7-x64;osx.10.12-x64;linux-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -17,7 +17,7 @@
<ItemGroup>
<ProjectReference Include="../../src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj"/>
<ProjectReference Include="../../src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj"/>
<ProjectReference Include="../../src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj"/>
<ProjectReference Include="../../src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj"/>
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 14 additions & 9 deletions test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,16 +476,21 @@ Describe "TabCompletion" -Tags CI {
}

It "Tab completion for filesystem provider qualified path" {
if ($IsWindows) {
$beforeTab = 'filesystem::{0}\Wind' -f $env:SystemDrive
$afterTab = 'filesystem::{0}\Windows' -f $env:SystemDrive
} else {
$beforeTab = 'filesystem::/us' -f $env:SystemDrive
$afterTab = 'filesystem::/usr' -f $env:SystemDrive
$tempFolder = [System.IO.Path]::GetTempPath()
try
{
New-Item -ItemType Directory -Path "$tempFolder/helloworld" > $null
$tempFolder | Should -Exist
$beforeTab = 'filesystem::{0}hello' -f $tempFolder
$afterTab = 'filesystem::{0}helloworld' -f $tempFolder
$res = TabExpansion2 -inputScript $beforeTab -cursorColumn $beforeTab.Length
$res.CompletionMatches.Count | Should -BeGreaterThan 0
$res.CompletionMatches[0].CompletionText | Should -Be $afterTab
}
finally
{
Remove-Item -Path "$tempFolder/helloworld" -Force -ErrorAction SilentlyContinue
}
$res = TabExpansion2 -inputScript $beforeTab -cursorColumn $beforeTab.Length
$res.CompletionMatches.Count | Should -BeGreaterThan 0
$res.CompletionMatches[0].CompletionText | Should -Be $afterTab
}

It "Tab completion dynamic parameter of a custom function" {
Expand Down
Loading