Merge pull request #1167 from dotnet/main

✅ Merge `main` into `live`
dotnet · Jun 28, 2024 · ab1af42 · ab1af42
2 parents e980b4c + c435bcf
commit ab1af42
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 21 deletions.
diff --git a/.github/policies/label-prs.yml b/.github/policies/label-prs.yml
@@ -45,7 +45,7 @@ configuration:
           - isActivitySender:
               user: dotnet-policy-service[bot]
           - titleContains:
-              pattern: Merge main into live
+              pattern: "✅ Merge `main` into `live`"
               isRegex: False
         then:
           - addLabel:

diff --git a/.github/workflows/dispatch-merge-main-to-live.yml b/.github/workflows/dispatch-merge-main-to-live.yml
@@ -0,0 +1,51 @@
+name: go-live
+
+on:
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: "The reason for running the workflow"
+        required: true
+        default: "Need to update live now, before daily scheduled run."
+
+jobs:
+  go-live:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: "Print manual run reason"
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          echo 'Reason: ${{ github.event.inputs.reason }}'
+
+      - name: Check out code
+        uses: actions/checkout@main
+
+      - name: Check for existing PR
+        id: exists
+        run: |
+          result=$(gh pr list --base live --head main --json number --jq '.[0].number' || echo "")
+          echo "PR_NUMBER=$result" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Create pull request
+        id: create
+        if: steps.exists.outputs.PR_NUMBER == ''
+        run: |
+          gh pr create \
+            --title "✅ Merge \`main\` into \`live\`" \
+            --body "🤖 Queue merge when ready..." \
+            --base live \
+            --head main
+          echo "CREATED=true" >> $GITHUB_OUTPUT
+
+      - name: Enable auto-merge for the pull request
+        if: steps.create.outputs.CREATED == 'true'
+        run: |
+          PR_NUMBER=$(gh pr list --base live --head main --json number --jq '.[0].number')
+          gh pr merge $PR_NUMBER --merge --auto
diff --git a/docs/azureai/azureai-openai-component.md b/docs/azureai/azureai-openai-component.md
@@ -2,7 +2,7 @@
 title: .NET Aspire Azure AI OpenAI component
 description: Learn how to use the .NET Aspire Azure AI OpenAI component.
 ms.topic: how-to
-ms.date: 06/05/2024
+ms.date: 06/26/2024
 ---
 
 # .NET Aspire Azure AI OpenAI component
@@ -102,7 +102,7 @@ When using a connection string from the `ConnectionStrings` configuration sectio
 builder.AddAzureAIOpenAI("openAiConnectionName");
 ```
 
-And then the connection string will be retrieved from the `ConnectionStrings` configuration section:
+The connection string is retrieved from the `ConnectionStrings` configuration section, and there are two supported formats, either the account endpoint used in conjunction with the default Azure credential or a connection string with the account key.
 
 #### Account endpoint
 
@@ -123,7 +123,7 @@ Alternatively, a custom connection string can be used.
 ```json
 {
   "ConnectionStrings": {
-    "openaiConnectionName": "Endpoint=https://{account_name}.openai.azure.com/;Key={account_key};"
+    "openAiConnectionName": "Endpoint=https://{account_name}.openai.azure.com/;Key={account_key};"
   }
 }
 ```

diff --git a/docs/frameworks/dapr.md b/docs/frameworks/dapr.md
@@ -1,7 +1,7 @@
 ---
 title: Use Dapr with .NET Aspire
 description: Learn how to use Dapr with .NET Aspire
-ms.date: 06/04/2024
+ms.date: 06/26/2024
 ms.topic: overview
 ---
 

diff --git a/docs/frameworks/snippets/Dapr/Dapr.Web/WeatherApiClient.cs b/docs/frameworks/snippets/Dapr/Dapr.Web/WeatherApiClient.cs
@@ -11,10 +11,10 @@ public async Task<WeatherForecast[]> GetWeatherAsync(
             await client.InvokeMethodAsync<List<WeatherForecast>>(
                 HttpMethod.Get,
                 "apiservice",
-                "/weatherforecast",
+                "weatherforecast",
                 cancellationToken);
 
-        return forecasts?.ToArray() ?? [];
+        return forecasts?.Take(maxItems)?.ToArray() ?? [];
     }
 }
 

diff --git a/docs/frameworks/snippets/Dapr/Dapr.sln b/docs/frameworks/snippets/Dapr/Dapr.sln
@@ -11,18 +11,11 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Web", "Dapr.Web\Dapr.Web.csproj", "{084CE0BA-28EE-4ABB-8E95-F5243F897922}"
 EndProject
 Global
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7307B03D-798E-47A2-B413-E5B2C2D62234}
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2A333D8-A8CE-467A-B854-24C7E0A103E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A2A333D8-A8CE-467A-B854-24C7E0A103E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A2A333D8-A8CE-467A-B854-24C7E0A103E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,12 +24,19 @@ Global
 		{ECD0E8F9-65BF-44DA-A8EC-2475A56E97A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECD0E8F9-65BF-44DA-A8EC-2475A56E97A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECD0E8F9-65BF-44DA-A8EC-2475A56E97A8}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B67544C-F50B-4EE1-A3E1-DD0A394BAF1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{084CE0BA-28EE-4ABB-8E95-F5243F897922}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7307B03D-798E-47A2-B413-E5B2C2D62234}
+	EndGlobalSection
 EndGlobal