Bump .NET to 5.0.0-preview.4 (#12507)

2020-04-28 14:18:16 -07:00 · 2020-04-28 14:18:16 -07:00 · cc0d20aa08
parent 7c1fa6c799
commit cc0d20aa08
13 changed files with 28 additions and 39 deletions
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "channel": "release/5.0.1xx-preview3",
-    "packageVersionPattern": "5.0.0-preview.3"
+    "channel": "release/5.0.1xx-preview4",
+    "packageVersionPattern": "5.0.0-preview.4"
  }
 }
--- a/assets/files.wxs
+++ b/assets/files.wxs
@ -1619,18 +1619,9 @@
        <Component Id="cmpEA40E9164309426C88C4388FDCA9559D" Guid="{2c84f9de-c203-4551-bde8-71e9e7e21f45}">
          <File Id="fil205C9BE7027A408B985D96F5EEF11594" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Threading.Channels.dll" />
        </Component>
-        <Component Id="cmp34649490F5B04041A08E73D7A86D5A5A" Guid="{d8f897d8-16cd-41a0-b5d7-863f379b30a2}">
-          <File Id="fil2DDAEABD470A475E950B94AC186DAB2E" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
-        </Component>
-        <Component Id="cmpB3116053008E492C9B36C89BF682B8F7" Guid="{6572fcd7-3c98-4180-b3da-bdaeb21294cd}">
-          <File Id="fil0D09CC7B4B8A43369D0207AC861D8D21" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
-        </Component>
        <Component Id="cmp859A3876902946E7B5B4965F90664C5D" Guid="{25192d48-42fc-4551-baec-cce4ecb420ea}">
          <File Id="fil2E0E3963F95C47F3BEA7D5A5848D6F28" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
        </Component>
-        <Component Id="cmpF1B0E6DCC3BD4797B206C879EF270062" Guid="{af38a3e7-6bc2-47c8-a83e-ee8bfd0cc8be}">
-          <File Id="fil2694AE6F8EB8473CBDF0F73A4E55164B" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
-        </Component>
        <Component Id="cmp25A144CC34E545378735B06794A02F90" Guid="{35a3c141-1309-4277-9325-a97e177a9f09}">
          <File Id="filFCE4A935DE1D4DD08E9A1D32A07E0266" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Drawing.dll" />
        </Component>
@ -3643,10 +3634,7 @@
      <ComponentRef Id="cmp1719A38F3C30484BBA189D718AF00D3C" />
      <ComponentRef Id="cmp770700CA06564FB187D1CD2A79AA3DA8" />
      <ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
-      <ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
-      <ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
      <ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
-      <ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
      <ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
      <ComponentRef Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" />
      <ComponentRef Id="cmpA620CA71E6FF4F50B6D7BB0761D17036" />
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@ -47,7 +47,7 @@

  <ItemGroup>
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@ -32,8 +32,8 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.4.20223.9" />
    <PackageReference Include="NJsonSchema" Version="10.1.12" />
  </ItemGroup>

--- 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="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@ -18,9 +18,9 @@
    <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
    <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.4.20217.4" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.4.20223.9" />
    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
    <PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
    <PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
@ -30,7 +30,7 @@
    <PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
    <!-- 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="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>

 </Project>
--- 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="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>

  <PropertyGroup>
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@ -16,16 +16,16 @@
    <!-- the Application Insights package -->
    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.14.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Management" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Management" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20223.9" />
    <!-- the following package(s) are from the powershell org -->
    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0" />
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@ -71,6 +71,7 @@ Describe "Validate start of console host" -Tag CI {
                'System.Management.dll'
                'System.Security.Claims.dll'
                'System.Security.Cryptography.Primitives.dll'
+                'System.Security.Principal.dll'
                'System.Threading.Overlapped.dll'
            )
        }
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@ -12,7 +12,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>

 </Project>
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.3.20215.14" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.4.20224.4" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>

  <ItemGroup>
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@ -14,6 +14,6 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>
 </Project>
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.3.20214.6" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.3.20214.6" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20223.9" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20223.9" />
  </ItemGroup>
 </Project>