Fixed references to RC2, OS X, and Update 2

docs/concepts/codesharing.md

@@ -69,7 +69,7 @@ Platforms that support the .NET Standard Library then provide implementations of
 
 - The .NET Framework, which, starting with Windows 8, is a system component included with the Windows operating system.
 
-- .NET Core,  which is a modular, cross-platform, open source implementation of the .NET Framework that runs on Windows devices, as well as on Linux and OS X.
+- .NET Core,  which is a modular, cross-platform, open source implementation of the .NET Framework that runs on Windows devices, as well as on Linux and macOS.
 
 - The Universal Windows Platform, an application architecture for creating apps that can run on a variety of Windows devices, such as desktop Windows systems, Windows tablets, and Windows phones.   
 

docs/concepts/editions-overview.md

@@ -24,7 +24,7 @@ The architecture defined in ECMA 335 enables CPU- and OS-agnostic programming mo
 
 The following are the main characteristics of .NET Core:
 
-**Cross-platform** - .NET Core currently supports three main operating systems: Linux, Windows and OS X. There are other OS ports in progress such as FreeBSD and Alpine. .NET Core libraries can run unmodified across supported OSes. The apps must be re-compiled per environment, given that apps use a native host. Users select the .NET Core supported environment that works best for their situation.
+**Cross-platform** - .NET Core currently supports three main operating systems: Linux, Windows and macOS. There are other OS ports in progress such as FreeBSD and Alpine. .NET Core libraries can run unmodified across supported OSes. The apps must be re-compiled per environment, given that apps use a native host. Users select the .NET Core supported environment that works best for their situation.
 
 **Open Source** - [.NET Core](https://github.com/dotnet/core) is available on GitHub, licensed with the [MIT](https://github.com/dotnet/coreclr/blob/master/LICENSE.TXT) and [Apache 2](https://github.com/dotnet/roslyn/blob/master/License.txt) licenses (licensing is per component). It also makes use of a significant set of open source industry [dependencies](https://github.com/dotnet/core/releases) (see release notes). 
 

docs/concepts/framework-libraries.md

@@ -58,4 +58,4 @@ The BCL provides the most foundational types and utility functionality and are t
 
 There are many app-models that can be used with .NET, provided by several companies.
 
-*   [ASP.NET](http://asp.net) - Provides a web framework for building Web sites and services. Supported on Windows, Linux and OS X (depends on ASP.NET version).
+*   [ASP.NET](http://asp.net) - Provides a web framework for building Web sites and services. Supported on Windows, Linux and macOS (depends on ASP.NET version).

docs/concepts/native-interop.md

@@ -26,7 +26,7 @@ Of course, the list above does not cover all of the potential situations and sce
 
 > **Note**
 > 
-> Most of the examples in this document will be presented for all three supported platforms for .NET Core (Windows, Linux, OS X). However, for some short and illustrative examples, I have decided to leave just one sample that will use Windows filenames and extensions (i.e. “dll” for libraries). This does not mean that those features are not available on Linux or OS X, it was done merely for conveince sake.
+> Most of the examples in this document will be presented for all three supported platforms for .NET Core (Windows, Linux, macOS). However, for some short and illustrative examples, I have decided to leave just one sample that will use Windows filenames and extensions (i.e. “dll” for libraries). This does not mean that those features are not available on Linux or macOS, it was done merely for conveince sake.
 
 ## Platform Invoke (P/Invoke)
 
@@ -60,7 +60,7 @@ The example above is pretty simple, but it does show off what is needed to invok
 
 The rest of the example is just invoking the method as you would any other managed method.
 
-The sample is similar for OS X. One thing that needs to change is, of course, the name of the library in the `DllImport` attribute, as OS X has a different scheme of naming dynamic libraries. The sample below uses the `getpid(2)` function to get the process ID of the application and print it out to the console.
+The sample is similar for macOS. One thing that needs to change is, of course, the name of the library in the `DllImport` attribute, as macOS has a different scheme of naming dynamic libraries. The sample below uses the `getpid(2)` function to get the process ID of the application and print it out to the console.
 
 ```cs
 using System;
@@ -154,7 +154,7 @@ With this in mind, let’s walk through the example:
 *   Lines #13 - 16 implement the delegate. For this simple example, we just want to output the handle to the console.
 *   Finally, in line #19 we invoke the external method and pass in the delegate.
 
-The Linux and OS X examples are shown below. For them, we use the `ftw` function that can be found in `libc`, the C library. This function is used to traverse directory hierarchies and it takes a pointer to a function as one of its parameters. The said function has the following signature: `int (*fn) (const char *fpath, const struct stat *sb, int typeflag)`.
+The Linux and macOS examples are shown below. For them, we use the `ftw` function that can be found in `libc`, the C library. This function is used to traverse directory hierarchies and it takes a pointer to a function as one of its parameters. The said function has the following signature: `int (*fn) (const char *fpath, const struct stat *sb, int typeflag)`.
 
 ```cs
 using System;
@@ -207,7 +207,7 @@ namespace PInvokeSamples {
 
 ```
 
-OS X example uses the same function, and the only difference is the argument to the `DllImport` attribute, as OS X keeps `libc` in a different place.
+macOS example uses the same function, and the only difference is the argument to the `DllImport` attribute, as macOS keeps `libc` in a different place.
 
 ```cs
 using System;
@@ -318,7 +318,7 @@ typedef struct _SYSTEMTIME {
 
 ```
 
-We already saw the Linux and OS X example for this in the previous example. It is shown again below.
+We already saw the Linux and macOS example for this in the previous example. It is shown again below.
 
 ```cs
 [StructLayout(LayoutKind.Sequential)]

docs/concepts/primer.md

@@ -16,7 +16,7 @@ ms.assetid: bbfe6465-329d-4982-869d-472e7ef85d93
 
 .NET is a general purpose development platform. It can be used for any kind of app type or workload where general purpose solutions are used. It has several key features that are attractive to many developers, including automatic memory management and modern programming languages, that make it easier to efficiently build high-quality applications. .NET enables a high-level programming environment with many convenience features, while providing low-level access to native memory and APIs.
 
-Multiple implementations of .NET are available, based on open [.NET Standards](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/dotnet-standards.md) that specify the fundamentals of the platform. They are separately optimized for different application types (e.g. desktop, mobile, gaming, cloud) and support many chips (e.g. x86/x64, ARM) and operating systems (e.g. Windows, Linux, iOS, Android, OS X). Open source is also an important part of the .NET ecosystem, with multiple .NET implementations and many libraries available under OSI-approved licenses.
+Multiple implementations of .NET are available, based on open [.NET Standards](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/dotnet-standards.md) that specify the fundamentals of the platform. They are separately optimized for different application types (e.g. desktop, mobile, gaming, cloud) and support many chips (e.g. x86/x64, ARM) and operating systems (e.g. Windows, Linux, iOS, Android, macOS). Open source is also an important part of the .NET ecosystem, with multiple .NET implementations and many libraries available under OSI-approved licenses.
 
 You can take a look at the [Overview of .NET implementations](editions-overview.md) document to figure out all of the different editions of the .NET Framework that are available, both Microsoft's and others.
 

docs/core-concepts/app-types.md

@@ -101,7 +101,7 @@ easier to deploy to the target machine, since you only deploy your application.
 
 Since the application carries the runtime within itself, you need to make an explicit choice which platforms your application 
 needs to run on. For instance, if you publish a self-contained application for Windows 10, that same application will 
-not work on OS X or Linux and vice versa. Of course, you can add or remove platforms during development at any given time. 
+not work on macOS or Linux and vice versa. Of course, you can add or remove platforms during development at any given time. 
 
 There are several steps to get to a self-contained application. The first is to remove any `"type": "platform"` properties 
 off of any dependencies you have. Second is to leave the dependency on `Microsoft.NETCore.App` as it will pull in

docs/core-concepts/core-sdk/cli/dotnet-publish.md

@@ -88,5 +88,5 @@ Publishes the current application using the `netcoreapp1.0` framework.
 
 `dotnet publish --framework netcoreapp1.0 --runtime osx.10.11-x64`
 
-Publishes the current application using the `netcoreapp1.0` framework and runtime for `OS X 10.10`. This RID has to 
+Publishes the current application using the `netcoreapp1.0` framework and runtime for `macOS 10.10`. This RID has to 
 exist in the `project.json` `runtimes` node.

docs/core-concepts/core-sdk/cli/overview.md

@@ -117,7 +117,7 @@ You can learn more about both of these in the [application types overview](../..
 
 ## Migration from DNX
 If you used DNX in RC1 of .NET Core, you may be wondering what happened to it and how do these new tools
-relate to the DNX tools. In short, the DNX tools have been replaced with the .NET Core CLI tools in RC2. 
+relate to the DNX tools. In short, the DNX tools have been replaced with the .NET Core CLI tools. 
 If you have existing projects or are just wondering how the commands map, you
 can use the [DNX to CLI migration document](../../dnx-migration.md) to get all of the details. 
 

docs/core-concepts/dnx-migration.md

@@ -16,7 +16,7 @@ ms.assetid: c0d70120-78c8-4d26-bb3c-801f42fc2366
 
 ## Overview
 With RC1 release of .NET Core and ASP.NET Core 1.0, we introduced DNX tooling to the world. With RC2 release of .NET 
-Core and ASP.NET Core 1.0 we are transitioning to the .NET Core CLI.
+Core and ASP.NET Core 1.0 we transitioned to the .NET Core CLI.
 
 As a slight refresher, let's recap what DNX was about. DNX was a runtime and a toolset used to build .NET Core and, 
 more specifically, ASP.NET Core 1.0 applications. It consisted of 3 main pieces:
@@ -105,11 +105,11 @@ In addition to using new commands when working with your code, there are three m
 3. Migrating off of any DNX APIs to their BCL counterparts. 
 
 ### Changing the global.json file
-The `global.json` file acts like a solution file for both the RC1 and RC2 projects. In order for the CLI tools (as well 
-as Visual Studio) to differentiate between RC1 and RC2, they use the `"sdk": { "version" }` property to make the distinction
-which project is RC1 or RC2. If `global.json` doesn't have this node at all, it is assumed to be the latest, that is RC2. 
+The `global.json` file acts like a solution file for both the RC1 and RC2 (or later) projects. In order for the CLI tools (as well 
+as Visual Studio) to differentiate between RC1 and later versions, they use the `"sdk": { "version" }` property to make the distinction
+which project is RC1 or later. If `global.json` doesn't have this node at all, it is assumed to be the latest. 
 
-In order to update the `global.json` file to RC2, either remove the property or set it to the exact version of the 
+In order to update the `global.json` file, either remove the property or set it to the exact version of the 
 tools that you wish to use, in this case **1.0.0-preview2-003118**:
 
 ```json

docs/core-concepts/libraries/libraries-with-cli.md

@@ -432,7 +432,7 @@ It's important to be able to test across platforms.  It's easiest to use [xUnit]
 
    * `netcoreapp1.0` listed as the only entry under `frameworks`.
    * `dnxcore50` and `portable-net45+win8` added as `imports` under `netcoreapp1.0`.
-   * A reference to `Microsoft.NETCore.App` version `1.0.0-rc2-3002702`.
+   * A reference to `Microsoft.NETCore.App` version `1.0.0`.
    * A reference to xUnit version `2.1.0`.
    * A reference to `dotnet-test-xunit` version `1.0.0-rc2-build10025`
    * A project reference to the library being tested.
@@ -450,7 +450,7 @@ It's important to be able to test across platforms.  It's easiest to use [xUnit]
             },
             "Microsoft.NETCore.App":{
                 "type":"platform",
-                "version":"1.0.0-rc2"
+                "version":"1.0.0"
             },
             "xunit":"2.1.0",
             "dotnet-test-xunit":"1.0.0-rc2",
@@ -640,7 +640,7 @@ Lib.1.0.0.symbols.nupkg
 
 And now you have the necessary files to publish a NuGet package!
 
-> For .NET Core RC2, libraries are expected to be distributed as NuGet packages. This can only be done with `dotnet pack` when using the .NET CLI.  It is important that you use `dotnet pack` instead of `dotnet publish` for this.  Using `dotnet publish` for a library will error out.
+> For .NET Core 1.0, libraries are expected to be distributed as NuGet packages. This can only be done with `dotnet pack` when using the .NET CLI.  It is important that you use `dotnet pack` instead of `dotnet publish` for this.  Using `dotnet publish` for a library will error out.
 
 If you want to build a NuGet package with release mode binaries, all you need to do is add the `-c`/`--configuration` switch and use `release` as the argument.
 

docs/core-concepts/rid-catalog.md

@@ -37,7 +37,7 @@ The RID graph is defined in a package called `Microsoft.NETCore.Platforms` in a
 see on the [CoreFX repo](https://github.com/dotnet/corefx/blob/master/pkg/Microsoft.NETCore.Platforms/runtime.json). If 
 you use this file, you will notice that some of the RIDs have an `"#import"` statement in them. These statements are 
 compatibility statements. That means that a RID that has an imported RID in it, can be a target for restoring packages 
-for that RID. Slightly confusing, but let's look at an example. Let's take a look at OS X:
+for that RID. Slightly confusing, but let's look at an example. Let's take a look at macOS:
 
 ```json
 "osx.10.11-x64": {
@@ -119,7 +119,7 @@ wish to check if new ones are added, please check back here.
     * `linuxmint.17.2-x64`
     * `linuxmint.17.3-x64`
 
-## OS X RIDs
+## macOS RIDs
 
 * `osx.10.10-x64`
 * `osx.10.11-x64`

docs/core-concepts/testing/unit-testing-with-dotnet-test.md

@@ -57,7 +57,7 @@ CD into that directory, and run `dotnet new` to create the source
 project.
 
 
-In RC2, `dotnet new` creates a console application project, so you'll want to
+The `dotnet new` command creates a console application project, so you'll want to
 make a modification to `project.json` so that you build a class library
 project. 
 

docs/getting-started/cli-console-app-tutorial.md

@@ -50,7 +50,7 @@ Let's do a quick walkthrough:
         "dependencies": {
             "Microsoft.NETCore.App": {
                 "type": "platform",
-                "version": "1.0.0-rc2-3002702"
+                "version": "1.0.0"
             }
         },   
        "frameworks": {
@@ -108,7 +108,7 @@ This project's only dependency so far is `"Microsoft.NETCore.App"`. The `depende
 ```javascript
 "dependencies": {
 "Microsoft.NETCore.App": {
-    "version": "1.0.0-rc2-3002702"
+    "version": "1.0.0"
 }
 },
 ```

docs/getting-started/devenv/using-visual-studio.md

@@ -237,7 +237,7 @@ Moving a PCL to a NetStandard library
 
 The PCL library that we built in the previous procedure is based on a `csproj` project file. In order to move it to NetStandard, the simplest solution is to manually move its code into a new empty **.NET Core Class Library** project.
 
-If you have pre-RC2 PCL libraries with a `xproj` file and a `project.json` file, you should be able to edit the `project.json` file instead, to reference `"NETStandard.Library": "1.5.0-rc2-24027"`, and target "netstandard1.3".
+If you have older PCL libraries with a `xproj` file and a `project.json` file, you should be able to edit the `project.json` file instead, to reference `"NETStandard.Library": "1.6.0"`, and target "netstandard1.3".
 
 
 

docs/getting-started/installing/index.md

@@ -17,4 +17,4 @@ ms.assetid: b7dd59c6-fda5-45d8-917d-c1313401b269
 *  [.NET Core System Requirements](system-reqs.md)
 *  [Installing .NET Core on Windows](installing-core-windows.md)
 *  [Installing .NET Core on Linux](installing-core-linux.md)
-*  [Installing .NET Core on OS X](installing-core-osx.md)
+*  [Installing .NET Core on macOS](installing-core-osx.md)

docs/getting-started/installing/installing-core-osx.md

@@ -1,6 +1,6 @@
 ---
-title: Installing .NET Core on OS X
-description: Installing .NET Core on OS X
+title: Installing .NET Core on macOS
+description: Installing .NET Core on macOS
 keywords: .NET, .NET Core
 author: blackdwarf
 manager: wpickett
@@ -12,7 +12,7 @@ ms.devlang: dotnet
 ms.assetid: f5a0ac25-aa26-42b1-b066-413d464762db
 ---
 
-# Installing .NET Core on OS X
+# Installing .NET Core on macOS
 
 The best way to get started is to follow our interactive guide on the [.NET Core website](http://go.microsoft.com/fwlink/p/?LinkID=798306&clcid=0x409). 
 

docs/getting-started/installing/system-reqs.md

@@ -44,8 +44,8 @@ For simple instructions on how to install it, visit the [.NET Core website](http
 * Red Hat Enterprise Linux 7.2
 * Ubuntu 14.04 LTS
 
-## OS X
+## macOS
 
-.NET Core is supported in the following versions of OS X (64-bit only):
+.NET Core is supported in the following versions of macOS (64-bit only):
 
-* OS X 10.11 (El Capitan) and above
+* macOS 10.11 (El Capitan) and above

docs/project-model/project-json-reference.md

@@ -478,11 +478,11 @@ For example:
         "System.Reflection.Metadata": "1.2.0-rc3-23811",
         "Microsoft.Extensions.JsonParser.Sources": {
           "type": "build",
-          "version": "1.0.0-rc2-16453"
+          "version": "1.0.0"
         },
         "Microsoft.Extensions.HashCodeCombiner.Sources": {
           "type": "build",
-          "version": "1.0.0-rc2-16054"
+          "version": "1.0.0"
         },
         "Microsoft.Extensions.DependencyModel": "1.0.0-*"
     }
@@ -800,7 +800,7 @@ For example:
     "frameworks": {
         "dnxcore50": {
             "dependencies": {
-                "Microsoft.Extensions.JsonParser.Sources": "1.0.0-rc2-23811"
+                "Microsoft.Extensions.JsonParser.Sources": "1.0.0"
             }
         }
     }

docs/scenarios/solution-authoring/cli-golden-path.md

@@ -22,7 +22,7 @@ The scripts in this document describe the steps necessary to build a number of t
 Prerequisites
 -------------
 
-These scripts assume that .NET Core RC2 CLI SDK preview and VS Code or another code editor are installed on the machine.
+These scripts assume that .NET Core 1.0 and VS Code or another code editor are installed on the machine.
 
 A solution using only .NET Core projects
 ----------------------------------------
@@ -36,7 +36,7 @@ A solution using only .NET Core projects
 
 1. Open a command-line on `GoldenCLI/src/Library`, then do `dotnet new`.
 2. Edit `GoldenCLI/src/Library/project.json` and remove the `buildOptions` section.
-3. Change dependencies to `"NETStandard.Library": "1.5.0-rc2-24027", "Newtonsoft.Json": "9.0.1-beta1"`.
+3. Change dependencies to `"NETStandard.Library": "1.6.0", "Newtonsoft.Json": "9.0.1-beta1"`.
 4. Under `frameworks`, change `netcoreapp1.0` to `netstandard1.5`.
 5. From `GoldenCLI/src/Library`, run  `dotnet restore`.
 6. Rename `Program.cs` to `Thing.cs`, and replace its contents with:

docs/scenarios/solution-authoring/f-golden-path.md

@@ -22,7 +22,7 @@ The scripts in this document describe the steps necessary to build a number of t
 Prerequisites
 -------------
 
-These scripts assume that .NET Core RC2 CLI SDK preview and VS Code or another code editor are installed on the machine.
+These scripts assume that .NET Core 1.0 and VS Code or another code editor are installed on the machine.
 
 A solution using only .NET Core projects
 ----------------------------------------
@@ -111,4 +111,4 @@ You should now be able to `dotnet run` and get "Hello World!" and "42" output to
 
 You should now be able to run the test and verify it passes by doing `dotnet test`.
 
-**Note**: This will temporarily fail on OS X. This is a known issue.
+**Note**: This will temporarily fail on macOS. This is a known issue.