Bump .NET to 3.1.0 (#11260)

2019-12-04 13:17:16 -08:00 · 2019-12-04 13:17:16 -08:00 · 8e76ad00e2
parent 8f4eb668c3
commit 8e76ad00e2
13 changed files with 37 additions and 37 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.1.100-preview3
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100

 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
--- a/assets/files.wxs
+++ b/assets/files.wxs
@ -3071,8 +3071,8 @@
      <Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
        <File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
      </Component>
-      <Component Id="cmp62E7F775F1394EA6810AC0F13B3CF337" Guid="{f6f973db-9e30-41bb-8071-97ae55ddb3a0}">
-        <File Id="fil4F37E2767AB446D3A15F98B47F76466D" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.53102.dll" />
+      <Component Id="cmp391B9B0E71AF4A99BFE7260F811AFAC4" Guid="{2d8c929e-37e0-488c-8793-246b36559bd3}">
+        <File Id="filB279809149164F37A0C48A01D092529A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.56402.dll" />
      </Component>
    </DirectoryRef>
  </Fragment>
@ -3919,7 +3919,7 @@
      <ComponentRef Id="cmpAC984FA3A67247BC996F60290C87D0A1" />
      <ComponentRef Id="cmp2E32A6E773F543F0A150B972F8D3E23A" />
      <ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
-      <ComponentRef Id="cmp62E7F775F1394EA6810AC0F13B3CF337" />
+      <ComponentRef Id="cmp391B9B0E71AF4A99BFE7260F811AFAC4" />
    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/build.psm1
+++ b/build.psm1
@ -5,7 +5,7 @@
 # On Windows paths is separated by semicolon
 $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator

-$dotnetCLIChannel = 'preview' # TODO: Change this to 'release' once .Net Core 3.0 goes RTM
+$dotnetCLIChannel = 'release'
 $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version

 # Track if tags have been sync'ed
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "3.1.100-preview3-014645"
+    "version": "3.1.100"
  }
 }
--- 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="4.7.0-preview3.19551.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.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
@ -32,8 +32,8 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
-    <PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0-preview3.19551.4" />
+    <PackageReference Include="System.Threading.AccessControl" Version="4.7.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
    <PackageReference Include="NJsonSchema" Version="10.0.28" />
  </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.7.0-preview3.19551.4" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="4.7.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.8.0-preview1.19504.10" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview3.19551.4" />
+    <PackageReference Include="System.IO.Packaging" Version="4.7.0" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.7.0" />
    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0-preview1.final" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.7.0-preview1.final" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0-preview1.final" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0-preview1.final" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.7.0-preview1.final" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.7.0-preview1.final" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.7.0" />
+    <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="3.1.0-preview1.19504.10" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.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.7.0-preview3.19551.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.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.11.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.DirectoryServices" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Management" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Security.Permissions" Version="4.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview3.19551.4" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="System.DirectoryServices" Version="4.7.0" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
+    <PackageReference Include="System.Management" Version="4.7.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.7.0" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0" />
+    <PackageReference Include="System.Security.Permissions" Version="4.7.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.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.4" />
--- 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.1.0-preview3.19555.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview3.19551.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.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.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview3.19551.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.7.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.7.0-preview3.19551.4" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0-preview3.19551.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.7.0" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
  </ItemGroup>
 </Project>