Skip to content

Merge main into live #45194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

############### .NET Core ########################
# What's New
/docs/core/whats-new/ @camsoper @gewarren @dotnet/docs
/docs/core/whats-new/ @camsoper @dotnet/docs
# Deployment
/docs/core/deploying/ @adegeo @dotnet/docs
# Diagnostics
Expand All @@ -105,7 +105,7 @@
# Install
/docs/core/install/ @adegeo @dotnet/docs
# Breaking changes
/docs/core/compatibility/ @camsoper @gewarren @dotnet/docs
/docs/core/compatibility/ @camsoper @dotnet/docs
# Project SDKs
/docs/core/project-sdk/ @gewarren @dotnet/docs
# Config settings
Expand Down Expand Up @@ -174,7 +174,7 @@
# Data
/docs/standard/data/ @gewarren @dotnet/docs
# Data - SQLite
/docs/standard/data/sqlite/ @ajcvickers @dotnet/docs
/docs/standard/data/sqlite/ @dotnet/docs
# Datetime
/docs/standard/datetime/ @adegeo @dotnet/docs
# Design guidelines
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/02-breaking-change.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: ".NET breaking change"
description: Report a change in .NET that breaks something that worked in a previous version. Intended mostly for product-team use.
description: This template is for .NET product team members to report breaking changes to documentation content developers. Please report user-discovered issues in the appropriate product repo.
title: "[Breaking change]: "
labels:
- breaking-change
Expand Down
16 changes: 16 additions & 0 deletions .openpublishing.redirection.csharp.json
Original file line number Diff line number Diff line change
Expand Up @@ -4156,6 +4156,22 @@
"source_path_from_root": "/docs/csharp/tour-of-csharp/types.md",
"redirect_url": "/dotnet/csharp/tour-of-csharp"
},
{
"source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/arrays-and-collections.md",
"redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials/list-collection"
},
{
"source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/local-environment.md",
"redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials"
},
{
"source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/branches-and-loops-local.md",
"redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials/branches-and-loops"
},
{
"source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/numbers-in-csharp-local.md",
"redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials/numbers-in-csharp"
},
{
"source_path_from_root": "/docs/csharp/tuples.md",
"redirect_url": "/dotnet/csharp/language-reference/builtin-types/value-tuples"
Expand Down
8 changes: 4 additions & 4 deletions .openpublishing.redirection.framework.json
Original file line number Diff line number Diff line change
Expand Up @@ -3502,11 +3502,11 @@
},
{
"source_path_from_root": "/docs/framework/network-programming/accessing-the-internet-through-a-proxy.md",
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
},
{
"source_path_from_root": "/docs/framework/network-programming/automatic-proxy-detection.md",
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
},
{
"source_path_from_root": "/docs/framework/network-programming/how-to-override-a-global-proxy-selection.md",
Expand All @@ -3522,7 +3522,7 @@
},
{
"source_path_from_root": "/docs/framework/network-programming/proxy-configuration.md",
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
},
{
"source_path_from_root": "/docs/framework/network-programming/changes-to-the-system-uri-namespace-in-version-2-0.md",
Expand All @@ -3534,7 +3534,7 @@
},
{
"source_path_from_root": "/docs/framework/network-programming/how-to-enable-a-webrequest-to-use-a-proxy-to-communicate-with-the-internet.md",
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
"redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
}
]
}
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/includes/ai-templates-azure-openai.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
1. Create a new app with the `dotnet new` command and the following parameters:

```dotnetcli
dotnet new aichatweb --framework "net9.0" --AIServiceProvider "azureopenai" --VectorStore "local"
dotnet new aichatweb --framework "net9.0" --AiServiceProvider "azureopenai" --VectorStore "local"
```

The .NET CLI creates a new .NET 9.0 app with the configurations you specified.
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/includes/ai-templates-ollama.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
1. Create a new app with the `dotnet new` command and the following parameters:

```dotnetcli
dotnet new aichatweb --framework "net9.0" --AIServiceProvider "ollama" --VectorStore "local"
dotnet new aichatweb --framework "net9.0" --AiServiceProvider "ollama" --VectorStore "local"
```

The .NET CLI creates a new .NET 9.0 app with the configurations you specified.
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/includes/ai-templates-openai.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
1. Create a new app with the `dotnet new` command and the following parameters:

```dotnetcli
dotnet new aichatweb --framework "net9.0" --AIServiceProvider "openai" --VectorStore "local"
dotnet new aichatweb --framework "net9.0" --AiServiceProvider "openai" --VectorStore "local"
```

The .NET CLI creates a new .NET 9.0 app with the configurations you specified.
Expand Down
Loading
Loading