Skip to content

Commit 87d533e

Browse files
authored
Merge pull request #5089 from dotnet/master
Update Live with current Master
2 parents cb70f85 + 49c8e85 commit 87d533e

File tree

5 files changed

+85
-79
lines changed

5 files changed

+85
-79
lines changed

docs/framework/data/adonet/connection-string-syntax.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ You can also set the <xref:System.Data.SqlClient.SqlConnectionStringBuilder.Data
133133
The <xref:System.Data.OleDb.OleDbConnection.ConnectionString%2A> property of a <xref:System.Data.OleDb.OleDbConnection> allows you to get or set a connection string for an OLE DB data source, such as Microsoft Access. You can also create an `OleDb` connection string at run time by using the <xref:System.Data.OleDb.OleDbConnectionStringBuilder> class.
134134

135135
### OleDb Connection String Syntax
136-
You must specify a provider name for an <xref:System.Data.OleDb.OleDbConnection> connection string. The following connection string connects to a Microsoft Access database using the Jet provider. Note that the `UserID` and `Password` keywords are optional if the database is unsecured (the default).
136+
You must specify a provider name for an <xref:System.Data.OleDb.OleDbConnection> connection string. The following connection string connects to a Microsoft Access database using the Jet provider. Note that the `User ID` and `Password` keywords are optional if the database is unsecured (the default).
137137

