From 83057b857cdf27a86867f1f719e74fe4ce5dee88 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Wed, 17 Nov 2021 10:19:05 -0800 Subject: [PATCH 1/2] acrolinx --- docs/core/deploying/trimming/trim-warnings/il2007.md | 7 ++----- docs/core/deploying/trimming/trim-warnings/il2023.md | 10 ++++------ docs/core/deploying/trimming/trim-warnings/il2029.md | 10 ++++------ 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/docs/core/deploying/trimming/trim-warnings/il2007.md b/docs/core/deploying/trimming/trim-warnings/il2007.md index 56e94e22536a4..a0e6abe96e4f8 100644 --- a/docs/core/deploying/trimming/trim-warnings/il2007.md +++ b/docs/core/deploying/trimming/trim-warnings/il2007.md @@ -15,12 +15,9 @@ An assembly specified in a descriptor file could not be resolved. ## Rule description -[Descriptor files](https://github.com/mono/linker/blob/main/docs/data-formats.md) are -used to instruct the trimmer to always keep certain items in an assembly, regardless of -whether the trimmer could find any references to them. +[Descriptor files](https://github.com/mono/linker/blob/main/docs/data-formats.md) are used to instruct the trimmer to always keep certain items in an assembly, regardless of whether the trimmer could find any references to them. -The assembly specified in the descriptor file by its full name could not be found in any -of the assemblies seen by the trimmer. +The assembly specified in the descriptor file by its full name could not be found in any of the assemblies seen by the trimmer. ## Example diff --git a/docs/core/deploying/trimming/trim-warnings/il2023.md b/docs/core/deploying/trimming/trim-warnings/il2023.md index 54242b98a7f0e..af539f54ca57a 100644 --- a/docs/core/deploying/trimming/trim-warnings/il2023.md +++ b/docs/core/deploying/trimming/trim-warnings/il2023.md @@ -18,13 +18,11 @@ element when putting an attribute on the return parameter of a method. [Custom attribute annotation files](https://github.com/mono/linker/blob/main/docs/data-formats.md#custom-attributes-annotations-format) are used to instruct the trimmer to behave as if the specified item has a given -attribute. Attribute annotations can only be used to add attributes which have effect on -the trimmer behavior, all other attributes will be ignored. Attributes added via -attribute annotations only influence the trimmer behavior and they are never added to the -output assembly. +attribute. Attribute annotations can only be used to add attributes that have effect on +the trimmer behavior. All other attributes are ignored. Attributes added via +attribute annotations only influence the trimmer behavior, and they are never added to the output assembly. -A `method` element has more than one `return` element specified. Trimmer only allows one -attribute annotation on the retun type of a given method. +A `method` element has more than one `return` element specified. Trimmer only allows one attribute annotation on the return type of a given method. ## Example diff --git a/docs/core/deploying/trimming/trim-warnings/il2029.md b/docs/core/deploying/trimming/trim-warnings/il2029.md index 4538a5c3330d0..e1dfa0c60e9ef 100644 --- a/docs/core/deploying/trimming/trim-warnings/il2029.md +++ b/docs/core/deploying/trimming/trim-warnings/il2029.md @@ -18,13 +18,11 @@ argument `fullname` or its value is an empty string. [Custom attribute annotation files](https://github.com/mono/linker/blob/main/docs/data-formats.md#custom-attributes-annotations-format) are used to instruct the trimmer to behave as if the specified item has a given -attribute. Attribute annotations can only be used to add attributes which have effect on -the trimmer behavior, all other attributes will be ignored. Attributes added via -attribute annotations only influence the trimmer behavior and they are never added to the -output assembly. +attribute. Attribute annotations can only be used to add attributes that have effect on +the trimmer behavior. All other attributes are ignored. Attributes added via +attribute annotations only influence the trimmer behavior, and they're never added to the output assembly. -All `attribute` elements must have the required `fullname` argument and its value cannot -be an empty string. +All `attribute` elements must have the required `fullname` argument and its value cannot be an empty string. ## Example From 5264358763234b6fee241a53b125f94fb4f6b5ae Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Wed, 17 Nov 2021 10:29:58 -0800 Subject: [PATCH 2/2] fix link --- .../strategies-migrating-in-production.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/architecture/porting-existing-aspnet-apps/strategies-migrating-in-production.md b/docs/architecture/porting-existing-aspnet-apps/strategies-migrating-in-production.md index f2d7e53ac14f0..296df439e079b 100644 --- a/docs/architecture/porting-existing-aspnet-apps/strategies-migrating-in-production.md +++ b/docs/architecture/porting-existing-aspnet-apps/strategies-migrating-in-production.md @@ -45,7 +45,7 @@ Eventually, the entire facade layer corresponds to the new, modern implementatio Multi-targeting is recommended for large apps that will be migrated over time and for teams applying the Strangler pattern approach. This approach can address `BindingRedirect` and package restoration challenges that surface from mixing [PackageReference](/nuget/consume-packages/package-references-in-project-files) and [packages.config](/nuget/reference/packages-config) restore styles. There are two options available for code that must run in both .NET Framework and .NET Core environments. -* Preprocessor [`#if` in C#](../../csharp/language-reference/preprocessor-directives.md#conditional-compilation) (or [`#If` in Visual Basic]([preprocessor `#if`](/dotnet/visual-basic/reference/language-specification/preprocessing-directives#conditional-compilation)) directives allow you to implement different functionality or use different dependencies when run in .NET Framework versus .NET Core. +* Preprocessor directives ([#if in C#](../../csharp/language-reference/preprocessor-directives.md#conditional-compilation) or [#If in Visual Basic](/dotnet/visual-basic/reference/language-specification/preprocessing-directives#conditional-compilation)) allow you to implement different functionality or use different dependencies when run in .NET Framework versus .NET Core. * Project files can use conditional [globbing patterns](../../core/project-sdk/overview.md#default-includes-and-excludes), such as `*.core.cs`, to include different sets of files based on which framework is being targeted.