Skip to content

Commit 855cdf4

Browse files
Merge pull request #50874 from dotnet/main
Merge main into live
2 parents 94eb556 + 15a63d4 commit 855cdf4

14 files changed

Lines changed: 23 additions & 16 deletions

File tree

docs/core/deploying/native-aot/warnings/il3058.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ public class Program
4141
}
4242
```
4343

44-
```
44+
```output
4545
warning IL3058: Referenced assembly 'MyLibrary' is not built with `<IsAotCompatible>true</IsAotCompatible>` and may not be compatible with AOT.
4646
```
4747

4848
## How to fix violations
4949

5050
You have several options to fix this warning:
5151

52-
- **Update the referenced library** to be built with `<IsAotCompatible>true</IsAotCompatible>`. This is the preferred approach if you control the library source code. The `IsAotCompatible` property marks the assembly as compatible with Native AOT and enables AOT-specific analysis.
53-
- **Disable the verification** by setting `<VerifyReferenceAotCompatibility>false</VerifyReferenceAotCompatibility>` in your project file if you're confident that the library works correctly with Native AOT even without the attribute.
52+
- If you control the library source code, **update the referenced library** to be built with `<IsAotCompatible>true</IsAotCompatible>`. The `IsAotCompatible` property marks the assembly as compatible with Native AOT and enables AOT-specific analysis. This is the preferred approach.
53+
- If you're confident that the library works correctly with Native AOT even without the attribute, **disable the verification** by setting `<VerifyReferenceAotCompatibility>false</VerifyReferenceAotCompatibility>` in your project file.
5454

5555
## See also
5656

docs/core/deploying/trimming/trim-warnings/il2125.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ public class Program
4141
}
4242
```
4343

44-
```
44+
```output
4545
warning IL2125: Referenced assembly 'MyLibrary' is not built with `<IsTrimmable>true</IsTrimmable>` and may not be compatible with trimming.
4646
```
4747

4848
## How to fix violations
4949

5050
You have several options to fix this warning:
5151

52-
- **Update the referenced library** to be built with `<IsTrimmable>true</IsTrimmable>`. This is the preferred approach if you control the library source code. For guidance on making libraries trim-compatible, see [Prepare .NET libraries for trimming](../prepare-libraries-for-trimming.md).
53-
- **Disable the verification** by setting `<VerifyReferenceTrimCompatibility>false</VerifyReferenceTrimCompatibility>` in your project file if you're confident that the library works correctly with trimming even without the attribute.
52+
- If you control the library source code, **update the referenced library** to be built with `<IsTrimmable>true</IsTrimmable>`. For guidance on making libraries trim-compatible, see [Prepare .NET libraries for trimming](../prepare-libraries-for-trimming.md). This is the preferred approach.
53+
- If you're confident that the library works correctly with trimming even without the attribute, **disable the verification** by setting `<VerifyReferenceTrimCompatibility>false</VerifyReferenceTrimCompatibility>` in your project file.
5454

5555
## See also
5656

