Skip to content

Commit a625097

Browse files
committed
Merge branch 'feature-azure-functions' into philliphoff-orchestration-id
2 parents 861525d + be56177 commit a625097

File tree

790 files changed

+74656
-8636
lines changed

Some content is hidden

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

790 files changed

+74656
-8636
lines changed

.github/.linkspector.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ignorePatterns:
1212
- pattern: "https:\/\/platform.openai.com"
1313
- pattern: "http:\/\/localhost"
1414
- pattern: "http:\/\/127.0.0.1"
15+
- pattern: "https:\/\/localhost"
16+
- pattern: "https:\/\/127.0.0.1"
1517
- pattern: "0001-spec.md"
1618
- pattern: "0001-madr-architecture-decisions.md"
1719
- pattern: "https://api.powerplatform.com/.default"

.github/upgrades/prompts/SemanticKernelToAgentFramework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ AgentThread thread = agent.GetNewThread();
10521052

10531053
**Add Agent Framework Packages:**
10541054
```xml
1055-
<PackageReference Include="Microsoft.Agents.AI.AzureAI" />
1055+
<PackageReference Include="Microsoft.Agents.AI.AzureAI.Persistent" />
10561056
<PackageReference Include="Azure.Identity" />
10571057
```
10581058
</configuration_changes>

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ name: dotnet-build-and-test
88
on:
99
workflow_dispatch:
1010
pull_request:
11-
branches: ["main"]
11+
branches: ["main", "feature*"]
1212
merge_group:
13-
branches: ["main"]
13+
branches: ["main", "feature*"]
1414
push:
15-
branches: ["main"]
15+
branches: ["main", "feature*"]
1616
schedule:
1717
- cron: "0 0 * * *" # Run at midnight UTC daily
1818

@@ -74,6 +74,7 @@ jobs:
7474
.
7575
.github
7676
dotnet
77+
python
7778
workflow-samples
7879
7980
- name: Setup dotnet
@@ -150,10 +151,14 @@ jobs:
150151
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
151152
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
152153

154+
# This setup action is required for both Durable Task and Azure Functions integration tests.
155+
# We only run it on Ubuntu since the Durable Task and Azure Functions features are not available
156+
# on .NET Framework (net472) which is what we use the Windows runner for.
153157
- name: Set up Durable Task and Azure Functions Integration Test Emulators
154-
if: github.event_name != 'pull_request' && matrix.integration-tests
158+
if: github.event_name != 'pull_request' && matrix.integration-tests && matrix.os == 'ubuntu-latest'
155159
uses: ./.github/actions/azure-functions-integration-setup
156160
id: azure-functions-setup
161+
157162
- name: Run Integration Tests
158163
shell: bash
159164
if: github.event_name != 'pull_request' && matrix.integration-tests
@@ -175,6 +180,9 @@ jobs:
175180
OpenAI__ApiKey: ${{ secrets.OPENAI__APIKEY }}
176181
OpenAI__ChatModelId: ${{ vars.OPENAI__CHATMODELID }}
177182
OpenAI__ChatReasoningModelId: ${{ vars.OPENAI__CHATREASONINGMODELID }}
183+
# Azure OpenAI Models
184+
AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
185+
AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
178186
# Azure AI Foundry
179187
AzureAI__Endpoint: ${{ secrets.AZUREAI__ENDPOINT }}
180188
AzureAI__DeploymentName: ${{ vars.AZUREAI__DEPLOYMENTNAME }}

.github/workflows/python-code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
python-version: ["3.10"]
21+
python-version: ["3.10", "3.14"]
2222
runs-on: ubuntu-latest
2323
continue-on-error: true
2424
defaults:

.github/workflows/python-lab-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
fail-fast: true
5050
matrix:
51-
python-version: ["3.10", "3.11", "3.12", "3.13"]
51+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
5252
# TODO(ekzhu): re-enable macos-latest when this is fixed: https://github.com/actions/runner-images/issues/11881
5353
os: [ubuntu-latest, windows-latest]
5454
env:

.github/workflows/python-test-coverage-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
4040
- name: Pytest coverage comment
4141
id: coverageComment
42-
uses: MishaKav/[email protected].57
42+
uses: MishaKav/[email protected].59
4343
with:
4444
github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
4545
issue-number: ${{ env.PR_NUMBER }}

.github/workflows/python-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: true
1818
matrix:
19-
python-version: ["3.10", "3.11", "3.12", "3.13"]
19+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2020
# todo: add macos-latest when problems are resolved
2121
os: [ubuntu-latest, windows-latest]
2222
env:

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,3 +216,11 @@ WARP.md
216216

217217
# Azure Functions local settings
218218
local.settings.json
219+
220+
# Frontend
221+
**/frontend/node_modules/
222+
**/frontend/.vite/
223+
**/frontend/dist/
224+
225+
# Database files
226+
*.db

docs/FAQS.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ To download nightly builds follow the following steps:
2323
<configuration>
2424
<packageSources>
2525
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
26-
<add key="github" value="https://nuget.pkg.github.com/microsoft/index.json" />
26+
<add key="GitHubMicrosoft" value="https://nuget.pkg.github.com/microsoft/index.json" />
2727
</packageSources>
2828
2929
<packageSourceMapping>
3030
<packageSource key="nuget.org">
3131
<package pattern="*" />
3232
</packageSource>
33-
<packageSource key="github">
33+
<packageSource key="GitHubMicrosoft">
3434
<package pattern="*nightly"/>
3535
</packageSource>
3636
</packageSourceMapping>
3737
3838
<packageSourceCredentials>
39-
<github>
40-
<add key="Username" value="<Your GitHub Id>" />
41-
<add key="ClearTextPassword" value="<Your Personal Access Token>" />
42-
</github>
39+
<GitHubMicrosoft>
40+
<add key="Username" value="<Your GitHub Id>" />
41+
<add key="ClearTextPassword" value="<Your Personal Access Token>" />
42+
</GitHubMicrosoft>
4343
</packageSourceCredentials>
4444
</configuration>
4545
```
590 KB
Loading

0 commit comments

Comments
 (0)