diff --git a/.aspire/settings.json b/.aspire/settings.json new file mode 100644 index 0000000..cb7b839 --- /dev/null +++ b/.aspire/settings.json @@ -0,0 +1,3 @@ +{ + "appHostPath": "../src/KITT.AppHost/KITT.AppHost.csproj" +} \ No newline at end of file diff --git a/LemonBot.sln b/LemonBot.sln index 90747f1..c92bdaf 100644 --- a/LemonBot.sln +++ b/LemonBot.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31815.197 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F47298C6-FC9C-4B30-88D6-3DDAAD1B7B65}" EndProject @@ -23,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KITT.Core.Test", "tests\KIT EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KITT.Web.App.UI", "src\KITT.Web.App.UI\KITT.Web.App.UI.csproj", "{2B84BEBB-A29E-4BDE-893F-BBCCE979A0BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KITT.Bot.Functions", "src\KITT.Bot.Functions\KITT.Bot.Functions.csproj", "{EB1A10AF-8561-42E1-9348-6C8669F09176}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KITT.Telegram.Messages", "src\KITT.Telegram.Messages\KITT.Telegram.Messages.csproj", "{6E87C525-EB68-4DAD-9F63-39E426D01668}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KITT.Telegram.Functions", "src\KITT.Telegram.Functions\KITT.Telegram.Functions.csproj", "{A6A4722A-4AA2-4B9C-A2FB-A7C171E03DF4}" @@ -161,18 +159,6 @@ Global {2B84BEBB-A29E-4BDE-893F-BBCCE979A0BE}.Release|x64.Build.0 = Release|Any CPU {2B84BEBB-A29E-4BDE-893F-BBCCE979A0BE}.Release|x86.ActiveCfg = Release|Any CPU {2B84BEBB-A29E-4BDE-893F-BBCCE979A0BE}.Release|x86.Build.0 = Release|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Debug|x64.ActiveCfg = Debug|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Debug|x64.Build.0 = Debug|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Debug|x86.ActiveCfg = Debug|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Debug|x86.Build.0 = Debug|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Release|Any CPU.Build.0 = Release|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Release|x64.ActiveCfg = Release|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Release|x64.Build.0 = Release|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Release|x86.ActiveCfg = Release|Any CPU - {EB1A10AF-8561-42E1-9348-6C8669F09176}.Release|x86.Build.0 = Release|Any CPU {6E87C525-EB68-4DAD-9F63-39E426D01668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6E87C525-EB68-4DAD-9F63-39E426D01668}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E87C525-EB68-4DAD-9F63-39E426D01668}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -402,7 +388,6 @@ Global {66F99049-7BCF-47D4-81FF-8E0254FE82EE} = {53F76412-0B22-4C62-8519-834A82747AD4} {AB7A75D3-84BA-4AFD-BC49-D0C7545FB235} = {B32B1475-75B8-41DD-BB71-D6106152C656} {2B84BEBB-A29E-4BDE-893F-BBCCE979A0BE} = {53F76412-0B22-4C62-8519-834A82747AD4} - {EB1A10AF-8561-42E1-9348-6C8669F09176} = {53F76412-0B22-4C62-8519-834A82747AD4} {6E87C525-EB68-4DAD-9F63-39E426D01668} = {53F76412-0B22-4C62-8519-834A82747AD4} {A6A4722A-4AA2-4B9C-A2FB-A7C171E03DF4} = {53F76412-0B22-4C62-8519-834A82747AD4} {92122C69-6CEC-4FEA-BAC5-AC7F8197C6FE} = {B32B1475-75B8-41DD-BB71-D6106152C656} diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000..993d13d --- /dev/null +++ b/NuGet.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/KITT.AppHost/KITT.AppHost.csproj b/src/KITT.AppHost/KITT.AppHost.csproj index 38ad8e2..5967448 100644 --- a/src/KITT.AppHost/KITT.AppHost.csproj +++ b/src/KITT.AppHost/KITT.AppHost.csproj @@ -1,6 +1,6 @@ - + Exe @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/src/KITT.AppHost/Program.cs b/src/KITT.AppHost/Program.cs index b37dadc..0cea868 100644 --- a/src/KITT.AppHost/Program.cs +++ b/src/KITT.AppHost/Program.cs @@ -27,7 +27,11 @@ .WithReference(kittDb) .WaitFor(kittDb) .WithEnvironment("Identity__TenantId", tenantId) - .WithEnvironment("Identity__Cms__AppId", cmsApiAppId); + .WithEnvironment("Identity__Cms__AppId", cmsApiAppId) + .PublishAsAzureContainerApp((_, app) => + { + app.Template.Scale = new() { MinReplicas = 0, MaxReplicas = 5 }; + }); #endregion #region Proposals @@ -35,7 +39,11 @@ .WithReference(kittDb) .WaitFor(kittDb) .WithEnvironment("Identity__TenantId", tenantId) - .WithEnvironment("Identity__Proposals__AppId", proposalsApiAppId); + .WithEnvironment("Identity__Proposals__AppId", proposalsApiAppId) + .PublishAsAzureContainerApp((_, app) => + { + app.Template.Scale = new() { MinReplicas = 0, MaxReplicas = 5 }; + }); #endregion var webApp = builder.AddProject(ServiceNames.WebApp) @@ -51,7 +59,11 @@ .WithEnvironment("Identity__WebApp__AppSecret", webAppSecret) .WithEnvironment("Identity__Cms__AppId", cmsApiAppId) .WithEnvironment("Identity__Proposals__AppId", proposalsApiAppId) - .WithExternalHttpEndpoints(); + .WithExternalHttpEndpoints() + .PublishAsAzureContainerApp((_, app) => + { + app.Template.Scale = new() { MinReplicas = 0, MaxReplicas = 5 }; + }); if (!builder.ExecutionContext.IsPublishMode) diff --git a/src/KITT.Bot.Functions/.gitignore b/src/KITT.Bot.Functions/.gitignore deleted file mode 100644 index ff5b00c..0000000 --- a/src/KITT.Bot.Functions/.gitignore +++ /dev/null @@ -1,264 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# Azure Functions localsettings file -local.settings.json - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -project.fragment.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -#*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc \ No newline at end of file diff --git a/src/KITT.Bot.Functions/BotFunction.cs b/src/KITT.Bot.Functions/BotFunction.cs deleted file mode 100644 index 3398701..0000000 --- a/src/KITT.Bot.Functions/BotFunction.cs +++ /dev/null @@ -1,155 +0,0 @@ -using KITT.Bot.Functions.Models; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Azure.WebJobs; -using Microsoft.Azure.WebJobs.Extensions.Http; -using Microsoft.Azure.WebJobs.Extensions.SignalRService; -using System.IO; -using System.Net; -using System.Threading.Tasks; - -namespace KITT.Bot.Functions -{ - public static class BotFunction - { - [FunctionName("negotiate")] - public static SignalRConnectionInfo Negotiate( - [HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest request, - [SignalRConnectionInfo(HubName = "Bot")] SignalRConnectionInfo connectionInfo) - { - return connectionInfo; - } - - #region Bot Management calls - [FunctionName(nameof(NotifyStart))] - public static async Task NotifyStart( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var notification = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "BotStarted", - Arguments = new[] { notification } - }); - } - - [FunctionName(nameof(NotifyStop))] - public static async Task NotifyStop( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var notification = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "BotStopped", - Arguments = new[] { notification } - }); - } - - [FunctionName(nameof(SendNewUserSubscription))] - public static async Task SendNewUserSubscription( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var subscription = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "UserSubscriptionReceived", - Arguments = new[] { subscription.SubscriberName } - }); - } - - [FunctionName(nameof(SendUserLeft))] - public static async Task SendUserLeft( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var user = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "UserLeftReceived", - Arguments = new[] { user.UserName } - }); - } - - [FunctionName(nameof(SendUserJoin))] - public static async Task SendUserJoin( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var user = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "UserJoinReceived", - Arguments = new[] { user.UserName } - }); - } - #endregion - - [FunctionName(nameof(SendImageOverlay))] - public static async Task SendImageOverlay( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var image = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "ImageOverlayReceived", - Arguments = new[] { image.ResourceUrl } - }); - } - - [FunctionName(nameof(SendTextOverlay))] - public static async Task SendTextOverlay( - [HttpTrigger(AuthorizationLevel.Function, "post")] HttpRequest request, - [SignalR(HubName = "Bot")] IAsyncCollector signalRMessages) - { - var text = await request.ReadFromJsonAsync(); - - await signalRMessages.AddAsync(new SignalRMessage - { - Target = "TextOverlayReceived", - Arguments = new[] { text.UserName, text.Message } - }); - } - - #region Overlay pages - [FunctionName(nameof(Image))] - public static IActionResult Image( - [HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequest request, - ExecutionContext context) - { - var overlayFilePath = Path.Combine(context.FunctionAppDirectory, "content", "image.html"); - - return new ContentResult - { - Content = File.ReadAllText(overlayFilePath), - ContentType = "text/html", - StatusCode = (int)HttpStatusCode.OK - }; - } - - [FunctionName(nameof(Text))] - public static IActionResult Text( - [HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequest request, - ExecutionContext context) - { - var overlayFilePath = Path.Combine(context.FunctionAppDirectory, "content", "text.html"); - - return new ContentResult - { - Content = File.ReadAllText(overlayFilePath), - ContentType = "text/html", - StatusCode = (int)HttpStatusCode.OK - }; - } - #endregion - } -} diff --git a/src/KITT.Bot.Functions/KITT.Bot.Functions.csproj b/src/KITT.Bot.Functions/KITT.Bot.Functions.csproj deleted file mode 100644 index 7f76076..0000000 --- a/src/KITT.Bot.Functions/KITT.Bot.Functions.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - net6.0 - v4 - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Never - - - diff --git a/src/KITT.Bot.Functions/Models/ImageOverlay.cs b/src/KITT.Bot.Functions/Models/ImageOverlay.cs deleted file mode 100644 index 05331eb..0000000 --- a/src/KITT.Bot.Functions/Models/ImageOverlay.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace KITT.Bot.Functions.Models; - -public record ImageOverlay -{ - [Required] - public string ResourceUrl { get; init; } = string.Empty; -} diff --git a/src/KITT.Bot.Functions/Models/StartNotification.cs b/src/KITT.Bot.Functions/Models/StartNotification.cs deleted file mode 100644 index 382e207..0000000 --- a/src/KITT.Bot.Functions/Models/StartNotification.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace KITT.Bot.Functions.Models; - -public record StartNotification -{ - public DateTime StartTime { get; init; } -} diff --git a/src/KITT.Bot.Functions/Models/StopNotification.cs b/src/KITT.Bot.Functions/Models/StopNotification.cs deleted file mode 100644 index 9d0ddb9..0000000 --- a/src/KITT.Bot.Functions/Models/StopNotification.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace KITT.Bot.Functions.Models; - -public record StopNotification -{ - public DateTime StopTime { get; init; } -} diff --git a/src/KITT.Bot.Functions/Models/TextOverlay.cs b/src/KITT.Bot.Functions/Models/TextOverlay.cs deleted file mode 100644 index c892513..0000000 --- a/src/KITT.Bot.Functions/Models/TextOverlay.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace KITT.Bot.Functions.Models; - -public record TextOverlay -{ - [Required] - public string UserName { get; init; } = string.Empty; - - [Required] - public string Message { get; init; } = string.Empty; -} diff --git a/src/KITT.Bot.Functions/Models/UserJoin.cs b/src/KITT.Bot.Functions/Models/UserJoin.cs deleted file mode 100644 index 65a4031..0000000 --- a/src/KITT.Bot.Functions/Models/UserJoin.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace KITT.Bot.Functions.Models; - -public record UserJoin -{ - public string UserName { get; init; } -} diff --git a/src/KITT.Bot.Functions/Models/UserLeft.cs b/src/KITT.Bot.Functions/Models/UserLeft.cs deleted file mode 100644 index ffb9fa9..0000000 --- a/src/KITT.Bot.Functions/Models/UserLeft.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace KITT.Bot.Functions.Models; - -public record UserLeft -{ - public string UserName { get; init; } -} diff --git a/src/KITT.Bot.Functions/Models/UserSubscription.cs b/src/KITT.Bot.Functions/Models/UserSubscription.cs deleted file mode 100644 index b208429..0000000 --- a/src/KITT.Bot.Functions/Models/UserSubscription.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace KITT.Bot.Functions.Models; - -public record UserSubscription -{ - public string SubscriberName { get; init; } -} diff --git a/src/KITT.Bot.Functions/Properties/ServiceDependencies/kitt-bot-api/appInsights1.arm.json b/src/KITT.Bot.Functions/Properties/ServiceDependencies/kitt-bot-api/appInsights1.arm.json deleted file mode 100644 index f190a6e..0000000 --- a/src/KITT.Bot.Functions/Properties/ServiceDependencies/kitt-bot-api/appInsights1.arm.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "resourceGroupName": { - "type": "string", - "defaultValue": "KITT_LiveTools_RG", - "metadata": { - "_parameterType": "resourceGroup", - "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking." - } - }, - "resourceGroupLocation": { - "type": "string", - "defaultValue": "westeurope", - "metadata": { - "_parameterType": "location", - "description": "Location of the resource group. Resource groups could have different location than resources." - } - }, - "resourceLocation": { - "type": "string", - "defaultValue": "[parameters('resourceGroupLocation')]", - "metadata": { - "_parameterType": "location", - "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there." - } - } - }, - "resources": [ - { - "type": "Microsoft.Resources/resourceGroups", - "name": "[parameters('resourceGroupName')]", - "location": "[parameters('resourceGroupLocation')]", - "apiVersion": "2019-10-01" - }, - { - "type": "Microsoft.Resources/deployments", - "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat('kitt-bot-api', subscription().subscriptionId)))]", - "resourceGroup": "[parameters('resourceGroupName')]", - "apiVersion": "2019-10-01", - "dependsOn": [ - "[parameters('resourceGroupName')]" - ], - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "name": "kitt-bot-api", - "type": "microsoft.insights/components", - "location": "[parameters('resourceLocation')]", - "kind": "web", - "properties": {}, - "apiVersion": "2015-05-01" - } - ] - } - } - } - ], - "metadata": { - "_dependencyType": "appInsights.azure" - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/Properties/ServiceDependencies/kitt-bot-api/storage1.arm.json b/src/KITT.Bot.Functions/Properties/ServiceDependencies/kitt-bot-api/storage1.arm.json deleted file mode 100644 index bd3f417..0000000 --- a/src/KITT.Bot.Functions/Properties/ServiceDependencies/kitt-bot-api/storage1.arm.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "resourceGroupName": { - "type": "string", - "defaultValue": "KITT_LiveTools_RG", - "metadata": { - "_parameterType": "resourceGroup", - "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking." - } - }, - "resourceGroupLocation": { - "type": "string", - "defaultValue": "westeurope", - "metadata": { - "_parameterType": "location", - "description": "Location of the resource group. Resource groups could have different location than resources." - } - }, - "resourceLocation": { - "type": "string", - "defaultValue": "[parameters('resourceGroupLocation')]", - "metadata": { - "_parameterType": "location", - "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there." - } - } - }, - "resources": [ - { - "type": "Microsoft.Resources/resourceGroups", - "name": "[parameters('resourceGroupName')]", - "location": "[parameters('resourceGroupLocation')]", - "apiVersion": "2019-10-01" - }, - { - "type": "Microsoft.Resources/deployments", - "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat('kittlivetoolsrg8356', subscription().subscriptionId)))]", - "resourceGroup": "[parameters('resourceGroupName')]", - "apiVersion": "2019-10-01", - "dependsOn": [ - "[parameters('resourceGroupName')]" - ], - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "sku": { - "name": "Standard_LRS", - "tier": "Standard" - }, - "kind": "Storage", - "name": "kittlivetoolsrg8356", - "type": "Microsoft.Storage/storageAccounts", - "location": "[parameters('resourceLocation')]", - "apiVersion": "2017-10-01" - } - ] - } - } - } - ], - "metadata": { - "_dependencyType": "storage.azure" - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/Properties/launchSettings.json b/src/KITT.Bot.Functions/Properties/launchSettings.json deleted file mode 100644 index 8681a7f..0000000 --- a/src/KITT.Bot.Functions/Properties/launchSettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "profiles": { - "KITT.Bot.Functions": { - "commandName": "Project", - "commandLineArgs": "--port 7043", - "launchBrowser": false - } - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/Properties/serviceDependencies.json b/src/KITT.Bot.Functions/Properties/serviceDependencies.json deleted file mode 100644 index 4dd197a..0000000 --- a/src/KITT.Bot.Functions/Properties/serviceDependencies.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "appInsights1": { - "type": "appInsights", - "connectionId": "APPLICATIONINSIGHTS_CONNECTION_STRING" - }, - "storage1": { - "type": "storage", - "connectionId": "AzureWebJobsStorage" - } - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/Properties/serviceDependencies.kitt-bot-api.json b/src/KITT.Bot.Functions/Properties/serviceDependencies.kitt-bot-api.json deleted file mode 100644 index ac98f2b..0000000 --- a/src/KITT.Bot.Functions/Properties/serviceDependencies.kitt-bot-api.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "appInsights1": { - "resourceId": "/subscriptions/[parameters('subscriptionId')]/resourceGroups/[parameters('resourceGroupName')]/providers/microsoft.insights/components/kitt-bot-api", - "type": "appInsights.azure", - "connectionId": "APPLICATIONINSIGHTS_CONNECTION_STRING" - }, - "storage1": { - "resourceId": "/subscriptions/[parameters('subscriptionId')]/resourceGroups/[parameters('resourceGroupName')]/providers/Microsoft.Storage/storageAccounts/kittlivetoolsrg8356", - "type": "storage.azure", - "connectionId": "AzureWebJobsStorage" - } - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/Properties/serviceDependencies.local.json b/src/KITT.Bot.Functions/Properties/serviceDependencies.local.json deleted file mode 100644 index b804a28..0000000 --- a/src/KITT.Bot.Functions/Properties/serviceDependencies.local.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "appInsights1": { - "type": "appInsights.sdk" - }, - "storage1": { - "type": "storage.emulator", - "connectionId": "AzureWebJobsStorage" - } - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/content/image.html b/src/KITT.Bot.Functions/content/image.html deleted file mode 100644 index 9792d62..0000000 --- a/src/KITT.Bot.Functions/content/image.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - -
- - - - \ No newline at end of file diff --git a/src/KITT.Bot.Functions/content/text.html b/src/KITT.Bot.Functions/content/text.html deleted file mode 100644 index 8837164..0000000 --- a/src/KITT.Bot.Functions/content/text.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/src/KITT.Bot.Functions/host.json b/src/KITT.Bot.Functions/host.json deleted file mode 100644 index beb2e40..0000000 --- a/src/KITT.Bot.Functions/host.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "2.0", - "logging": { - "applicationInsights": { - "samplingSettings": { - "isEnabled": true, - "excludedTypes": "Request" - } - } - } -} \ No newline at end of file diff --git a/src/KITT.Bot.Functions/settings.json b/src/KITT.Bot.Functions/settings.json deleted file mode 100644 index 2ab15ec..0000000 --- a/src/KITT.Bot.Functions/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "UpstreamSettings": { - "Templates": [ - { - "UrlTemplate": "http://localhost:7071/runtime/webhooks/signalr", - "EventPattern": "*", - "HubPattern": "Bot", - "CategoryPattern": "*" - } - ] - } -} diff --git a/src/KITT.Cms.Web.Api/KITT.Cms.Web.Api.csproj b/src/KITT.Cms.Web.Api/KITT.Cms.Web.Api.csproj index b2550b7..bc05eb5 100644 --- a/src/KITT.Cms.Web.Api/KITT.Cms.Web.Api.csproj +++ b/src/KITT.Cms.Web.Api/KITT.Cms.Web.Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/KITT.Proposals.Web.Api/KITT.Proposals.Web.Api.csproj b/src/KITT.Proposals.Web.Api/KITT.Proposals.Web.Api.csproj index 50917e0..50c6991 100644 --- a/src/KITT.Proposals.Web.Api/KITT.Proposals.Web.Api.csproj +++ b/src/KITT.Proposals.Web.Api/KITT.Proposals.Web.Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/KITT.ServiceDefaults/KITT.ServiceDefaults.csproj b/src/KITT.ServiceDefaults/KITT.ServiceDefaults.csproj index 16239b5..4fc2edb 100644 --- a/src/KITT.ServiceDefaults/KITT.ServiceDefaults.csproj +++ b/src/KITT.ServiceDefaults/KITT.ServiceDefaults.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/KITT.Support.Seeder/KITT.Support.Seeder.csproj b/src/KITT.Support.Seeder/KITT.Support.Seeder.csproj index 92c7caf..98bfb58 100644 --- a/src/KITT.Support.Seeder/KITT.Support.Seeder.csproj +++ b/src/KITT.Support.Seeder/KITT.Support.Seeder.csproj @@ -8,8 +8,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/KITT.Web.App/KITT.Web.App/KITT.Web.App.csproj b/src/KITT.Web.App/KITT.Web.App/KITT.Web.App.csproj index c82e360..923a605 100644 --- a/src/KITT.Web.App/KITT.Web.App/KITT.Web.App.csproj +++ b/src/KITT.Web.App/KITT.Web.App/KITT.Web.App.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/KITT.Web.Shared/KITT.Web.Shared.csproj b/src/KITT.Web.Shared/KITT.Web.Shared.csproj index c44adeb..57a2a37 100644 --- a/src/KITT.Web.Shared/KITT.Web.Shared.csproj +++ b/src/KITT.Web.Shared/KITT.Web.Shared.csproj @@ -7,7 +7,7 @@ - +