Skip to content

Commit d76f9ad

Browse files
author
Jason Zhai
committed
Merge branch 'release/7.0.1xx' into release/7.0.2xx
2 parents 5d0f110 + c4280df commit d76f9ad

File tree

73 files changed

+1112
-340
lines changed

Some content is hidden

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

73 files changed

+1112
-340
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
77
<!-- End: Package sources from dotnet-aspnetcore -->
88
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
9+
<add key="darc-pub-DotNet-msbuild-Trusted-9a89d02" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9a89d02f/nuget/v3/index.json" />
910
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1011
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1112
<!-- End: Package sources from dotnet-roslyn-analyzers -->

documentation/manpages/sdk/dotnet-add-package.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-add-package" "1" "2022-06-03" "" ".NET Documentation"
17+
.TH "dotnet-add-package" "1" "2022-10-10" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet add package
2020
.PP

documentation/manpages/sdk/dotnet-add-reference.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-add-reference" "1" "2022-06-03" "" ".NET Documentation"
17+
.TH "dotnet-add-reference" "1" "2022-10-10" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet add reference
2020
.PP

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" "2022-06-03" "" ".NET Documentation"
17+
.TH "dotnet-build-server" "1" "2022-10-10" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet build-server
2020
.PP

documentation/manpages/sdk/dotnet-build.1

Lines changed: 12 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-build" "1" "2022-06-03" "" ".NET Documentation"
17+
.TH "dotnet-build" "1" "2022-10-21" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet build
2020
.PP
@@ -31,7 +31,7 @@ dotnet build [<PROJECT>|<SOLUTION>] [-a|--arch <ARCHITECTURE>]
3131
[--force] [--interactive] [--no-dependencies] [--no-incremental]
3232
[--no-restore] [--nologo] [--no-self-contained] [--os <OS>]
3333
[-o|--output <OUTPUT_DIRECTORY>] [-r|--runtime <RUNTIME_IDENTIFIER>]
34-
[--self-contained [true|false]] [--source <SOURCE>]
34+
[--self-contained [true|false]] [--source <SOURCE>] [--use-current-runtime, --ucr [true|false]]
3535
[-v|--verbosity <LEVEL>] [--version-suffix <VERSION_SUFFIX>]
3636

3737
dotnet build -h|--help
@@ -140,6 +140,7 @@ The default for most projects is \f[V]Debug\f[R], but you can override the build
140140
.PP
141141
Compiles for a specific framework.
142142
The framework must be defined in the project file.
143+
Examples: \f[V]net7.0\f[R], \f[V]net462\f[R].
143144
.RE
144145
.IP \[bu] 2
145146
\f[B]\f[VB]--force\f[B]\f[R]
@@ -220,6 +221,7 @@ Available since .NET 6.
220221
Specifies the target runtime.
221222
For a list of Runtime Identifiers (RIDs), see the RID catalog.
222223
If you use this option with .NET 6 SDK, use \f[V]--self-contained\f[R] or \f[V]--no-self-contained\f[R] also.
224+
If not specified, the default is to build for the current OS and architecture.
223225
.RE
224226
.IP \[bu] 2
225227
\f[B]\f[VB]--self-contained [true|false]\f[B]\f[R]
@@ -245,6 +247,14 @@ The default is \f[V]minimal\f[R].
245247
For more information, see <xref:Microsoft.Build.Framework.LoggerVerbosity>.
246248
.RE
247249
.IP \[bu] 2
250+
\f[B]\f[VB]--use-current-runtime, --ucr [true|false]\f[B]\f[R]
251+
.RS 2
252+
.PP
253+
Sets the \f[V]RuntimeIdentifier\f[R] to a platform portable \f[V]RuntimeIdentifier\f[R] based on the one of your machine.
254+
This happens implicitly with properties that require a \f[V]RuntimeIdentifier\f[R], such as \f[V]SelfContained\f[R], \f[V]PublishAot\f[R], \f[V]PublishSelfContained\f[R], \f[V]PublishSingleFile\f[R], and \f[V]PublishReadyToRun\f[R].
255+
If the property is set to false, that implicit resolution will no longer occur.
256+
.RE
257+
.IP \[bu] 2
248258
\f[B]\f[VB]--version-suffix <VERSION_SUFFIX>\f[B]\f[R]
249259
.RS 2
250260
.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" "2022-06-03" "" ".NET Documentation"
17+
.TH "dotnet-clean" "1" "2022-10-10" "" ".NET Documentation"
1818
.hy
1919
.SH dotnet clean
2020
.PP

0 commit comments

Comments
 (0)