Skip to content

Commit 68a47e8

Browse files
Merge pull request #47129 from dotnet/main
Merge main into live
2 parents b1e7db6 + 7f30eb5 commit 68a47e8

File tree

16 files changed

+54
-517
lines changed

16 files changed

+54
-517
lines changed

.github/workflows/whats-new.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

.openpublishing.redirection.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,20 @@
245245
"redirect_url": "/dotnet/samples-and-tutorials/"
246246
},
247247
{
248-
"source_path_from_root": "/docs/whats-new/dotnet-docs-2022-08-01.md",
249-
"redirect_url": "/dotnet/whats-new/dotnet-docs-mod2"
248+
"source_path_from_root": "/docs/whats-new/dotnet-docs-mod0",
249+
"redirect_url": "/dotnet/whats-new"
250250
},
251251
{
252-
"source_path_from_root": "/docs/whats-new/dotnet-docs-2022-09-01.md",
253-
"redirect_url": "/dotnet/whats-new/dotnet-docs-mod0"
252+
"source_path_from_root": "/docs/whats-new/dotnet-docs-mod1",
253+
"redirect_url": "/dotnet/whats-new"
254254
},
255255
{
256-
"source_path_from_root": "/docs/whats-new/dotnet-docs-2022-10-01.md",
257-
"redirect_url": "/dotnet/whats-new/dotnet-docs-mod1"
256+
"source_path_from_root": "/docs/whats-new/dotnet-docs-mod2",
257+
"redirect_url": "/dotnet/whats-new"
258+
},
259+
{
260+
"source_path_from_root": "/docs/whats-new/dotnet-9-release.md",
261+
"redirect_url": "/dotnet/whats-new"
258262
}
259263
]
260264
}

docs/azure/includes/dotnet-all.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
| Resource Management - App Configuration | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.AppConfiguration/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppConfiguration-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppConfiguration_1.4.0/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/) |
182182
| Resource Management - App Service | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.4.0/sdk/websites/Azure.ResourceManager.AppService/) |
183183
| Resource Management - Application Insights | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.ApplicationInsights/1.0.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ApplicationInsights-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApplicationInsights_1.0.1/sdk/applicationinsights/Azure.ResourceManager.ApplicationInsights/) |
184-
| Resource Management - Arizeaiobservabilityeval | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ArizeAIObservabilityEval/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ArizeAIObservabilityEval-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ArizeAIObservabilityEval_1.0.0-beta.1/sdk/arizeaiobservabilityeval/Azure.ResourceManager.ArizeAIObservabilityEval/) |
184+
| Resource Management - Arizeaiobservabilityeval | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ArizeAIObservabilityEval/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ArizeAIObservabilityEval-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ArizeAIObservabilityEval_1.0.0/sdk/arizeaiobservabilityeval/Azure.ResourceManager.ArizeAIObservabilityEval/) |
185185
| Resource Management - Astro | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.Astro/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.Astro-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Astro_1.0.0-beta.2/sdk/astronomer/Azure.ResourceManager.Astro/) |
186186
| Resource Management - Attestation | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.Attestation/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.Attestation-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Attestation_1.0.0-beta.5/sdk/attestation/Azure.ResourceManager.Attestation/) |
187187
| Resource Management - Authorization | NuGet [1.1.4](https://www.nuget.org/packages/Azure.ResourceManager.Authorization/1.1.4) | [docs](/dotnet/api/overview/azure/ResourceManager.Authorization-readme) | GitHub [1.1.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Authorization_1.1.4/sdk/authorization/Azure.ResourceManager.Authorization/) |
@@ -195,7 +195,7 @@
195195
| Resource Management - Billing Benefits | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.BillingBenefits/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.BillingBenefits-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.BillingBenefits_1.0.0-beta.4/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/) |
196196
| Resource Management - Blueprint | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.Blueprint/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.Blueprint-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Blueprint_1.0.0-beta.5/sdk/blueprint/Azure.ResourceManager.Blueprint/) |
197197
| Resource Management - Bot Service | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.BotService/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.BotService-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.BotService_1.1.1/sdk/botservice/Azure.ResourceManager.BotService/) |
198-
| Resource Management - Carbonoptimization | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.CarbonOptimization/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.CarbonOptimization-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.CarbonOptimization_1.0.0-beta.1/sdk/carbon/Azure.ResourceManager.CarbonOptimization/) |
198+
| Resource Management - Carbonoptimization | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.CarbonOptimization/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.CarbonOptimization-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.CarbonOptimization_1.0.0/sdk/carbon/Azure.ResourceManager.CarbonOptimization/) |
199199
| Resource Management - Change Analysis | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.ChangeAnalysis/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ChangeAnalysis-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ChangeAnalysis_1.1.1/sdk/changeanalysis/Azure.ResourceManager.ChangeAnalysis/) |
200200
| Resource Management - Chaos | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Chaos/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Chaos-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Chaos_1.1.0/sdk/chaos/Azure.ResourceManager.Chaos/) |
201201
| Resource Management - Cloudhealth | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.CloudHealth/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.CloudHealth-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.CloudHealth_1.0.0-beta.1/sdk/cloudhealth/Azure.ResourceManager.CloudHealth/) |

