Upgrade .Net Core 3.0 version from Preview 9 to RC1 (#10552)

2019-09-16 23:14:21 +01:00 · 2019-09-16 23:14:21 +01:00 · 6bf5c7656b
parent fc0e3bc6b8
commit 6bf5c7656b
13 changed files with 30 additions and 30 deletions
--- 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-preview9
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-rc1

 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
--- 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-preview9, including pwsh (Debian 10)",
+	"name": ".NET Core 3.0-rc1, including pwsh (Debian 10)",
 	"dockerFile": "Dockerfile",

 	// Uncomment the next line to run commands after the container is created.
--- a/assets/files.wxs
+++ b/assets/files.wxs
@ -3053,9 +3053,6 @@
      <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="cmp712842BFA391403DA3F21B2A4C729ED3" Guid="{e141999c-71cc-4c7f-9f2b-11b1005bd5dc}">
-        <File Id="filDB5CFCFC242B419586E36CD5B281216A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.42102.dll" />
-      </Component>
      <Component Id="cmpECBD8DFB18AD451AB3D81803DECC13BF" Guid="{c6e5a982-3e3d-4e16-82c3-34c564bec4fe}">
        <File Id="fil639FFF2D706848E18758EE576F1B527D" KeyPath="yes" Source="$(env.ProductSourcePath)\PowerShellCoreExecutionPolicy.adml" />
      </Component>
@ -3065,6 +3062,9 @@
      <Component Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" Guid="{e0776aa4-b3aa-4a15-a497-697b510fba8c}">
        <File Id="fil9120D0A4381F4B34B80AB37D2EFBCF7D" KeyPath="yes" Source="$(env.ProductSourcePath)\InstallPSCorePolicyDefinitions.ps1" />
      </Component>
+      <Component Id="cmp954401F9FFBE447490CFAB5B129A996B" Guid="{2837e9f6-cd1d-4f2d-b1a8-4fb273801f73}">
+        <File Id="fil3177366E77E849449693A2F4E079E08F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.45506.dll" />
+      </Component>
    </DirectoryRef>
  </Fragment>
  <Fragment>
@ -3900,12 +3900,12 @@
      <ComponentRef Id="cmpAD1A205D445C43588868B205091DD390" />
      <ComponentRef Id="cmpD7A187ADE66347E5A7550B96BA10D493" />
      <ComponentRef Id="cmp827B25EEC28D4699BB29042B273C8CBF" />
-      <ComponentRef Id="cmp712842BFA391403DA3F21B2A4C729ED3" />
      <ComponentRef Id="cmpAC685A1C6E354E228EB6A1DD95FF03D5" />
      <ComponentRef Id="cmp67C4A6FC5E48487BB31DE411CF38B0B2" />
      <ComponentRef Id="cmpECBD8DFB18AD451AB3D81803DECC13BF" />
      <ComponentRef Id="cmp01B3850D6E55468AA84B758FDE8CA59E" />
      <ComponentRef Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" />
+      <ComponentRef Id="cmp954401F9FFBE447490CFAB5B129A996B" />
    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "3.0.100-preview9-014004"
+    "version": "3.0.100-rc1-014190"
  }
 }
--- 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-preview9.19421.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-rc1.19456.4" />
  </ItemGroup>

 </Project>
--- 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-preview9.19421.4" />
+    <PackageReference Include="System.Threading.AccessControl" Version="4.6.0-rc1.19456.4" />
    <PackageReference Include="NJsonSchema" Version="10.0.23" />
  </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="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-rc1.19456.4" />
  </ItemGroup>

 </Project>
--- 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-preview9.19421.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.7.0-rc1.19456.4" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.IO.Packaging" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-rc1.19456.4" />
    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
    <PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview9.final" />
    <PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview9.final" />
@ -30,7 +30,7 @@
    <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview9.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-preview9.19421.4" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-rc1.19456.4" />
  </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="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-rc1.19456.4" />
  </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.10.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.DirectoryServices" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Management" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Security.Permissions" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.DirectoryServices" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Management" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Security.Permissions" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-rc1.19456.4" />
    <!-- the following package(s) are from the powershell org -->
    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0-preview.2" />
    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.2" />
--- 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-preview9.19424.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-rc1.19456.4" />
  </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.2" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-rc1.19456.4" />
  </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="1.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-rc1.19456.4" />
  </ItemGroup>
 </Project>