Skip to content

Commit 8154ea9

Browse files
authored
Merge branch 'main' into main
2 parents b0afa62 + 9f2dafc commit 8154ea9

File tree

224 files changed

+8250
-14394
lines changed

Some content is hidden

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

224 files changed

+8250
-14394
lines changed

.devcontainer/devcontainer.json

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@
22
"image": "mcr.microsoft.com/devcontainers/universal:2",
33
"features": {
44
"ghcr.io/devcontainers/features/node:1": {},
5-
"ghcr.io/devcontainers/features/dotnet:1": {
6-
"version": "8"
5+
"ghcr.io/jlaundry/devcontainer-features/azure-functions-core-tools:1": {},
6+
"ghcr.io/devcontainers/features/github-cli:1": {
7+
"version": "2"
78
},
8-
"ghcr.io/jlaundry/devcontainer-features/azure-functions-core-tools:1": {}
9+
"ghcr.io/devcontainers/features/powershell:1": {
10+
"version": "latest"
11+
},
12+
"ghcr.io/azure/azure-dev/azd:0": {
13+
"version": "latest"
14+
},
15+
"ghcr.io/devcontainers/features/common-utils:2": {},
16+
"ghcr.io/devcontainers/features/dotnet:2": {
17+
"version": "none",
18+
"dotnetRuntimeVersions": "10.0",
19+
"aspNetCoreRuntimeVersions": "10.0"
20+
},
21+
"ghcr.io/devcontainers/features/copilot-cli:1": {}
922
},
1023
"customizations": {
1124
"vscode": {

.github/workflows/dotnet-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
persist-credentials: false
7575

7676
- name: Setup dotnet
77-
uses: actions/setup-dotnet@v4.3.1
77+
uses: actions/setup-dotnet@v5
7878
with:
7979
global-json-file: ${{ github.workspace }}/dotnet/global.json
8080

.github/workflows/dotnet-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
persist-credentials: false
7979

8080
- name: Setup .NET SDK ${{ matrix.dotnet-version }}
81-
uses: actions/setup-dotnet@v4
81+
uses: actions/setup-dotnet@v5
8282
with:
8383
dotnet-version: ${{ matrix.dotnet-version }}
8484
env:

.github/workflows/dotnet-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
persist-credentials: false
3030

3131
- name: Setup .NET
32-
uses: actions/setup-dotnet@v4
32+
uses: actions/setup-dotnet@v5
3333
if: ${{ github.event_name != 'pull_request' }}
3434
with:
3535
dotnet-version: 10.0.x

.github/workflows/generate-pr-description.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

dotnet/Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
<PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" />
8181
<PackageVersion Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.23.2" />
8282
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="2.0.0" />
83-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.68.0" />
84-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.68.0" />
85-
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.68.0" />
83+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.71.0" />
84+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.71.0" />
85+
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.71.0" />
8686
<PackageVersion Include="Microsoft.SemanticKernel.Planners.OpenAI" Version="1.47.0-preview" />
8787
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />
8888
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.2" />

dotnet/nuget/nuget-package.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
4-
<VersionPrefix>1.70.0</VersionPrefix>
4+
<VersionPrefix>1.72.0</VersionPrefix>
55
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
66
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
77

88
<Configurations>Debug;Release;Publish</Configurations>
99
<IsPackable>true</IsPackable>
1010

1111
<!-- Package validation. Baseline Version should be the latest version available on NuGet. -->
12-
<PackageValidationBaselineVersion>1.69.0</PackageValidationBaselineVersion>
12+
<PackageValidationBaselineVersion>1.71.0</PackageValidationBaselineVersion>
1313
<!-- Validate assembly attributes only for Publish builds -->
1414
<NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
1515
<!-- Do not validate reference assemblies -->

dotnet/samples/Demos/CodeInterpreterPlugin/Program.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ async Task<string> TokenProvider(CancellationToken cancellationToken)
5858
sessionId: Guid.NewGuid().ToString(),
5959
endpoint: new Uri(endpoint));
6060

61+
// Uncomment the following lines to enable file upload operations (disabled by default for security)
62+
// settings.EnableDangerousFileUploads = true;
63+
// settings.AllowedUploadDirectories = new[] { @"C:\allowed\upload\directory" };
64+
// settings.AllowedDownloadDirectories = new[] { @"C:\allowed\download\directory" };
65+
6166
Console.WriteLine("=== Code Interpreter With Azure Container Apps Plugin Demo ===\n");
6267

6368
Console.WriteLine("Start your conversation with the assistant. Type enter or an empty message to quit.");

dotnet/samples/Demos/ProcessFrameworkWithSignalR/src/ProcessFramework.Aspire.SignalR.ReactFrontend/package-lock.json

Lines changed: 89 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dotnet/samples/Demos/ProcessFrameworkWithSignalR/src/ProcessFramework.Aspire.SignalR.ReactFrontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
"globals": "^15.15.0",
3535
"typescript": "~5.7.2",
3636
"typescript-eslint": "^8.24.1",
37-
"vite": "^6.2.7"
37+
"vite": "^6.4.1"
3838
}
3939
}

0 commit comments

Comments
 (0)