Move to .NET Core 3.0 preview.8 (PowerShell#10351)

alexku7 · Aug 15, 2019 · 4220271 · 4220271
1 parent 7ab3cb1
commit 4220271
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 36 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-preview7
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview8
 
 # 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-preview7, including pwsh (Debian 10)",
+	"name": ".NET Core 3.0-preview8, including pwsh (Debian 10)",
 	"dockerFile": "Dockerfile",
 
 	// Uncomment the next line to run commands after the container is created.

diff --git a/.gitignore b/.gitignore
@@ -79,6 +79,7 @@ Temporary Items
 # TestsResults
 TestsResults*.xml
 ParallelXUnitResults.xml
+xUnitResults.xml
 
 # Resharper settings
 PowerShell.sln.DotSettings.user

diff --git a/assets/files.wxs b/assets/files.wxs
@@ -2922,9 +2922,6 @@
       <Component Id="cmp30126C60BD784974B74EA45AE9B04032" Guid="{777d7afa-784b-4f16-9879-a6eada18d59f}">
         <File Id="fil7352ABFC8A154701BFE3B47CFA66B8F4" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.Channels.dll" />
       </Component>
-      <Component Id="cmpB6616472F56D49C0A092411F4D29EA8A" Guid="{3036bf65-f44a-4fb9-b802-01841bf587ed}">
-        <File Id="filFC27BBD7B6764674966AB7AEBC639982" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.32702.dll" />
-      </Component>
       <Component Id="cmp9EC1507780D247E095EA92A7715B4BAC" Guid="{c111d60b-4bd3-4abc-b08c-1b503dde5931}">
         <File Id="filFA98F788E7724D41A2A88F2C0298E691" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Printing.dll" />
       </Component>
@@ -3051,6 +3048,9 @@
       <Component Id="cmp827B25EEC28D4699BB29042B273C8CBF" Guid="{f7ccc70c-5aaf-4e6b-bf9f-c59f4e631f9c}">
         <File Id="filEF6B07EDBC8F43AE8DF88CFDF798FC22" KeyPath="yes" Source="$(env.ProductSourcePath)\System.ComponentModel.Composition.Registration.dll" />
       </Component>
+      <Component Id="cmp45C246DB0A6548B88F0ECFAE7E04DDF9" Guid="{c0aa34fa-b8b3-4fdd-8ea9-0a7b552fd62a}">
+        <File Id="fil03DDF9C95E914AB68AE38D7B8AEF4BE9" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.37902.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -3624,7 +3624,6 @@
       <ComponentRef Id="cmp0D4F53C257044BE1912BDD4E99A5F0DE" />
       <ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
       <ComponentRef Id="cmp30126C60BD784974B74EA45AE9B04032" />
-      <ComponentRef Id="cmpB6616472F56D49C0A092411F4D29EA8A" />
       <ComponentRef Id="cmp9EC1507780D247E095EA92A7715B4BAC" />
       <ComponentRef Id="cmpF2634E50875D4698921081E3C6B1D5DC" />
       <ComponentRef Id="cmpDCAA22865EF8486AB7526E046A51DBF6" />
@@ -3888,6 +3887,7 @@
       <ComponentRef Id="cmpAD1A205D445C43588868B205091DD390" />
       <ComponentRef Id="cmpD7A187ADE66347E5A7550B96BA10D493" />
       <ComponentRef Id="cmp827B25EEC28D4699BB29042B273C8CBF" />
+      <ComponentRef Id="cmp45C246DB0A6548B88F0ECFAE7E04DDF9" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-preview7-012821"
+    "version": "3.0.100-preview8-013656"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -57,7 +57,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview8.19405.3" />
   </ItemGroup>
 
 </Project>
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.1" />
-    <PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview8.19405.3" />
     <PackageReference Include="NJsonSchema" Version="10.0.22" />
   </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.Diagnostics.EventLog" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-preview8.19405.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -16,21 +16,21 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview7.19362.9" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview8.19405.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <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" />
+    <PackageReference Include="System.IO.Packaging" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview8.19405.3" />
     <!-- 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" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview6.final" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview6.final" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview6.final" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview6.final" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview8.final" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview8.final" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview8.final" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview8.final" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview8.final" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview8.final" />
     <!-- the source could not be found for the following package(s) -->
     <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-preview7.19362.9" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-preview8.19405.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -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.6.0-preview7.19362.9" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview8.19405.3" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -14,16 +14,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-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" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.DirectoryServices" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Management" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Security.Permissions" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview8.19405.3" />
     <!-- 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/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-preview7.19362.9" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview8.19405.3" />
   </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-preview7.19362.9" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
   </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
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <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-preview7.19362.9" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview8.19405.3" />
   </ItemGroup>
 </Project>