Update to .Net Core 3.0 RTM (#10604)

2019-09-23 21:10:58 +01:00 · 2019-09-23 21:10:58 +01:00 · 3b93fd285e
parent becb4d98a6
commit 3b93fd285e
13 changed files with 36 additions and 36 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-rc1
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100

 # 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-rc1, including pwsh (Debian 10)",
+	"name": ".NET Core 3.0, 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
@ -3062,8 +3062,8 @@
      <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 Id="cmp916D506512B2490299EDA831FF6729CD" Guid="{614c1c6e-163a-4d82-accd-1f894ccac384}">
+        <File Id="fil5AF5BABB352B44428947D79DEBDD547A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.46205.dll" />
      </Component>
    </DirectoryRef>
  </Fragment>
@ -3905,7 +3905,7 @@
      <ComponentRef Id="cmpECBD8DFB18AD451AB3D81803DECC13BF" />
      <ComponentRef Id="cmp01B3850D6E55468AA84B758FDE8CA59E" />
      <ComponentRef Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" />
-      <ComponentRef Id="cmp954401F9FFBE447490CFAB5B129A996B" />
+      <ComponentRef Id="cmp916D506512B2490299EDA831FF6729CD" />
    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "3.0.100-rc1-014190"
+    "version": "3.0.100"
  }
 }
--- 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-rc1.19456.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
  </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-rc1.19456.4" />
+    <PackageReference Include="System.Threading.AccessControl" Version="4.6.0" />
    <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-rc1.19456.4" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0" />
  </ItemGroup>

 </Project>
--- 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-rc1.19456.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <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" />
+    <PackageReference Include="System.IO.Packaging" Version="4.6.0" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0" />
    <!-- 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" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview9.final" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview9.final" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview9.final" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview9.final" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.6.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.6.0" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.6.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="3.0.0-rc1.19456.4" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0" />
  </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-rc1.19456.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
  </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-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" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+    <PackageReference Include="System.DirectoryServices" Version="4.6.0" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" />
+    <PackageReference Include="System.Management" Version="4.6.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0" />
+    <PackageReference Include="System.Security.Permissions" Version="4.6.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
    <!-- 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
@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview9.19424.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
  </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-rc1.19456.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0" />
  </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-rc1.19456.4" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-rc1.19456.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0" />
  </ItemGroup>
 </Project>