2.1.1 release

karamem0 · Aug 24, 2023 · 87a2ec9 · 87a2ec9
1 parent 395245a
commit 87a2ec9
Show file tree

Hide file tree

Showing 37 changed files with 1,270 additions and 332 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -4,7 +4,7 @@ on:
       - develop
 
 env:
-  BUILD_VERSION: 2.1.0.${{github.run_number}}
+  BUILD_VERSION: 2.1.1.${{github.run_number}}
   BUILD_CONFIGURATION: Release
 
 jobs:
@@ -70,6 +70,9 @@ jobs:
         with:
           name: commistant-bot
           path: source/server/Karamem0.Commistant.Bot/build
+      - name: Test func
+        run: dotnet test --filter TestCategory=Karamem0.Commistant.Functions
+        working-directory: source/server
       - name: Build func
         run: |
           dotnet publish `

diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -6,7 +6,7 @@ on:
       - v*.*.*
 
 env:
-  BUILD_VERSION: 2.1.0.${{github.run_number}}
+  BUILD_VERSION: 2.1.1.${{github.run_number}}
   BUILD_CONFIGURATION: Release
 
 jobs:
@@ -72,6 +72,9 @@ jobs:
         with:
           name: commistant-bot
           path: source/server/Karamem0.Commistant.Bot/build
+      - name: Test func
+        run: dotnet test --filter TestCategory=Karamem0.Commistant.Functions
+        working-directory: source/server
       - name: Build func
         run: |
           dotnet publish `

diff --git a/source/server/.vscode/extensions.json b/source/server/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "derivitec-ltd.vscode-dotnet-adapter",
+    "hbenl.vscode-test-explorer"
+  ]
+}
diff --git a/source/server/.vscode/launch.json b/source/server/.vscode/launch.json
@@ -0,0 +1,37 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Bot",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      "program": "${workspaceFolder}/Karamem0.Commistant.Bot/bin/Debug/net7.0/Karamem0.Commistant.Bot.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/Karamem0.Commistant.Bot",
+      "stopAtEntry": false,
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    {
+      "name": "Launch Functions",
+      "type": "coreclr",
+      "request": "attach",
+      "processId": "${command:azureFunctions.pickProcess}"
+    },
+    {
+      "name": "Launch Web",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      "program": "${workspaceFolder}/Karamem0.Commistant.Web/bin/Debug/net7.0/Karamem0.Commistant.Web.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/Karamem0.Commistant.Web",
+      "stopAtEntry": false,
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  ]
+}
diff --git a/source/server/.vscode/settings.json b/source/server/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+  "azurite.location": ".azurite",
+  "azureFunctions.preDeployTask": "publish function",
+  "azureFunctions.projectLanguage": "C#",
+  "azureFunctions.projectRuntime": "~4",
+  "dotnetCoreExplorer.searchpatterns": "**/bin/**/*.Tests.dll",
+  "testExplorer.useNativeTesting": true
+}
diff --git a/...aramem0.Commistant.Bot/.vscode/tasks.json → source/server/.vscode/tasks.json b/...aramem0.Commistant.Bot/.vscode/tasks.json → source/server/.vscode/tasks.json
diff --git a/source/server/Karamem0.Commistant.Bot/.vscode/launch.json b/source/server/Karamem0.Commistant.Bot/.vscode/launch.json
diff --git a/source/server/Karamem0.Commistant.Bot/Bots/ActivityBot.cs b/source/server/Karamem0.Commistant.Bot/Bots/ActivityBot.cs
@@ -64,7 +64,8 @@ protected override async Task OnMembersAddedAsync(IList<ChannelAccount> membersA
                         "Commistant は Microsoft Teams 会議によるコミュニティ イベントをサポートするアシスタント ボットです。" +
                         "会議の開始時、終了時、または会議中に定型のメッセージ通知を送信します。" +
                         "通知にはテキストおよび QR コードつきの URL を添付することができます。",
-                        cancellationToken: cancellationToken);
+                        cancellationToken: cancellationToken
+                    );
                 }
             }
             await base.OnMembersAddedAsync(membersAdded, turnContext, cancellationToken);
