Skip to content

Commit ca0b278

Browse files
authored
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-554b8747-f93f-44e6-b51d-52712adfede0
2 parents ecf5b6d + a0aaff7 commit ca0b278

File tree

127 files changed

+3390
-1685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+3390
-1685
lines changed

.github/copilot-instructions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ Coding Style and Changes:
22
- Code should match the style of the file it's in.
33
- Changes should be minimal to resolve a problem in a clean way.
44
- User-visible changes to behavior should be considered carefully before committing. They should always be flagged.
5+
- When generating code, run `dotnet format` to ensure uniform formatting.
6+
- Prefer using file-based namespaces for new code.
7+
- Do not allow unused `using` directives to be committed.
58

69
Testing:
710
- Large changes should always include test changes.

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- Begin: Package sources from dotnet-aspire -->
77
<!-- End: Package sources from dotnet-aspire -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<add key="darc-int-dotnet-runtime-893c2eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb/nuget/v3/index.json" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1211
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -38,7 +37,6 @@
3837
<clear />
3938
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4039
<!-- Begin: Package sources from dotnet-runtime -->
41-
<add key="darc-int-dotnet-runtime-893c2eb" value="true" />
4240
<!-- End: Package sources from dotnet-runtime -->
4341
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4442
</disabledPackageSources>

documentation/manpages/sdk/dotnet-migrate.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
. ftr VB CB
1515
. ftr VBI CBI
1616
.\}
17-
.TH "dotnet-migrate" "1" "2025-06-13" "" ".NET Documentation"
17+
.TH "dotnet-migrate" "1" "2025-09-15" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet migrate
2020
.PP
@@ -49,7 +49,7 @@ A single project by specifying the \f[I]project.json\f[R] file to migrate.
4949
.IP \[bu] 2
5050
All of the directories specified in the \f[I]global.json\f[R] file by passing in a path to the \f[I]global.json\f[R] file.
5151
.IP \[bu] 2
52-
A \f[I]solution.sln(x)\f[R] file, where it migrates the projects referenced in the solution.
52+
A \f[I]solution.sln\f[R] file, where it migrates the projects referenced in the solution.
5353
.IP \[bu] 2
5454
On all subdirectories of the given directory recursively.
5555
.PP
@@ -72,7 +72,7 @@ a \f[I]project.json\f[R] file to migrate.
7272
.IP \[bu] 2
7373
a \f[I]global.json\f[R] file: the folders specified in \f[I]global.json\f[R] are migrated.
7474
.IP \[bu] 2
75-
a \f[I]solution.sln(x)\f[R] file: the projects referenced in the solution are migrated.
75+
a \f[I]solution.sln\f[R] file: the projects referenced in the solution are migrated.
7676
.IP \[bu] 2
7777
a directory to migrate: recursively searches for \f[I]project.json\f[R] files to migrate inside the specified directory.
7878
.PP

0 commit comments

Comments
 (0)