Skip to content

Commit 8040f40

Browse files
authored
Merge branch 'main' into darc-main-dfdd07c8-a19b-4a2f-97c3-11cae5af91fc
2 parents 2bdd090 + 4e12cae commit 8040f40

File tree

267 files changed

+6261
-3066
lines changed

Some content is hidden

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

267 files changed

+6261
-3066
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25302.4",
6+
"version": "1.1.0-beta.25305.3",
77
"commands": [
88
"darc"
99
]

.vsts-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ extends:
6464
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6565
parameters:
6666
containers:
67-
alpine319WithNode:
68-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
67+
alpine322Amd64:
68+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
6969
centosStream9:
7070
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
7171
debian12Amd64:
@@ -215,7 +215,7 @@ extends:
215215
runTests: false
216216
### MUSL ###
217217
- categoryName: Musl
218-
container: alpine319WithNode
218+
container: alpine322Amd64
219219
runtimeIdentifier: linux-musl-x64
220220
publishArgument: $(_publishArgument)
221221
officialBuildProperties: $(_officialBuildProperties)

.vsts-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ variables:
2727

2828
resources:
2929
containers:
30-
- container: alpine319WithNode
31-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
30+
- container: alpine322Amd64
31+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
3232
- container: centosStream9
3333
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
3434
- container: debian12Amd64

CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
/src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
3131

3232
# Area-Format
33-
/src/Cli/dotnet/commands/dotnet-format @sharwell @arunchndr
34-
/test/dotnet-format.UnitTests @sharwell @arunchndr
33+
/src/Cli/dotnet/commands/dotnet-format @arunchndr
34+
/test/dotnet-format.UnitTests @arunchndr
3535

3636
# Area-NuGet
3737
/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team

documentation/manpages/sdk/dotnet-build-server.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
. ftr VB CB
1515
. ftr VBI CBI
1616
.\}
17-
.TH "dotnet-build-server" "1" "2024-10-02" "" ".NET Documentation"
17+
.TH "dotnet-build-server" "1" "2025-05-30" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet build-server
2020
.PP

documentation/manpages/sdk/dotnet-build.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
. ftr VB CB
1515
. ftr VBI CBI
1616
.\}
17-
.TH "dotnet-build" "1" "2024-10-02" "" ".NET Documentation"
17+
.TH "dotnet-build" "1" "2025-05-30" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet build
2020
.PP

documentation/manpages/sdk/dotnet-clean.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
. ftr VB CB
1515
. ftr VBI CBI
1616
.\}
17-
.TH "dotnet-clean" "1" "2024-10-02" "" ".NET Documentation"
17+
.TH "dotnet-clean" "1" "2025-05-30" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet clean
2020
.PP

documentation/manpages/sdk/dotnet-dev-certs.1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
. ftr VB CB
1616
. ftr VBI CBI
1717
.\}
18-
.TH "dotnet-dev-certs" "1" "2024-10-02" "" ".NET Documentation"
18+
.TH "dotnet-dev-certs" "1" "2025-05-30" "" ".NET Documentation"
1919
.hy
2020
.SH dotnet dev-certs
2121
.PP
@@ -119,6 +119,7 @@ successfully removed from the machine.
119119
.PP
120120
Exports the certificate to a file so that it can be used by other tools.
121121
Specify the full path to the exported certificate file, including the file name.
122+
The containing directories must already exist and access to them should be restricted.
122123
The type of certificate files that are created depends on which options are used with \f[V]--export-path\f[R]:
123124
.PP
124125
.TS

documentation/manpages/sdk/dotnet-environment-variables.7

Lines changed: 2 additions & 2 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-environment-variables" "7" "2024-10-02" "" ".NET Documentation"
17+
.TH "dotnet-environment-variables" "7" "2025-05-30" "" ".NET Documentation"
1818
.hy
1919
.SH NAME
2020
.PP
@@ -439,7 +439,7 @@ For more information, see the \f[V]--roll-forward\f[R] option for the \f[V]dotne
439439
If set to \f[V]1\f[R] (enabled), enables rolling forward to a pre-release version from a release version.
440440
By default (\f[V]0\f[R] - disabled), when a release version of .NET runtime is requested, roll-forward will only consider installed release versions.
441441
.PP
442-
For more information, see the \f[V]--roll-forward\f[R] option for the \f[V]dotnet\f[R] command
442+
For more information, see the \f[V]--roll-forward\f[R] option for the \f[V]dotnet\f[R] command.
443443
.SS \f[V]DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX\f[R]
444444
.PP
445445
Disables minor version roll forward, if set to \f[V]0\f[R].

documentation/manpages/sdk/dotnet-format.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
. ftr VB CB
1515
. ftr VBI CBI
1616
.\}
17-
.TH "dotnet-format" "1" "2024-10-02" "" ".NET Documentation"
17+
.TH "dotnet-format" "1" "2025-05-30" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet format
2020
.PP

0 commit comments

Comments
 (0)