Skip to content

Commit fb81cb7

Browse files
Rob-SRob-S
authored
Merge pull request #596 from dotnet/main
Merge from upstream
2 parents f9825ac + ebd6691 commit fb81cb7

File tree

3,583 files changed

+13862
-205489
lines changed

Some content is hidden

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

3,583 files changed

+13862
-205489
lines changed

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,15 @@
143143
/docs/standard/asynchronous-programming-patterns/ @BillWagner
144144
# Attributes
145145
/docs/standard/attributes/ @tdykstra
146+
# Character encoding
147+
/docs/standard/base-types/character-encoding/ @tdykstra
148+
/docs/standard/base-types/character-encoding-introduction/ @tdykstra
146149
# Base types
147150
/docs/standard/base-types/ @adegeo
148151
# Collections
149152
/docs/standard/collections/ @IEvangelist
153+
# System.CommandLine
154+
/docs/standard/commandline/ @tdykstra
150155
# Data
151156
/docs/standard/data/ @gewarren
152157
# Data - SQLite

‎.github/workflows/build-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
echo "Downloading dotnet-install.ps1"
4141
Invoke-WebRequest https://github.com/raw/dotnet/install-scripts/master/src/dotnet-install.ps1 -OutFile dotnet-install.ps1
4242
echo "Installing dotnet version ${{ env.DOTNET_INSTALLER_CHANNEL }}"
43-
.\dotnet-install.ps1 -InstallDir "c:\program files\dotnet" -Channel "${{ env.DOTNET_INSTALLER_CHANNEL }}"
43+
.\dotnet-install.ps1 -InstallDir "c:\program files\dotnet" -Channel "${{ env.DOTNET_INSTALLER_CHANNEL }}" -Quality preview
4444
4545
# Print dotnet info
4646
- name: Display .NET info

‎.github/workflows/dependencies/dotnet-whatsnew.2.1.4.nupkg‎

-918 KB
Binary file not shown.

‎.github/workflows/dependencies/dotnet-whatsnew.2.1.5.nupkg‎

920 KB
Binary file not shown.

‎.openpublishing.publish.config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{
5656
"path_to_root": "_csharpstandard",
5757
"url": "https://github.com/dotnet/csharpstandard",
58-
"branch": "draft-v6",
58+
"branch": "draft-v7",
5959
"include_in_build": true,
6060
"branch_mapping": {}
6161
},
@@ -118,6 +118,7 @@
118118
".openpublishing.redirection.fsharp.json",
119119
".openpublishing.redirection.fundamentals.json",
120120
".openpublishing.redirection.machine-learning.json",
121+
".openpublishing.redirection.orleans.json",
121122
".openpublishing.redirection.standard.json",
122123
".openpublishing.redirection.visual-basic.json"
123124
],

‎.openpublishing.redirection.csharp.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/_csharplang/proposals/csharp-7.0/binary-literals.md",
5+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
6+
},
7+
{
8+
"source_path_from_root": "/_csharplang/proposals/csharp-7.0/digit-separators.md",
9+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
10+
},
11+
{
12+
"source_path_from_root": "/_csharplang/proposals/csharp-7.3/leading-digit-separator.md",
13+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
14+
},
315
{
416
"source_path_from_root": "/docs/csharp/basic-types.md",
517
"redirect_url": "/dotnet/csharp/fundamentals/types"
@@ -151,6 +163,10 @@
151163
"source_path_from_root": "/docs/csharp/lambda-expressions.md",
152164
"redirect_url": "/dotnet/csharp/language-reference/operators/lambda-expressions"
153165
},
166+
{
167+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8892.md",
168+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/warning-waves#cs8892"
169+
},
154170
{
155171
"source_path_from_root": "/docs/csharp/language-reference/compiler-options/addmodule-compiler-option.md",
156172
"redirect_url": "/dotnet/csharp/language-reference/compiler-options/inputs"
@@ -851,6 +867,10 @@
851867
"source_path_from_root": "/docs/csharp/language-reference/operators/right-shift-operator.md",
852868
"redirect_url": "/dotnet/csharp/language-reference/operators/bitwise-and-shift-operators#right-shift-operator-"
853869
},
870+
{
871+
"source_path_from_root": "/docs/csharp/language-reference/operators/null-parameter-check.md",
872+
"redirect_url": "/dotnet/csharp/language-reference/operators"
873+
},
854874
{
855875
"source_path_from_root": "/docs/csharp/language-reference/operators/subtraction-assignment-operator.md",
856876
"redirect_url": "/dotnet/csharp/language-reference/operators/arithmetic-operators#compound-assignment"

‎.openpublishing.redirection.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@
7979
{
8080
"source_path_from_root": "/docs/tutorials/index.md",
8181
"redirect_url": "/dotnet/samples-and-tutorials/"
82-
},
83-
{
84-
"source_path_from_root": "/docs/orleans/whats-new/whats-new-in-orleans.md",
85-
"redirect_url": "https://github.com/dotnet/orleans/releases"
8682
}
8783
]
8884
}

‎.openpublishing.redirection.orleans.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/docs/orleans/whats-new/whats-new-in-orleans.md",
5+
"redirect_url": "https://github.com/dotnet/orleans/releases"
6+
},
7+
{
8+
"source_path_from_root": "/docs/orleans/deployment/azure-web-apps-with-azure-cloud-services.md",
9+
"redirect_url": "/dotnet/orleans/deployment/deploy-to-azure-app-service"
10+
}
11+
]
12+
}

‎.repoman.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ issues:
6767
# New issue opened, add Not Triaged
6868
- labels-add: [":watch: Not Triaged"]
6969

70+
# Dependabot opened issue, label it
71+
- check:
72+
- type: query
73+
value: "Issue.user.login == 'dependabot'"
74+
pass:
75+
- labels-add: ["dependencies"]
76+
7077
# If breaking change issue metadata, add labels
7178
- check:
7279
- type: metadata-comment

‎docfx.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@
3939
"inactive/**",
4040
"rejected/**",
4141
"csharp-6.0/enum-base-type.md",
42+
"csharp-7.0/binary-literals.md",
43+
"csharp-7.0/digit-separators.md",
4244
"csharp-7.0/expression-bodied-everything.md",
4345
"csharp-7.0/ref-locals-returns.md",
4446
"csharp-7.0/tuples.md",
4547
"csharp-7.0/value-task.md",
48+
"csharp-7.2/leading-separator.md",
4649
"csharp-7.2/readonly-struct.md",
4750
"csharp-7.2/ref-extension-methods.md",
4851
"csharp-7.2/ref-struct-and-span.md",
@@ -359,7 +362,6 @@
359362
"docs/orleans/**/*.*": "dapine",
360363
"docs/core/**/**.md": "dotnetcontent",
361364
"docs/core/compatibility/**/**.md": "gewarren",
362-
"docs/core/compatibility/aspnet-core/**/**.md": "kirklarkin",
363365
"docs/core/deploying/**/**.md": "adegeo",
364366
"docs/core/diagnostics/**/**.md": "tommcdon",
365367
"docs/core/extensions/**/**.md": "dapine",

0 commit comments

Comments
 (0)