Skip to content

November changes #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Nov 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/core/testing/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies on infrastructure. These tend to make tests slower and
more brittle, and thus should be reserved for integration tests. You
can avoid these hidden dependencies in your application code by following
the [Explicit Dependencies Principle](http://deviq.com/explicit-dependencies-principle/)
and using [Dependency Injection](https://docs.asp.net/en/latest/fundamentals/dependency-injection.html)
and using [Dependency Injection](https://docs.asp.net/en/latest/standard/dependency-injection.html)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this link shouldn't be changed

to request your dependencies from the framework. You can also keep your
unit tests in a separate project from your integration tests, and ensure
your unit test project doesn’t have references to or dependencies on
Expand Down
2 changes: 1 addition & 1 deletion docs/framework/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ms.devlang: dotnet
ms.assetid: a27b2ae4-154e-4b2b-b221-0c4c05185274
---

# .NET Framework
# .NET Framework on Docker Guide

The .NET Framework is a development platform for building applications for Windows, Windows Phone, Windows Server, and Microsoft Azure. It consists of the common language runtime (CLR) and the .NET Framework class library, which includes classes, interfaces, and value types that support an extensive range of technologies. The .NET Framework provides a managed execution environment, simplified development and deployment, and integration with a variety of programming languages, including Visual Basic, Visual C# and F#.

Expand Down
7 changes: 5 additions & 2 deletions docs/about/index.md → docs/standard/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ ms.assetid: 2e38e9d9-8284-46ee-a15f-199adc4f26f4

# About .NET

> [!NOTE]
This article is going to be rewritten.

> Check out the ["Getting Started with .NET Core" tutorials](../core/getting-started.md) to learn how to create a simple .NET Core application. It only takes a few minutes to get your first app up and running.

.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.
Expand All @@ -22,9 +25,9 @@ C#, F# and Visual Basic are popular languages that target and rely on the .NET p

There is great diversity across these languages, in philosophy and syntax, but also symmetry provided by a shared type system. This type system is provided by the underlying runtime environment. .NET was designed around the idea of a "common language runtime" that could support the requirements of diverse languages -- for example, dynamic and statically typed languages -- and enable interoperability between them. For example, it's possible to pass a collection of `People` objects between languages with no loss in semantics or capability.

Multiple [.NET implementations and products](products.md) 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 (for example, desktop, mobile, gaming, cloud) and support many chips (for example, x86/x64, ARM) and operating systems (for example, 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.
Multiple [.NET implementations and products](concepts.md) 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 (for example, desktop, mobile, gaming, cloud) and support many chips (for example, x86/x64, ARM) and operating systems (for example, 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.

- Learn about [.NET](../standard/index.md)
- Learn about [.NET](index.md)
- Learn about [C#](../csharp/index.md)
- Learn about [F#](../fsharp/index.md)
- Browse the [.NET API Library](../../api/index.md)
Expand Down
10 changes: 7 additions & 3 deletions docs/about/products.md → docs/standard/concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ms.devlang: dotnet
ms.assetid: 2e38e9d9-8284-46ee-a15f-199adc4f26f4
---

# .NET Products
#.NET Concepts

>[!WARNING]
This article will be rewritten.

.NET is a very flexible, general purpose and inherently cross-platform [specification](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/dotnet-standards.md) for building developer products. It is used for all of the most popular app categories: desktop, mobile, cloud, gaming and IoT.

Expand Down Expand Up @@ -64,7 +67,8 @@ You can build Web and Cloud apps for Windows and Linux.
- [ASP.NET](http://www.asp.net/) for Windows with the [.NET Framework](#net-framework)
- [ASP.NET Core](http://docs.asp.net/) for Windows, macOS and Linux with [.NET Core](#net-core)

## .NET Implementations
.NET Implementations
--------------------

Major commercial and open source .NET implementations are listed below, in alphabetical order.

Expand All @@ -80,7 +84,7 @@ The following are the main characteristics of .NET Core:

**Cross-platform** - .NET Core supports three operating systems families: Linux, Windows and macOS. .NET Core apps are cross-platform by default. You can write apps and libraries that run unmodified across supported OSes.

**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). Documentation is [CC-BY](https://github.com/dotnet/docs/blob/master/license.txt). .NET Core also makes use of a significant set of open source industry dependencies, listed in the [.NET Core release notes](https://github.com/dotnet/core/releases).
**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). Documentation is [CC-BY](https://github.com/dotnet/core-docs/blob/master/license.txt). .NET Core also makes use of a significant set of open source industry dependencies, listed in the [.NET Core release notes](https://github.com/dotnet/core/releases).

**Natural acquisition** - NET Core is distributed in several forms, aligning with specific developer needs. You can acquire .NET Core with the [.NET Core SDK](https://dot.net/core) installer (or zips) or via OS-specific package managers, such as APT and Yum. [Official .NET Core Docker images](https://hub.docker.com/r/microsoft/dotnet/) are available on Docker Hub. Higher-level framework libraries and the larger .NET library ecosystem are available on [NuGet](http://www.nuget.org/).

Expand Down
6 changes: 3 additions & 3 deletions docs/standard/frameworks.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Frameworks
description: Frameworks
title: Frameworks and Targets
description: Explains the concepts of framework targets when writing .NET code.
keywords: .NET, .NET Core
author: richlander
manager: wpickett
Expand All @@ -12,7 +12,7 @@ ms.devlang: dotnet
ms.assetid: 6ef56a2e-593d-497b-925a-1e25bb6df2e6
---

# Frameworks
# Frameworks and Targets

The .NET ecosystem has a concept of frameworks. Frameworks define the API that you can use to target a particular platform. The .NET Framework 4.6 is one of those platforms. Frameworks are used in Visual Studio and other IDEs and editors to provide you with the correct set of APIs. They are also used by NuGet, for both production and consumption of NuGet packages, to ensure that you produce and use appropriate packages (and underlying assets) for the framework you are targeting. One can think of frameworks as one of the key currencies in the .NET ecosystem. The concept is there for correctness, to help you and your customers avoid seeing @System.MissingMethodException and friends at runtime.

Expand Down
18 changes: 18 additions & 0 deletions docs/standard/getting-started.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
title: Getting Started
description: Getting started with .NET
keywords: .NET, .NET Core
author: cartermp
manager: wpickett
ms.date: 10/17/2016
ms.topic: article
ms.prod: .net-core
ms.technology: .net-core-technologies
ms.devlang: dotnet
ms.assetid: bbfe6465-329d-4982-869d-472e7ef85d93
---

# Getting Started

> [!NOTE]
This article is in-progress.
Loading