Skip to content

Commit af6c257

Browse files
DuncanmaDuncanma
committed
Merge branch 'master' into devtheme
2 parents 6d4406f + d652eee commit af6c257

File tree

9 files changed

+3115
-16
lines changed

9 files changed

+3115
-16
lines changed

‎docs/core/docker/index.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: Docker and .NET Core
3+
description: Docker and .NET Core
4+
keywords: Docker, .NET, .NET Core
5+
author: spboyer
6+
manager: wpickett
7+
ms.date: 09/01/2016
8+
ms.topic: article
9+
ms.prod: .net-core
10+
ms.technology: .net-core-technologies
11+
ms.devlang: dotnet
12+
ms.assetid: cae32148-aef4-4e64-a7f0-88072bad4400
13+
---
14+
15+
# Docker and .NET Core
16+
17+
The following tutorials are available for learning about using Docker with .NET Core.
18+
19+
- [Building Docker Images for .NET Core Applications](building-net-docker-images.md)
20+
21+
22+
For tutorials about developing ASP.NET Core web applications, we suggest you head over to [ASP.NET Core documentation](https://docs.asp.net).

‎docs/core/porting/libraries.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ You can target .NET Core with the traditional project system in Visual Studio, b
241241

242242
If you have more advanced project system needs, this should be your choice. Note that if you wish to multitarget by generating platform-specific assemblies like with the `xproj` project system, you'll need to create a "Bait and Switch" PCL, as described in [How to Make Portable Class Libraries Work for You](https://blogs.msdn.microsoft.com/dsplaisted/2012/08/27/how-to-make-portable-class-libraries-work-for-you/).
243243

244-
## Retargeting your .NET Framework Code to .NET Framework 4.6.1
244+
## Retargeting your .NET Framework Code to .NET Framework 4.6.2
245245

246-
If your code is not targeting .NET Framework 4.6.1, it's recommended that you retarget. This ensures that you can use the latest API alternatives for cases where the .NET Standard can't support existing APIs.
246+
If your code is not targeting .NET Framework 4.6.2, it's recommended that you retarget. This ensures that you can use the latest API alternatives for cases where the .NET Standard can't support existing APIs.
247247

248248
For each of your projects in Visual Studio you wish to port, do the following:
249249

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,4 @@ will be seamless, and you can concentrate on the problem at hand. The
252252
tools will run automatically.
253253

254254
> [!TIP]
255-
> On Windows platform you can you can use MSTest. You can find out more in the [Using MSTest on Windows document](./using-mstest-on-windows.md).
255+
> On Windows platform you can use MSTest. Find out more in the [Using MSTest on Windows document](./using-mstest-on-windows.md).

‎docs/core/tools/project-json.md

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,124 @@ ms.assetid: 3aef32bd-ee2a-4e24-80f8-a2b615e0336d
1717
> [!NOTE]
1818
> This topic is preliminary and subject to change in the next release. You can track the status of this issue through our public GitHub issue tracker.
1919
20+
## Overview
21+
22+
{
23+
"name": String,
24+
"version": String,
25+
"description": String,
26+
"copyright": String,
27+
"title": String,
28+
"entryPoint": String,
29+
"testRunner": String,
30+
"authors": String[],
31+
"language": String,
32+
"embedInteropTypes": Boolean,
33+
"preprocess": String or String[],
34+
"shared": String or String[],
35+
"dependencies": Object,
36+
"tools": Object,
37+
"scripts": Object,
38+
"buildOptions": Object {
39+
"define": String[],
40+
"nowarn": String[],
41+
"additionalArguments": String[],
42+
"warningsAsErrors": Boolean,
43+
"allowUnsafe": Boolean,
44+
"emitEntryPoint": Boolean,
45+
"optimize": Boolean,
46+
"platform": String,
47+
"languageVersion": String,
48+
"keyFile": String,
49+
"delaySign": Boolean,
50+
"publicSign": Boolean,
51+
"debugType": String,
52+
"xmlDoc": Boolean,
53+
"preserveCompilationContext": Boolean,
54+
"outputName": String,
55+
"compilerName": String,
56+
"compile": Object {
57+
"include": String or String[],
58+
"exclude": String or String[],
59+
"includeFiles": String or String[],
60+
"excludeFiles": String or String[],
61+
"builtIns": Object,
62+
"mappings": Object
63+
},
64+
"embed": Object {
65+
"include": String or String[],
66+
"exclude": String or String[],
67+
"includeFiles": String or String[],
68+
"excludeFiles": String or String[],
69+
"builtIns": Object,
70+
"mappings": Object
71+
},
72+
"copyToOutput": Object {
73+
"include": String or String[],
74+
"exclude": String or String[],
75+
"includeFiles": String or String[],
76+
"excludeFiles": String or String[],
77+
"builtIns": Object,
78+
"mappings": Object
79+
}
80+
},
81+
"publishOptions": Object {
82+
"include": String or String[],
83+
"exclude": String or String[],
84+
"includeFiles": String or String[],
85+
"excludeFiles": String or String[],
86+
"builtIns": Object,
87+
"mappings": Object
88+
},
89+
"runtimeOptions": Object {
90+
"configProperties": Object {
91+
"System.GC.Server": Boolean,
92+
"System.GC.Concurrent": Boolean,
93+
"System.GC.RetainVM": Boolean,
94+
"System.Threading.ThreadPool.MinThreads": Integer,
95+
"System.Threading.ThreadPool.MaxThreads": Integer
96+
},
97+
"framework": Object {
98+
"name": String,
99+
"version": String,
100+
},
101+
"applyPatches": Boolean
102+
},
103+
"packOptions": Object {
104+
"summary": String,
105+
"tags": String[],
106+
"owners": String[],
107+
"releaseNotes": String,
108+
"iconUrl": String,
109+
"projectUrl": String,
110+
"licenseUrl": String,
111+
"requireLicenseAcceptance": Boolean,
112+
"repository": Object {
113+
"type": String,
114+
"url": String
115+
},
116+
"files": Object {
117+
"include": String or String[],
118+
"exclude": String or String[],
119+
"includeFiles": String or String[],
120+
"excludeFiles": String or String[],
121+
"builtIns": Object,
122+
"mappings": Object
123+
}
124+
},
125+
"analyzerOptions": Object {
126+
"languageId": String
127+
},
128+
"configurations": Object,
129+
"frameworks": Object {
130+
"dependencies": Object,
131+
"frameworkAssemblies": Object,
132+
"wrappedProject": String,
133+
"bin": Object,
134+
"imports": String
135+
}
136+
}
137+
20138
## name
21139
Type: String
22140

@@ -1165,6 +1283,7 @@ For example:
11651283
```
11661284

11671285
### files
1286+
Type: Object
11681287

11691288
#### include
11701289
Type: String or String[] with a globbing pattern.

‎docs/core/tutorials/using-on-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Starting from the solution obtained with the previous script, execute the follow
165165
The application should build and hit the breakpoint. The application output should be "The answer is 42.".
166166

167167
> [!TIP]
168-
> On Windows platform you can you can use MSTest. You can find out more in the [Using MSTest on Windows document](../testing/using-mstest-on-windows.md).
168+
> On Windows platform you can use MSTest. Find out more in the [Using MSTest on Windows document](../testing/using-mstest-on-windows.md).
169169

170170
Moving a library from netstandard 1.4 to 1.3
171171
--------------------------------------------

‎docs/fsharp/index.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ The [Tutorials](tutorials/index.md) also have step-by-step guides for various sk
3434

3535
If you know your way around F#, you'll find a lot of use in the [Language Reference](language-reference/index.md), which documents each aspect of the language thoroughly, supplemented by numerous code samples. You'll also find a lot of use in the [F# Core Library Reference](https://msdn.microsoft.com/en-us/visualfsharpdocs/conceptual/fsharp-core-library-reference).
3636

37+
## The F# Software Foundation
38+
39+
Although Microsoft is the primary developer of the F# language and Visual F# Tooling, F# is also backed by an independent foundation, the F# Software Foundation (FSSF).
40+
41+
The mission of the F# Software Foundation is to promote, protect, and advance the F# programming language, and to support and facilitate the growth of a diverse and international community of F# programmers.
42+
43+
To learn more and get involved, check out [fsharp.org](http://fsharp.org).
44+
3745
## Documentation
3846

3947
* [Getting Started](tutorials/getting-started/index.md)
@@ -46,4 +54,5 @@ If you know your way around F#, you'll find a lot of use in the [Language Refere
4654

4755
* [F# Learning Resources](http://fsharp.org/learn.html)
4856
* [F# for Fun and Profit](https://swlaschin.gitbooks.io/fsharpforfunandprofit/content/)
57+
* [F# Snippets](http://www.fssnip.net)
4958
* [F# Software Foundation](http://fsharp.org)

‎docs/standard/frameworks.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Frameworks
44
keywords: .NET, .NET Core
55
author: richlander
66
manager: wpickett
7-
ms.date: 06/20/2016
7+
ms.date: 09/01/2016
88
ms.topic: article
99
ms.prod: .net-core
1010
ms.technology: .net-core-technologies
@@ -14,7 +14,7 @@ ms.assetid: 6ef56a2e-593d-497b-925a-1e25bb6df2e6
1414

1515
# Frameworks
1616

17-
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 [MissingMethodException](https://docs.microsoft.com/dotnet/core/api/System.MissingMethodException) and friends at runtime.
17+
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.
1818

1919
## Framework Versions
2020

@@ -23,10 +23,11 @@ The table below defines the set of frameworks that you can use, how they are ref
2323
| Framework | Latest Version | Target Framework Moniker (TFM) | Compact Target Framework Moniker (TFM) | .NET Standard Version | Metapackage |
2424
|:--------: | :--: | :--: | :--: | :--: | :--: | :--: |
2525
| .NET Standard | 1.6 | .NETStandard,Version=1.6 | netstandard1.6 | N/A | [NETStandard.Library](https://www.nuget.org/packages/NETStandard.Library)|
26-
| .NET Core Application | 1.0 | .NETCoreApp,Version=1.0 | netcoreapp1.0 | 1.5 | [Microsoft.NETCore.App](https://www.nuget.org/packages/Microsoft.NETCore.App)|
27-
| .NET Framework | 4.6.1 | .NETFramework,Version=4.6.1 | net461 | 1.4 | N/A |
26+
| .NET Core Application | 1.0 | .NETCoreApp,Version=1.0 | netcoreapp1.0 | 1.6 | [Microsoft.NETCore.App](https://www.nuget.org/packages/Microsoft.NETCore.App)|
27+
| .NET Framework | 4.6.2 | .NETFramework,Version=4.6.2 | net462 | 1.5 | N/A |
2828

29-
Note: These framework versions are the latest stable versions. There may be pre-released versioned as well that are not described by this table.
29+
> [!NOTE]
30+
> These framework versions are the latest stable versions. There may be pre-released versions as well that are not described by this table.
3031
3132
## Writing about Frameworks
3233

0 commit comments

Comments
 (0)