Skip to content

Commit e069f12

Browse files
wh-alicewh-alice
authored
Merge pull request #1594 from OfficeDev/dev
2 parents af6f0fc + d83d455 commit e069f12

File tree

67 files changed

+5361
-5191
lines changed

Some content is hidden

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

67 files changed

+5361
-5191
lines changed

‎.config/samples-config-v3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,8 @@
991991
],
992992
"time": "5 mins to run",
993993
"configuration": "Manual configurations required",
994-
"thumbnailPath": "images/screen009.jpg",
995-
"gifPath": "images/screen009.jpg",
994+
"thumbnailPath": "assets/thumbnail.jpg",
995+
"gifPath": "assets/sampleDemo.gif",
996996
"suggested": true
997997
},
998998
{

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
# Pull Request
2-
3-
## Description
4-
5-
<!-- Please provide a brief description of the changes in this PR -->
6-
7-
## Type of Change
8-
9-
- [ ] New sample onboarding (internal - source code in this repo)
10-
- [ ] New sample onboarding (external - source code in another repo)
11-
- [ ] Sample update/fix
12-
- [ ] Documentation update
13-
- [ ] Validation tool update
14-
- [ ] Other (please describe)
15-
16-
---
17-
18-
## For New Sample Onboarding
19-
20-
### Checklist
21-
22-
- [ ] I have added/updated the sample entry in `.config/samples-config-v3.json`
23-
- [ ] I have included a README.md with setup instructions
24-
- [ ] I have included a thumbnail image with correct aspect ratio (40:23, e.g., 1600×920 or 800×460)
25-
26-
### Validation Results (Required)
27-
28-
> **Important**: You must run the validation tool locally and provide a screenshot of the results.
29-
30-
#### For Internal Samples (source code in this repo)
31-
32-
```bash
33-
cd validation-tool
34-
npm install
35-
node validator.cjs -p ../<your-sample-folder>
36-
```
37-
38-
#### For External Samples (source code in another repo)
39-
40-
```bash
41-
cd validation-tool
42-
npm install
43-
44-
# Clone your sample repo (sparse checkout recommended)
45-
git clone --filter=blob:none --sparse <your-repo-url>
46-
cd <repo-name>
47-
git sparse-checkout set <path-to-sample>
48-
cd ..
49-
50-
# Run validation
51-
node validate-external.js <sample-id> ./<repo-name>
52-
```
53-
54-
55-
---
56-
57-
## Related Issues
58-
59-
<!-- Link any related issues here, e.g., "Fixes #123" or "Related to #456" -->
60-
if any question related to validation, may refer to the [Sample Validation Guide](validation-tool/sample_validation.md)
61-
if still has questions, may open a issue :)
1+
# Pull Request
2+
3+
## Description
4+
5+
<!-- Please provide a brief description of the changes in this PR -->
6+
7+
## Type of Change
8+
9+
- [ ] New sample onboarding (internal - source code in this repo)
10+
- [ ] New sample onboarding (external - source code in another repo)
11+
- [ ] Sample update/fix
12+
- [ ] Documentation update
13+
- [ ] Validation tool update
14+
- [ ] Other (please describe)
15+
16+
---
17+
18+
## For New Sample Onboarding
19+
20+
### Checklist
21+
22+
- [ ] I have added/updated the sample entry in `.config/samples-config-v3.json`
23+
- [ ] I have included a README.md with setup instructions
24+
- [ ] I have included a thumbnail image with correct aspect ratio (40:23, e.g., 1600×920 or 800×460)
25+
26+
### Validation Results (Required)
27+
28+
> **Important**: You must run the validation tool locally and provide a screenshot of the results.
29+
30+
#### For Internal Samples (source code in this repo)
31+
32+
```bash
33+
cd validation-tool
34+
npm install
35+
node validator.mjs -p ../<your-sample-folder>
36+
```
37+
38+
#### For External Samples (source code in another repo)
39+
40+
```bash
41+
cd validation-tool
42+
npm install
43+
44+
# Clone your sample repo (sparse checkout recommended)
45+
git clone --filter=blob:none --sparse <your-repo-url>
46+
cd <repo-name>
47+
git sparse-checkout set <path-to-sample>
48+
cd ..
49+
50+
# Run validation
51+
node validate-external.js <sample-id> ./<repo-name>
52+
```
53+
54+
55+
---
56+
57+
## Related Issues
58+
59+
<!-- Link any related issues here, e.g., "Fixes #123" or "Related to #456" -->
60+
if any question related to validation, may refer to the [Sample Validation Guide](validation-tool/sample_validation.md)
61+
if still has questions, may open a issue :)

‎.github/workflows/ci-sample-validation.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Validate Sample Config
4141
run: |
42-
node validation-tool/validate-config.js .config/samples-config-v3.json
42+
node validation-tool/validate-config.cjs .config/samples-config-v3.json
4343
exit $?
4444
4545
- name: Run Sample Validation Tool Based on Sample Config
@@ -54,7 +54,7 @@ jobs:
5454
while IFS= read -r line; do
5555
if [[ ! ${exceptions[@]} =~ $line ]]
5656
then
57-
result=`node ./validation-tool/validator.cjs -p $line`
57+
result=`node ./validation-tool/validator.mjs -p $line`
5858
if grep -q "$validationFailed" <<< "$result"; then
5959
printf "\n❌ Sample '$line' validation failed.\n"
6060
echo "$result"
@@ -99,7 +99,7 @@ jobs:
9999
printf "\nSkipping deleted folder: '$line'\n"
100100
continue
101101
fi
102-
result=`node ./validation-tool/validator.cjs -p $line`
102+
result=`node ./validation-tool/validator.mjs -p $line`
103103
if grep -q "$validationFailed" <<< "$result"; then
104104
printf "\nSample '$line' validation failed.\n"
105105
echo "$result"

