maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update PowerShell to build against .NET Core 3.0-preview7 (#10227)

Browse source
This commit is contained in:
Christoph Bergmeister [MVP] 2019-08-05 17:56:29 +01:00 committed by Dongbo Wang
parent d7811c8d25
commit 7af38294db
12 changed files with 863 additions and 856 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/Dockerfile
View file

@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview6
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive

2
.devcontainer/devcontainer.json
View file

@ -1,6 +1,6 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
{
"name": ".NET Core 3.0-preview6, including pwsh (Debian 10)",
"name": ".NET Core 3.0-preview7, including pwsh (Debian 10)",
"dockerFile": "Dockerfile",
// Uncomment the next line to run commands after the container is created.

1670
assets/files.wxs
View file

File diff suppressed because it is too large Load diff

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview6-012264"
"version": "3.0.100-preview7-012821"
}
}

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

@ -56,7 +56,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="NJsonSchema" Version="10.0.21" />
</ItemGroup>

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

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview7.19362.9" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

@ -16,11 +16,11 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview6.19303.8" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview7.19362.9" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.IO.Packaging" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview7.19362.9" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview6.final" />

20
src/System.Management.Automation/System.Management.Automation.csproj
View file

@ -11,16 +11,16 @@
<!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Management" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview7.19362.9" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.1" />

5
src/powershell-win-core/powershell-win-core.csproj
View file

@ -18,6 +18,11 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' " />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' " />
<PropertyGroup Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' ">
<UseWpf>true</UseWpf>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\powershell\Program.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
<Content Include="..\System.Management.Automation\powershell.config.json">

2
test/tools/WebListener/WebListener.csproj
View file

@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview7.19362.9" />
</ItemGroup>
<ItemGroup>

2
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview7.19362.9" />
</ItemGroup>
</Project>

2
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file

@ -10,6 +10,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview.19113.10" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview7.19362.9" />
</ItemGroup>
</Project>