Merge branch 'main' into copilot/fix-171

brandonh-msft · web-flow · commit 81226fe93b90 · 2025-09-08T08:55:55.000-07:00
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
@@ -29,6 +29,6 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup .NET 9.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 9.x
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -22,11 +22,11 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup .NET 9.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 9.x
       - name: Setup .NET ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Restore dependencies
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup .NET 9.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 9.x
       - name: Restore dependencies
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -49,7 +49,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
       with:
         dotnet-version: |
           8.0.x
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
           dotnet-version: |
             9.0.x
@@ -108,7 +108,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
           dotnet-version: 9.0.x
 
@@ -146,7 +146,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
           dotnet-version: 9.0.x
 
@@ -174,7 +174,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
           dotnet-version: 9.0.x
 
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,5 +1,6 @@
 {
     "recommendations": [
-        "ms-dotnettools.csharp"
+        "ms-dotnettools.csharp",
+        "anweber.vscode-httpyac"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
-  "sdk": {
-    "version": "9.0.304"
-  }
+    "sdk": {
+        "allowPrerelease": false
+    }
 }
diff --git a/samples/AgentServer/http-tests/message-send.http b/samples/AgentServer/http-tests/message-send.http
@@ -22,6 +22,7 @@ POST {{host}}/echo/v1/message:send
 Content-Type: application/json
 {
         "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
@@ -42,6 +43,7 @@ POST {{host}}/echotasks/v1/message:send
 Content-Type: application/json
 {
         "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
@@ -70,6 +72,7 @@ Content-Type: application/json
     "method": "message/send",
     "params": {
           "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
@@ -95,6 +98,7 @@ Content-Type: application/json
     "method": "message/send",
     "params": {
           "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
diff --git a/samples/AgentServer/http-tests/message-stream.http b/samples/AgentServer/http-tests/message-stream.http
@@ -22,6 +22,7 @@ POST {{host}}/echo/v1/message:stream
 Content-Type: application/json
 {
         "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
@@ -50,6 +51,7 @@ Content-Type: application/json
     "method": "message/stream",
     "params": {
         "message": {
+            "kind": "message",
             "messageId": "messageId2",
             "role": "user",
             "parts": [
@@ -75,6 +77,7 @@ Content-Type: application/json
     "method": "message/stream",
     "params": {
         "message": {
+            "kind": "message",
             "messageId": "messageId2",
             "role": "user",
             "parts": [
diff --git a/samples/AgentServer/http-tests/push-notifications.http b/samples/AgentServer/http-tests/push-notifications.http
@@ -22,6 +22,7 @@ POST {{host}}/echotasks/v1/message:send
 Content-Type: application/json
 {
         "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
@@ -92,6 +93,7 @@ Content-Type: application/json
     "method": "message/send",
     "params": {
           "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
diff --git a/samples/AgentServer/http-tests/researcher-agent.http b/samples/AgentServer/http-tests/researcher-agent.http
@@ -27,6 +27,7 @@ Content-Type: application/json
     "method": "message/send",
     "params": {
        "message": {
+            "kind": "message",
             "messageId": "asdasdasd",
             "role": "user",
             "parts": [
@@ -70,6 +71,7 @@ Content-Type: application/json
     "method": "message/send",
     "params": {
         "message": {
+            "kind": "message",
             "messageId": "abcdef",
             "taskId": "c65e7047-2938-432f-bae0-660d6d9fda50",
             "role": "user",
diff --git a/samples/AgentServer/http-tests/task-management.http b/samples/AgentServer/http-tests/task-management.http
@@ -23,6 +23,7 @@ POST {{host}}/echotasks/v1/message:send
 Content-Type: application/json
 {
         "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
@@ -59,6 +60,7 @@ Content-Type: application/json
     "method": "message/send",
     "params": {
           "message": {
+            "kind": "message",
             "messageId": "12345",
             "role": "user",
             "parts": [
diff --git a/samples/SemanticKernelAgent/SemanticKernelAgent.http b/samples/SemanticKernelAgent/SemanticKernelAgent.http
@@ -10,14 +10,15 @@ Content-Type: application/json
 {
     "id": "3",
     "jsonrpc": "2.0",
-    "method": "task/send",
+    "method": "message/send",
     "params": {
-        "id": "12345",
         "message": {
+            "kind": "message",
+            "messageId": "12345",
             "role": "user",
             "parts": [
                 {
-                    "type": "text",
+                    "kind": "text",
                     "text": "I am based in London. What's the exchange rate and recommended itinerary for visiting Galway?"
                 }
             ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"recommendations": [`
`3`		`- "ms-dotnettools.csharp"`
	`3`	`+ "ms-dotnettools.csharp",`
	`4`	`+ "anweber.vscode-httpyac"`
`4`	`5`	`]`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "sdk": {`
`3`		`- "version": "9.0.304"`
`4`		`- }`
	`2`	`+ "sdk": {`
	`3`	`+ "allowPrerelease": false`
	`4`	`+ }`
`5`	`5`	`}`