Merge branch 'main' into copilot/update-samples-to-minimal-apis

Author: rido-min

.azdo/cd-core.yaml

@@ -0,0 +1,70 @@
+pr:
+  branches:
+    include:
+      - next/*
+  # Uncomment and edit the following lines to add path filters for PRs in the future
+  # paths:
+  #   include:
+  #     - core/**
+
+trigger:
+  branches:
+    include:
+    - next/*
+  paths:
+    include:
+    - core/**
+
+pool:
+  vmImage: 'ubuntu-22.04'
+
+stages:
+- stage: Build_Test_Pack
+  jobs:
+  - job: BuildTestPack
+    displayName: 'Build, Test, and Pack'
+    steps:
+
+      - task: UseDotNet@2
+        displayName: 'Use .NET 8 SDK'
+        inputs:
+          packageType: 'sdk'
+          version: '8.0.x'
+
+      - task: UseDotNet@2
+        displayName: 'Use .NET 10 SDK'
+        inputs:
+          packageType: 'sdk'
+          version: '10.0.x'
+
+      - script: dotnet restore 
+        displayName: 'Restore'
+        workingDirectory: '$(Build.SourcesDirectory)/core'
+
+      - script: dotnet build --no-restore --configuration Release
+        displayName: 'Build'
+        workingDirectory: '$(Build.SourcesDirectory)/core'
+
+      - script: dotnet test --no-build --configuration Release
+        displayName: 'Test'
+        workingDirectory: '$(Build.SourcesDirectory)/core'
+
+      - script: dotnet pack --no-build -o $(Build.ArtifactStagingDirectory) /p:SymbolPackageFormat=snupkg --configuration Release
+        displayName: 'Pack'
+        workingDirectory: '$(Build.SourcesDirectory)/core'
+
+      - task: NuGetCommand@2
+        displayName: 'Push NuGet Packages'
+        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/next/core'))
+        inputs:
+          command: push
+          packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
+          nuGetFeedType: internal
+          publishVstsFeed: '$(System.TeamProject)/TeamsSDKPreviews'
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish NuGet Packages as Pipeline Artifact'
+        inputs:
+          targetPath: '$(Build.ArtifactStagingDirectory)'
+          artifact: 'nuget-packages'
+          publishLocation: 'pipeline'

.azdo/ci.yaml

@@ -1,6 +1,12 @@
 pr:
-- main
-- release/*
+  branches:
+    include:
+      - main
+      - release/*
+  paths:
+    exclude:
+      - core/**
+
 
 pool:
   vmImage: 'ubuntu-22.04'

.github/ado-publish.yml

@@ -134,7 +134,6 @@ stages:
 - stage: PushToNuGet
   displayName: 'Push NuGet Packages to nuget.org'
   dependsOn: Build_Test_Sign_Pack
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
   jobs:
   - deployment: PushPackages
     displayName: 'Manual Approval Required to Push Packages'

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

@@ -5,9 +5,18 @@ on:
   workflow_dispatch:
   pull_request:
     branches: ['main']
+    paths-ignore:
+      - '**/*.md'
+      - 'docs/**'
+      - 'Assets/**'
+      - 'core/**'
   push:
     branches: ['main']
-
+    paths-ignore:
+      - '**/*.md'
+      - 'docs/**'
+      - 'Assets/**'
+      - 'core/**'
 permissions: read-all
 
 jobs:

Libraries/Microsoft.Teams.AI.Models.OpenAI/Microsoft.Teams.AI.Models.OpenAI.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

Libraries/Microsoft.Teams.AI/Microsoft.Teams.AI.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

Libraries/Microsoft.Teams.Api/Clients/ActivityClient.cs

@@ -41,7 +41,7 @@ public ActivityClient(string serviceUrl, IHttpClientFactory factory, Cancellatio
         }
 
         var req = HttpRequest.Post(url, body: activity);
-        
+
         var res = await _http.SendAsync(req, _cancellationToken);
 
         if (res.Body == string.Empty) return null;
@@ -57,7 +57,7 @@ public ActivityClient(string serviceUrl, IHttpClientFactory factory, Cancellatio
         {
             url += "?isTargetedActivity=true";
         }
-        
+
         var req = HttpRequest.Put(url, body: activity);
 
         var res = await _http.SendAsync(req, _cancellationToken);
@@ -71,13 +71,13 @@ public ActivityClient(string serviceUrl, IHttpClientFactory factory, Cancellatio
     public async Task<Resource?> ReplyAsync(string conversationId, string id, IActivity activity, bool isTargeted = false)
     {
         activity.ReplyToId = id;
-        
+
         var url = $"{ServiceUrl}v3/conversations/{conversationId}/activities/{id}";
         if (isTargeted)
         {
             url += "?isTargetedActivity=true";
         }
-        
+
         var req = HttpRequest.Post(url, body: activity);
 
         var res = await _http.SendAsync(req, _cancellationToken);

Libraries/Microsoft.Teams.Api/Entities/ProductInfoEntity.cs

@@ -12,4 +12,4 @@ public class ProductInfoEntity : Entity
     public string? Id { get; set; }
 
     public ProductInfoEntity() : base("ProductInfo") { }
-}
+}

Libraries/Microsoft.Teams.Api/Microsoft.Teams.Api.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

Libraries/Microsoft.Teams.Apps.Testing/Microsoft.Teams.Apps.Testing.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>