@@ -118,22 +119,25 @@ protected override async Task OnMessageActivityAsync(ITurnContext<IMessageActivi
                         {
                             _ = await turnContext.SendActivityAsync(
                                 "認識できないコマンドです。",
-                                cancellationToken: cancellationToken);
+                                cancellationToken: cancellationToken
+                            );
                         }
                     }
                     else
                     {
                         _ = await turnContext.SendActivityAsync(
                             "新しいコマンドを開始する前に中断されたコマンドを完了させてください。",
-                            cancellationToken: cancellationToken);
+                            cancellationToken: cancellationToken
+                        );
                     }
                 }
             }
             else
             {
                 _ = await turnContext.SendActivityAsync(
                     "開催者のみがコマンドを実行できます。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             await this.conversationState.SaveChangesAsync(turnContext, cancellationToken: cancellationToken);
         }

diff --git a/source/server/Karamem0.Commistant.Bot/Dialogs/EndMeetingDialog.cs b/source/server/Karamem0.Commistant.Bot/Dialogs/EndMeetingDialog.cs
@@ -55,7 +55,8 @@ protected override async Task OnInitializeAsync(DialogContext dc)
                 {
                     this.BeforeConfirmAsync,
                     this.AfterConrifmAsync
-                }));
+                }
+            ));
             _ = this.AddDialog(new TextPrompt(nameof(this.BeforeConfirmAsync), AdaptiveCardvalidator.Validate));
             await base.OnInitializeAsync(dc);
         }
@@ -154,7 +155,8 @@ private async Task<DialogTurnResult> BeforeConfirmAsync(WaterfallStepContext ste
                 {
                     Prompt = (Activity)activity
                 },
-                cancellationToken);
+                cancellationToken
+            );
         }
 
         private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext stepContext, CancellationToken cancellationToken)
@@ -174,14 +176,16 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 this.logger.SettingsUpdated(stepContext.Context.Activity);
                 _ = await stepContext.Context.SendActivityAsync(
                     "設定を変更しました。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             if (value.Value<string>("Button") == "Cancel")
             {
                 this.logger.SettingsCancelled(stepContext.Context.Activity);
                 _ = await stepContext.Context.SendActivityAsync(
                     "キャンセルしました。設定は変更されていません。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             if (stepContext.Context.Activity.ReplyToId is not null)
             {
@@ -238,7 +242,8 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 activity.Id = stepContext.Context.Activity.ReplyToId;
                 _ = await stepContext.Context.UpdateActivityAsync(
                     activity,
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             return await stepContext.EndDialogAsync(cancellationToken: cancellationToken);
         }

diff --git a/source/server/Karamem0.Commistant.Bot/Dialogs/InMeetingDialog.cs b/source/server/Karamem0.Commistant.Bot/Dialogs/InMeetingDialog.cs
@@ -55,7 +55,8 @@ protected override async Task OnInitializeAsync(DialogContext dc)
                 {
                     this.BeforeConfirmAsync,
                     this.AfterConrifmAsync
-                }));
+                }
+            ));
             _ = this.AddDialog(new TextPrompt(nameof(this.BeforeConfirmAsync), AdaptiveCardvalidator.Validate));
             await base.OnInitializeAsync(dc);
         }
@@ -159,7 +160,8 @@ private async Task<DialogTurnResult> BeforeConfirmAsync(WaterfallStepContext ste
                 {
                     Prompt = (Activity)activity
                 },
-                cancellationToken);
+                cancellationToken
+            );
         }
 
         private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext stepContext, CancellationToken cancellationToken)
