From a78a8cbf7ecb7fec42f62f6f5828c43620dcfd37 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Fri, 3 Jan 2020 10:02:24 +0200 Subject: [PATCH 01/13] .NET framework -> .NET Framework --- .../docker-application-development-process/index.md | 2 +- .../net-container-os-targets.md | 4 ++-- .../walkthroughs-technical-get-started-overview.md | 2 +- docs/csharp/delegate-class.md | 2 +- docs/csharp/indexers.md | 2 +- .../concepts/async/handling-reentrancy-in-async-apps.md | 2 +- docs/csharp/whats-new/csharp-7.md | 2 +- .../mitigation-serialization-control-characters.md | 2 +- .../misc/security-and-public-read-only-array-fields.md | 3 ++- docs/framework/network-programming/tls.md | 4 ++-- .../wcf/add-service-reference-in-a-portable-subset-project.md | 3 ++- docs/framework/wcf/migrating-from-net-remoting-to-wcf.md | 2 +- docs/framework/wcf/wcf-and-aspnet-web-api.md | 2 +- docs/framework/wcf/wcf-simplification-features.md | 2 +- docs/framework/wcf/whats-new.md | 2 +- .../advanced/wpf-globalization-and-localization-overview.md | 2 +- .../com-interoperability-in-net-framework-applications.md | 2 +- .../concepts/async/handling-reentrancy-in-async-apps.md | 2 +- .../retargeting/ef/entity-framework-version-must-match-net.md | 2 +- ...-control-characters-with-datacontractjsonserializer-now.md | 2 +- 20 files changed, 24 insertions(+), 22 deletions(-) diff --git a/docs/architecture/microservices/docker-application-development-process/index.md b/docs/architecture/microservices/docker-application-development-process/index.md index 66059db104978..a7405dd17e720 100644 --- a/docs/architecture/microservices/docker-application-development-process/index.md +++ b/docs/architecture/microservices/docker-application-development-process/index.md @@ -37,7 +37,7 @@ By installing [Docker Desktop Community Edition (CE)](https://hub.docker.com/sea ## .NET languages and frameworks for Docker containers -As mentioned in earlier sections of this guide, you can use .NET Framework, .NET Core, or the open-source Mono project when developing Docker containerized .NET applications. You can develop in C\#, F\#, or Visual Basic when targeting Linux or Windows Containers, depending on which .NET framework is in use. For more details about.NET languages, see the blog post [The .NET Language Strategy](https://devblogs.microsoft.com/dotnet/the-net-language-strategy/). +As mentioned in earlier sections of this guide, you can use .NET Framework, .NET Core, or the open-source Mono project when developing Docker containerized .NET applications. You can develop in C\#, F\#, or Visual Basic when targeting Linux or Windows Containers, depending on which .NET Framework is in use. For more details about.NET languages, see the blog post [The .NET Language Strategy](https://devblogs.microsoft.com/dotnet/the-net-language-strategy/). >[!div class="step-by-step"] >[Previous](../architect-microservice-container-applications/scalable-available-multi-container-microservice-applications.md) diff --git a/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md b/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md index e597677c2da6d..ae362065e1912 100644 --- a/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md +++ b/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md @@ -12,11 +12,11 @@ For Windows, you can use Windows Server Core or Windows Nano Server. These Windo For Linux, multiple distros are available and supported in official .NET Docker images (like Debian). -In Figure 3-1 you can see the possible OS version depending on the .NET framework used. +In Figure 3-1 you can see the possible OS version depending on the .NET Framework used. ![Diagram showing what OS to use with which .NET containers.](./media/net-container-os-targets/targeting-operating-systems.png) -**Figure 3-1.** Operating systems to target depending on versions of the .NET framework +**Figure 3-1.** Operating systems to target depending on versions of the .NET Framework When deploying legacy .NET Framework applications you have to target Windows Server Core, compatible with legacy apps and IIS, but it has a larger image. When deploying .NET Core applications, you can target Windows Nano Server, which is cloud optimized, uses Kestrel and is smaller and starts faster. You can also target Linux, supporting Debian, Alpine and others. Also uses Kestrel, is smaller, and starts faster. diff --git a/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md b/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md index 6c7217b84a32f..afb554c555451 100644 --- a/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md +++ b/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md @@ -108,7 +108,7 @@ Figure below shows the scenario for a 3-Tier app with a containerized WCF servic ### Benefits -There are advantages to running your monolithic application in a container. First, you create an image for the application. From that point on, every deployment runs in the same environment. Every container uses the same OS version, has the same version of dependencies installed, uses the same .NET framework version, and is built by using the same process. Basically, you control the dependencies of your application by using a Docker image. The dependencies travel with the application when you deploy the containers. +There are advantages to running your monolithic application in a container. First, you create an image for the application. From that point on, every deployment runs in the same environment. Every container uses the same OS version, has the same version of dependencies installed, uses the same .NET Framework version, and is built by using the same process. Basically, you control the dependencies of your application by using a Docker image. The dependencies travel with the application when you deploy the containers. An additional benefit is that developers can run the application in the consistent environment that's provided by Windows Containers. Issues that appear only with certain versions can be spotted immediately, instead of surfacing in a staging or production environment. Differences in development environments used by members of the development team matter less when applications run in containers. diff --git a/docs/csharp/delegate-class.md b/docs/csharp/delegate-class.md index cf99a735c2b47..e47a2ce8fc323 100644 --- a/docs/csharp/delegate-class.md +++ b/docs/csharp/delegate-class.md @@ -10,7 +10,7 @@ ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393 [Previous](delegates-overview.md) -This article will cover the classes in the .NET framework +This article will cover the classes in the .NET Framework that support delegates, and how those map to the `delegate` keyword. diff --git a/docs/csharp/indexers.md b/docs/csharp/indexers.md index 6690b31780ae7..e1cdaa3804375 100644 --- a/docs/csharp/indexers.md +++ b/docs/csharp/indexers.md @@ -391,7 +391,7 @@ This construct does require using the fully qualified type names on the right side of the `=` sign. The second technique is to strip off the time portions of any `DateTime` object -used to index into the collections. The .NET framework does not include a Date only type. +used to index into the collections. The .NET Framework does not include a Date only type. Developers use the `DateTime` type, but use the `Date` property to ensure that any `DateTime` object from that day are equal. diff --git a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md index 4ff0da3f30d88..37a0369a3c749 100644 --- a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md +++ b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md @@ -25,7 +25,7 @@ When you include asynchronous code in your app, you should consider and possibly > To run the example, you must have Visual Studio 2012 or newer and the .NET Framework 4.5 or newer installed on your computer. > [!NOTE] -> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md) +> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). ## Recognizing Reentrancy diff --git a/docs/csharp/whats-new/csharp-7.md b/docs/csharp/whats-new/csharp-7.md index 5768e42c79a7e..830cc72dc1d5c 100644 --- a/docs/csharp/whats-new/csharp-7.md +++ b/docs/csharp/whats-new/csharp-7.md @@ -314,7 +314,7 @@ costly if those allocations occur in tight loops. The new language feature means that async method return types aren't limited to `Task`, `Task`, and `void`. The returned type must still satisfy the async pattern, meaning a `GetAwaiter` method must be accessible. As one concrete example, the `ValueTask` type -has been added to the .NET framework to make use of this new language +has been added to the .NET Framework to make use of this new language feature: [!code-csharp[UsingValueTask](~/samples/snippets/csharp/new-in-7/AsyncWork.cs#UsingValueTask "Using ValueTask")] diff --git a/docs/framework/migration-guide/mitigation-serialization-control-characters.md b/docs/framework/migration-guide/mitigation-serialization-control-characters.md index 64c600c0c8e7a..c7462d1dea4ab 100644 --- a/docs/framework/migration-guide/mitigation-serialization-control-characters.md +++ b/docs/framework/migration-guide/mitigation-serialization-control-characters.md @@ -14,7 +14,7 @@ Starting with the .NET Framework 4.7, the way in which control characters are se ## Impact -In the .NET framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as `\b`, `\f`, and `\t`, in a way that was compatible with the ECMAScript V6 and V8 standards. +In the .NET Framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as `\b`, `\f`, and `\t`, in a way that was compatible with the ECMAScript V6 and V8 standards. For apps that target versions of the .NET Framework starting with the .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8. The following APIs are affected: diff --git a/docs/framework/misc/security-and-public-read-only-array-fields.md b/docs/framework/misc/security-and-public-read-only-array-fields.md index fba20bb4ea966..6c9ca9b064b7e 100644 --- a/docs/framework/misc/security-and-public-read-only-array-fields.md +++ b/docs/framework/misc/security-and-public-read-only-array-fields.md @@ -11,7 +11,8 @@ ms.author: "mairaw" Never use read-only public array fields from managed libraries to define the boundary behavior or security of your applications because read-only public array fields can be modified. ## Remarks - Some .NET framework classes include read-only public fields that contain platform-specific boundary parameters. For example, the field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout the .NET Framework. + +Some .NET Framework classes include read-only public fields that contain platform-specific boundary parameters. For example, the field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout the .NET Framework. The values of public read-only fields like can be modified by your code or code that shares your code’s application domain. You should not use read-only public array fields like this to define the boundary behavior of your applications. If you do, malicious code can alter the boundary definitions and use your code in unexpected ways. diff --git a/docs/framework/network-programming/tls.md b/docs/framework/network-programming/tls.md index 9fad83d641848..bb6591faf26ff 100644 --- a/docs/framework/network-programming/tls.md +++ b/docs/framework/network-programming/tls.md @@ -134,7 +134,7 @@ These versions of the WCF framework are hardcoded to use values SSL 3.0 and TLS ## If your app targets .NET Framework 3.5 -If you must explicitly set a security protocol instead of letting the .NET framework or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. See [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework). +If you must explicitly set a security protocol instead of letting the .NET Framework or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. See [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework). @@ -203,7 +203,7 @@ If your app targets .NET Framework 4.7 or later versions, this key defaults to a For more info, see [Cumulative Update for Windows 10 Version 1511 and Windows Server 2016 Technical Preview 4: May 10, 2016](https://support.microsoft.com/help/3156421/cumulative-update-for-windows-10-version-1511-and-windows-server-2016). -For more information with .NET framework 3.5.1, see [Support for TLS System Default Versions included in .NET Framework 3.5.1 on Windows 7 SP1 and Server 2008 R2 SP1](https://support.microsoft.com/help/3154518/support-for-tls-system-default-versions-included-in-the--net-framework). +For more information with .NET Framework 3.5.1, see [Support for TLS System Default Versions included in .NET Framework 3.5.1 on Windows 7 SP1 and Server 2008 R2 SP1](https://support.microsoft.com/help/3154518/support-for-tls-system-default-versions-included-in-the--net-framework). The following _.REG_ file sets the registry keys and their variants to their most safe values: diff --git a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md index 5535ee4350b55..d0843060b9821 100644 --- a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md +++ b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md @@ -4,7 +4,8 @@ ms.date: "03/30/2017" ms.assetid: 61ccfe0f-a34b-40ca-8f5e-725fa1b8095e --- # Add Service Reference in a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET framework assembly that can be used on any .NET implementation. + +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET Framework assembly that can be used on any .NET implementation. ## Add Service Reference Details When adding a service reference in a portable subset project the following restrictions are enforced: diff --git a/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md b/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md index 985353dd619db..4b3d596f7a0f4 100644 --- a/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md +++ b/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md @@ -280,7 +280,7 @@ catch (FaultException fault) - **.NET Remoting is a legacy product.** As described in [.NET Remoting](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/72x4h507%28v=vs.100%29), it is considered a legacy product and is not recommended for new development. WCF or ASP.NET Web API are recommended for new and existing applications. -- **WCF uses cross-platform standards.** WCF was designed with cross-platform interoperability in mind and supports many industry standards (SOAP, WS-Security, WS-Trust, etc.). A WCF service can interoperate with clients running on operating systems other than Windows. Remoting was designed primarily for environments where both the server and client applications run using the .NET framework on a Windows operating system. +- **WCF uses cross-platform standards.** WCF was designed with cross-platform interoperability in mind and supports many industry standards (SOAP, WS-Security, WS-Trust, etc.). A WCF service can interoperate with clients running on operating systems other than Windows. Remoting was designed primarily for environments where both the server and client applications run using the .NET Framework on a Windows operating system. - **WCF has built-in security.** WCF was designed with security in mind and offers many options for authentication, transport level security, message level security, etc. Remoting was designed to make it easy for applications to interoperate but was not designed to be secure in non-trusted environments. WCF was designed to work in both trusted and non-trusted environments. diff --git a/docs/framework/wcf/wcf-and-aspnet-web-api.md b/docs/framework/wcf/wcf-and-aspnet-web-api.md index b4edc87052a3d..f6848bd37867e 100644 --- a/docs/framework/wcf/wcf-and-aspnet-web-api.md +++ b/docs/framework/wcf/wcf-and-aspnet-web-api.md @@ -16,7 +16,7 @@ WCF is Microsoft’s unified programming model for building service-oriented app |Supports building services with WS-* standards like Reliable Messaging, Transactions, Message Security.|Uses basic protocol and formats such as HTTP, WebSockets, SSL, JSON, and XML. There is no support for higher level protocols such as Reliable Messaging or Transactions.| |Supports Request-Reply, One Way, and Duplex message exchange patterns.|HTTP is request/response but additional patterns can be supported through [SignalR](https://github.com/SignalR/SignalR) and WebSockets integration.| |WCF SOAP services can be described in WSDL allowing automated tools to generate client proxies even for services with complex schemas.|There is a variety of ways to describe a Web API ranging from auto-generated HTML help page describing snippets to structured metadata for OData integrated APIs.| -|Ships with the .NET framework.|Ships with .NET framework but is open-source and is also available out-of-band as independent download.| +|Ships with the .NET Framework.|Ships with .NET Framework but is open-source and is also available out-of-band as independent download.| Use WCF to create reliable, secure web services that are accessible over a variety of transports. Use ASP.NET Web API to create HTTP-based services that are accessible from a wide variety of clients. Use ASP.NET Web API if you are creating and designing new REST-style services. Although WCF provides some support for writing REST-style services, the support for REST in ASP.NET Web API is more complete and all future REST feature improvements will be made in ASP.NET Web API. If you have an existing WCF service and you want to expose additional REST endpoints, use WCF and the . diff --git a/docs/framework/wcf/wcf-simplification-features.md b/docs/framework/wcf/wcf-simplification-features.md index 0815ab1d4f830..10e23f1e89314 100644 --- a/docs/framework/wcf/wcf-simplification-features.md +++ b/docs/framework/wcf/wcf-simplification-features.md @@ -73,7 +73,7 @@ WCF now has support for contract-first development. The svcutil.exe tool has a / ## Add Service Reference From a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET framework assembly that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET Framework assembly that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). ## ASP.NET Compatibility Mode Default Changed diff --git a/docs/framework/wcf/whats-new.md b/docs/framework/wcf/whats-new.md index aab66165fab9c..0911f221923a7 100644 --- a/docs/framework/wcf/whats-new.md +++ b/docs/framework/wcf/whats-new.md @@ -31,7 +31,7 @@ WCF now has support for contract-first development. The svcutil.exe has a /servi ### Add Service Reference from a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET framework assembly that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET Framework assembly that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). ### ASP.NET Compatibility Mode Default Changed diff --git a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md index 77971b243c14c..696ded372fa0b 100644 --- a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md +++ b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md @@ -209,7 +209,7 @@ On German Windows, if this resources.dll is placed in a de-DE folder next to the |Code|Original English BAML|Localized BAML| |Culturally neutral resources|Other resources in English|Other resources localized to German| -The .NET framework automatically chooses which satellite resources assembly to load based on the application’s `Thread.CurrentThread.CurrentUICulture`. This defaults to the culture of your Windows OS. So if you are using German Windows, the de-DE\MyDialog.resources.dll loads, if you are using English Windows, the en-US\MyDialog.resources.dll loads. You can set the ultimate fallback resource for your application by specifying the NeutralResourcesLanguage in your project’s AssemblyInfo.*. For example if you specify: +.NET Framework automatically chooses which satellite resources assembly to load based on the application’s `Thread.CurrentThread.CurrentUICulture`. This defaults to the culture of your Windows OS. So if you are using German Windows, the de-DE\MyDialog.resources.dll loads, if you are using English Windows, the en-US\MyDialog.resources.dll loads. You can set the ultimate fallback resource for your application by specifying the NeutralResourcesLanguage in your project’s AssemblyInfo.*. For example if you specify: `[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]` diff --git a/docs/visual-basic/programming-guide/com-interop/com-interoperability-in-net-framework-applications.md b/docs/visual-basic/programming-guide/com-interop/com-interoperability-in-net-framework-applications.md index 87241b64995ab..a637a92aa8cd3 100644 --- a/docs/visual-basic/programming-guide/com-interop/com-interoperability-in-net-framework-applications.md +++ b/docs/visual-basic/programming-guide/com-interop/com-interoperability-in-net-framework-applications.md @@ -2,7 +2,7 @@ title: "COM Interoperability in .NET Framework Applications" ms.date: 07/20/2015 helpviewer_keywords: - - "interoperability, COM and .NET framework objects" + - "interoperability, COM and .NET Framework objects" - "COM interop [Visual Basic]" - "shared components" ms.assetid: f5a72143-c268-4dff-a019-974ad940e17d diff --git a/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md index eaf4fad49cdeb..26f388e06f3ea 100644 --- a/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md +++ b/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md @@ -11,7 +11,7 @@ When you include asynchronous code in your app, you should consider and possibly > To run the example, you must have Visual Studio 2012 or newer and the .NET Framework 4.5 or newer installed on your computer. > [!NOTE] -> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md) +> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). ## Recognizing Reentrancy diff --git a/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md b/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md index 479610201060c..5d398cad471fb 100644 --- a/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md +++ b/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md @@ -2,7 +2,7 @@ | | | |---|---| -|Details|The entity framework version should be matched with the .NET framework version. Entity Framework 5 is recommended for .NET Framework 4.5. There are some known issues with EF 4.x in a .NET Framework 4.5 project around . In .NET 4.5, these were moved to a different assembly, so there are issues determining which annotations to use.| +|Details|The entity framework version should be matched with the .NET Framework version. Entity Framework 5 is recommended for .NET Framework 4.5. There are some known issues with EF 4.x in a .NET Framework 4.5 project around . In .NET 4.5, these were moved to a different assembly, so there are issues determining which annotations to use.| |Suggestion|Upgrade to Entity Framework 5 for .NET Framework 4.5| |Scope|Major| |Version|4.5| diff --git a/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md b/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md index 4109f54569313..3e072c17eb540 100644 --- a/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md +++ b/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md @@ -2,7 +2,7 @@ | | | |---|---| -|Details|In the .NET framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as \b, \f, and \t, in a way that was compatible with the ECMAScript V6 and V8 standards. Starting with the .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8.| +|Details|In the .NET Framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as \b, \f, and \t, in a way that was compatible with the ECMAScript V6 and V8 standards. Starting with the .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8.| |Suggestion|For apps that target the .NET Framework 4.7, this feature is enabled by default. If this behavior is not desirable, you can opt out of this feature by adding the following line to the <runtime> section of the app.config or web.config file:
<runtime>
<AppContextSwitchOverrides value="Switch.System.Runtime.Serialization.DoNotUseECMAScriptV6EscapeControlCharacter=false" />
</runtime>
| |Scope|Edge| |Version|4.7| From 57e65fb3718fab11ec3283637342d2f236e8d540 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:03:48 +0200 Subject: [PATCH 02/13] the .NET Framework -> .NET Framework --- docs/csharp/delegate-class.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/csharp/delegate-class.md b/docs/csharp/delegate-class.md index e47a2ce8fc323..36ba59775a2d2 100644 --- a/docs/csharp/delegate-class.md +++ b/docs/csharp/delegate-class.md @@ -1,6 +1,6 @@ --- title: System.Delegate and the `delegate` keyword -description: Learn about the classes in the .NET Framework that support delegates and how those map to the 'delegate' keyword. +description: Learn about the classes in .NET Framework that support delegates and how those map to the 'delegate' keyword. ms.date: 06/20/2016 ms.technology: csharp-fundamentals ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393 @@ -10,7 +10,7 @@ ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393 [Previous](delegates-overview.md) -This article will cover the classes in the .NET Framework +This article will cover the classes in .NET Framework that support delegates, and how those map to the `delegate` keyword. From b6e0951bc445f5d419c16b3f5a57c4010b92c080 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:04:12 +0200 Subject: [PATCH 03/13] Update indexers.md --- docs/csharp/indexers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/csharp/indexers.md b/docs/csharp/indexers.md index e1cdaa3804375..c17703325c84f 100644 --- a/docs/csharp/indexers.md +++ b/docs/csharp/indexers.md @@ -391,7 +391,7 @@ This construct does require using the fully qualified type names on the right side of the `=` sign. The second technique is to strip off the time portions of any `DateTime` object -used to index into the collections. The .NET Framework does not include a Date only type. +used to index into the collections. .NET Framework does not include a Date only type. Developers use the `DateTime` type, but use the `Date` property to ensure that any `DateTime` object from that day are equal. From a78879f43379f5fc079d3d9f0c26152d66f719fd Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:04:29 +0200 Subject: [PATCH 04/13] Update csharp-7.md --- docs/csharp/whats-new/csharp-7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/csharp/whats-new/csharp-7.md b/docs/csharp/whats-new/csharp-7.md index 830cc72dc1d5c..a22de59908798 100644 --- a/docs/csharp/whats-new/csharp-7.md +++ b/docs/csharp/whats-new/csharp-7.md @@ -314,7 +314,7 @@ costly if those allocations occur in tight loops. The new language feature means that async method return types aren't limited to `Task`, `Task`, and `void`. The returned type must still satisfy the async pattern, meaning a `GetAwaiter` method must be accessible. As one concrete example, the `ValueTask` type -has been added to the .NET Framework to make use of this new language +has been added to .NET Framework to make use of this new language feature: [!code-csharp[UsingValueTask](~/samples/snippets/csharp/new-in-7/AsyncWork.cs#UsingValueTask "Using ValueTask")] From 5f7fcd5789eaa53c40628b4df489478a0c600012 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:07:52 +0200 Subject: [PATCH 05/13] Update handling-reentrancy-in-async-apps.md --- .../concepts/async/handling-reentrancy-in-async-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md index 37a0369a3c749..b67f7c7fc5bea 100644 --- a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md +++ b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md @@ -22,7 +22,7 @@ When you include asynchronous code in your app, you should consider and possibly - [Reviewing and Running the Example App](#BKMD_SettingUpTheExample) > [!NOTE] -> To run the example, you must have Visual Studio 2012 or newer and the .NET Framework 4.5 or newer installed on your computer. +> To run the example, you must have Visual Studio 2012 or newer and .NET Framework 4.5 or newer installed on your computer. > [!NOTE] > Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). From bf7da15bf0186378cc5de81cabf738893a8fa619 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:09:22 +0200 Subject: [PATCH 06/13] Update mitigation-serialization-control-characters.md --- .../mitigation-serialization-control-characters.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/framework/migration-guide/mitigation-serialization-control-characters.md b/docs/framework/migration-guide/mitigation-serialization-control-characters.md index c7462d1dea4ab..66a15451d43f9 100644 --- a/docs/framework/migration-guide/mitigation-serialization-control-characters.md +++ b/docs/framework/migration-guide/mitigation-serialization-control-characters.md @@ -10,19 +10,19 @@ ms.assetid: e065d458-a128-44f2-9f17-66af9d5be954 --- # Mitigation: Serialization of control characters with the DataContractJsonSerializer -Starting with the .NET Framework 4.7, the way in which control characters are serialized with the has changed to conform to ECMAScript V6 and V8. +Starting with .NET Framework 4.7, the way in which control characters are serialized with the has changed to conform to ECMAScript V6 and V8. ## Impact -In the .NET Framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as `\b`, `\f`, and `\t`, in a way that was compatible with the ECMAScript V6 and V8 standards. +In .NET Framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as `\b`, `\f`, and `\t`, in a way that was compatible with the ECMAScript V6 and V8 standards. -For apps that target versions of the .NET Framework starting with the .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8. The following APIs are affected: +For apps that target versions of .NET Framework starting with .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8. The following APIs are affected: - ## Mitigation -For apps that target versions of the .NET Framework starting with the .NET Framework 4.7, this behavior is enabled by default. +For apps that target versions of .NET Framework starting with .NET Framework 4.7, this behavior is enabled by default. If this behavior is not desirable, you can opt out of this feature by adding the following line to the `` section of the app.config or web.config file: From 60c8499764191323bb0266425ca1fdc67730a94d Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 19:49:46 +0200 Subject: [PATCH 07/13] Update index.md --- .../docker-application-development-process/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/architecture/microservices/docker-application-development-process/index.md b/docs/architecture/microservices/docker-application-development-process/index.md index a7405dd17e720..66059db104978 100644 --- a/docs/architecture/microservices/docker-application-development-process/index.md +++ b/docs/architecture/microservices/docker-application-development-process/index.md @@ -37,7 +37,7 @@ By installing [Docker Desktop Community Edition (CE)](https://hub.docker.com/sea ## .NET languages and frameworks for Docker containers -As mentioned in earlier sections of this guide, you can use .NET Framework, .NET Core, or the open-source Mono project when developing Docker containerized .NET applications. You can develop in C\#, F\#, or Visual Basic when targeting Linux or Windows Containers, depending on which .NET Framework is in use. For more details about.NET languages, see the blog post [The .NET Language Strategy](https://devblogs.microsoft.com/dotnet/the-net-language-strategy/). +As mentioned in earlier sections of this guide, you can use .NET Framework, .NET Core, or the open-source Mono project when developing Docker containerized .NET applications. You can develop in C\#, F\#, or Visual Basic when targeting Linux or Windows Containers, depending on which .NET framework is in use. For more details about.NET languages, see the blog post [The .NET Language Strategy](https://devblogs.microsoft.com/dotnet/the-net-language-strategy/). >[!div class="step-by-step"] >[Previous](../architect-microservice-container-applications/scalable-available-multi-container-microservice-applications.md) From b5eec6de609592535eb21a47341205852be2ba71 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 19:50:48 +0200 Subject: [PATCH 08/13] Update net-container-os-targets.md --- .../net-container-os-targets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md b/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md index ae362065e1912..e597677c2da6d 100644 --- a/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md +++ b/docs/architecture/microservices/net-core-net-framework-containers/net-container-os-targets.md @@ -12,11 +12,11 @@ For Windows, you can use Windows Server Core or Windows Nano Server. These Windo For Linux, multiple distros are available and supported in official .NET Docker images (like Debian). -In Figure 3-1 you can see the possible OS version depending on the .NET Framework used. +In Figure 3-1 you can see the possible OS version depending on the .NET framework used. ![Diagram showing what OS to use with which .NET containers.](./media/net-container-os-targets/targeting-operating-systems.png) -**Figure 3-1.** Operating systems to target depending on versions of the .NET Framework +**Figure 3-1.** Operating systems to target depending on versions of the .NET framework When deploying legacy .NET Framework applications you have to target Windows Server Core, compatible with legacy apps and IIS, but it has a larger image. When deploying .NET Core applications, you can target Windows Nano Server, which is cloud optimized, uses Kestrel and is smaller and starts faster. You can also target Linux, supporting Debian, Alpine and others. Also uses Kestrel, is smaller, and starts faster. From 3777e88f580a2d8cf6a12b3866bcfcd3ebda0de1 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 19:51:33 +0200 Subject: [PATCH 09/13] Update walkthroughs-technical-get-started-overview.md --- .../walkthroughs-technical-get-started-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md b/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md index afb554c555451..6c7217b84a32f 100644 --- a/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md +++ b/docs/architecture/modernize-with-azure-containers/walkthroughs-technical-get-started-overview.md @@ -108,7 +108,7 @@ Figure below shows the scenario for a 3-Tier app with a containerized WCF servic ### Benefits -There are advantages to running your monolithic application in a container. First, you create an image for the application. From that point on, every deployment runs in the same environment. Every container uses the same OS version, has the same version of dependencies installed, uses the same .NET Framework version, and is built by using the same process. Basically, you control the dependencies of your application by using a Docker image. The dependencies travel with the application when you deploy the containers. +There are advantages to running your monolithic application in a container. First, you create an image for the application. From that point on, every deployment runs in the same environment. Every container uses the same OS version, has the same version of dependencies installed, uses the same .NET framework version, and is built by using the same process. Basically, you control the dependencies of your application by using a Docker image. The dependencies travel with the application when you deploy the containers. An additional benefit is that developers can run the application in the consistent environment that's provided by Windows Containers. Issues that appear only with certain versions can be spotted immediately, instead of surfacing in a staging or production environment. Differences in development environments used by members of the development team matter less when applications run in containers. From 938352fce216fb985cc08cc1e55f7f6a348b1bb0 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 3 Jan 2020 19:58:12 +0200 Subject: [PATCH 10/13] Apply suggestions from code review Co-Authored-By: Genevieve Warren --- docs/csharp/delegate-class.md | 4 ++-- docs/csharp/indexers.md | 2 +- docs/csharp/whats-new/csharp-7.md | 2 +- .../misc/security-and-public-read-only-array-fields.md | 2 +- docs/framework/network-programming/tls.md | 2 +- .../wcf/add-service-reference-in-a-portable-subset-project.md | 2 +- docs/framework/wcf/migrating-from-net-remoting-to-wcf.md | 2 +- docs/framework/wcf/wcf-simplification-features.md | 2 +- docs/framework/wcf/whats-new.md | 2 +- .../advanced/wpf-globalization-and-localization-overview.md | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/csharp/delegate-class.md b/docs/csharp/delegate-class.md index 36ba59775a2d2..19f1327a54bbf 100644 --- a/docs/csharp/delegate-class.md +++ b/docs/csharp/delegate-class.md @@ -1,6 +1,6 @@ --- title: System.Delegate and the `delegate` keyword -description: Learn about the classes in .NET Framework that support delegates and how those map to the 'delegate' keyword. +description: Learn about the classes in .NET that support delegates and how those map to the 'delegate' keyword. ms.date: 06/20/2016 ms.technology: csharp-fundamentals ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393 @@ -10,7 +10,7 @@ ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393 [Previous](delegates-overview.md) -This article will cover the classes in .NET Framework +This article covers the classes in .NET that support delegates, and how those map to the `delegate` keyword. diff --git a/docs/csharp/indexers.md b/docs/csharp/indexers.md index c17703325c84f..888e3b0f30c40 100644 --- a/docs/csharp/indexers.md +++ b/docs/csharp/indexers.md @@ -391,7 +391,7 @@ This construct does require using the fully qualified type names on the right side of the `=` sign. The second technique is to strip off the time portions of any `DateTime` object -used to index into the collections. .NET Framework does not include a Date only type. +used to index into the collections. .NET does not include a date-only type. Developers use the `DateTime` type, but use the `Date` property to ensure that any `DateTime` object from that day are equal. diff --git a/docs/csharp/whats-new/csharp-7.md b/docs/csharp/whats-new/csharp-7.md index a22de59908798..050a026d00188 100644 --- a/docs/csharp/whats-new/csharp-7.md +++ b/docs/csharp/whats-new/csharp-7.md @@ -314,7 +314,7 @@ costly if those allocations occur in tight loops. The new language feature means that async method return types aren't limited to `Task`, `Task`, and `void`. The returned type must still satisfy the async pattern, meaning a `GetAwaiter` method must be accessible. As one concrete example, the `ValueTask` type -has been added to .NET Framework to make use of this new language +has been added to .NET to make use of this new language feature: [!code-csharp[UsingValueTask](~/samples/snippets/csharp/new-in-7/AsyncWork.cs#UsingValueTask "Using ValueTask")] diff --git a/docs/framework/misc/security-and-public-read-only-array-fields.md b/docs/framework/misc/security-and-public-read-only-array-fields.md index 6c9ca9b064b7e..3c19dd9f392c6 100644 --- a/docs/framework/misc/security-and-public-read-only-array-fields.md +++ b/docs/framework/misc/security-and-public-read-only-array-fields.md @@ -12,7 +12,7 @@ Never use read-only public array fields from managed libraries to define the bou ## Remarks -Some .NET Framework classes include read-only public fields that contain platform-specific boundary parameters. For example, the field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout the .NET Framework. +Some .NET classes include read-only public fields that contain platform-specific boundary parameters. For example, the field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout .NET. The values of public read-only fields like can be modified by your code or code that shares your code’s application domain. You should not use read-only public array fields like this to define the boundary behavior of your applications. If you do, malicious code can alter the boundary definitions and use your code in unexpected ways. diff --git a/docs/framework/network-programming/tls.md b/docs/framework/network-programming/tls.md index bb6591faf26ff..c3fe5c06444cd 100644 --- a/docs/framework/network-programming/tls.md +++ b/docs/framework/network-programming/tls.md @@ -134,7 +134,7 @@ These versions of the WCF framework are hardcoded to use values SSL 3.0 and TLS ## If your app targets .NET Framework 3.5 -If you must explicitly set a security protocol instead of letting the .NET Framework or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. See [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework). +If you must explicitly set a security protocol instead of letting .NET or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. See [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework). diff --git a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md index d0843060b9821..98bd618ba16cd 100644 --- a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md +++ b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md @@ -5,7 +5,7 @@ ms.assetid: 61ccfe0f-a34b-40ca-8f5e-725fa1b8095e --- # Add Service Reference in a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET Framework assembly that can be used on any .NET implementation. +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference portable libraries that are .NET assemblies that can be used on any .NET implementation. ## Add Service Reference Details When adding a service reference in a portable subset project the following restrictions are enforced: diff --git a/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md b/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md index 4b3d596f7a0f4..dd9488aa73ddb 100644 --- a/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md +++ b/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md @@ -280,7 +280,7 @@ catch (FaultException fault) - **.NET Remoting is a legacy product.** As described in [.NET Remoting](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/72x4h507%28v=vs.100%29), it is considered a legacy product and is not recommended for new development. WCF or ASP.NET Web API are recommended for new and existing applications. -- **WCF uses cross-platform standards.** WCF was designed with cross-platform interoperability in mind and supports many industry standards (SOAP, WS-Security, WS-Trust, etc.). A WCF service can interoperate with clients running on operating systems other than Windows. Remoting was designed primarily for environments where both the server and client applications run using the .NET Framework on a Windows operating system. +- **WCF uses cross-platform standards.** WCF was designed with cross-platform interoperability in mind and supports many industry standards (SOAP, WS-Security, WS-Trust, etc.). A WCF service can interoperate with clients running on operating systems other than Windows. Remoting was designed primarily for environments where both the server and client applications run using .NET Framework on a Windows operating system. - **WCF has built-in security.** WCF was designed with security in mind and offers many options for authentication, transport level security, message level security, etc. Remoting was designed to make it easy for applications to interoperate but was not designed to be secure in non-trusted environments. WCF was designed to work in both trusted and non-trusted environments. diff --git a/docs/framework/wcf/wcf-simplification-features.md b/docs/framework/wcf/wcf-simplification-features.md index 10e23f1e89314..719f537d52e16 100644 --- a/docs/framework/wcf/wcf-simplification-features.md +++ b/docs/framework/wcf/wcf-simplification-features.md @@ -73,7 +73,7 @@ WCF now has support for contract-first development. The svcutil.exe tool has a / ## Add Service Reference From a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET Framework assembly that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). ## ASP.NET Compatibility Mode Default Changed diff --git a/docs/framework/wcf/whats-new.md b/docs/framework/wcf/whats-new.md index 0911f221923a7..6450b06f38085 100644 --- a/docs/framework/wcf/whats-new.md +++ b/docs/framework/wcf/whats-new.md @@ -31,7 +31,7 @@ WCF now has support for contract-first development. The svcutil.exe has a /servi ### Add Service Reference from a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET Framework assembly that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). ### ASP.NET Compatibility Mode Default Changed diff --git a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md index 696ded372fa0b..cc404d0b397bf 100644 --- a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md +++ b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md @@ -209,7 +209,7 @@ On German Windows, if this resources.dll is placed in a de-DE folder next to the |Code|Original English BAML|Localized BAML| |Culturally neutral resources|Other resources in English|Other resources localized to German| -.NET Framework automatically chooses which satellite resources assembly to load based on the application’s `Thread.CurrentThread.CurrentUICulture`. This defaults to the culture of your Windows OS. So if you are using German Windows, the de-DE\MyDialog.resources.dll loads, if you are using English Windows, the en-US\MyDialog.resources.dll loads. You can set the ultimate fallback resource for your application by specifying the NeutralResourcesLanguage in your project’s AssemblyInfo.*. For example if you specify: +.NET automatically chooses which satellite resources assembly to load based on the application’s . This defaults to the culture of your Windows OS. If you're using German Windows, the *de-DE\MyDialog.resources.dll* loads. If you're using English Windows, the *en-US\MyDialog.resources.dll* loads. You can set the ultimate fallback resource for your application by specifying the NeutralResourcesLanguage in your project’s AssemblyInfo.* file. For example if you specify: `[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]` From 2c2abd88f3f27b5f863d11212660e69d9151c293 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Mon, 6 Jan 2020 21:10:14 +0200 Subject: [PATCH 11/13] Apply suggestions from code review Co-Authored-By: Maira Wenzel --- docs/csharp/indexers.md | 2 +- .../concepts/async/handling-reentrancy-in-async-apps.md | 2 +- .../wcf/add-service-reference-in-a-portable-subset-project.md | 2 +- docs/framework/wcf/wcf-simplification-features.md | 2 +- docs/framework/wcf/whats-new.md | 2 +- .../concepts/async/handling-reentrancy-in-async-apps.md | 2 +- ...on-control-characters-with-datacontractjsonserializer-now.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/csharp/indexers.md b/docs/csharp/indexers.md index 888e3b0f30c40..6d803eecf96e2 100644 --- a/docs/csharp/indexers.md +++ b/docs/csharp/indexers.md @@ -391,7 +391,7 @@ This construct does require using the fully qualified type names on the right side of the `=` sign. The second technique is to strip off the time portions of any `DateTime` object -used to index into the collections. .NET does not include a date-only type. +used to index into the collections. .NET doesn't include a date-only type. Developers use the `DateTime` type, but use the `Date` property to ensure that any `DateTime` object from that day are equal. diff --git a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md index b67f7c7fc5bea..e0cdb8ac92e45 100644 --- a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md +++ b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md @@ -25,7 +25,7 @@ When you include asynchronous code in your app, you should consider and possibly > To run the example, you must have Visual Studio 2012 or newer and .NET Framework 4.5 or newer installed on your computer. > [!NOTE] -> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). +> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). ## Recognizing Reentrancy diff --git a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md index 98bd618ba16cd..b75215f3b88f6 100644 --- a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md +++ b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md @@ -5,7 +5,7 @@ ms.assetid: 61ccfe0f-a34b-40ca-8f5e-725fa1b8095e --- # Add Service Reference in a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference portable libraries that are .NET assemblies that can be used on any .NET implementation. +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and Xbox). Portable subset projects only reference portable libraries that are .NET assemblies that can be used on any .NET implementation. ## Add Service Reference Details When adding a service reference in a portable subset project the following restrictions are enforced: diff --git a/docs/framework/wcf/wcf-simplification-features.md b/docs/framework/wcf/wcf-simplification-features.md index 719f537d52e16..05e3be52887a6 100644 --- a/docs/framework/wcf/wcf-simplification-features.md +++ b/docs/framework/wcf/wcf-simplification-features.md @@ -73,7 +73,7 @@ WCF now has support for contract-first development. The svcutil.exe tool has a / ## Add Service Reference From a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and Xbox). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). ## ASP.NET Compatibility Mode Default Changed diff --git a/docs/framework/wcf/whats-new.md b/docs/framework/wcf/whats-new.md index 6450b06f38085..a7f9e2f7b03f1 100644 --- a/docs/framework/wcf/whats-new.md +++ b/docs/framework/wcf/whats-new.md @@ -31,7 +31,7 @@ WCF now has support for contract-first development. The svcutil.exe has a /servi ### Add Service Reference from a Portable Subset Project -Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). +Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and Xbox). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md). ### ASP.NET Compatibility Mode Default Changed diff --git a/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md index 26f388e06f3ea..853e52b6788d6 100644 --- a/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md +++ b/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md @@ -11,7 +11,7 @@ When you include asynchronous code in your app, you should consider and possibly > To run the example, you must have Visual Studio 2012 or newer and the .NET Framework 4.5 or newer installed on your computer. > [!NOTE] -> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). +> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md). ## Recognizing Reentrancy diff --git a/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md b/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md index 3e072c17eb540..bfb0e3931db17 100644 --- a/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md +++ b/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md @@ -2,7 +2,7 @@ | | | |---|---| -|Details|In the .NET Framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as \b, \f, and \t, in a way that was compatible with the ECMAScript V6 and V8 standards. Starting with the .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8.| +|Details|In .NET Framework 4.6.2 and earlier versions, the did not serialize some special control characters, such as \b, \f, and \t, in a way that was compatible with the ECMAScript V6 and V8 standards. Starting with .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8.| |Suggestion|For apps that target the .NET Framework 4.7, this feature is enabled by default. If this behavior is not desirable, you can opt out of this feature by adding the following line to the <runtime> section of the app.config or web.config file:
<runtime>
<AppContextSwitchOverrides value="Switch.System.Runtime.Serialization.DoNotUseECMAScriptV6EscapeControlCharacter=false" />
</runtime>
| |Scope|Edge| |Version|4.7| From d067061bc573a54e08c4899567bc77608083343e Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Fri, 24 Jan 2020 21:20:54 +0200 Subject: [PATCH 12/13] Apply suggestions from code review Co-Authored-By: Maira Wenzel --- .../misc/security-and-public-read-only-array-fields.md | 2 +- docs/framework/network-programming/tls.md | 2 +- .../retargeting/ef/entity-framework-version-must-match-net.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/framework/misc/security-and-public-read-only-array-fields.md b/docs/framework/misc/security-and-public-read-only-array-fields.md index 3c19dd9f392c6..50034c3730297 100644 --- a/docs/framework/misc/security-and-public-read-only-array-fields.md +++ b/docs/framework/misc/security-and-public-read-only-array-fields.md @@ -12,7 +12,7 @@ Never use read-only public array fields from managed libraries to define the bou ## Remarks -Some .NET classes include read-only public fields that contain platform-specific boundary parameters. For example, the field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout .NET. +Some .NET classes include read-only public fields that contain platform-specific boundary parameters. For example, the field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout .NET. The values of public read-only fields like can be modified by your code or code that shares your code’s application domain. You should not use read-only public array fields like this to define the boundary behavior of your applications. If you do, malicious code can alter the boundary definitions and use your code in unexpected ways. diff --git a/docs/framework/network-programming/tls.md b/docs/framework/network-programming/tls.md index c3fe5c06444cd..6305111398f5d 100644 --- a/docs/framework/network-programming/tls.md +++ b/docs/framework/network-programming/tls.md @@ -134,7 +134,7 @@ These versions of the WCF framework are hardcoded to use values SSL 3.0 and TLS ## If your app targets .NET Framework 3.5 -If you must explicitly set a security protocol instead of letting .NET or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. See [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework). +If you must explicitly set a security protocol instead of letting .NET or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. For more information, see [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework). diff --git a/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md b/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md index 5d398cad471fb..a4e1653a51f4d 100644 --- a/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md +++ b/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md @@ -2,7 +2,7 @@ | | | |---|---| -|Details|The entity framework version should be matched with the .NET Framework version. Entity Framework 5 is recommended for .NET Framework 4.5. There are some known issues with EF 4.x in a .NET Framework 4.5 project around . In .NET 4.5, these were moved to a different assembly, so there are issues determining which annotations to use.| +|Details|The Entity Framework (EF) version should be matched with the .NET Framework version. Entity Framework 5 is recommended for .NET Framework 4.5. There are some known issues with EF 4.x in a .NET Framework 4.5 project around . In .NET Framework 4.5, these were moved to a different assembly, so there are issues determining which annotations to use.| |Suggestion|Upgrade to Entity Framework 5 for .NET Framework 4.5| |Scope|Major| |Version|4.5| From 094960e9906b38455aa56bdf695cb454088d0e17 Mon Sep 17 00:00:00 2001 From: Youssef Victor <31348972+Youssef1313@users.noreply.github.com> Date: Sat, 25 Jan 2020 09:49:10 +0200 Subject: [PATCH 13/13] Update docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md Co-Authored-By: Andy De George <2672110+Thraka@users.noreply.github.com> --- .../wpf/advanced/wpf-globalization-and-localization-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md index cc404d0b397bf..bebabe560713f 100644 --- a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md +++ b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md @@ -209,7 +209,7 @@ On German Windows, if this resources.dll is placed in a de-DE folder next to the |Code|Original English BAML|Localized BAML| |Culturally neutral resources|Other resources in English|Other resources localized to German| -.NET automatically chooses which satellite resources assembly to load based on the application’s . This defaults to the culture of your Windows OS. If you're using German Windows, the *de-DE\MyDialog.resources.dll* loads. If you're using English Windows, the *en-US\MyDialog.resources.dll* loads. You can set the ultimate fallback resource for your application by specifying the NeutralResourcesLanguage in your project’s AssemblyInfo.* file. For example if you specify: +.NET automatically chooses which satellite resources assembly to load based on the application’s . This defaults to the culture of your Windows OS. If you're using German Windows, the *de-DE\MyDialog.resources.dll* loads. If you're using English Windows, the *en-US\MyDialog.resources.dll* loads. You can set the ultimate fallback resource for your application by specifying the `NeutralResourcesLanguage` attribute in your project’s *AssemblyInfo* file. For example if you specify: `[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]`