‎ProxyAgent-CSharp/.github/copilot-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is a proxy solution that connects Microsoft Foundry agents to Microsoft 365
66
## Technology Stack
77
- **.NET 9** - Bot application runtime
88
- **Microsoft 365 Agents SDK** - Microsoft 365 Agents SDK
9-
- **Microsoft 365 Agents Toolkit** - Formerly Microsoft 365 Agent Toolkit
9+
- **Microsoft 365 Agents Toolkit** - Formerly Teams Toolkit
1010
- **Microsoft Foundry Agent SDK** - For agent integration
1111
- **Bicep** - Infrastructure as Code
1212
- **Managed Identity** - For production authentication (no secrets)

‎ProxyAgent-CSharp/.vscode/launch.json‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@
7171
{
7272
"name": "Debug in Teams (Edge)",
7373
"configurations": [
74-
"Launch in Teams (Edge)",
7574
"Launch AzureAgentToM365ATK"
7675
],
77-
"preLaunchTask": "PreReq & Start Tunnel",
76+
"preLaunchTask": "PreReq & Launch Teams",
7877
"postDebugTask": "Stop All Services",
7978
"presentation": {
8079
"group": "all",
@@ -83,46 +82,17 @@
8382
"stopAll": true
8483
},
8584
{
86-
"name": "Debug in Teams (Chrome)",
85+
"name": "Debug in Copilot (Edge)",
8786
"configurations": [
88-
"Launch in Teams (Chrome)",
8987
"Launch AzureAgentToM365ATK"
9088
],
91-
"preLaunchTask": "PreReq & Start Tunnel",
89+
"preLaunchTask": "PreReq & Launch Copilot",
9290
"postDebugTask": "Stop All Services",
9391
"presentation": {
9492
"group": "all",
9593
"order": 2
9694
},
9795
"stopAll": true
98-
},
99-
{
100-
"name": "Debug in Copilot (Edge)",
101-
"configurations": [
102-
"Launch AzureAgentToM365ATK",
103-
"Launch in Copilot (Edge)",
104-
],
105-
"preLaunchTask": "PreReq & Start Tunnel",
106-
"postDebugTask": "Stop All Services",
107-
"presentation": {
108-
"group": "all",
109-
"order": 3
110-
},
111-
"stopAll": true
112-
},
113-
{
114-
"name": "Debug in Copilot (Chrome)",
115-
"configurations": [
116-
"Launch AzureAgentToM365ATK",
117-
"Launch in Copilot (Chrome)"
118-
],
119-
"preLaunchTask": "PreReq & Start Tunnel",
120-
"postDebugTask": "Stop All Services",
121-
"presentation": {
122-
"group": "all",
123-
"order": 4
124-
},
125-
"stopAll": true
12696
}
12797
]
12898
}

‎ProxyAgent-CSharp/.vscode/tasks.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,22 @@
139139
]
140140
}
141141
}
142+
},
143+
{
144+
"label": "PreReq & Launch Teams",
145+
"dependsOn": [
146+
"PreReq & Start Tunnel",
147+
"Launch Edge - Teams"
148+
],
149+
"dependsOrder": "sequence"
150+
},
151+
{
152+
"label": "PreReq & Launch Copilot",
153+
"dependsOn": [
154+
"PreReq & Start Tunnel",
155+
"Launch Edge - Copilot"
156+
],
157+
"dependsOrder": "sequence"
142158
}
143159
]
144160
}

‎ProxyAgent-CSharp/AzureAgentToM365ATK/AzureAgentToM365ATK.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
@@ -20,14 +20,13 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Azure.Identity" Version="1.17.1" />
23-
<PackageReference Include="AdaptiveCards" Version="3.1.0" />
24-
<PackageReference Include="Microsoft.Agents.Authentication.Msal" Version="1.3.173-beta" />
25-
<PackageReference Include="Microsoft.Agents.Hosting.AspNetCore" Version="1.3.173-beta" />
26-
<PackageReference Include="Microsoft.Agents.AI" Version="1.0.0-preview.251114.1" />
27-
<PackageReference Include="Microsoft.Agents.AI.AzureAI" Version="1.0.0-preview.251114.1" />
28-
<PackageReference Include="Microsoft.Agents.AI.AzureAI.Persistent" Version="1.0.0-preview.251114.1" />
29-
<PackageReference Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.7" />
30-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.0.0" />
23+
<PackageReference Include="Microsoft.Agents.Authentication.Msal" Version="1.3.176" />
24+
<PackageReference Include="Microsoft.Agents.Hosting.AspNetCore" Version="1.3.176" />
25+
<PackageReference Include="Microsoft.Agents.AI" Version="1.0.0-preview.260108.1" />
26+
<PackageReference Include="Microsoft.Agents.AI.AzureAI" Version="1.0.0-preview.260108.1" />
27+
<PackageReference Include="Microsoft.Agents.AI.AzureAI.Persistent" Version="1.0.0-preview.260108.1" />
28+
<PackageReference Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.8" />
29+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.2.0" />
3130
</ItemGroup>
3231

3332

0 commit comments

Comments
 (0)