[C#] bump: Bump the production group with 2 updates

.github/workflows/coverage.yml

@@ -7,13 +7,8 @@ name: Coverage
 on:
   workflow_dispatch:
   push:
-    branches: ['**']
-    paths: [
-        '.github/workflows/coverage.yml',
-        'js/**',
-        'dotnet/**',
-        'python/**'
-    ]
+    branches: ["**"]
+    paths: [".github/workflows/coverage.yml", "js/**", "dotnet/**", "python/**"]
 
 permissions: read-all
 
@@ -30,23 +25,23 @@ jobs:
       dotnet: ${{ steps.filter.outputs.dotnet }}
       python: ${{ steps.filter.outputs.python }}
     steps:
-    - uses: actions/checkout@v4
-    - uses: dorny/paths-filter@v3
-      id: filter
-      with:
-        filters: |
-          js:
-            - 'js/**'
-          dotnet:
-            - 'dotnet/**'
-          python:
-            - 'python/**'
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            js:
+              - 'js/**'
+            dotnet:
+              - 'dotnet/**'
+            python:
+              - 'python/**'
   javascript:
     name: Javascript
     runs-on: ubuntu-latest
     environment: main
     env:
-      node-version: 18.x
+      node-version: 20.x
     defaults:
       run:
         shell: bash
@@ -59,7 +54,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup NodeJS ${{ env.node-version }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: ${{ env.node-version }}
       - name: Install Dependencies
@@ -98,11 +93,11 @@ jobs:
       - name: Test
         run: dotnet test Microsoft.TeamsAI.Tests/Microsoft.Teams.AI.Tests.csproj --verbosity normal --logger trx --results-directory ./TestResults --collect:"XPlat Code Coverage" --configuration Release
       - name: Coverage
-        uses: danielpalme/ReportGenerator-GitHub-Action@25b1e0261a9f68d7874dbbace168300558ef68f7 # 5.4.5
+        uses: danielpalme/ReportGenerator-GitHub-Action@4c0f60daf67483745c34efdeadd4c4e78a19991e # 5.4.8
         with:
           reports: ${{ env.SOLUTION_DIR }}TestResults/*/coverage.cobertura.xml
           targetdir: ${{ env.SOLUTION_DIR }}TestResults/coverage
-          reporttypes: 'HtmlInline;lcov'
+          reporttypes: "HtmlInline;lcov"
           toolpath: ${{ env.SOLUTION_DIR }}report-generator-tool
       - name: Coveralls
         uses: coverallsapp/github-action@v2.2.3
@@ -133,7 +128,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Python ${{ env.python-version }}
-        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.python-version }}
       - name: Install Dependencies
@@ -161,4 +156,4 @@ jobs:
         uses: coverallsapp/github-action@v2
         with:
           parallel-finished: true
-          carryforward: 'javascript,dotnet,python'
+          carryforward: "javascript,dotnet,python"

.github/workflows/dependency-review.yml

@@ -19,4 +19,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
+        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

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

@@ -10,6 +10,9 @@ on:
   push:
     branches: ['**']
     paths: ['.github/workflows/dotnet-*.yml', 'dotnet/**']
+  pull_request:
+    branches: ['main']
+    paths: ['dotnet/**']
 
 permissions: read-all
 
@@ -43,7 +46,7 @@ jobs:
       - name: Test
         run: dotnet test Microsoft.TeamsAI.Tests/Microsoft.Teams.AI.Tests.csproj --no-restore --verbosity normal --logger trx --results-directory ./TestResults --collect:"XPlat Code Coverage" --configuration Release
       - name: Coverage
-        uses: danielpalme/ReportGenerator-GitHub-Action@25b1e0261a9f68d7874dbbace168300558ef68f7 # 5.4.5
+        uses: danielpalme/ReportGenerator-GitHub-Action@4c0f60daf67483745c34efdeadd4c4e78a19991e # 5.4.8
         with:
           reports: ${{ env.SOLUTION_DIR }}TestResults/*/coverage.cobertura.xml
           targetdir: ${{ env.SOLUTION_DIR }}TestResults/coverage
@@ -55,6 +58,6 @@ jobs:
           name: testresults-dotnet-${{ matrix.dotnet-version }}
           path: ${{ env.SOLUTION_DIR }}TestResults
       - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit

.github/workflows/dotnet-codeql.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: csharp
       - name: Setup .NET
@@ -50,6 +50,6 @@ jobs:
         working-directory: dotnet/packages/Microsoft.TeamsAI/
         run: dotnet build Microsoft.Teams.AI.sln --configuration Release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: "/language:csharp"

.github/workflows/js-build-test-lint.yml

@@ -8,8 +8,8 @@ on:
   workflow_call:
   workflow_dispatch:
   push:
-    branches: ['**']
-    paths: ['.github/workflows/js-*.yml', 'js/**']
+    branches: ["**"]
+    paths: [".github/workflows/js-*.yml", "js/**"]
 
 permissions: read-all
 
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
     defaults:
       run:
         shell: bash
@@ -30,7 +30,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup NodeJS ${{ matrix.node-version }}
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies
@@ -42,6 +42,6 @@ jobs:
       - name: Lint
         run: yarn lint
       - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit

.github/workflows/js-codeql.yml

@@ -38,10 +38,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: javascript
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: "/language:javascript"

.github/workflows/python-build-test-lint.yml

@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Dependencies
@@ -51,6 +51,6 @@ jobs:
         run: |
           python scripts/lint.py
       - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit

.github/workflows/python-codeql.yml

@@ -38,10 +38,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: python
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: "/language:python"

.github/workflows/scorecards.yml

@@ -36,7 +36,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif

README.md

@@ -1,5 +1,8 @@
 # <img src="https://media.githubusercontent.com/media/microsoft/teams-ai/main/assets/icon.png" width="100px"> Teams AI Library
 
+> [!IMPORTANT] 
+> **V2 PREVIEW:** We recently released a preview of our Teams AI Library v2 in Typescript! Navigate to [branch v2-preview](https://github.com/microsoft/teams-ai/tree/v2-preview) and view our [blog post](https://devblogs.microsoft.com/microsoft365dev/announcing-the-updated-teams-ai-library-and-mcp-support/) for more information.
+
 [![Coverage Status](https://coveralls.io/repos/github/microsoft/teams-ai/badge.svg?branch=main)](https://coveralls.io/github/microsoft/teams-ai?branch=main)
 
 | Name       | Status                                                                                                                                                                                                                                                                  | Package                                                    |

dotnet/packages/Microsoft.TeamsAI/Directory.Build.props

@@ -1,8 +1,6 @@
 <Project>
-
   <PropertyGroup>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>$([MSBuild]::GetPathOfFileAbove('key.snk'))</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-
 </Project>

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI.Tests/Application/ApplicationRouteTests.cs

@@ -1967,11 +1967,13 @@ void CaptureSend(Activity[] arg)
                 From = new() { Id = "fromId" },
             };
             var turnContext1 = new TurnContext(adapter, activity1);
-            var messageFetchTaskResponse = new Mock<MessageFetchTaskResponse>();
+            var messageFetchTaskResponse = new MessageFetchTaskResponse() { Message = "response" };
             var expectedInvokeResponse = new InvokeResponse()
             {
                 Status = 200,
-                Body = messageFetchTaskResponse.Object
+                Body = new TaskModuleResponse() {
+                    Task = new TaskModuleMessageResponse("response")
+                }
             };
             var turnState = TurnStateConfig.GetTurnStateWithConversationStateAsync(turnContext1);
             var app = new Application<TurnState>(new()
@@ -1984,7 +1986,7 @@ void CaptureSend(Activity[] arg)
             app.OnMessageFetchTask((turnContext, _, _, _) =>
             {
                 names.Add(turnContext.Activity.Name);
-                return Task.FromResult(messageFetchTaskResponse.Object);
+                return Task.FromResult(messageFetchTaskResponse);
             });
 
             // Act

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI.Tests/Application/StreamingResponseTests.cs

@@ -300,5 +300,72 @@ void CaptureSend(Activity[] arg)
             // Assert
             Assert.Equal("Error occurred when sending activity while streaming", ex.Message);
         }
+
+        [Fact]
+        public async Task Test_SendTextChunk_SendsFinalMessageWithUniqueCitations()
+        {
+            // Arrange
+            List<Activity> activitiesToSend = [];
+            void CaptureSend(Activity[] arg)
+            {
+                activitiesToSend.AddRange(arg);
+            }
+            var adapter = new SimpleAdapter(CaptureSend);
+            ITurnContext turnContext = new TurnContext(adapter, new Activity(
+                text: "hello",
+                channelId: "channelId",
+                recipient: new() { Id = "recipientId" },
+                conversation: new() { Id = "conversationId" },
+                from: new() { Id = "fromId" }
+            ));
+
+            StreamingResponse streamer = new(turnContext);
+
+            // Prepare two citations and set them on the streamer.
+            // Citation with [1] and citation with [2]
+            var citations = new List<Citation>
+            {
+                new Citation(content: "Citation 1 content", title: "Citation 1", url: "https://example.com/1"),
+                new Citation(content: "Citation 2 content", title: "Citation 2", url: "https://example.com/2")
+            };
+            streamer.SetCitations(citations);
+
+            // Queue text chunks where citation [1] is referenced multiple times and [2] is referenced once.
+            streamer.QueueTextChunk("This is a test with citation [1] and again citation [1].");
+            await streamer.WaitForQueue();
+            streamer.QueueTextChunk("Adding citation [2] and citation [1] again.");
+            await streamer.WaitForQueue();
+
+            // End the stream which should combine text chunks and deduplicate citations.
+            await streamer.EndStream();
+
+            // Assert that two updates were sent.
+            Assert.Equal(2, streamer.UpdatesSent());
+
+            // Assert that the citations included in the final message are unique.
+            // Since [1] was referenced multiple times, the final unique citation count should be 2.
+            Assert.NotNull(streamer.Citations);
+            Assert.Equal(2, streamer.Citations.Count);
+
+            // Assert that the citations are unique in the activities to send collection
+            activitiesToSend.ForEach(activity =>
+            {
+                if (activity.Entities != null)
+                {
+                    foreach (var entity in activity.Entities)
+                    {
+                        if (entity is AIEntity)
+                        {
+                            var citations = ((AIEntity)entity).Citation;
+
+                            // Assert that the citations are unique by comparing the property "position"
+                            var uniqueCitations = citations.GroupBy(c => c.Position).Select(g => g.First()).ToList();
+                            Assert.Equal(citations.Count, uniqueCitations.Count);
+                        }
+                    }
+                }
+            }) ;
+
+        }
     }
 }