Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: pre-release 5.13.2 #1400

Merged
merged 6 commits into from
Feb 12, 2025
Merged

release: pre-release 5.13.2 #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1cb552
fix: sample validation rule
tecton Jan 6, 2025
bec16f0
fix: update validation build file
tecton Jan 7, 2025
4215185
Merge pull request #1392 from OfficeDev/nintan/validation-update
tecton Jan 7, 2025
ad4ab4b
perf: update Microsoft Entra app manifest to new schema (#1390)
SLdragon Jan 7, 2025
fa4dcfe
perf: update teams app yaml version to 1.8 for aad project (#1393)
SLdragon Jan 8, 2025
fc7a801
feat: onboard new sample "Policies Graph connector" and "Browse the m…
tecton Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions .config/samples-config-v3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,62 @@
"thumbnailPath": "assets/thumbnail.png",
"gifPath": "assets/thumbnail.png",
"suggested": false
},
{
"id": "nodejs-typescript-policies",
"shortId": "nodejs-ts-policies",
"onboardDate": "2024-09-24",
"title": "Policies Graph connector",
"shortDescription": "This sample project uses Teams Toolkit for Visual Studio Code to simplify the process of creating a Microsoft Graph connector that ingests data from a custom API to Microsoft Graph.",
"fullDescription": "This sample project uses Teams Toolkit for Visual Studio Code to simplify the process of creating a Microsoft Graph connector that ingests data from a custom API to Microsoft Graph. It provides an end to end example of creating the connector, ingesting content and refreshing the ingested content.",
"types": [
"Microsoft Graph Connector"
],
"tags": [
"TS",
"Graph Connector",
"Azure Function",
"Copilot for Microsoft 365"
],
"time": "10 mins to run",
"configuration": "Ready for local debug",
"thumbnailPath": "assets/search-results.png",
"gifPath": "assets/search-results.png",
"suggested": false,
"downloadUrlInfo": {
"owner": "pnp",
"repository": "graph-connectors-samples",
"ref": "main",
"dir": "samples/nodejs-typescript-policies"
}
},
{
"id": "da-ristorante-api",
"shortId": "da-ristorante-api",
"onboardDate": "2025-01-22",
"title": "Browse the menu and place an order at a local Italian restaurant using Microsoft 365 Copilot",
"shortDescription": "This sample demonstrates how to build a declarative agent for Microsoft 365 Copilot that allows you to browse a menu of a local Italian restaurant and place an order.",
"fullDescription": "This sample demonstrates how to build a declarative agent for Microsoft 365 Copilot that allows you to browse a menu of a local Italian restaurant and place an order. The agent uses an API plugin to connect to an anonymous API. The project contains an Azure Function that serves as the API.",
"types": [
"Declarative Agent"
],
"tags": [
"TS",
"Declarative Agent",
"Azure Function",
"Copilot for Microsoft 365"
],
"time": "2 mins to run",
"configuration": "Ready for local debug",
"thumbnailPath": "assets/screenshot-menu.png",
"gifPath": "assets/screenshot-menu.png",
"suggested": false,
"downloadUrlInfo": {
"owner": "pnp",
"repository": "copilot-pro-dev-samples",
"ref": "main",
"dir": "samples/da-ristorante-api"
}
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/ci-sample-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: |
# This script runs the validation tool against all samples in the samples-config-v3.json file.
# External samples are excluded from the validation.
exceptions=("incoming-webhook-notification")
exceptions=("incoming-webhook-notification" "hello-world-office-addin")
samples=`jq -r ".samples | .[] | select(has(\"downloadUrlInfo\") | not) | .id" .config/samples-config-v3.json`
validationFailed="validation failed"
validationResult=true
Expand Down
155 changes: 82 additions & 73 deletions bot-sso-docker/aad.manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,77 @@
{
"id": "${{AAD_APP_OBJECT_ID}}",
"appId": "${{AAD_APP_CLIENT_ID}}",
"name": "SSO Bot AAD",
"accessTokenAcceptedVersion": 2,
"displayName": "SSO Bot AAD",
"identifierUris": [
"api://botid-${{BOT_ID}}"
],
"signInAudience": "AzureADMyOrg",
"api": {
"requestedAccessTokenVersion": 2,
"oauth2PermissionScopes": [
{
"adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
"adminConsentDisplayName": "Teams can access app's web APIs",
"id": "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}",
"isEnabled": true,
"type": "User",
"userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
"userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
"value": "access_as_user"
}
],
"preAuthorizedApplications": [
{
"appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "00000002-0000-0ff1-ce00-000000000000",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "4345a7b9-9a63-4910-a426-35363201d503",
"delegatedPermissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
}
]
},
"info": {},
"optionalClaims": {
"idToken": [],
"accessToken": [
Expand All @@ -16,6 +84,9 @@
],
"saml2Token": []
},
"publicClient": {
"redirectUris": []
},
"requiredResourceAccess": [
{
"resourceAppId": "Microsoft Graph",
Expand All @@ -27,75 +98,13 @@
]
}
],
"oauth2Permissions": [
{
"adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
"adminConsentDisplayName": "Teams can access app's web APIs",
"id": "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}",
"isEnabled": true,
"type": "User",
"userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
"userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
"value": "access_as_user"
}
],
"preAuthorizedApplications": [
{
"appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "00000002-0000-0ff1-ce00-000000000000",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
},
{
"appId": "4345a7b9-9a63-4910-a426-35363201d503",
"permissionIds": [
"${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
]
}
],
"identifierUris":[
"api://botid-${{BOT_ID}}"
],
"replyUrlsWithType":[
{
"url": "https://${{BOT_DOMAIN}}/auth-end.html",
"type": "Web"
}
]
"web": {
"redirectUris": [
"https://${{BOT_DOMAIN}}/auth-end.html"
],
"implicitGrantSettings": {}
},
"spa": {
"redirectUris": []
}
}
8 changes: 5 additions & 3 deletions bot-sso-docker/teamsapp.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.2/yaml.schema.json
version: v1.2
# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.8/yaml.schema.json
# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
# Visit https://aka.ms/teamsfx-actions for details on actions
version: v1.8

additionalMetadata:
sampleTag: TeamsFx-Samples:sso-bot-docker
Expand Down Expand Up @@ -66,7 +68,7 @@ provision:
# Path to manifest template
manifestPath: ./appPackage/manifest.json
outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json
outputFolder: ./appPackage/build
# Validate app package using validation rules
- uses: teamsApp/validateAppPackage
with:
Expand Down
11 changes: 7 additions & 4 deletions bot-sso-docker/teamsapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.2/yaml.schema.json
version: v1.2
# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.8/yaml.schema.json
# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
# Visit https://aka.ms/teamsfx-actions for details on actions
version: v1.8

additionalMetadata:
sampleTag: TeamsFx-Samples:sso-bot-docker
Expand Down Expand Up @@ -56,7 +58,7 @@ provision:
# Path to manifest template
manifestPath: ./appPackage/manifest.json
outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json
outputFolder: ./appPackage/build
# Validate app package using validation rules
- uses: teamsApp/validateAppPackage
with:
Expand Down Expand Up @@ -104,12 +106,13 @@ publish:
with:
# Path to manifest template
manifestPath: ./appPackage/manifest.json
# Build Teams app package with latest env value
- uses: teamsApp/zipAppPackage
with:
# Path to manifest template
manifestPath: ./appPackage/manifest.json
outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json
outputFolder: ./appPackage/build
# Validate app package using validation rules
- uses: teamsApp/validateAppPackage
with:
Expand Down
Loading
Loading