Skip to content

Commit b90f476

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #43772 from dotnet/main
Merge main into live
2 parents ef81785 + 9819404 commit b90f476

File tree

42 files changed

+365
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+365
-259
lines changed

‎.github/dependabot.yml

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,50 @@ updates:
778778
dotnet:
779779
patterns:
780780
- "*" # Prefer a single PR per project update.
781+
- package-ecosystem: "nuget"
782+
directory: "/docs/ai/quickstarts/snippets/build-chat-app/azure-openai" #ChatAppAI.csproj
783+
schedule:
784+
interval: "weekly"
785+
day: "wednesday"
786+
open-pull-requests-limit: 5
787+
groups:
788+
# Group .NET updates together for projects.
789+
dotnet:
790+
patterns:
791+
- "*" # Prefer a single PR per project update.
792+
- package-ecosystem: "nuget"
793+
directory: "/docs/ai/quickstarts/snippets/build-chat-app/openai" #ExtensionsOpenAI.csproj
794+
schedule:
795+
interval: "weekly"
796+
day: "wednesday"
797+
open-pull-requests-limit: 5
798+
groups:
799+
# Group .NET updates together for projects.
800+
dotnet:
801+
patterns:
802+
- "*" # Prefer a single PR per project update.
803+
- package-ecosystem: "nuget"
804+
directory: "/docs/ai/quickstarts/snippets/function-calling/azure-openai" #FunctionCallingAI.csproj
805+
schedule:
806+
interval: "weekly"
807+
day: "wednesday"
808+
open-pull-requests-limit: 5
809+
groups:
810+
# Group .NET updates together for projects.
811+
dotnet:
812+
patterns:
813+
- "*" # Prefer a single PR per project update.
814+
- package-ecosystem: "nuget"
815+
directory: "/docs/ai/quickstarts/snippets/function-calling/openai" #FunctionCallingAI.csproj
816+
schedule:
817+
interval: "weekly"
818+
day: "wednesday"
819+
open-pull-requests-limit: 5
820+
groups:
821+
# Group .NET updates together for projects.
822+
dotnet:
823+
patterns:
824+
- "*" # Prefer a single PR per project update.
781825
- package-ecosystem: "nuget"
782826
directory: "/docs/ai/quickstarts/snippets/local-ai" #ollama.csproj
783827
schedule:
@@ -789,6 +833,28 @@ updates:
789833
dotnet:
790834
patterns:
791835
- "*" # Prefer a single PR per project update.
836+
- package-ecosystem: "nuget"
837+
directory: "/docs/ai/quickstarts/snippets/prompt-completion/azure-openai" #ExtensionsAzureOpenAI.csproj
838+
schedule:
839+
interval: "weekly"
840+
day: "wednesday"
841+
open-pull-requests-limit: 5
842+
groups:
843+
# Group .NET updates together for projects.
844+
dotnet:
845+
patterns:
846+
- "*" # Prefer a single PR per project update.
847+
- package-ecosystem: "nuget"
848+
directory: "/docs/ai/quickstarts/snippets/prompt-completion/openai" #ExtensionsOpenAI.csproj
849+
schedule:
850+
interval: "weekly"
851+
day: "wednesday"
852+
open-pull-requests-limit: 5
853+
groups:
854+
# Group .NET updates together for projects.
855+
dotnet:
856+
patterns:
857+
- "*" # Prefer a single PR per project update.
792858
- package-ecosystem: "nuget"
793859
directory: "/docs/ai/tutorials/snippets/llm-eval" #llm-eval.csproj
794860
schedule:
@@ -822,6 +888,17 @@ updates:
822888
dotnet:
823889
patterns:
824890
- "*" # Prefer a single PR per project update.
891+
- package-ecosystem: "nuget"
892+
directory: "/docs/azure/sdk/snippets/configure-proxy" #ProxyServerConfiguration.csproj
893+
schedule:
894+
interval: "weekly"
895+
day: "wednesday"
896+
open-pull-requests-limit: 5
897+
groups:
898+
# Group .NET updates together for projects.
899+
dotnet:
900+
patterns:
901+
- "*" # Prefer a single PR per project update.
825902
- package-ecosystem: "nuget"
826903
directory: "/docs/azure/sdk/snippets/logging" #LoggingSampleApp.csproj
827904
schedule:
@@ -2120,80 +2197,3 @@ updates:
21202197
dotnet:
21212198
patterns:
21222199
- "*" # Prefer a single PR per project update.
2123-
- package-ecosystem: "nuget"
2124-
directory: "/docs/machine-learning/tutorials/snippets/iris-clustering/csharp" #IrisFlowerClustering.csproj
2125-
schedule:
2126-
interval: "weekly"
2127-
day: "wednesday"
2128-
open-pull-requests-limit: 5
2129-
groups:
2130-
# Group .NET updates together for projects.
2131-
dotnet:
2132-
patterns:
2133-
- "*" # Prefer a single PR per project update.
2134-
- package-ecosystem: "nuget"
2135-
directory: "/docs/machine-learning/tutorials/snippets/movie-recommendation/csharp" #MovieRecommendation.csproj
2136-
schedule:
2137-
interval: "weekly"
2138-
day: "wednesday"
2139-
open-pull-requests-limit: 5
2140-
groups:
2141-
# Group .NET updates together for projects.
2142-
dotnet:
2143-
patterns:
2144-
- "*" # Prefer a single PR per project update.
2145-
- package-ecosystem: "nuget"
2146-
directory: "/docs/machine-learning/tutorials/snippets/phone-calls-anomaly-detection/csharp" #PhoneCallsAnomalyDetection.csproj
2147-
schedule:
2148-
interval: "weekly"
2149-
day: "wednesday"
2150-
open-pull-requests-limit: 5
2151-
groups:
2152-
# Group .NET updates together for projects.
2153-
dotnet:
2154-
patterns:
2155-
- "*" # Prefer a single PR per project update.
2156-
- package-ecosystem: "nuget"
2157-
directory: "/docs/machine-learning/tutorials/snippets/predict-prices/csharp" #TaxiFarePrediction.csproj
2158-
schedule:
2159-
interval: "weekly"
2160-
day: "wednesday"
2161-
open-pull-requests-limit: 5
2162-
groups:
2163-
# Group .NET updates together for projects.
2164-
dotnet:
2165-
patterns:
2166-
- "*" # Prefer a single PR per project update.
2167-
- package-ecosystem: "nuget"
2168-
directory: "/docs/machine-learning/tutorials/snippets/sales-anomaly-detection/csharp" #ProductSalesAnomalyDetection.csproj
2169-
schedule:
2170-
interval: "weekly"
2171-
day: "wednesday"
2172-
open-pull-requests-limit: 5
2173-
groups:
2174-
# Group .NET updates together for projects.
2175-
dotnet:
2176-
patterns:
2177-
- "*" # Prefer a single PR per project update.
2178-
- package-ecosystem: "nuget"
2179-
directory: "/docs/machine-learning/tutorials/snippets/sentiment-analysis/csharp" #SentimentAnalysis.csproj
2180-
schedule:
2181-
interval: "weekly"
2182-
day: "wednesday"
2183-
open-pull-requests-limit: 5
2184-
groups:
2185-
# Group .NET updates together for projects.
2186-
dotnet:
2187-
patterns:
2188-
- "*" # Prefer a single PR per project update.
2189-
- package-ecosystem: "nuget"
2190-
directory: "/docs/machine-learning/tutorials/snippets/text-classification-tf/csharp" #TextClassificationTF.csproj
2191-
schedule:
2192-
interval: "weekly"
2193-
day: "wednesday"
2194-
open-pull-requests-limit: 5
2195-
groups:
2196-
# Group .NET updates together for projects.
2197-
dotnet:
2198-
patterns:
2199-
- "*" # Prefer a single PR per project update.

