Skip to content

Commit 1682be5

Browse files
Merge pull request #44195 from dotnet/main
Merge main into live
2 parents 3024b0a + d8b4ab2 commit 1682be5

File tree

14 files changed

+335
-145
lines changed

14 files changed

+335
-145
lines changed

.openpublishing.redirection.orleans.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
{
4040
"source_path_from_root": "/docs/orleans/host/configuration-guide/activation-garbage-collection.md",
4141
"redirect_url": "/dotnet/orleans/host/configuration-guide/activation-collection"
42+
},
43+
{
44+
"source_path_from_root": "/docs/orleans/implementation/cluster-configuration.md",
45+
"redirect_url": "/dotnet/orleans/implementation/cluster-management"
4246
}
47+
4348
]
4449
}

docs/ai/how-to/snippets/semantic-kernel/semantic-kernel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
18-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.32.0" />
18+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.33.0" />
1919
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.9.0-alpha" />
2020
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Redis" Version="1.9.0-alpha" />
2121
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.9.0-alpha" />

docs/ai/tutorials/snippets/llm-eval/llm-eval.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
15-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.32.0" />
15+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.33.0" />
1616
</ItemGroup>
1717

1818
</Project>

docs/architecture/maui/navigation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This interface specifies that an implementing class must provide the following m
5959
The `MauiNavigationService` class, which implements the `INavigationService` interface, is registered as a singleton with the dependency injection container in the `MauiProgram.CreateMauiApp()` method, as demonstrated in the following code example:
6060

6161
```csharp
62-
mauiAppBuilder.Services.AddSingleton<INavigationService, MauiNavigationService>();;
62+
mauiAppBuilder.Services.AddSingleton<INavigationService, MauiNavigationService>();
6363
```
6464

6565
The `INavigationService` interface can then be resolved by adding it to the constructor of our views and view-models, as demonstrated in the following code example:

docs/core/compatibility/core-libraries/5.0/hardware-instrinsics-issupported-checks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 11/01/2020
88
Checking `<Isa>.X64.IsSupported`, where `<Isa>` refers to the classes in the <xref:System.Runtime.Intrinsics.X86?displayProperty=nameWithType> namespace, may now produce a different result to previous versions of .NET.
99

1010
> [!TIP]
11-
> *ISA* stands for industry standard architecture.
11+
> *ISA* stands for Instruction Set Architecture.
1212
1313
## Version introduced
1414

docs/core/compatibility/core-libraries/5.0/sse-comparegreaterthan-intrinsics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Previously, `NaN` inputs to the listed <xref:System.Runtime.Intrinsics.X86.Sse>
2222

2323
Starting in .NET 5, these methods correctly handle `NaN` inputs and return the same results as the corresponding methods in the <xref:System.Runtime.Intrinsics.X86.Avx> class.
2424

25-
The Streaming SIMD Extensions (SSE) and Streaming SIMD Extensions 2 (SSE2) industry standard architectures (ISAs) don't provide direct hardware support for these comparison methods, so they're implemented in software. Previously, the methods were improperly implemented, and they incorrectly handled `NaN` inputs. For code ported from native, the incorrect behavior may introduce bugs. For a 256-bit code path, the methods can also produce different results to the equivalent methods in the <xref:System.Runtime.Intrinsics.X86.Avx> class.
25+
The Streaming SIMD Extensions (SSE) and Streaming SIMD Extensions 2 (SSE2) Instruction Set Architectures (ISAs) don't provide direct hardware support for these comparison methods, so they're implemented in software. Previously, the methods were improperly implemented, and they incorrectly handled `NaN` inputs. For code ported from native, the incorrect behavior may introduce bugs. For a 256-bit code path, the methods can also produce different results to the equivalent methods in the <xref:System.Runtime.Intrinsics.X86.Avx> class.
2626

2727
As an example of how the methods were previously incorrect, you can implement `CompareNotGreaterThan(x,y)` as `CompareLessThanOrEqual(x,y)` for regular integers. However, for `NaN` inputs, that logic computes the wrong result. Instead, using `CompareNotLessThan(y,x)` compares the numbers correctly *and* takes `NaN` inputs into consideration.
2828

