Skip to content

Commit

Permalink
Merge pull request #36941 from dotnet/main
Browse files Browse the repository at this point in the history
  • Loading branch information
@BillWagner
BillWagner authored Sep 1, 2023
2 parents 1878d92 + b8f805b commit 281fb00
Show file tree
Hide file tree
Showing 105 changed files with 1,593 additions and 2,692 deletions.
119 changes: 110 additions & 9 deletions .openpublishing.redirection.csharp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,41 @@
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/integral-numeric-types#native-sized-integers"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0834.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#conversion-to-expression-trees"
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0178.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0188.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/feature-version-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0270.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0650.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0826.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0834.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#conversion-to-expression-trees"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0843.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/feature-version-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0846.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs3007.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs7000.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
Expand Down Expand Up @@ -1220,6 +1244,10 @@
"source_path_from_root": "/docs/csharp/methods-lambda-expressions.md",
"redirect_url": "/dotnet/csharp/language-reference/operators/lambda-expressions"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0022.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0105.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
Expand All @@ -1233,23 +1261,23 @@
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/feature-version-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0431.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
"source_path_from_root": "/docs/csharp/misc/cs0248.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/feature-version-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0432.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
"source_path_from_root": "/docs/csharp/misc/cs0251.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/feature-version-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0440.md",
"source_path_from_root": "/docs/csharp/misc/cs0431.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0576.md",
"source_path_from_root": "/docs/csharp/misc/cs0432.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0687.md",
"source_path_from_root": "/docs/csharp/misc/cs0440.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
},
{
Expand Down Expand Up @@ -1284,14 +1312,38 @@
"source_path_from_root": "/docs/csharp/misc/cs0570.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/constructor-errors#CS0570"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0576.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0611.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0623.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0687.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0710.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/constructor-errors#constructor-declarations"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0719.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0748.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#lambda-expression-parameters-and-returns"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0820.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs0824.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/constructor-errors#constructor-declarations"
Expand All @@ -1308,6 +1360,14 @@
"source_path_from_root": "/docs/csharp/misc/cs1537.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs1552.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs1586.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs1621.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"
Expand All @@ -1332,6 +1392,10 @@
"source_path_from_root": "/docs/csharp/misc/cs1706.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"
},
{
"source_path_from_root": "/docs/csharp/misc/cs1925.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/misc/cs1951.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"
Expand All @@ -1344,6 +1408,10 @@
"source_path_from_root": "/docs/csharp/misc/cs1953.md",
"redirect_url": "/dotnet/csharp/misc/cs0837"
},
{
"source_path_from_root": "/docs/csharp/misc/cs3016.md",
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
},
{
"source_path_from_root": "/docs/csharp/namespaces-and-assemblies.md",
"redirect_url": "/dotnet/csharp/fundamentals/types/namespaces"
Expand Down Expand Up @@ -1440,6 +1508,34 @@
"source_path_from_root": "/docs/csharp/programming-guide/classes-and-structs/using-structs.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/struct"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/implicitly-typed-arrays.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays#implicitly-typed-arrays"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/index.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/jagged-arrays.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays#jagged-arrays"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/multidimensional-arrays.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays#multidimensional-arrays"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/passing-arrays-as-arguments.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays#passing-arrays-as-arguments"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/single-dimensional-arrays.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays#single-dimensional-arrays"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/arrays/using-foreach-with-arrays.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/arrays"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/concepts/assemblies-gac/friend-assemblies.md",
"redirect_url": "/dotnet/standard/assembly/friend",
Expand Down Expand Up @@ -1570,6 +1666,11 @@
"source_path_from_root": "/docs/csharp/programming-guide/concepts/caller-information.md",
"redirect_url": "/dotnet/csharp/language-reference/attributes/caller-information"
},
{
"source_path_from_root": "/docs/csharp/programming-guide/concepts/collections.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/collections",
"redirect_document_id": true
},
{
"source_path_from_root": "/docs/csharp/programming-guide/concepts/expression-trees/index.md",
"redirect_url": "/dotnet/csharp/advanced-topics/expression-trees/index"
Expand Down
23 changes: 13 additions & 10 deletions docfx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@
"csharp-9.0/*.md",
"csharp-10.0/*.md",
"csharp-11.0/*.md",
"csharp-12.0/*.md"
"csharp-12.0/primary-constructors.md",
"csharp-12.0/collection-expressions.md",
"csharp-12.0/using-alias-types.md",
"csharp-12.0/lambda-method-group-defaults.md",
"csharp-12.0/inline-arrays.md",
"csharp-12.0/experimental-attribute.md"
],
"src": "_csharplang/proposals",
"dest": "csharp/language-reference/proposals",
Expand All @@ -67,8 +72,7 @@
"csharp-8.0/obsolete-accessor.md",
"csharp-8.0/shadowing-in-nested-functions.md",
"csharp-8.0/unconstrained-null-coalescing.md",
"csharp-8.0/nullable-reference-types-specification.md",
"csharp-12.0/ref-readonly-parameters.md"
"csharp-8.0/nullable-reference-types-specification.md"
]
},
{
Expand Down Expand Up @@ -186,8 +190,7 @@
"docs/fundamentals/code-analysis/quality-rules/**/il*.md": "https://github.com/mono/linker/issues",
"docs/fundamentals/code-analysis/style-rules/**/*.md": "https://github.com/dotnet/roslyn/issues",
"docs/machine-learning/**/**.md": "https://github.com/dotnet/machinelearning",
"docs/standard/data/sqlite/**/*.md": "https://github.com/dotnet/efcore",
"docs/spark/**/**.md": "https://github.com/dotnet/spark"
"docs/standard/data/sqlite/**/*.md": "https://github.com/dotnet/efcore"
},
"ms.prod": {
"_csharplang/**/*.md": "dotnet-csharp",
Expand All @@ -208,7 +211,6 @@
"docs/standard/design-guidelines/*.md": "dotnet",
"docs/standard/security/*.md": "dotnet",
"docs/visual-basic/**/**.md": "dotnet-visualbasic",
"docs/spark/**/**.md": "dotnet-spark",
"docs/orleans/**/**.md": "dotnet-orleans"
},
"ms.topic": {
Expand Down Expand Up @@ -338,7 +340,6 @@
"docs/fundamentals/syslib-diagnostics/**/**.md": "gewarren",
"docs/iot/**/*.*": "camsoper",
"docs/machine-learning/**/**.md": "luisquintanilla",
"docs/spark/**/**.md": "luisquintanilla",
"docs/standard/**/**.md": "gewarren",
"docs/standard/analyzers/**/**.md": "IEvangelist",
"docs/standard/assembly/**/**.md": "IEvangelist",
Expand Down Expand Up @@ -425,7 +426,6 @@
"docs/fundamentals/syslib-diagnostics/**/**.md": "gewarren",
"docs/iot/**/*.*": "casoper",
"docs/machine-learning/**/**.md": "luquinta",
"docs/spark/**/**.md": "luquinta",
"docs/standard/**/**.md": "gewarren",
"docs/standard/analyzers/**/**.md": "dapine",
"docs/standard/assembly/**/**.md": "dapine",
Expand Down Expand Up @@ -666,8 +666,8 @@
"_csharplang/proposals/csharp-12.0/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
"_csharplang/proposals/csharp-12.0/inline-arrays.md": "Inline arrays, or fixed sized buffers",
"_csharplang/proposals/csharp-12.0/collection-expressions.md": "Collection expressions",
"_csharplang/proposals/csharp-12.0/experimental-attribute.md": "Experimental attribute",



"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "C# compiler breaking changes since C# 10",
"_vblang/spec/introduction.md": "Introduction",
Expand Down Expand Up @@ -780,7 +780,8 @@
"_csharplang/proposals/csharp-12.0/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
"_csharplang/proposals/csharp-12.0/inline-arrays.md": "Inline arrays provide a general-purpose and safe mechanism for declaring inline arrays within C# classes, structs, and interfaces.",
"_csharplang/proposals/csharp-12.0/collection-expressions.md": "Collection expressions provide a concise syntax to initialize collections by defining elements or embedded collections as the source of the new collection's elements.",

"_csharplang/proposals/csharp-12.0/experimental-attribute.md": "Use the ExperimentalAttribute attribute to indicate APIs that aren't stable.",

"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "Learn about any breaking changes since the initial release of C# 10",
"_vblang/spec/introduction.md": "This chapter provides and introduction to the Visual Basic language.",
"_vblang/spec/lexical-grammar.md": "This chapter defines the lexical grammar for Visual Basic.",
Expand All @@ -797,6 +798,7 @@
"_vblang/spec/overload-resolution.md": "This chapter describes the rules that govern overload resolution when multiple members have the same name."
},
"titleSuffix": {
"docs/**/**.md": ".NET",
"_csharpstandard/standard/*.md": "C# language specification",
"_csharplang/proposals/csharp-8.0/*.md": "C# 8.0 draft feature specifications",
"_csharplang/proposals/csharp-9.0/*.md": "C# 9.0 draft feature specifications",
Expand Down Expand Up @@ -827,6 +829,7 @@
"docs/core/tools/**.md": ".NET CLI",
"docs/core/tutorials/**.md": ".NET",
"docs/core/versions/**.md": ".NET",
"docs/csharp/**/**.md": "C#",
"docs/machine-learning/**/**.md": "ML.NET",
"docs/standard/data/sqlite/**/**.md": "Microsoft.Data.Sqlite",
"docs/standard/design-guidelines/**/**.md": "Framework Design Guidelines",
Expand Down
Loading

0 comments on commit 281fb00

Please sign in to comment.