Merge pull request #47519 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

.github/ISSUE_TEMPLATE/02-breaking-change.yml

@@ -23,12 +23,15 @@ body:
       options:
         - .NET 8
         - .NET 9
-        - .NET 10 Preview 1
-        - .NET 10 Preview 2
-        - .NET 10 Preview 3
         - .NET 10 Preview 4
         - .NET 10 Preview 5
         - .NET 10 Preview 6
+        - .NET 10 Preview 7
+        - .NET 10 RC 1
+        - .NET 10 RC 2
+        - .NET 10 GA
+        - .NET 11 Preview 1
+        - .NEt 11 Preview 2
         - Other (please put exact version in description textbox)
     validations:
       required: true

.github/dependabot.yml

@@ -1361,6 +1361,17 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/core/diagnostics/snippets/resource-monitoring-with-manual-metrics" #resource-monitoring-with-manual-metrics.csproj
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    open-pull-requests-limit: 5
+    groups:
+      # Group .NET updates together for projects.
+      dotnet:
+        patterns:
+          - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
     directory: "/docs/core/diagnostics/snippets/resource-monitoring" #resource-monitoring.csproj
     schedule:
@@ -2186,14 +2197,3 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
-  - package-ecosystem: "nuget"
-    directory: "/docs/core/resilience/snippets/resilience" #resilience.csproj
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    open-pull-requests-limit: 5
-    groups:
-      # Group .NET updates together for projects.
-      dotnet:
-        patterns:
-          - "*" # Prefer a single PR per project update.

.github/prompts/whats-new-net.md

@@ -0,0 +1,44 @@
+When you're assigned an issue where one label includes the word "Release" and you're given a link to an issue with this prompt file as context to update the what's new in .NET pages, follow these guidelines:
+
+## Task
+
+You'll update 4 articles. For .NET 10, you update these:
+
+- https://github.com/dotnet/docs/blob/main/docs/core/whats-new/dotnet-10/overview.md
+- https://github.com/dotnet/docs/blob/main/docs/core/whats-new/dotnet-10/runtime.md
+- https://github.com/dotnet/docs/blob/main/docs/core/whats-new/dotnet-10/libraries.md
+- https://github.com/dotnet/docs/blob/main/docs/core/whats-new/dotnet-10/sdk.md
+
+For other releases, replace "dotnet-10" in the preceding paths with the correct release. For example, use "dotnet-11" for the ".NET 11" releases.
+
+## Source material
+
+To learn what's new in the targeted release, use the corresponding release notes in the [dotnet core](https://github.com/dotnet/core) repository. The release notes will be in a subfolder of the "release-notes" folder.
+
+For production releases, the path is `<major-release>/<release-number>`, where:
+
+- `<major-release>` is the release number. For example, `8.0`, `9.0` or `10.0`.
+- `<minor-release>` is the three part release number. For example, `8.0.3`, `9.0.6` or `10.0.0`.
+
+For preview releases, the path is `<major-release>/preview/preview<n>` where:
+
+- `<major-release>` is the release number. For example, `8.0`, `9.0` or `10.0`.
+- `n` is the preview number. For example, `1`, `3`, or `6`.
+
+The primary release notes are in the `README.MD` file in that folder.  That file contains links to other release notes for components of .NET: libraries, runtime, SDK, languages, and so on. Use all that information for source.
+
+## Updates for each file
+
+- Each file should have its `ms.date` metadata field updated to match the date you're assigned the issue.
+- Ensure each file has the `ai-usage: ai-assisted` metadata field added.
+- Update phrasing on the latest update to reference the current release (preview, GA, or service release). Individual features shouldn't reference a given preview release, but the article should make it clear which was the last preview.
+- Search this repository for articles that have been recently updated pertaining to new features. Add links to those as you write about that feature. Or, add applicable information from the release notes into existing feature articles where it makes sense.
+- For the runtime and libraries articles, include extensive examples as well as links to recently updated articles related to the new feature. The examples should be at least as thorough as the examples from the source release notes.
+- Where applicable, the SDK article should include the samples.
+- The overview article generally doesn't include examples. Its purpose is to direct readers to more detailed information in other articles.
+- All APIs should be referenced using an `xref` style link, at least on first mention.
+- All links to article in the `dotnet/docs` repository should be file relative.
+- Spell out acronyms on first use in each file.
+- In general, don't mention specific contributors or pull requests to the product repos.
+
+Next, create a pull request. In the description, include the text "Fixes #\<issue-number>", where "issue-number" is the GitHub issue number.