docs/core/testing/selective-unit-tests.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ For `FullyQualifiedName` values that include a comma for generic type parameters
5656
dotnet test --filter "FullyQualifiedName=MyNamespace.MyTestsClass<ParameterType1%2CParameterType2>.MyTestMethod"
5757
```
5858

59+
For `Name` or `DisplayName`, use the URL encoding for the special characters. For example, to run a test with the name `MyTestMethod` and a string value `"text"`, use the following filter:
60+
61+
```dotnetcli
62+
dotnet test --filter "Name=MyTestMethod \(%22text%22\)"
63+
```
64+
5965
:::zone pivot="mstest"
6066

6167
## MSTest examples

docs/core/testing/unit-testing-platform-vs-vstest.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,7 @@ VSTest also uses a JSON based communication protocol, but it's not JSON-RPC base
4747

4848
### Disabling the new protocol
4949

50-
To disable the use of the new protocol in Test Explorer, you can edit the csproj and remove the `TestingPlatformServer` capability.
51-
52-
```xml
53-
<ItemGroup>
54-
<ProjectCapability Remove="TestingPlatformServer" />
55-
</ItemGroup>
56-
```
50+
To disable the use of the new protocol in Test Explorer, you can edit your project to add the following property: `<DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>`.
5751

5852
## Executables
5953

docs/core/tools/dotnet-install-script.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: dotnet-install scripts
33
description: Learn about the dotnet-install scripts to install the .NET SDK and the shared runtime.
4-
ms.date: 12/26/2024
4+
ms.date: 01/15/2024
55
---
66
# dotnet-install scripts reference
77

@@ -20,7 +20,7 @@ Windows:
2020
dotnet-install.ps1 [-Architecture <ARCHITECTURE>] [-AzureFeed]
2121
[-Channel <CHANNEL>] [-DryRun] [-FeedCredential]
2222
[-InstallDir <DIRECTORY>] [-JSonFile <JSONFILE>]
23-
[-NoCdn] [-NoPath] [-ProxyAddress] [-ProxyBypassList <LIST_OF_URLS>]
23+
[-NoPath] [-ProxyAddress] [-ProxyBypassList <LIST_OF_URLS>]
2424
[-ProxyUseDefaultCredentials] [-Quality <QUALITY>] [-Runtime <RUNTIME>]
2525
[-SkipNonVersionedFiles] [-UncachedFeed] [-KeepZip] [-ZipPath <PATH>] [-Verbose]
2626
[-Version <VERSION>]
@@ -34,7 +34,7 @@ Linux/macOS:
3434
dotnet-install.sh [--architecture <ARCHITECTURE>] [--azure-feed]
3535
[--channel <CHANNEL>] [--dry-run] [--feed-credential]
3636
[--install-dir <DIRECTORY>] [--jsonfile <JSONFILE>]
37-
[--no-cdn] [--no-path] [--quality <QUALITY>]
37+
[--no-path] [--quality <QUALITY>]
3838
[--runtime <RUNTIME>] [--runtime-id <RID>]
3939
[--skip-non-versioned-files] [--uncached-feed] [--keep-zip] [--zip-path <PATH>] [--verbose]
4040
[--version <VERSION>]
@@ -102,7 +102,7 @@ The install scripts do not update the registry on Windows. They just download th
102102

103103
- **`-AzureFeed|--azure-feed`**
104104

105-
For internal use only. Allows using a different storage to download SDK archives from. This parameter is only used if --no-cdn is false. The default is `https://builds.dotnet.microsoft.com/dotnet`.
105+
For internal use only. Allows using a different storage to download SDK archives from. The default is `https://builds.dotnet.microsoft.com/dotnet`.
106106

107107
- **`-Channel|--channel <CHANNEL>`**
108108

@@ -137,10 +137,6 @@ The install scripts do not update the registry on Windows. They just download th
137137

138138
Specifies a path to a [global.json](global-json.md) file that will be used to determine the SDK version. The *global.json* file must have a value for `sdk:version`.
139139

140-
- **`-NoCdn|--no-cdn`**
141-
142-
Disables downloading from the [Azure Content Delivery Network (CDN)](/azure/cdn/cdn-overview) and uses the uncached feed directly.
143-
144140
- **`-NoPath|--no-path`**
145141

146142
If set, the installation folder isn't exported to the path for the current session. By default, the script modifies the PATH, which makes the .NET CLI available immediately after install.
@@ -205,7 +201,7 @@ The install scripts do not update the registry on Windows. They just download th
205201

206202
- **`-UncachedFeed|--uncached-feed`**
207203

208-
For internal use only. Allows using a different storage to download SDK archives from. This parameter is only used if --no-cdn is true.
204+
For internal use only. Allows using a different storage to download SDK archives from. This parameter overwrites `-AzureFeed|--azure-feed`.
209205

210206
- **`-KeepZip|--keep-zip`**
211207

docs/orleans/host/configuration-guide/local-development-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ using Microsoft.Extensions.Hosting;
2626
await Host.CreateDefaultBuilder(args)
2727
.UseOrleans(siloBuilder =>
2828
{
29-
siloBuilder.UseLocalhostClustering();;
29+
siloBuilder.UseLocalhostClustering();
3030
})
3131
.RunConsoleAsync();
3232
```

0 commit comments

Comments
 (0)