Restore standard appsettings & use User Secrets

.gitignore

@@ -216,14 +216,13 @@ ModelManifest.xml
 .idea/
 *.*.iml
 
-# Settings for different environments
-appsettings.*.json
-launchSettings.json
-
 out.json
 bucket-name.txt
 out.yml
 local.settings.json
 
 .fake
 .ionide
+
+/Console/Properties/launchSettings.json
+/InlineQueries/Properties/launchSettings.json

Console.Advanced/Console.Advanced.csproj

@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>83ea0939-143a-4cb0-bd93-76083cc6c235</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

Console.Advanced/Properties/launchSettings.json

@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "Console.Advanced": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

Console.Advanced/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

Console/Program.cs

@@ -108,12 +108,12 @@ await bot.SendTextMessageAsync(msg.Chat, """
 
 async Task OnUpdate(Update update)
 {
-    await (update switch
+    switch (update)
     {
-        { CallbackQuery: { } callbackQuery } => OnCallbackQuery(callbackQuery),
-        { PollAnswer: { } pollAnswer } => OnPollAnswer(pollAnswer),
-        _ => OnUnhandledUpdate(update)
-    });
+        case { CallbackQuery: { } callbackQuery }: await OnCallbackQuery(callbackQuery); break;
+        case { PollAnswer: { } pollAnswer }: await OnPollAnswer(pollAnswer); break;
+        default: Console.WriteLine($"Received unhandled update {update.Type}"); break;
+    };
 }
 
 async Task OnCallbackQuery(CallbackQuery callbackQuery)
@@ -127,5 +127,3 @@ async Task OnPollAnswer(PollAnswer pollAnswer)
     if (pollAnswer.User != null)
         await bot.SendTextMessageAsync(pollAnswer.User.Id, $"You voted for option(s) id [{string.Join(',', pollAnswer.OptionIds)}]");
 }
-
-async Task OnUnhandledUpdate(Update update) => Console.WriteLine($"Received unhandled update {update.Type}");

FSharp.Example/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

InlineQueries/InlineQueries.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telegram.Bot" Version="21.3.0" />
+    <PackageReference Include="Telegram.Bot" Version="21.7.1" />
   </ItemGroup>
 
   <ItemGroup>

InlineQueries/Program.cs

@@ -22,33 +22,24 @@
 }
 
 // start the bot
-var bot = new TelegramBotClient(token);
-var me = await bot.GetMeAsync();
 using var cts = new CancellationTokenSource();
-bot.StartReceiving(OnUpdate, OnError, null, cts.Token);
+var bot = new TelegramBotClient(token, cancellationToken: cts.Token);
+var me = await bot.GetMeAsync();
+bot.OnUpdate += OnUpdate;
 
 Console.WriteLine($"Start listening for @{me.Username}");
 Console.ReadLine();
+cts.Cancel(); // stop the bot
 
-// stop the bot
-cts.Cancel();
-
-Task OnError(ITelegramBotClient bot, Exception ex, HandleErrorSource source, CancellationToken ct)
-{
-    Console.WriteLine($"A {source} occured: {ex}");
-    return Task.CompletedTask;
-}
-
-async Task OnUpdate(ITelegramBotClient bot, Update update, CancellationToken ct)
+async Task OnUpdate(Update update)
 {
     try
     {
-        await (update.Type switch
+        switch (update.Type)
         {
-            UpdateType.InlineQuery => BotOnInlineQueryReceived(bot, update.InlineQuery!),
-            UpdateType.ChosenInlineResult => BotOnChosenInlineResultReceived(bot, update.ChosenInlineResult!),
-            _ => Task.CompletedTask
-        });
+            case UpdateType.InlineQuery: await OnInlineQuery(bot, update.InlineQuery!); break;
+            case UpdateType.ChosenInlineResult: await OnChosenInlineResult(bot, update.ChosenInlineResult!); break;
+        };
     }
 #pragma warning disable CA1031
     catch (Exception ex)
@@ -59,7 +50,7 @@ async Task OnUpdate(ITelegramBotClient bot, Update update, CancellationToken ct)
 }
 
 // for this method to be called, you need to enable "Inline mode" on in BotFather
-async Task BotOnInlineQueryReceived(ITelegramBotClient botClient, InlineQuery inlineQuery)
+async Task OnInlineQuery(ITelegramBotClient botClient, InlineQuery inlineQuery)
 {
     var results = new List<InlineQueryResult>();
 
@@ -86,11 +77,10 @@ async Task BotOnInlineQueryReceived(ITelegramBotClient botClient, InlineQuery in
 }
 
 // for this method to be called, you need to enable "Inline feedback" in BotFather (100% if you want to know all your users choices)
-Task BotOnChosenInlineResultReceived(ITelegramBotClient botClient, ChosenInlineResult chosenInlineResult)
+async Task OnChosenInlineResult(ITelegramBotClient botClient, ChosenInlineResult chosenInlineResult)
 {
     if (uint.TryParse(chosenInlineResult.ResultId, out uint index) && index < articleNames.Length)
     {
         Console.WriteLine($"User {chosenInlineResult.From} has selected article: {articleNames[index]}");
     }
-    return Task.CompletedTask;
 }

Webhook.Controllers/Webhook.Controllers.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>6521903b-26d3-496b-8a25-0bad27b56010</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

Webhook.Controllers/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

Webhook.MinimalAPIs/Webhook.MinimalAPIs.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>37c33694-a3c1-43d7-b843-89936e9fbcbd</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

Webhook.MinimalAPIs/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

Webhook.MinimalAPIs/appsettings.json

@@ -5,7 +5,7 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
+  "AllowedHosts": "*",
   "BotToken": "YOUR_BOT_TOKEN",
-  "BotWebhookUrl": "https://your.public.host/bot",
-  "AllowedHosts": "*"
+  "BotWebhookUrl": "https://your.public.host/bot"
 }