‎.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0
27+
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
74+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
7575
with:
7676
sarif_file: results.sarif

‎.openpublishing.redirection.fsharp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
},
152152
{
153153
"source_path_from_root": "/docs/fsharp/whats-new/index.md",
154-
"redirect_url": "/dotnet/fsharp/whats-new/fsharp-6",
154+
"redirect_url": "/dotnet/fsharp/whats-new/fsharp-9",
155155
"ms.custom": "updateeachrelease"
156156
},
157157
{

‎api/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Explore Microsoft's comprehensive .NET API browser. Your ultimate r
33
layout: ApiBrowserPage
44
hide_bc: true
55
title: .NET API browser
6-
quickFilterColumn1: net-9.0,netframework-4.8,netstandard-2.1
6+
quickFilterColumn1: net-9.0,netframework-4.8.1,netstandard-2.1
77
quickFilterColumn2: aspnetcore-9.0,efcore-8.0,net-maui-9.0
88
quickFilterColumn3: azure-dotnet,ml-dotnet,spark-dotnet
99
ms.topic: landing-page

‎docs/ai/quickstarts/snippets/build-chat-app/azure-openai/ChatAppAI.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Azure.Identity" Version="1.13.1" />
13-
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.1" />
14-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24525.1" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
13+
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
14+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
1717

1818
</ItemGroup>
1919

‎docs/ai/quickstarts/snippets/build-chat-app/openai/ExtensionsOpenAI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24525.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
1414
</ItemGroup>
1515

1616
</Project>

‎docs/ai/quickstarts/snippets/function-calling/azure-openai/FunctionCallingAI.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Azure.Identity" Version="1.13.1" />
13-
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.1" />
13+
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
1414
<PackageReference Include="Microsoft.Extensions.AI" Version="9.0.0-preview.9.24556.5" />
15-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24525.1" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
1818

1919
</ItemGroup>
2020

‎docs/ai/quickstarts/snippets/function-calling/openai/FunctionCallingAI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.AI" Version="9.0.0-preview.9.24556.5" />
12-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24525.1" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎docs/ai/quickstarts/snippets/prompt-completion/azure-openai/ExtensionsAzureOpenAI.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Azure.Identity" Version="1.13.1" />
12-
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.1" />
13-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24525.1" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
12+
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
13+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
1616

1717
</ItemGroup>
1818

0 commit comments

Comments
 (0)