@@ -179,7 +181,8 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 this.logger.SettingsUpdated(stepContext.Context.Activity);
                 _ = await stepContext.Context.SendActivityAsync(
                     "設定を変更しました。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             if (stepContext.Context.Activity.ReplyToId is not null)
             {
@@ -235,7 +238,8 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 activity.Id = stepContext.Context.Activity.ReplyToId;
                 _ = await stepContext.Context.UpdateActivityAsync(
                     activity,
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             return await stepContext.EndDialogAsync(cancellationToken: cancellationToken);
         }

diff --git a/source/server/Karamem0.Commistant.Bot/Dialogs/ResetDialog.cs b/source/server/Karamem0.Commistant.Bot/Dialogs/ResetDialog.cs
@@ -46,7 +46,8 @@ protected override async Task OnInitializeAsync(DialogContext dc)
                 {
                     this.BeforeConfirmAsync,
                     this.AfterConrifmAsync
-                }));
+                }
+            ));
             _ = this.AddDialog(new TextPrompt(nameof(this.BeforeConfirmAsync), AdaptiveCardvalidator.Validate));
             await base.OnInitializeAsync(dc);
         }
@@ -99,7 +100,8 @@ private async Task<DialogTurnResult> BeforeConfirmAsync(WaterfallStepContext ste
                 {
                     Prompt = (Activity)activity
                 },
-                cancellationToken);
+                cancellationToken
+            );
         }
 
         private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext stepContext, CancellationToken cancellationToken)
@@ -115,7 +117,8 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 await this.conversationState.ClearStateAsync(stepContext.Context, cancellationToken);
                 _ = await stepContext.Context.SendActivityAsync(
                     "設定を初期化しました。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             if (value.Value<string>("Button") == "No")
             {
@@ -147,7 +150,8 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 activity.Id = stepContext.Context.Activity.ReplyToId;
                 _ = await stepContext.Context.UpdateActivityAsync(
                     activity,
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             return await stepContext.EndDialogAsync(cancellationToken: cancellationToken);
         }

diff --git a/source/server/Karamem0.Commistant.Bot/Dialogs/StartMeetingDialog.cs b/source/server/Karamem0.Commistant.Bot/Dialogs/StartMeetingDialog.cs
@@ -54,7 +54,8 @@ protected override async Task OnInitializeAsync(DialogContext dc)
                 {
                     this.BeforeConfirmAsync,
                     this.AfterConrifmAsync
-                }));
+                }
+            ));
             _ = this.AddDialog(new TextPrompt(nameof(this.BeforeConfirmAsync), AdaptiveCardvalidator.Validate));
             await base.OnInitializeAsync(dc);
         }
@@ -153,7 +154,8 @@ private async Task<DialogTurnResult> BeforeConfirmAsync(WaterfallStepContext ste
                 {
                     Prompt = (Activity)activity
                 },
-                cancellationToken);
+                cancellationToken
+            );
         }
 
         private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext stepContext, CancellationToken cancellationToken)
@@ -173,14 +175,16 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 this.logger.SettingsUpdated(stepContext.Context.Activity);
                 _ = await stepContext.Context.SendActivityAsync(
                     "設定を変更しました。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             if (value.Value<string>("Button") == "Cancel")
             {
                 this.logger.SettingsCancelled(stepContext.Context.Activity);
                 _ = await stepContext.Context.SendActivityAsync(
                     "キャンセルしました。設定は変更されていません。",
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             if (stepContext.Context.Activity.ReplyToId is not null)
             {
@@ -237,7 +241,8 @@ private async Task<DialogTurnResult> AfterConrifmAsync(WaterfallStepContext step
                 activity.Id = stepContext.Context.Activity.ReplyToId;
                 _ = await stepContext.Context.UpdateActivityAsync(
                     activity,
-                    cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken
+                );
             }
             return await stepContext.EndDialogAsync(cancellationToken: cancellationToken);
         }

diff --git a/source/server/Karamem0.Commistant.Common/.vscode/tasks.json b/source/server/Karamem0.Commistant.Common/.vscode/tasks.json
diff --git a/source/server/Karamem0.Commistant.Common/Extensions/BlobClientExtension.cs b/source/server/Karamem0.Commistant.Common/Extensions/BlobClientExtension.cs
@@ -47,7 +47,8 @@ public static async Task SetObjectAsync<T>(this BlobClient target, BlobContent<T
                     {
                         IfMatch = value.ETag
                     }
-                });
+                }
+            );
         }
 
     }