Sync

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -205,12 +205,17 @@ samples/AngularSample/src/AngularSample/wwwroot/lib
 project.lock.json
 samples/WebApplication1/src/WebApplication1/wwwroot/lib/
 
-/samples/linq/csharp/aggregate/*.xproj
-/samples/linq/csharp/aggregate/*.sln
+/samples/core/linq/csharp/aggregate/*.xproj
+/samples/core/linq/csharp/aggregate/*.sln
 
 _site/
-api_ref/
+api_src/
+api/
 _themes/
 log/
 .optemp/
 .openpublishing.buildcore.ps1
+# Spelling add-on file for VS Code.
+spell.json
+samples/framework/docker/MVCRandomAnswerGenerator/containerImage
+.DS_Store

.localization-config

@@ -0,0 +1,34 @@
+{
+  "Filters": [
+    {
+      "Files": [
+        "**/*.md"
+      ],
+      "Priorities": [
+        {
+          "Priority": "ht",
+          "Locales": [
+            "cs-cz",
+            "de-de",
+            "es-es",
+            "fr-fr",
+            "it-it",
+            "ja-jp",
+            "ko-kr",
+            "pl-pl",
+            "pt-br",
+            "ru-ru",
+            "tr-tr",
+            "zh-cn",
+            "zh-tw"
+          ],
+          "Type": "ht"
+        }
+      ]
+    }
+  ],
+  "IncludeDependencies": true,
+  "AutoPush": true,
+  "XliffVersion": "1.2",
+  "UseJavascriptMarkdownTransformer": true
+}

.openpublishing.publish.config.json