138-
```
138+
```
139139
Provider=Microsoft.Jet.OLEDB.4.0; Data Source=d:\Northwind.mdb;User ID=Admin;Password=;
140140
```
141141

docs/standard/clr.md

Lines changed: 64 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Common Language Runtime (CLR)"
33
ms.custom: "updateeachrelease"
4-
ms.date: "10/17/2017"
4+
ms.date: "04/16/2018"
55
ms.prod: ".net"
66
ms.technology: dotnet-standard
77
ms.topic: "article"
@@ -25,65 +25,68 @@ ms.workload:
2525
- "dotnet"
2626
- "dotnetcore"
2727
---
28-
# Common Language Runtime (CLR)
29-
The .NET Framework provides a run-time environment called the common language runtime, which runs the code and provides services that make the development process easier.
30-
31-
Compilers and tools expose the common language runtime's functionality and enable you to write code that benefits from this managed execution environment. Code that you develop with a language compiler that targets the runtime is called managed code; it benefits from features such as cross-language integration, cross-language exception handling, enhanced security, versioning and deployment support, a simplified model for component interaction, and debugging and profiling services.
32-
28+
# Common Language Runtime (CLR) overview
29+
30+
The .NET Framework provides a run-time environment called the common language runtime, which runs the code and provides services that make the development process easier.
31+
32+
Compilers and tools expose the common language runtime's functionality and enable you to write code that benefits from this managed execution environment. Code that you develop with a language compiler that targets the runtime is called managed code; it benefits from features such as cross-language integration, cross-language exception handling, enhanced security, versioning and deployment support, a simplified model for component interaction, and debugging and profiling services.
33+
3334
> [!NOTE]
34-
> Compilers and tools are able to produce output that the common language runtime can consume because the type system, the format of metadata, and the runtime environment (the virtual execution system) are all defined by a public standard, the ECMA Common Language Infrastructure specification. For more information, see [ECMA C# and Common Language Infrastructure Specifications](https://www.visualstudio.com/license-terms/ecma-c-common-language-infrastructure-standards/).
35-
36-
To enable the runtime to provide services to managed code, language compilers must emit metadata that describes the types, members, and references in your code. Metadata is stored with the code; every loadable common language runtime portable executable (PE) file contains metadata. The runtime uses metadata to locate and load classes, lay out instances in memory, resolve method invocations, generate native code, enforce security, and set run-time context boundaries.
37-
38-
The runtime automatically handles object layout and manages references to objects, releasing them when they are no longer being used. Objects whose lifetimes are managed in this way are called managed data. Garbage collection eliminates memory leaks as well as some other common programming errors. If your code is managed, you can use managed data, unmanaged data, or both managed and unmanaged data in your .NET Framework application. Because language compilers supply their own types, such as primitive types, you might not always know (or need to know) whether your data is being managed.
39-
40-
The common language runtime makes it easy to design components and applications whose objects interact across languages. Objects written in different languages can communicate with each other, and their behaviors can be tightly integrated. For example, you can define a class and then use a different language to derive a class from your original class or call a method on the original class. You can also pass an instance of a class to a method of a class written in a different language. This cross-language integration is possible because language compilers and tools that target the runtime use a common type system defined by the runtime, and they follow the runtime's rules for defining new types, as well as for creating, using, persisting, and binding to types.
41-
42-
As part of their metadata, all managed components carry information about the components and resources they were built against. The runtime uses this information to ensure that your component or application has the specified versions of everything it needs, which makes your code less likely to break because of some unmet dependency. Registration information and state data are no longer stored in the registry where they can be difficult to establish and maintain. Instead, information about the types you define (and their dependencies) is stored with the code as metadata, making the tasks of component replication and removal much less complicated.
43-
44-
Language compilers and tools expose the runtime's functionality in ways that are intended to be useful and intuitive to developers. This means that some features of the runtime might be more noticeable in one environment than in another. How you experience the runtime depends on which language compilers or tools you use. For example, if you are a Visual Basic developer, you might notice that with the common language runtime, the Visual Basic language has more object-oriented features than before. The runtime provides the following benefits:
45-
46-
- Performance improvements.
47-
48-
- The ability to easily use components developed in other languages.
49-
50-
- Extensible types provided by a class library.
51-
52-
- Language features such as inheritance, interfaces, and overloading for object-oriented programming.
53-
54-
- Support for explicit free threading that allows creation of multithreaded, scalable applications.
55-
56-
- Support for structured exception handling.
57-
58-
- Support for custom attributes.
59-
60-
- Garbage collection.
61-
62-
- Use of delegates instead of function pointers for increased type safety and security. For more information about delegates, see [Common Type System](../../docs/standard/base-types/common-type-system.md).
63-
64-
## Versions of the Common Language Runtime
65-
The version number of the .NET Framework doesn't necessarily correspond to the version number of the CLR it includes. The following table shows how the two version numbers correlate.
66-
67-
|.NET Framework version|Includes CLR version|
68-
|----------------------------|--------------------------|
69-
|1.0|1.0|
70-
|1.1|1.1|
71-
|2.0|2.0|
72-
|3.0|2.0|
73-
|3.5|2.0|
74-
|4|4|
75-
|4.5 (including 4.5.1 and 4.5.2)|4|
35+
> Compilers and tools are able to produce output that the common language runtime can consume because the type system, the format of metadata, and the runtime environment (the virtual execution system) are all defined by a public standard, the ECMA Common Language Infrastructure specification. For more information, see [ECMA C# and Common Language Infrastructure Specifications](https://www.visualstudio.com/license-terms/ecma-c-common-language-infrastructure-standards/).
36+
37+
To enable the runtime to provide services to managed code, language compilers must emit metadata that describes the types, members, and references in your code. Metadata is stored with the code; every loadable common language runtime portable executable (PE) file contains metadata. The runtime uses metadata to locate and load classes, lay out instances in memory, resolve method invocations, generate native code, enforce security, and set run-time context boundaries.
38+
39+
The runtime automatically handles object layout and manages references to objects, releasing them when they are no longer being used. Objects whose lifetimes are managed in this way are called managed data. Garbage collection eliminates memory leaks as well as some other common programming errors. If your code is managed, you can use managed data, unmanaged data, or both managed and unmanaged data in your .NET Framework application. Because language compilers supply their own types, such as primitive types, you might not always know (or need to know) whether your data is being managed.
40+
41+
The common language runtime makes it easy to design components and applications whose objects interact across languages. Objects written in different languages can communicate with each other, and their behaviors can be tightly integrated. For example, you can define a class and then use a different language to derive a class from your original class or call a method on the original class. You can also pass an instance of a class to a method of a class written in a different language. This cross-language integration is possible because language compilers and tools that target the runtime use a common type system defined by the runtime, and they follow the runtime's rules for defining new types, as well as for creating, using, persisting, and binding to types.
42+
43+
As part of their metadata, all managed components carry information about the components and resources they were built against. The runtime uses this information to ensure that your component or application has the specified versions of everything it needs, which makes your code less likely to break because of some unmet dependency. Registration information and state data are no longer stored in the registry where they can be difficult to establish and maintain. Instead, information about the types you define (and their dependencies) is stored with the code as metadata, making the tasks of component replication and removal much less complicated.
44+
45+
Language compilers and tools expose the runtime's functionality in ways that are intended to be useful and intuitive to developers. This means that some features of the runtime might be more noticeable in one environment than in another. How you experience the runtime depends on which language compilers or tools you use. For example, if you are a Visual Basic developer, you might notice that with the common language runtime, the Visual Basic language has more object-oriented features than before. The runtime provides the following benefits:
46+
47+
- Performance improvements.
48+
49+
- The ability to easily use components developed in other languages.
50+
51+
- Extensible types provided by a class library.
52+
53+
- Language features such as inheritance, interfaces, and overloading for object-oriented programming.
54+
55+
- Support for explicit free threading that allows creation of multithreaded, scalable applications.
56+
57+
- Support for structured exception handling.
58+
59+
- Support for custom attributes.
60+
61+
- Garbage collection.
62+
63+
- Use of delegates instead of function pointers for increased type safety and security. For more information about delegates, see [Common Type System](../../docs/standard/base-types/common-type-system.md).
64+
65+
## CLR versions
66+
67+
The version number of the .NET Framework doesn't necessarily correspond to the version number of the CLR it includes. The following table shows how the two version numbers correlate.
68+
69+
|.NET Framework version|Includes CLR version|
70+
|----------------------------|--------------------------|
71+
|1.0|1.0|
72+
|1.1|1.1|
73+
|2.0|2.0|
74+
|3.0|2.0|
75+
|3.5|2.0|
76+
|4|4|
77+
|4.5 (including 4.5.1 and 4.5.2)|4|
7678
|4.6 (including 4.6.1 and 4.6.2)|4|
77-
|4.7 (including 4.7.1)|4|
78-
79-
## Related Topics
80-
81-
|Title|Description|
82-
|-----------|-----------------|
83-
|[Managed Execution Process](../../docs/standard/managed-execution-process.md)|Describes the steps required to take advantage of the common language runtime.|
84-
|[Automatic Memory Management](../../docs/standard/automatic-memory-management.md)|Describes how the garbage collector allocates and releases memory.|
85-
|[NIB: Overview of the .NET Framework](https://msdn.microsoft.com/library/ea38ac1e-92af-4d1b-8db1-e8a5ea10ed85)|Describes key .NET Framework concepts such as the common type system, cross-language interoperability, managed execution, application domains, and assemblies.|
86-
|[Common Type System](../../docs/standard/base-types/common-type-system.md)|Describes how types are declared, used, and managed in the runtime in support of cross-language integration.|
87-
88-
## See Also
89-
[Versions and Dependencies](../../docs/framework/migration-guide/versions-and-dependencies.md)
79+
|4.7 (including 4.7.1 and 4.7.2)|4|
80+
81+
## Related topics
82+
83+
|Title|Description|
84+
|-----------|-----------------|
85+
|[Managed Execution Process](managed-execution-process.md)|Describes the steps required to take advantage of the common language runtime.|
86+
|[Automatic Memory Management](automatic-memory-management.md)|Describes how the garbage collector allocates and releases memory.|
87+
|[Overview of the .NET Framework](../framework/get-started/overview.md)|Describes key .NET Framework concepts such as the common type system, cross-language interoperability, managed execution, application domains, and assemblies.|
88+
|[Common Type System](./base-types/common-type-system.md)|Describes how types are declared, used, and managed in the runtime in support of cross-language integration.|
89+
90+
## See also
91+
92+
[Versions and Dependencies](../framework/migration-guide/versions-and-dependencies.md)

docs/standard/frameworks.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Target frameworks
33
description: Learn about target frameworks for .NET Core apps and libraries.
44
author: richlander
55
ms.author: mairaw
6-
ms.date: 09/22/2017
6+
ms.date: 04/16/2018
77
ms.topic: article
88
ms.custom: "updateeachrelease"
99
ms.prod: .net
@@ -26,13 +26,13 @@ For package-based target frameworks (for example, .NET Standard and .NET Core),
2626

2727
## Latest target framework versions
2828

29-
The following table defines the most common target frameworks, how they're referenced, and which version of the [.NET Standard](~/docs/standard/net-standard.md) they implement. These target framework versions are the latest stable versions. Pre-release versions aren't shown. A Target Framework Moniker (TFM) is a standardized token format for specifying the target framework of a .NET app or library.
29+
The following table defines the most common target frameworks, how they're referenced, and which version of the [.NET Standard](~/docs/standard/net-standard.md) they implement. These target framework versions are the latest stable versions. Pre-release versions aren't shown. A Target Framework Moniker (TFM) is a standardized token format for specifying the target framework of a .NET app or library.
3030

31-
| Target Framework | Latest Version | Target Framework Moniker (TFM) | Implemented <br/> .NET Standard Version |
32-
| :-------------------: | :------------: | :----------------------------: | :-------------------------------------: |
33-
| .NET Standard | 2.0 | netstandard2.0 | N/A |
34-
| .NET Core Application | 2.0 | netcoreapp2.0 | 2.0 |
35-
| .NET Framework | 4.7.1 | net471 | 2.0 |
31+
| Target Framework | Latest <br/> Stable Version | Target Framework Moniker (TFM) | Implemented <br/> .NET Standard Version |
32+
| :-------------------: | :-------------------------: | :----------------------------: | :-------------------------------------: |
33+
| .NET Standard | 2.0 | netstandard2.0 | N/A |
34+
| .NET Core Application | 2.0 | netcoreapp2.0 | 2.0 |
35+
| .NET Framework | 4.7.2 | net472 | 2.0 |
3636

3737
## Supported target framework versions
3838

@@ -41,8 +41,8 @@ A target framework is typically referenced by a TFM. The following table shows t
4141
| Target Framework | TFM |
4242
| -------------------------- | --- |
4343
| .NET Standard | netstandard1.0<br>netstandard1.1<br>netstandard1.2<br>netstandard1.3<br>netstandard1.4<br>netstandard1.5<br>netstandard1.6<br>netstandard2.0 |
44-
| .NET Core | netcoreapp1.0<br>netcoreapp1.1<br>netcoreapp2.0 |
45-
| .NET Framework | net11<br>net20<br>net35<br>net40<br>net403<br>net45<br>net451<br>net452<br>net46<br>net461<br>net462<br>net47<br>net471 |
44+
| .NET Core | netcoreapp1.0<br>netcoreapp1.1<br>netcoreapp2.0<br>netcoreapp2.1 |
45+
| .NET Framework | net11<br>net20<br>net35<br>net40<br>net403<br>net45<br>net451<br>net452<br>net46<br>net461<br>net462<br>net47<br>net471<br>net472 |
4646
| Windows Store | netcore [netcore45]<br>netcore45 [win] [win8]<br>netcore451 [win81] |
4747
| .NET Micro Framework | netmf |
4848
| Silverlight | sl4<br>sl5 |
@@ -130,10 +130,10 @@ The following target frameworks are deprecated. Packages targeting these target
130130

131131
## See also
132132

133-
[Packages, Metapackages and Frameworks](~/docs/core/packages.md)
134-
[Developing Libraries with Cross Platform Tools](~/docs/core/tutorials/libraries.md)
135-
[.NET Standard](~/docs/standard/net-standard.md)
136-
[.NET Core Versioning](~/docs/core/versions/index.md)
133+
[Packages, Metapackages and Frameworks](../core/packages.md)
134+
[Developing Libraries with Cross Platform Tools](../core/tutorials/libraries.md)
135+
[.NET Standard](net-standard.md)
136+
[.NET Core Versioning](../core/versions/index.md)
137137
[dotnet/standard GitHub repository](https://github.com/dotnet/standard)
138138
[NuGet Tools GitHub Repository](https://github.com/joelverhagen/NuGetTools)
139139
[Framework Profiles in .NET](https://blog.stephencleary.com/2012/05/framework-profiles-in-net.html)

includes/preprocessor-symbols.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
---
2+
ms.custom: "updateeachrelease"
3+
---
14
| Target Frameworks | Symbols |
25
| ------------------| ------- |
3-
| .NET Framework | `NET20`, `NET35`, `NET40`, `NET45`, `NET451`, `NET452`, `NET46`, `NET461`, `NET462`, `NET47`, `NET471` |
6+
| .NET Framework | `NET20`, `NET35`, `NET40`, `NET45`, `NET451`, `NET452`, `NET46`, `NET461`, `NET462`, `NET47`, `NET471`, `NET472` |
47
| .NET Standard | `NETSTANDARD1_0`, `NETSTANDARD1_1`, `NETSTANDARD1_2`, `NETSTANDARD1_3`, `NETSTANDARD1_4`, `NETSTANDARD1_5`, `NETSTANDARD1_6`, `NETSTANDARD2_0` |
5-
| .NET Core | `NETCOREAPP1_0`, `NETCOREAPP1_1`, `NETCOREAPP2_0` |
8+
| .NET Core | `NETCOREAPP1_0`, `NETCOREAPP1_1`, `NETCOREAPP2_0`, `NETCOREAPP2_1` |

index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ms.custom: "updateeachrelease"
4646
</a>
4747
</li>
4848
<li>
49-
<a href="/dotnet/api/?view=netframework-4.7.1">
49+
<a href="/dotnet/api/?view=netframework-4.7.2">
5050
<div class="cardSize">
5151
<div class="cardPadding">
5252
<div class="card">

0 commit comments

Comments
 (0)