docs/azure/includes/dotnet-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
| Resource Management - App Service | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.4.0/sdk/websites/Azure.ResourceManager.AppService/) |
189189
| Resource Management - Application Insights | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.ApplicationInsights/1.0.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ApplicationInsights-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApplicationInsights_1.0.1/sdk/applicationinsights/Azure.ResourceManager.ApplicationInsights/) |
190190
| Resource Management - Arc ScVmm | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.ArcScVmm/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.ArcScVmm-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ArcScVmm_1.0.0-beta.4/sdk/arc-scvmm/Azure.ResourceManager.ArcScVmm/) |
191-
| Resource Management - Arizeaiobservabilityeval | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ArizeAIObservabilityEval/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ArizeAIObservabilityEval-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ArizeAIObservabilityEval_1.0.0-beta.1/sdk/arizeaiobservabilityeval/Azure.ResourceManager.ArizeAIObservabilityEval/) |
191+
| Resource Management - Arizeaiobservabilityeval | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ArizeAIObservabilityEval/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ArizeAIObservabilityEval-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ArizeAIObservabilityEval_1.0.0/sdk/arizeaiobservabilityeval/Azure.ResourceManager.ArizeAIObservabilityEval/) |
192192
| Resource Management - Astro | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.Astro/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.Astro-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Astro_1.0.0-beta.2/sdk/astronomer/Azure.ResourceManager.Astro/) |
193193
| Resource Management - Attestation | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.Attestation/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.Attestation-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Attestation_1.0.0-beta.5/sdk/attestation/Azure.ResourceManager.Attestation/) |
194194
| Resource Management - Authorization | NuGet [1.1.4](https://www.nuget.org/packages/Azure.ResourceManager.Authorization/1.1.4) | [docs](/dotnet/api/overview/azure/ResourceManager.Authorization-readme) | GitHub [1.1.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Authorization_1.1.4/sdk/authorization/Azure.ResourceManager.Authorization/) |
@@ -202,7 +202,7 @@
202202
| Resource Management - Billing Benefits | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.BillingBenefits/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.BillingBenefits-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.BillingBenefits_1.0.0-beta.4/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/) |
203203
| Resource Management - Blueprint | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.Blueprint/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.Blueprint-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Blueprint_1.0.0-beta.5/sdk/blueprint/Azure.ResourceManager.Blueprint/) |
204204
| Resource Management - Bot Service | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.BotService/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.BotService-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.BotService_1.1.1/sdk/botservice/Azure.ResourceManager.BotService/) |
205-
| Resource Management - Carbonoptimization | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.CarbonOptimization/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.CarbonOptimization-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.CarbonOptimization_1.0.0-beta.1/sdk/carbon/Azure.ResourceManager.CarbonOptimization/) |
205+
| Resource Management - Carbonoptimization | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.CarbonOptimization/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.CarbonOptimization-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.CarbonOptimization_1.0.0/sdk/carbon/Azure.ResourceManager.CarbonOptimization/) |
206206
| Resource Management - Change Analysis | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.ChangeAnalysis/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ChangeAnalysis-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ChangeAnalysis_1.1.1/sdk/changeanalysis/Azure.ResourceManager.ChangeAnalysis/) |
207207
| Resource Management - Chaos | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Chaos/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Chaos-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Chaos_1.1.0/sdk/chaos/Azure.ResourceManager.Chaos/) |
208208
| Resource Management - Cloudhealth | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.CloudHealth/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.CloudHealth-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.CloudHealth_1.0.0-beta.1/sdk/cloudhealth/Azure.ResourceManager.CloudHealth/) |

docs/core/deploying/deploy-with-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ In .NET 9 and later versions, you can configure the .NET installation search pat
137137

