Update docs about .NET Core version 2.0 to be about version 2.x (PowerShell#7467)

bergmeister · daxian-dbw · commit b3c961f882e8 · 2018-08-30T16:51:52.000-07:00
diff --git a/.spelling b/.spelling
@@ -6,6 +6,8 @@
 
 #region Global Dictionary
 2ae5d07
+2.x
+2.x.
 acl
 ActiveDirectory
 aditya
diff --git a/demos/WindowsPowerShellModules/README.md b/demos/WindowsPowerShellModules/README.md
@@ -5,7 +5,7 @@
 Existing Windows PowerShell users are familiar with the large number of modules available, however, they are not necessarily compatible with PowerShell Core.
 More information regarding compatibility is in a [blog post](https://blogs.msdn.microsoft.com/powershell/2017/07/14/powershell-6-0-roadmap-coreclr-backwards-compatibility-and-more/).
 
-Windows PowerShell 5.1 is based on .Net Framework 4.6.1, while PowerShell Core is based on .Net Core 2.0.
+Windows PowerShell 5.1 is based on .Net Framework 4.6.1, while PowerShell Core is based on .Net Core 2.x.
 Although both adhere to .Net Standard 2.0 and can be compatible, some modules may be using APIs or cmdlets not supported on CoreCLR or using APIs from Windows PowerShell that have been deprecated and removed from PowerShell Core (for example, PSSnapins).
 
 ## Importing a Windows PowerShell module
diff --git a/docs/building/macos.md b/docs/building/macos.md
@@ -3,7 +3,7 @@
 This guide supplements the [Linux instructions](./linux.md), as
 building on macOS is almost identical.
 
-.NET Core 2.0 (and by transitivity, us) only supports macOS 10.12+.
+.NET Core 2.x (and by transitivity, us) only supports macOS 10.12+.
 
 ## Environment
 
@@ -16,7 +16,7 @@ The `Start-PSBootstrap` function does the following:
 
 - Uses `brew` to install CMake, OpenSSL, and GNU WGet
 - Uninstalls any prior versions of .NET CLI
-- Downloads and installs a preview version of .NET Core SDK 2.0 to `~/.dotnet`
+- Downloads and installs .NET Core SDK to `~/.dotnet`
 
 If you want to use `dotnet` outside of `Start-PSBuild`,
 add `~/.dotnet` to your `PATH` environment variable.
diff --git a/docs/cmdlet-example/command-line-simple-example.md b/docs/cmdlet-example/command-line-simple-example.md
@@ -23,9 +23,9 @@ different implementations of PowerShell.
   to install PowerShell Core for the distribution and version of Linux you're running.
   You can get that version info by running the command `lsb_release -a` from the WSL console.
 
-* .NET Core 2.0 SDK
+* .NET Core 2.x SDK
 
-  Download and install the [.NET Core 2.0 SDK][net-core-sdk] for your operating system.
+  Download and install the [.NET Core 2.x SDK][net-core-sdk] for your operating system.
   It is recommended that you use a package manager to install the SDK on Linux.
   See these [instructions][linux-install] on how to install the SDK on Linux.
   Be sure to pick your distribution of Linux e.g. RHEL, Debian, etc to get the
@@ -40,7 +40,7 @@ different implementations of PowerShell.
    ```
 
    This should output `2.0.0` or higher. If it returns a major version of 1, make sure you have
-   installed the .NET Core 2.0 SDK and have restarted your shell to get the newer version of
+   installed the .NET Core 2.x SDK and have restarted your shell to get the newer version of
    the SDK tools.
 
 1. Use the `dotnet` CLI to create a starter `classlib` project based on .NET Standard 2.0
@@ -114,7 +114,7 @@ different implementations of PowerShell.
 ## Using a .NET Standard 2.0 based binary module in Windows PowerShell
 
 You may have heard that a .NET assembly compiled as a .NET Standard 2.0 class library
-will load into both .NET Core 2.0 applications such as PowerShell Core and
+will load into both .NET Core 2.x applications such as PowerShell Core and
 .NET Framework 4.6.1 (or higher) applications such as Windows PowerShell.
 This allows you to build a single, cross-platform binary module.
 
@@ -171,14 +171,15 @@ can't find the `netstandard.dll` "implementation" assembly for the version of th
 
 ### The fix for missing netstandard.dll
 
-If you install (or already have) the .NET Core 2.0 SDK for Windows, you can
+If you install (or already have) the .NET Core SDK for Windows, you can
 find the `netstandard.dll` implementation assembly for .NET 4.6.1 in the following directory:
-`C:\Program Files\dotnet\sdk\2.0.0\Microsoft\Microsoft.NET.Build.Extensions\net461\lib`.
+`C:\Program Files\dotnet\sdk\<version-number>\Microsoft\Microsoft.NET.Build.Extensions\net461\lib`.
+Note that, the version number in the path may vary depending on the installed SDK.
 
 If you copy `netstandard.dll` from this directory to the directory containing
 `MyModule.dll`, the `Write-TimestampedMessage` command will work.  Let's try that.
 
-1. Install the [.NET Core SDK 2.0 for Windows][net-core-sdk], if it isn't already installed.
+1. Install [.NET Core SDK for Windows][net-core-sdk], if it isn't already installed.
 
 1. Start a new Windows PowerShell console. Remember that once a binary assembly is
    loaded into PowerShell it can't be unloaded. Restarting PowerShell is necessary to
@@ -187,7 +188,7 @@ If you copy `netstandard.dll` from this directory to the directory containing
 1. Copy the `netstandard.dll` implementation assembly for .NET 4.6.1 to the module's directory.
    ```powershell
    cd 'path-to-where-you-copied-module.dll'
-   Copy-Item 'C:\Program Files\dotnet\sdk\2.0.0\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll' .
+   Copy-Item 'C:\Program Files\dotnet\sdk\<version-number>\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll' .
    ```
 
 1. Import the module and execute the command:
@@ -211,7 +212,7 @@ class library that will run in PowerShell Core on multiple operating systems.
 It will also run in Windows PowerShell on Windows systems that have been updated to
 .NET Framework 4.7.1 as well as the Windows 10 Fall Creators Update which comes with that
 version pre-installed.  Furthermore, this binary module can be built on Linux
-and macOS as well as Windows using the .NET Core 2.0 SDK command-line tools.
+and macOS as well as Windows using the .NET Core 2.x SDK command-line tools.
 
 For more information on .NET Standard, check out the [documentation][net-std-docs]
 and the [.NET Standard YouTube channel][net-std-chan].
diff --git a/test/tools/WebListener/README.md b/test/tools/WebListener/README.md
@@ -1,6 +1,6 @@
 # WebListener App
 
-ASP.NET Core 2.0 app for testing HTTP and HTTPS Requests.
+ASP.NET Core app for testing HTTP and HTTPS Requests.
 
 ## Run with `dotnet`
 
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\Test.Common.props"/>
 
   <PropertyGroup>
-    <Description>A simple ASP.NET Core 2.0 MVC app to provide an HTTP and HTTPS server for testing.</Description>
+    <Description>A simple ASP.NET Core MVC app to provide an HTTP and HTTPS server for testing.</Description>
   </PropertyGroup>
 
   <ItemGroup>
