Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
singhk97 committed Aug 7, 2024
2 parents c8c01b7 + c8e7936 commit 9fc785e
Show file tree
Hide file tree
Showing 291 changed files with 746 additions and 645 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
parallel: true
files: ${{ env.SOLUTION_DIR }}TestResults/coverage/lcov.info
- name: Upload Tests
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: testresults-dotnet-${{ env.dotnet-version }}
path: ${{ env.SOLUTION_DIR }}TestResults
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-build-test-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
reporttypes: 'HtmlInline;lcov'
toolpath: ${{ env.SOLUTION_DIR }}report-generator-tool
- name: Upload Tests
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: testresults-dotnet-${{ matrix.dotnet-version }}
path: ${{ env.SOLUTION_DIR }}TestResults
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Publish
run: dotnet nuget push *.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source https://nuget.pkg.github.com/microsoft/index.json --skip-duplicate --no-symbols
- name: Upload
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: nupkg-dotnet-${{ matrix.dotnet-version }}
path: dotnet/packages/Microsoft.TeamsAI/*.nupkg
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: SARIF file
path: results.sarif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.18.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public static ThreadMessage CreateThreadMessage(string threadId, string message)
{{
""type"": ""text"",
""text"": {{
""value"": ""{message}"",
""annotations"": []
""value"": ""{message}"",
""annotations"": []
}}
}}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Nullable>enable</Nullable>
<PackageId>Microsoft.Teams.AI</PackageId>
<Product>Microsoft Teams AI SDK</Product>
<Version>1.4.0</Version>
<Version>1.5.0</Version>
<Authors>Microsoft</Authors>
<Company>Microsoft</Company>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand Down Expand Up @@ -39,15 +39,15 @@
<PackageReference Include="Azure.AI.ContentSafety" Version="1.0.0-beta.1" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
<PackageReference Include="JsonSchema.Net" Version="5.5.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.7" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.22.7" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.61.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24271.1" />
<PackageReference Include="OpenAI" Version="2.0.0-beta.8" />
<PackageReference Include="System.Text.Json" Version="7.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/samples/01.messaging.echoBot/EchoBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.5.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"outline": "outline.png"
},
"name": {
"short": "EchoBot-${{TEAMSFX_ENV}}",
"short": "EchoBot${{APP_NAME_SUFFIX}}",
"full": "Full name for EchoBot"
},
"description": {
Expand Down
4 changes: 3 additions & 1 deletion dotnet/samples/01.messaging.echoBot/env/.env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ BOT_ID=
TEAMS_APP_ID=
BOT_AZURE_APP_SERVICE_RESOURCE_ID=
BOT_DOMAIN=
TEAMS_APP_TENANT_ID=
TEAMS_APP_TENANT_ID=

APP_NAME_SUFFIX=dev
4 changes: 2 additions & 2 deletions dotnet/samples/01.messaging.echoBot/teamsapp.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ provision:
- uses: teamsApp/create
with:
# Teams app name
name: EchoBot-${{TEAMSFX_ENV}}
name: EchoBot${{APP_NAME_SUFFIX}}
# Write the information of created resources into environment file for
# the specified environment variable(s).
writeToEnvironmentFile:
Expand All @@ -18,7 +18,7 @@ provision:
- uses: botAadApp/create
with:
# The Azure Active Directory application's display name
name: EchoBot-${{TEAMSFX_ENV}}
name: EchoBot${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
# The Azure Active Directory application's client id created for bot.
botId: BOT_ID
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/01.messaging.echoBot/teamsapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ provision:
- uses: teamsApp/create
with:
# Teams app name
name: EchoBot-${{TEAMSFX_ENV}}
name: EchoBot${{APP_NAME_SUFFIX}}
# Write the information of created resources into environment file for
# the specified environment variable(s).
writeToEnvironmentFile:
Expand All @@ -21,7 +21,7 @@ provision:
- uses: botAadApp/create
with:
# The Azure Active Directory application's display name
name: EchoBot-${{TEAMSFX_ENV}}
name: EchoBot${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
# The Azure Active Directory application's client id created for bot.
botId: BOT_ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.5.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.package.name",
"name": {
"short": "NuGetSearch-${{TEAMSFX_ENV}}",
"short": "NuGetSearch${{APP_NAME_SUFFIX}}",
"full": "NuGet Search Bot"
},
"developer": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ BOT_ID=
TEAMS_APP_ID=
TEAMS_APP_TENANT_ID=
BOT_AZURE_APP_SERVICE_RESOURCE_ID=
BOT_DOMAIN=
BOT_DOMAIN=

APP_NAME_SUFFIX=dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ TEAMS_APP_ID=
TEAMS_APP_TENANT_ID=
TEAMSFX_M365_USER_NAME=
BOT_ENDPOINT=
BOT_DOMAIN=
BOT_DOMAIN=

APP_NAME_SUFFIX=local
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ provision:
# Automates the creation of a Teams app registration and saves the App ID to an environment file.
- uses: teamsApp/create
with:
name: SearchCommand-${{TEAMSFX_ENV}}
name: SearchCommand${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
teamsAppId: TEAMS_APP_ID

# Automates the creation an Azure AD app registration which is required for a bot.
# The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
- uses: botAadApp/create
with:
name: SearchCommand-${{TEAMSFX_ENV}}
name: SearchCommand${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
botId: BOT_ID
botPassword: SECRET_BOT_PASSWORD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ provision:
# Automates the creation of a Teams app registration and saves the App ID to an environment file.
- uses: teamsApp/create
with:
name: SearchCommand-${{TEAMSFX_ENV}}
name: SearchCommand${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
teamsAppId: TEAMS_APP_ID

# Automates the creation an Azure AD app registration which is required for a bot.
# The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
- uses: botAadApp/create
with:
name: SearchCommand-${{TEAMSFX_ENV}}
name: SearchCommand${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
botId: BOT_ID
botPassword: SECRET_BOT_PASSWORD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.7" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.5.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.package.name",
"name": {
"short": "TypeAheadBot-${{TEAMSFX_ENV}}",
"short": "TypeAheadBot${{APP_NAME_SUFFIX}}",
"full": "Type Ahead Bot"
},
"developer": {
Expand Down
3 changes: 3 additions & 0 deletions dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ RESOURCE_SUFFIX=
BOT_ID=
TEAMS_APP_ID=
BOT_AZURE_APP_SERVICE_RESOURCE_ID=


APP_NAME_SUFFIX=dev
3 changes: 3 additions & 0 deletions dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ TEAMSFX_ENV=local
# Generated during provision, you can also add your own variables.
BOT_ID=
TEAMS_APP_ID=


APP_NAME_SUFFIX=local
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ provision:
- uses: teamsApp/create
with:
# Teams app name
name: TypeAheadBot-${{TEAMSFX_ENV}}
name: TypeAheadBot${{APP_NAME_SUFFIX}}
# Write the information of created resources into environment file for
# the specified environment variable(s).
writeToEnvironmentFile:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ provision:
- uses: teamsApp/create
with:
# Teams app name
name: TypeAheadBot-${{TEAMSFX_ENV}}
name: TypeAheadBot${{APP_NAME_SUFFIX}}
# Write the information of created resources into environment file for
# the specified environment variable(s).
writeToEnvironmentFile:
Expand Down
2 changes: 1 addition & 1 deletion dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.7" />
<PackageReference Include="Microsoft.KernelMemory.AI.OpenAI" Version="0.26.240121.1" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.26.240121.1" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.5.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.package.name",
"name": {
"short": "TeamsChef-${{TEAMSFX_ENV}}",
"short": "TeamsChef${{APP_NAME_SUFFIX}}",
"full": "Teams Developer Chef"
},
"developer": {
Expand Down
3 changes: 3 additions & 0 deletions dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ BOT_ID=
TEAMS_APP_ID=
BOT_AZURE_APP_SERVICE_RESOURCE_ID=
BOT_DOMAIN=


APP_NAME_SUFFIX=dev
3 changes: 3 additions & 0 deletions dotnet/samples/04.ai.a.teamsChefBot/env/.env.local
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ TEAMSFX_ENV=local
BOT_ID=
TEAMS_APP_ID=
BOT_DOMAIN=


APP_NAME_SUFFIX=local
2 changes: 1 addition & 1 deletion dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ provision:
- uses: teamsApp/create
with:
# Teams app name
name: TeamsChef-${{TEAMSFX_ENV}}
name: TeamsChef${{APP_NAME_SUFFIX}}
# Write the information of created resources into environment file for
# the specified environment variable(s).
writeToEnvironmentFile:
Expand Down
2 changes: 1 addition & 1 deletion dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ provision:
- uses: teamsApp/create
with:
# Teams app name
name: TeamsChef-${{TEAMSFX_ENV}}
name: TeamsChef${{APP_NAME_SUFFIX}}
# Write the information of created resources into environment file for
# the specified environment variable(s).
writeToEnvironmentFile:
Expand Down
2 changes: 1 addition & 1 deletion dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="AdaptiveCards" Version="3.1.0" />
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.5.*" />
</ItemGroup>

<!-- Include prompt as content in build output -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.package.name",
"name": {
"short": "GPT ME-${{TEAMSFX_ENV}}",
"short": "GPT ME${{APP_NAME_SUFFIX}}",
"full": "GPT Message Extensions"
},
"developer": {
Expand Down
4 changes: 3 additions & 1 deletion dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ BOT_ID=
TEAMS_APP_ID=
TEAMS_APP_TENANT_ID=
BOT_AZURE_APP_SERVICE_RESOURCE_ID=
BOT_DOMAIN=
BOT_DOMAIN=

APP_NAME_SUFFIX=dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ TEAMS_APP_ID=
TEAMS_APP_TENANT_ID=
TEAMSFX_M365_USER_NAME=
BOT_DOMAIN=
BOT_ENDPOINT=
BOT_ENDPOINT=

APP_NAME_SUFFIX=local
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ provision:
# Automates the creation of a Teams app registration and saves the App ID to an environment file.
- uses: teamsApp/create
with:
name: GPT-ME-${{TEAMSFX_ENV}}
name: GPT-ME${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
teamsAppId: TEAMS_APP_ID

# Automates the creation an Azure AD app registration which is required for a bot.
# The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
- uses: botAadApp/create
with:
name: GPT-ME-${{TEAMSFX_ENV}}
name: GPT-ME${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
botId: BOT_ID
botPassword: SECRET_BOT_PASSWORD
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ provision:
# Automates the creation of a Teams app registration and saves the App ID to an environment file.
- uses: teamsApp/create
with:
name: GPT-ME-${{TEAMSFX_ENV}}
name: GPT-ME${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
teamsAppId: TEAMS_APP_ID

# Automates the creation an Azure AD app registration which is required for a bot.
# The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
- uses: botAadApp/create
with:
name: GPT-ME-${{TEAMSFX_ENV}}
name: GPT-ME${{APP_NAME_SUFFIX}}
writeToEnvironmentFile:
botId: BOT_ID
botPassword: SECRET_BOT_PASSWORD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.5.*" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 9fc785e

Please sign in to comment.