138138
- `AppLocal`: app executable's folder
139139
- `AppRelative`: path relative to the app executable
140-
- `EnvironmentVariables`: value of [`DOTNET_ROOT[_<arch>]`](../tools/dotnet-environment-variables.md#dotnet_root-dotnet_rootx86-dotnet_root_x86-dotnet_root_x64) environment variables
140+
- `EnvironmentVariable`: value of [`DOTNET_ROOT[_<arch>]`](../tools/dotnet-environment-variables.md#dotnet_root-dotnet_rootx86-dotnet_root_x86-dotnet_root_x64) environment variables
141141
- `Global`: [registered](https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#global-install-to-custom-location) and [default](https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#global-install-to-default-location) global install locations
142142

143143
`AppHostRelativeDotNet` specifies the path relative to the executable that will be searched when `AppHostDotNetSearch` contains `AppRelative`.

docs/core/deploying/trimming/trimming-options.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Several feature areas of the framework libraries come with trimmer directives th
7171
| `EnableUnsafeBinaryFormatterSerialization` | When set to `false`, removes BinaryFormatter serialization support. For more information, see [BinaryFormatter serialization methods are obsolete](../../compatibility/serialization/5.0/binaryformatter-serialization-obsolete.md) and [In-box BinaryFormatter implementation removed and always throws](../../compatibility/serialization/9.0/binaryformatter-removal.md). |
7272
| `EnableUnsafeUTF7Encoding` | When set to `false`, removes insecure UTF-7 encoding code. For more information, see [UTF-7 code paths are obsolete](../../compatibility/core-libraries/5.0/utf-7-code-paths-obsolete.md). |
7373
| `EventSourceSupport` | When set to `false`, removes EventSource-related code and logic. |
74+
| `Http3Support` (.NET 10+) | When set to `false`, removes code related to support for HTTP/3 in <xref:System.Net.Http>. |
7475
| `HttpActivityPropagationSupport` | When set to `false`, removes code related to diagnostics support for <xref:System.Net.Http>. |
7576
| `InvariantGlobalization` | When set to `true`, removes globalization-specific code and data. For more information, see [Invariant mode](../../runtime-config/globalization.md#invariant-mode). |
7677
| `MetadataUpdaterSupport` | When set to `false`, removes metadata update&ndash;specific logic related to hot reload. |

docs/core/project-sdk/msbuild-props.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ The following table lists valid values. You can specify multiple values, separat
16281628
| --- | --- |
16291629
| `AppLocal` | App executable's folder |
16301630
| `AppRelative` | Path relative to the app executable as specified by [AppHostRelativeDotNet](#apphostrelativedotnet) |
1631-
| `EnvironmentVariables` | Value of [`DOTNET_ROOT[_<arch>]`](../tools/dotnet-environment-variables.md#dotnet_root-dotnet_rootx86-dotnet_root_x86-dotnet_root_x64) environment variables |
1631+
| `EnvironmentVariable` | Value of [`DOTNET_ROOT[_<arch>]`](../tools/dotnet-environment-variables.md#dotnet_root-dotnet_rootx86-dotnet_root_x86-dotnet_root_x64) environment variables |
16321632
| `Global` | [Registered](https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#global-install-to-custom-location) and [default](https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#global-install-to-default-location) global install locations |
16331633

16341634
This property was introduced in .NET 9.

docs/csharp/language-reference/compiler-messages/cs8170.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Other
3535
public void Method()
3636
{
3737
var p = new Program();
38-
var d = p.M();
38+
ref int d = ref p.M();
3939
}
4040
}
4141
```
@@ -83,3 +83,31 @@ public class Other
8383
}
8484
}
8585
```
86+
87+
Another approach is to use the <xref:System.Diagnostics.CodeAnalysis.UnscopedRefAttribute?displayProperty=nameWithType> attribute. It will mark the reference to be allowed to escape the scope.<br/>
88+
Use this only when you know that it is safe for the reference to leave the scope.
89+
Below is the example of applying <xref:System.Diagnostics.CodeAnalysis.UnscopedRefAttribute?displayProperty=nameWithType> to `int M()` method, which fixes the CS8170:
90+
91+
```csharp
92+
using System.Diagnostics.CodeAnalysis;
93+
94+
struct Program
95+
{
96+
public int d;
97+
98+
[UnscopedRef]
99+
public ref int M()
100+
{
101+
return ref d; // No error - ref is valid to escape the scope in this line of that method
102+
}
103+
}
104+
105+
public class Other
106+
{
107+
public void Method()
108+
{
109+
var p = new Program();
110+
ref int d = ref p.M();
111+
}
112+
}
113+
```

0 commit comments

Comments
 (0)