@@ -1,36 +1,53 @@
 {
-  "need_generate_pdf": false,
-  "need_generate_intellisense": false,
-  "git_repository_branch_open_to_public_contributors": "master",
-  "git_repository_url_open_to_public_contributors": "https://github.com/dotnet/core-docs",
-  "docsets_to_publish": [
-    {
-      "docset_name": "core-docs",
-      "build_source_folder": ".",
-      "build_output_subfolder": ".",
-      "locale": "en-us",
-      "version": 0,
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs"
-    }
-  ],
-  "notification_subscribers": [],
-  "skip_source_output_uploading": false,
-  "dependent_repositories": [
-    {
-      "path_to_root": "_themes",
-      "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master"
+    "need_generate_pdf": false,
+    "need_generate_intellisense": false,
+    "need_preview_pull_request": true,
+    "need_pr_comments": false,
+    "need_generate_pdf_url_template": true,
+    "git_repository_branch_open_to_public_contributors": "master",
+    "git_repository_url_open_to_public_contributors": "https://github.com/dotnet/core-docs",
+    "branch_target_mapping": {
+        "live": [
+            "Publish",
+            "Pdf"
+        ],
+        "master": [
+            "Publish",
+            "Pdf"
+        ]
     },
-    {
-      "path_to_root": "api_ref",
-      "url": "https://github.com/docascode/coreapi.git",
-      "branch": "master"
-    }
-  ]
+    "docsets_to_publish": [{
+        "docset_name": "core-docs",
+        "build_source_folder": ".",
+        "build_output_subfolder": ".",
+        "locale": "en-us",
+        "version": 0,
+        "open_to_public_contributors": true,
+        "type_mapping": {
+            "Conceptual": "Content",
+            "ManagedReference": "Content",
+            "RestApi": "Content"
+        },
+        "build_entry_point": "docs"
+    }],
+    "notification_subscribers": [],
+    "Targets": {
+        "Pdf": {
+            "template_folder": "_themes.pdf"
+        }
+    },
+    "skip_source_output_uploading": false,
+    "dependent_repositories": [{
+        "path_to_root": "_themes",
+        "url": "https://github.com/Microsoft/templates.docs.msft",
+        "branch": "master"
+    }, {
+        "path_to_root": "api_ref",
+        "url": "https://github.com/docascode/coreapi.git",
+        "branch": "master"
+    }, {
+        "path_to_root": "_themes.pdf",
+        "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+        "branch": "master"
+    }]
 }

.travis.yml

@@ -0,0 +1,19 @@
+language: csharp
+
+matrix:
+  include:
+    - os: linux # Ubuntu 14.04
+      dist: trusty
+      sudo: required
+      dotnet: 1.0.0-preview2-003121
+    - os: osx # OSX 10.11
+      osx_image: xcode7.2
+      dotnet: 1.0.0-preview2-003121
+
+script:
+  # Run a new console app
+  - mkdir -p "test/test-dotnet-new" && pushd "test/test-dotnet-new"
+  - dotnet new
+  - dotnet restore
+  - dotnet --verbose run a b
+  - popd

CONTRIBUTING.md

@@ -1,9 +1,8 @@
-Contributing
-============
+# Contributing
 
 Thank you for your interest in contributing to the .NET documentation!
 
-In this topic, you'll see the basic process for adding or updating content in the [.NET documentation site](https://docs.microsoft.com/dotnet). For the detailed step-by-step process and instructions, please see the [official guide](https://github.com/Microsoft/Docs/blob/master/readme.md) in the [Microsoft/Docs](https://github.com/Microsoft/Docs) repo.
+In this topic, you'll see the basic process for adding or updating content in the [.NET documentation site](https://docs.microsoft.com/dotnet). 
 
 In this topic, we'll cover: 
 
@@ -54,7 +53,7 @@ Also, remove the "wrench" icon (🔧) from the TOC and the file heading, if appl
         /porting
           porting_sample.cs
 
-**Step 5:** Submit a Pull Request (PR) from your branch to `dotnet/core-docs/master`.
+**Step 5:** Submit a Pull Request (PR) from your branch to `dotnet/docs/master`.
 
 If your PR is addressing an existing issue, add the `Fixes #Issue_Number` keyword to the commit message or PR description, so the issue can be automatically closed when the PR is merged. For more information, see [Closing issues via commit messages](https://help.github.com/articles/closing-issues-via-commit-messages/).
 
@@ -77,7 +76,7 @@ Below is a short list of guiding rules that you should keep in mind when you are
 - **DO** follow the [GitHub Flow workflow](https://guides.github.com/introduction/flow/). 
 - **DO** blog and tweet (or whatever) about your contributions, frequently!
 
-> Note: you might notice that some of the topics are not currently following all the guidelines specified here and on the [style guide](./styleguide/template.md) as well. We're working towards achieving consistency throughout the site. Check the list of [open issues](https://github.com/dotnet/core-docs/issues?q=is%3Aissue+is%3Aopen+label%3Aguidelines-adherence) we're currently tracking for that specific goal. 
+> Note: you might notice that some of the topics are not currently following all the guidelines specified here and on the [style guide](./styleguide/template.md) as well. We're working towards achieving consistency throughout the site. Check the list of [open issues](https://github.com/dotnet/docs/issues?q=is%3Aissue+is%3Aopen+label%3Aguidelines-adherence) we're currently tracking for that specific goal. 
 
 ## Building the docs
 
@@ -89,15 +88,15 @@ There are several ways to use DocFX, and most of them are covered in the [DocFX
 The following instructions use the [command-line based](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool) version of the tool. 
 If you are comfortable with other ways listed on the link above, feel free to use those. 
 
-**Note:** please note that as of now, DocFX requires the .NET Framework on Windows or Mono for Linux or macOS. We'll be working towards porting it to .NET Core in the future. 
+**Note:** Currently DocFX requires the .NET Framework on Windows or Mono (for Linux or macOS). We hope to port it to .NET Core in the future. 
 
 You can build and preview the resulting site locally using a built-in web server. Navigate to the core-docs folder on your machine and type the following command:
 
 ```
-docfx .\docfx.json --serve
+docfx -t default --serve
 ```
 
-This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/docs/[path]`, such as http://localhost:8080/docs/articles/.
+This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as http://localhost:8080/articles/welcome.html.
 
 **Note:** the local preview currently doesn't contain any themes at the moment so the look and feel won't be the same as in the documentation site. We're working towards fixing that experience.
 
@@ -110,25 +109,21 @@ All samples should be complete applications or libraries. Where the sample creat
 it should include unit tests or an application that lets readers run the code.
 
 The samples are organized in directories that match the directories under
-docs in this repo:
+docs in this repo.
 
-- `getting-started` contains getting started samples. 
+- `core` contains .NET Core samples. These are referenced by topics under `/docs/core`.
 
-   * Each top-level section of our documentation contains a "getting-started" or "tutorials" section.  These topics and their associated samples represent the first look(s) at a topic area. If your sample's goal is to help beginners get started with the platform or the technology, place your sample under `samples/getting-started`. There should be a directory that matches the section for your tutorial (such as `samples/getting-started/csharp`), but if not, simply create a new folder.
+   * The `core` directory contains samples that highlight .NET Core. The purpose of your sample should be to teach developers something about .NET Core. This includes the framework packaging, the new tooling, or the cross-platform experience. Our CI build server builds these samples on multiple supported platforms. Therefore, every sample must be configured to build on Linux, Mac, and Windows.
 
-- `core-projects` contains .NET Core samples. These are referenced by topics under `/docs/core`.
+- `csharp` contains C# language samples. These are referenced by topics under `docs/csharp`.
 
-   * The `core-projects` directory contains samples that highlight .NET Core. The purpose of your sample should be to teach developers something about .NET Core. This includes the framework packaging, the new tooling, or the cross-platform experience.
+   * The `csharp` directory contains samples where the purpose is to explain the C# language. While these samples will use frameworks and libraries, their focus is on the C# language. Our CI build server builds these samples on multiple supported platforms. Therefore, every sample must be configured to build on Linux, Mac, and Windows.
 
-- `csharp-language` contains C# language samples. These are referenced by topics under `docs/csharp`.
+- `framework` contains .NET Framework samples. These are referenced by topics under many different locations in the documentation. These samples build only on Windows where the .NET framework and Visual Studio are installed.
 
-   * The `csharp-language` directory contains samples where the purpose is to explain the C# language. While these samples will use frameworks and libraries, their focus is on the C# language.
+   * The `framework` directory contains samples that highlight .NET with platform dependencies. These may include migration samples, platform specific samples, or other samples that require the framework or the Windows based tools. Our CI build server builds these samples on Windows only. Do not place any samples here that should be checked for cross-platform builds.
 
- - `linq` contains all the 101 LINQ samples that were originally created when LINQ was developed. These don't have topics associated with them yet.
-
-   * The `linq` directory contains samples that are specific to understanding the concepts and implementation behind Language Integrated Query (LINQ). These samples should be focused on the language support and library methods that are specific to LINQ. Other samples my use the LINQ libraries, but unless they are focused on explaining LINQ concepts, they should be in one of the other directories.
-
-We will expand these directories as the core-docs repository adds new content. 
+We will expand these directories as the core-docs repository adds new content. For example, we will add Xamarin directories, like `xamarin-ios` and `xamarin-android` directories. 
 
 Sample code may fit more than one of these areas. In those cases, place the sample so it matches
 the topics you are covering in your documents. Ask yourself what readers will learn from reading
@@ -143,4 +138,4 @@ with `http://docs.microsoft.com/dotnet/articles`.
 
 Your topic will also contain links to the sample. Link directly to the sample's folder on GitHub.
 
-For more information, see the [Samples Readme](https://github.com/dotnet/core-docs/blob/master/samples/README.md).
+For more information, see the [Samples Readme](https://github.com/dotnet/docs/blob/master/samples/README.md).

README.md

@@ -1,12 +1,13 @@
-.NET Core Documentation
-=======================
+#.NET Documentation
 
-This repo contains work-in-progress documentation for .NET Core. Please see the [Contributing Guide](CONTRIBUTING.md) to get set up and take a look at our [issues list](https://github.com/dotnet/core-docs/issues). 
+This repo contains work-in-progress documentation for .NET. To contribute, see the [Contributing Guide](CONTRIBUTING.md) and the [issues list](https://github.com/dotnet/docs/issues). 
 
-We very much welcome contributions to help us provide a complete set of .NET Core docs sooner. Feel free to use (copy/paste) documentation from [.NET Framework docs](https://msdn.microsoft.com/library/w0x726c2.aspx) as a starting point for .NET Core docs. We will likely port higher-quality .NET Core content to the .NET Framework docs, such that investments in this repo have a broader impact than .NET Core users. We expect that [Xamarin](http://developer.xamarin.com/api/root/classlib/), [Mono](http://docs.go-mono.com/?link=root%3a%2fclasslib) and [Unity](http://docs.unity3d.com/Manual/index.html) will also use this documentation.
+We welcome contributions to help us improve and complete the .NET docs. Feel free to copy/paste documentation from [.NET Framework docs](https://msdn.microsoft.com/library/w0x726c2.aspx) as a starting point for .NET docs. We anticipate that [Xamarin](http://developer.xamarin.com/api/root/classlib/), [Mono](http://docs.go-mono.com/?link=root%3a%2fclasslib) and [Unity](http://docs.unity3d.com/Manual/index.html) will also use this documentation.
 
-Samples
+Samples Build Status
 ===
-Current build status for .NET core samples:
 
-![](https://dendeli-ms.visualstudio.com/_apis/public/build/definitions/9fc8ed28-e0a3-4cde-b7a6-a977d004e315/1/badge)
+
+| Framework | Ubuntu 16.04 (x64) | Windows Server 2012 R2 (x64)  |
+| ------------- |------------| -----|
+| .NET Core     | [![Build Status](http://seoul.westus.cloudapp.azure.com/buildStatus/icon?job=dotnetcore-samples-ubuntu1604-x64)](http://seoul.westus.cloudapp.azure.com/job/dotnetcore-samples-ubuntu1604-x64/) | [![Build Status](http://seoul.westus.cloudapp.azure.com/buildStatus/icon?job=dotnetcore-samples-windows2012-x64)](http://seoul.westus.cloudapp.azure.com/job/dotnetcore-samples-windows2012-x64/) |