Skip to content

Commit f7f9af2

Browse files
gewarrengewarren
authored
Merge pull request #46313 from gewarren/publish0521
Merge main into live
2 parents dd107a9 + cbbec16 commit f7f9af2

File tree

77 files changed

+184
-122
lines changed

Some content is hidden

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

77 files changed

+184
-122
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels:
66
- Pri1
77
- doc-idea
88
assignees:
9-
- camsoper
9+
- gewarren
1010
body:
1111
- type: textarea
1212
id: description

‎.github/workflows/markdownlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
egress-policy: audit
2828

2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30-
- uses: DavidAnson/markdownlint-cli2-action@05f32210e84442804257b2a6f20b273450ec8265 # v19.1.0
30+
- uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e # v20.0.0
3131
with:
3232
config: ".markdownlint-cli2.jsonc"
3333
globs: "**/*.md"

‎.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@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
74+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
7575
with:
7676
sarif_file: results.sarif

‎.markdownlint-cli2.jsonc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"MD050": {
6060
"style": "asterisk"
6161
},
62-
"MD051": false
62+
"MD051": false,
63+
"MD059": false
6364
},
6465
"ignores": [
6566
".github/",

‎docfx.json‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,7 @@
335335
"docs/architecture/modernize-desktop/**/**.md": "OliaG",
336336
"docs/azure/**/*.*": "alexwolfmsft",
337337
"docs/core/**/**.md": "gewarren",
338-
"docs/core/compatibility/**/**.md": "camsoper",
339-
"docs/core/containers/**/**.md": "camsoper",
338+
"docs/core/compatibility/**/**.md": "gewarren",
340339
"docs/core/deploying/**/**.md": "adegeo",
341340
"docs/core/diagnostics/**/**.md": "tommcdon",
342341
"docs/core/extensions/**/**.md": "IEvangelist",
@@ -349,13 +348,13 @@
349348
"docs/core/tools/**/**.md": "tdykstra",
350349
"docs/core/tutorials/**/**.md": "tdykstra",
351350
"docs/core/versions/**/**.md": "billwagner",
352-
"docs/core/whats-new/**/**.md": "camsoper",
351+
"docs/core/whats-new/**/**.md": "gewarren",
353352
"docs/csharp/**/*.*": "billwagner",
354353
"docs/framework/**/**.md": "gewarren",
355354
"docs/framework/additional-apis/pos-for-net/**/**.md": "TerryWarwick",
356355
"docs/framework/app-domains/**/**.md": "gewarren",
357356
"docs/framework/configure-apps/file-schema/network/**/**.md": "karelz",
358-
"docs/framework/configure-apps/file-schema/wcf/**/**.md": "HongGit",
357+
"docs/framework/configure-apps/file-schema/wcf/**/**.md": "mconnew",
359358
"docs/framework/configure-apps/file-schema/winforms/**/**.md": "adegeo",
360359
"docs/framework/data/**/**.md": "cmastr",
361360
"docs/framework/deployment/**/**.md": "adegeo",
@@ -378,12 +377,11 @@
378377
"docs/framework/unmanaged-api/strong-naming/**/**.md": "jeffschwMSFT",
379378
"docs/framework/unmanaged-api/tlbexp/**/**.md": "jeffschwMSFT",
380379
"docs/framework/whats-new/**/**.md": "gewarren",
381-
"docs/framework/wcf/**/**.md": "HongGit",
382-
"docs/fsharp/**/**.md": "KathleenDollard",
380+
"docs/framework/wcf/**/**.md": "mconnew",
381+
"docs/fsharp/**/**.md": "billwagner",
383382
"docs/fundamentals/code-analysis/**/**.md": "gewarren",
384383
"docs/fundamentals/runtime-libraries/**/**.md": "gewarren",
385384
"docs/fundamentals/syslib-diagnostics/**/**.md": "gewarren",
386-
"docs/iot/**/*.*": "camsoper",
387385
"docs/machine-learning/**/**.md": "gewarren",
388386
"docs/orleans/**/*.*": "IEvangelist",
389387
"docs/standard/**/**.md": "gewarren",
@@ -413,7 +411,7 @@
413411
"docs/standard/serialization/**/**.md": "gewarren",
414412
"docs/standard/threading/**/**.md": "billwagner",
415413
"docs/standard/whats-new/**/**.md": "gewarren",
416-
"docs/visual-basic/**/**.md": "KathleenDollard",
414+
"docs/visual-basic/**/**.md": "billwagner",
417415
"docs/whats-new/**/**.md": "billwagner",
418416
"includes/**/**.md": "docs"
419417
},
@@ -429,8 +427,7 @@
429427
"docs/azure/**/*.*": "alexwolf",
430428
"docs/orleans/**/*.*": "dapine",
431429
"docs/core/**/**.md": "dotnetcontent",
432-
"docs/core/compatibility/**/**.md": "casoper",
433-
"docs/core/containers/**/**.md": "casoper",
430+
"docs/core/compatibility/**/**.md": "gewarren",
434431
"docs/core/deploying/**/**.md": "adegeo",
435432
"docs/core/diagnostics/**/**.md": "tommcdon",
436433
"docs/core/extensions/**/**.md": "dapine",
@@ -444,7 +441,7 @@
444441
"docs/core/tools/**/**.md": "tdykstra",
445442
"docs/core/tutorials/**/**.md": "tdykstra",
446443
"docs/core/versions/**/**.md": "wiwagn",
447-
"docs/core/whats-new/**/**.md": "casoper",
444+
"docs/core/whats-new/**/**.md": "gewarren",
448445
"docs/csharp/**/*.*": "wiwagn",
449446
"docs/framework/**/**.md": "dotnetcontent",
450447
"docs/framework/app-domains/**/**.md": "gewarren",
@@ -470,11 +467,10 @@
470467
"docs/framework/unmanaged-api/strong-naming/**/**.md": "jeffschw",
471468
"docs/framework/unmanaged-api/tlbexp/**/**.md": "jeffschw",
472469
"docs/framework/whats-new/**/**.md": "gewarren",
473-
"docs/fsharp/**/**.md": "kdollard",
470+
"docs/fsharp/**/**.md": "wiwagn",
474471
"docs/fundamentals/code-analysis/**/*.md": "gewarren",
475472
"docs/fundamentals/runtime-libraries/**/**.md": "gewarren",
476473
"docs/fundamentals/syslib-diagnostics/**/**.md": "gewarren",
477-
"docs/iot/**/*.*": "casoper",
478474
"docs/machine-learning/**/**.md": "gewarren",
479475
"docs/standard/**/**.md": "gewarren",
480476
"docs/standard/analyzers/**/**.md": "dapine",
@@ -502,7 +498,7 @@
502498
"docs/standard/serialization/**/**.md": "gewarren",
503499
"docs/standard/threading/**/**.md": "wiwagn",
504500
"docs/standard/whats-new/**/**.md": "dotnetcontent",
505-
"docs/visual-basic/**/**.md": "kdollard",
501+
"docs/visual-basic/**/**.md": "wiwagn",
506502
"includes/**/**.md": "dapine"
507503
},
508504
"ms.date": {

‎docs/ai/dotnet-ai-ecosystem.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ For example, you can use [Ollama](https://ollama.com/) to [connect to local AI m
7777

7878
[!INCLUDE [vector-databases](includes/vector-databases.md)]
7979

80-
## Other options
81-
82-
This article summarized the tools and SDKs in the .NET ecosystem, with a focus on services that provide official support for .NET. Depending on your needs and stage of app development, you might also want to take a look at the open-source options for the ecosystem in [the unofficial list of .NET + AI resources](https://github.com/jmatthiesen/dotnet-ai-resources?tab=readme-ov-file#models). Microsoft is not the maintainer of many of these projects, so be sure to review their quality, licensing, and support.
83-
8480
## Next steps
8581

8682
- [What is Semantic Kernel?](/semantic-kernel/overview/)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" />
1212
<PackageReference Include="Azure.Identity" Version="1.14.0" />
13-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.4.0-preview.1.25207.5" />
13+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.5.0" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1515
</ItemGroup>
1616

‎docs/ai/how-to/snippets/hosted-app-auth/hosted-app-auth.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.14.0" />
1313
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
14-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.4.0-preview.1.25207.5" />
14+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.5.0" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1616
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.11.0" />
1717
</ItemGroup>

‎docs/ai/quickstarts/chat-local-model.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Complete the following steps to create a .NET console app that connects to your
6262
dotnet new console -o LocalAI
6363
```
6464

65-
1. Add the [Microsoft.Extensions.AI.Ollama](https://aka.ms/meai-ollama-nuget) packages to your app:
65+
1. Add the [Microsoft.Extensions.AI.Ollama](https://www.nuget.org/packages/Microsoft.Extensions.AI.Ollama/) package to your app:
6666

6767
```dotnetcli
6868
dotnet add package Microsoft.Extensions.AI.Ollama --prerelease

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.14.0" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.4.0-preview.1.25207.5" />
15-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.4.0-preview.1.25207.5" />
16-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.4.0-preview.1.25207.5" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
15+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.5.0" />
16+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.5.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
1919
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.5" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25107-01" />
21-
<PackageReference Include="MSTest" Version="3.8.3" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
21+
<PackageReference Include="MSTest" Version="3.9.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)