.github/workflows/scorecards.yml

@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
         with:
           sarif_file: results.sarif

docs/ai/how-to/snippets/content-filtering/AIContentFiltering.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Azure.Identity" Version="1.14.2" />
-    <PackageReference Include="Microsoft.Extensions.AI" Version="9.7.0" />
+    <PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
   </ItemGroup>
 

docs/ai/quickstarts/snippets/evaluate-ai-responses/TestAI.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Azure.Identity" Version="1.14.2" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.7.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.7.1" />
     <PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.7.0" />
     <PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.7.0" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.AddMessages/ConsoleAI.AddMessages.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OllamaSharp" Version="5.2.10" />
+    <PackageReference Include="OllamaSharp" Version="5.3.1" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomEmbeddingsMiddle/ConsoleAI.CustomEmbeddingsMiddle.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25358.103" />
-    <PackageReference Include="OllamaSharp" Version="5.2.10" />
+    <PackageReference Include="OllamaSharp" Version="5.3.1" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
     <ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
   </ItemGroup>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.DependencyInjection/ConsoleAI.DependencyInjection.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OllamaSharp" Version="5.2.10" />
+    <PackageReference Include="OllamaSharp" Version="5.3.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.6.25358.103" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25358.103" />
     <ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />

docs/architecture/cloud-native/candidate-apps.md

@@ -16,13 +16,9 @@ Applying cost/benefit analysis, there's a good chance some wouldn't support the
 What type of application might be a candidate for cloud native?
 
 - Strategic enterprise systems that need to constantly evolve business capabilities/features
-
 - An application that requires a high release velocity - with high confidence
-
 - A system where individual features must release *without* a full redeployment of the entire system
-
 - An application developed by teams with expertise in different technology stacks
-
 - An application with components that must scale independently
 
 Smaller, less impactful line-of-business applications might fare well with a simple monolithic architecture hosted in a Cloud PaaS environment.
@@ -70,29 +66,17 @@ With the introduction behind, we now dive into a much more detailed look at clou
 ### References
 
 - [Cloud Native Computing Foundation](https://www.cncf.io/)
-
 - [.NET Microservices: Architecture for Containerized .NET applications](https://dotnet.microsoft.com/download/thank-you/microservices-architecture-ebook)
-
 - [Microsoft Azure Well-Architected Framework](/azure/architecture/framework/)
-
 - [Modernize existing .NET applications with Azure cloud and Windows Containers](https://dotnet.microsoft.com/download/thank-you/modernizing-existing-net-apps-ebook)
-
 - [Cloud Native Patterns by Cornelia Davis](https://www.manning.com/books/cloud-native-patterns)
-
 - [Cloud native applications: Ship faster, reduce risk, and grow your business](https://tanzu.vmware.com/cloud-native)
-
 - [Dapr documents](https://dapr.io/)
-
 - [Beyond the Twelve-Factor Application](https://content.pivotal.io/blog/beyond-the-twelve-factor-app)
-
 - [What is Infrastructure as Code](/devops/deliver/what-is-infrastructure-as-code)
-
 - [Uber Engineering's Micro Deploy: Deploying Daily with Confidence](https://www.uber.com/blog/micro-deploy-code/)
-
 - [How Netflix Deploys Code](https://www.infoq.com/news/2013/06/netflix/)
 
-- [Overload Control for Scaling WeChat Microservices](https://www.cs.columbia.edu/~ruigu/papers/socc18-final100.pdf)
-
 >[!div class="step-by-step"]
 >[Previous](definition.md)
 >[Next](introduce-eshoponcontainers-reference-app.md)