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.

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

build: July Preview Release #1294

Merged
merged 7 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/hello-world-tab-codespaces/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "tab-codespaces",
"image": "mcr.microsoft.com/devcontainers/typescript-node:16",
// Default workspace folder
"workspaceFolder": "/workspaces/TeamsFx-Samples/hello-world-tab-codespaces/",
"workspaceFolder": "/workspaces/teams-toolkit-samples/hello-world-tab-codespaces/",
// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
53000
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/notification-codespaces/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"image": "mcr.microsoft.com/devcontainers/typescript-node:16",

// Default workspace folder
"workspaceFolder": "/workspaces/TeamsFx-Samples/notification-codespaces/",
"workspaceFolder": "/workspaces/teams-toolkit-samples/notification-codespaces/",

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"image": "mcr.microsoft.com/devcontainers/typescript-node:16",

// Default workspace folder
"workspaceFolder": "/workspaces/TeamsFx-Samples/NPM-search-message-extension-codespaces/",
"workspaceFolder": "/workspaces/teams-toolkit-samples/NPM-search-message-extension-codespaces/",

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
Expand Down
5 changes: 2 additions & 3 deletions NPM-search-connector-M365/appPackage/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand Down
7 changes: 3 additions & 4 deletions adaptive-card-notification/appPackage/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand All @@ -29,7 +28,7 @@
"scopes": [
"personal",
"team",
"groupchat"
"groupChat"
],
"supportsFiles": false,
"isNotificationOnly": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "${{TAB_ENDPOINT}}",
Expand Down
9 changes: 4 additions & 5 deletions bot-sso-docker/appPackage/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand All @@ -29,7 +28,7 @@
"scopes": [
"personal",
"team",
"groupchat"
"groupChat"
],
"supportsFiles": false,
"isNotificationOnly": false,
Expand All @@ -38,7 +37,7 @@
"scopes": [
"personal",
"team",
"groupchat"
"groupChat"
],
"commands": [
{
Expand Down
9 changes: 4 additions & 5 deletions bot-sso/appPackage/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand All @@ -29,7 +28,7 @@
"scopes": [
"personal",
"team",
"groupchat"
"groupChat"
],
"supportsFiles": false,
"isNotificationOnly": false,
Expand All @@ -38,7 +37,7 @@
"scopes": [
"personal",
"team",
"groupchat"
"groupChat"
],
"commands": [
{
Expand Down
7 changes: 3 additions & 4 deletions command-bot-with-sso/appPackage/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.15/MicrosoftTeams.schema.json",
"manifestVersion": "1.15",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand Down Expand Up @@ -36,7 +35,7 @@
"scopes": [
"personal",
"team",
"groupchat"
"groupChat"
],
"commands": [
{
Expand Down
7 changes: 3 additions & 4 deletions developer-assist-dashboard/appPackage/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
"manifestVersion": "1.17",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "https://www.example.com",
Expand Down Expand Up @@ -44,7 +43,7 @@
"messageTeamMembers"
],
"validDomains": [
"${{TAB_DOMAIN}}"
"${{TAB_HOSTNAME}}"
],
"webApplicationInfo": {
"id": "${{AAD_APP_CLIENT_ID}}",
Expand Down
1 change: 1 addition & 0 deletions developer-assist-dashboard/infra/azure.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
// The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
output TAB_DOMAIN string = siteDomain
output TAB_HOSTNAME string = siteDomain
output TAB_ENDPOINT string = tabEndpoint
output API_FUNCTION_ENDPOINT string = apiEndpoint
output API_FUNCTION_RESOURCE_ID string = functionApp.id
5 changes: 3 additions & 2 deletions developer-assist-dashboard/teamsapp.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ provision:
writeToEnvironmentFile:
teamsAppId: TEAMS_APP_ID

- uses: script # Set TAB_DOMAIN and TAB_ENDPOINT for local launch
- uses: script # Set required variables for local launch
with:
run:
echo "::set-teamsfx-env TAB_DOMAIN=localhost";
echo "::set-teamsfx-env TAB_HOSTNAME=localhost";
echo "::set-teamsfx-env TAB_DOMAIN=localhost:53000";
echo "::set-teamsfx-env TAB_ENDPOINT=https://localhost:53000";
echo "::set-teamsfx-env FUNC_NAME=callService";
echo "::set-teamsfx-env FUNC_ENDPOINT=http://localhost:7071";
Expand Down
25 changes: 0 additions & 25 deletions graph-connector-app/api/connection/function.json

This file was deleted.

25 changes: 0 additions & 25 deletions graph-connector-app/api/data/function.json

This file was deleted.

11 changes: 0 additions & 11 deletions graph-connector-app/api/extensions.csproj

This file was deleted.

6 changes: 5 additions & 1 deletion graph-connector-app/api/host.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
"excludedTypes": "Request"
}
}
},
"extensionBundle": {
"id": "Microsoft.Azure.Functions.ExtensionBundle",
"version": "[4.*, 5.0.0)"
}
}
}
6 changes: 6 additions & 0 deletions graph-connector-app/api/local.settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"IsEncrypted": false,
"Values": {
"FUNCTIONS_WORKER_RUNTIME": "node"
}
}
7 changes: 4 additions & 3 deletions graph-connector-app/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "teamsfx-template-api",
"version": "1.0.0",
"engines": {
"node": "16 || 18"
"node": "18"
},
"scripts": {
"dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
Expand All @@ -14,7 +14,7 @@
"start": "npx func start"
},
"dependencies": {
"@azure/functions": "^1.2.2",
"@azure/functions": "^4.2.0",
"@microsoft/microsoft-graph-client": "^3.0.0",
"@microsoft/teamsfx": "^2.0.0",
"csv-parse": "^5.0.4",
Expand All @@ -24,5 +24,6 @@
"@types/node": "^18.7.18",
"env-cmd": "^10.1.0",
"typescript": "^4.4.4"
}
},
"main": "dist/src/functions/*.js"
}
4 changes: 0 additions & 4 deletions graph-connector-app/api/proxies.json

This file was deleted.

25 changes: 0 additions & 25 deletions graph-connector-app/api/schema/function.json

This file was deleted.

Loading
Loading