docs/core/project-sdk/msbuild-props.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ Use the `DefaultItemExcludes` property to define glob patterns for files and fol
880880
```
881881

882882
> [!NOTE]
883-
> The `DefaultItemExcludes` property excludes files and folders from being watched by `dotnet watch`. For more information, see [Ignore specified folders and files from `dotnet watch`](/dotnet/core/tools/dotnet-watch#ignore-specified-files-and-folders).
883+
> The `DefaultItemExcludes` property excludes files and folders from being watched by `dotnet watch`. For more information, see [Ignore specified folders and files from `dotnet watch`](../tools/dotnet-watch.md#ignore-specified-files-and-folders).
884884
885885
### DefaultItemExcludesInProjectFolder
886886

-43.4 KB
Binary file not shown.
-84.4 KB
Binary file not shown.
-123 KB
Binary file not shown.
-472 KB
Binary file not shown.
-113 KB
Binary file not shown.

docs/core/tools/includes/cli-arguments-project-solution-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ The project or solution or C# (file-based app) file to operate on. If a file isn
1111

1212
- `SOLUTION` is the path and filename of a solution file (*.sln* or *.slnx* extension), or the path to a directory that contains a solution file.
1313

14-
- `FILE` is an argument added in .NET 10. The path and filename of a file-based app. File-based apps are contained within a single file that is built and run without a corresponding project (*.csproj*) file. For more information, see [Build file-based C# apps](/dotnet/csharp/fundamentals/tutorials/file-based-programs).
14+
- `FILE` is an argument added in .NET 10. The path and filename of a file-based app. File-based apps are contained within a single file that is built and run without a corresponding project (*.csproj*) file. For more information, see [Build file-based C# apps](../../../csharp/fundamentals/tutorials/file-based-programs.md).

docs/csharp/language-reference/toc.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ items:
922922
- name: CS0198
923923
href: ../misc/cs0198.md
924924
- name: CS0200
925-
href: ../misc/cs0200.md
925+
href: ./compiler-messages/property-declaration-errors.md
926926
- name: CS0201
927927
href: ./compiler-messages/cs0201.md
928928
- name: CS0202
@@ -1108,7 +1108,7 @@ items:
11081108
- name: CS0544
11091109
href: ../misc/cs0544.md
11101110
- name: CS0545
1111-
href: ./compiler-messages/cs0545.md
1111+
href: ./compiler-messages/property-declaration-errors.md
11121112
- name: CS0546
11131113
href: ../misc/cs0546.md
11141114
- name: CS0547
@@ -1124,7 +1124,7 @@ items:
11241124
- name: CS0570
11251125
href: ./compiler-messages/cs0570.md
11261126
- name: CS0571
1127-
href: ./compiler-messages/cs0571.md
1127+
href: ./compiler-messages/property-declaration-errors.md
11281128
- name: CS0572
11291129
href: ../misc/cs0572.md
11301130
- name: CS0573
@@ -1314,7 +1314,7 @@ items:
13141314
- name: CS0837
13151315
href: ../misc/cs0837.md
13161316
- name: CS0840
1317-
href: ./compiler-messages/cs0840.md
1317+
href: ./compiler-messages/property-declaration-errors.md
13181318
- name: CS0841
13191319
href: ../misc/cs0841.md
13201320
- name: CS0842
@@ -1336,7 +1336,7 @@ items:
13361336
- name: CS1013
13371337
href: ../misc/cs1013.md
13381338
- name: CS1014
1339-
href: ../misc/cs1014.md
1339+
href: ./compiler-messages/property-declaration-errors.md
13401340
- name: CS1015
13411341
href: ../misc/cs1015.md
13421342
- name: CS1017
@@ -1364,7 +1364,7 @@ items:
13641364
- name: CS1041
13651365
href: ../misc/cs1041.md
13661366
- name: CS1043
1367-
href: ../misc/cs1043.md
1367+
href: ./compiler-messages/property-declaration-errors.md
13681368
- name: CS1044
13691369
href: ../misc/cs1044.md
13701370
- name: CS1055
@@ -1752,7 +1752,7 @@ items:
17521752
- name: CS8141
17531753
href: ./compiler-messages/cs8141.md
17541754
- name: CS8145
1755-
href: ./compiler-messages/cs8145.md
1755+
href: ./compiler-messages/property-declaration-errors.md
17561756
- name: CS8146
17571757
href: ./compiler-messages/cs8146.md
17581758
- name: CS8147
@@ -1824,7 +1824,7 @@ items:
18241824
- name: CS8515
18251825
href: ./compiler-messages/cs8515.md
18261826
- name: CS9036
1827-
href: ./compiler-messages/cs9036.md
1827+
href: ./compiler-messages/property-declaration-errors.md
18281828
- name: CS9043
18291829
href: ./compiler-messages/cs9043.md
18301830
- name: Level 1 warning messages

0 commit comments

Comments
 (0)