Skip to content
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

Merge main into live #45087

Merged
merged 7 commits into from
Mar 1, 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
10 changes: 5 additions & 5 deletions docs/ai/quickstarts/snippets/evaluate-ai-responses/MyTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public sealed class MyTests
// <SnippetPrivateMembers>
private static ChatConfiguration? s_chatConfiguration;
private static IList<ChatMessage> s_messages = [
new ChatMessage(
new ChatMessage(
ChatRole.System,
"""
You're an AI assistant that can answer questions related to astronomy.
Expand All @@ -28,7 +28,7 @@ Keep your responses concise and try to stay under 100 words.
public static async Task InitializeAsync(TestContext _)
{
/// Set up the <see cref="ChatConfiguration"/>,
// which includes the <see cref="IChatClient"/> that the
/// which includes the <see cref="IChatClient"/> that the
/// evaluator uses to communicate with the model.
s_chatConfiguration = GetOllamaChatConfiguration();

Expand All @@ -39,7 +39,7 @@ public static async Task InitializeAsync(TestContext _)
ResponseFormat = ChatResponseFormat.Text
};

/// Fetch the response to be evaluated
// Fetch the response to be evaluated
// and store it in a static variable.
ChatResponse response = await s_chatConfiguration.ChatClient.GetResponseAsync(s_messages, chatOptions);
s_response = response.Message;
Expand All @@ -49,7 +49,7 @@ public static async Task InitializeAsync(TestContext _)
// <SnippetGetChatConfig>
private static ChatConfiguration GetOllamaChatConfiguration()
{
/// Get a chat client for the Ollama endpoint.
// Get a chat client for the Ollama endpoint.
IChatClient client =
new OllamaChatClient(
new Uri("http://localhost:11434"),
Expand All @@ -72,7 +72,7 @@ public async Task TestCoherence()
/// Retrieve the score for coherence from the <see cref="EvaluationResult"/>.
NumericMetric coherence = result.Get<NumericMetric>(CoherenceEvaluator.CoherenceMetricName);

/// Validate the default interpretation
// Validate the default interpretation
// for the returned coherence metric.
Assert.IsFalse(coherence.Interpretation!.Failed);
Assert.IsTrue(coherence.Interpretation.Rating is EvaluationRating.Good or EvaluationRating.Exceptional);
Expand Down
708 changes: 354 additions & 354 deletions docs/azure/includes/dotnet-all.md

Large diffs are not rendered by default.

724 changes: 362 additions & 362 deletions docs/azure/includes/dotnet-new.md

Large diffs are not rendered by default.

Binary file modified docs/core/diagnostics/media/aspire-dashboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/core/diagnostics/media/jaeger-activity-details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ public static int Add(int left, int right)
/// This tag will apply to the primary constructor parameter.
/// </param>
public record Person(string FirstName, string LastName);
//</ClassExample>
}
//</ClassExample>

namespace InheritDoc
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The main Math class
Contains all methods for performing basic math functions
*/
/// <summary>
/// <summary>
/// The main <c>Math</c> class.
/// Contains all methods for performing basic math functions.
/// <list type="bullet">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ else

The `==` symbol tests for *equality*. Using `==` distinguishes the test for equality from assignment, which you saw in `a = 5`.

The `&&` represents "and". It means both conditions must be true to execute the statement in the true branch. These examples also show that you can have multiple statements in each conditional branch, provided you enclose them in `{` and `}`. You can also use `||` to represent "or". Add the following code after what you've written so far:
The `&&` represents "and". It means both conditions must be true to execute the statement in the true branch. These examples also show that you can have multiple statements in each conditional branch, as long as you enclose them in `{` and `}`. You can also use `||` to represent "or". Add the following code after what you've written so far:

```csharp
if ((a + b + c > 10) || (a == b))
Expand Down
2 changes: 1 addition & 1 deletion docs/csharp/whats-new/csharp-14.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ delegate bool TryParse<T>(string text, out T result);
TryParse<int> parse1 = (text, out result) => Int32.TryParse(text, out result);
```

Previously, adding any modifiers was allowed only when the parameter declarations included the types for the parameters. The preceding declaration would require typs on all parameters:
Previously, adding any modifiers was allowed only when the parameter declarations included the types for the parameters. The preceding declaration would require types on all parameters:

```csharp
TryParse<int> parse2 = (string text, out int result) => Int32.TryParse(text, out result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ When adding a web API to your solution, you will be prompted to name the project
4.577113
```

Congratulations! You've successfully built a machine learning model to categorize the risk of health violations using Model Builder. You can find the source code for this tutorial at the [dotnet/machinelearning-samples](https://github.com/dotnet/machinelearning-samples/tree/main/samples/modelbuilder/MatrixFactorization_MovieRecommendation) GitHub repository.
Congratulations! You've successfully built a machine learning model for movie recommendations using Model Builder. You can find the source code for this tutorial at the [dotnet/machinelearning-samples](https://github.com/dotnet/machinelearning-samples/tree/main/samples/modelbuilder/MatrixFactorization_MovieRecommendation) GitHub repository.

## Additional resources

Expand Down
Loading