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

PowerShell · Aug 5, 2019 · 7af3829 · 7af3829
1 parent d7811c8
commit 7af3829
Show file tree

Hide file tree

Showing 12 changed files with 832 additions and 825 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -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

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -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.

diff --git a/assets/files.wxs b/assets/files.wxs
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-preview6-012264"
+    "version": "3.0.100-preview7-012821"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -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>
 

diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -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>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -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" />

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -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" />

diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
@@ -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">

diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
@@ -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>

diff --git a/...erence/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/...erence/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -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>
diff --git a/...aging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/...aging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -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>