Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .aspire/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"appHostPath": "../src/KITT.AppHost/KITT.AppHost.csproj"
}
19 changes: 2 additions & 17 deletions LemonBot.sln
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
12 changes: 12 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="https://api.nuget.org/v3/index.json" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="https://api.nuget.org/v3/index.json">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
12 changes: 6 additions & 6 deletions src/KITT.AppHost/KITT.AppHost.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.4.2" />
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.1" />

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -11,11 +11,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2" />
<PackageReference Include="Aspire.Hosting.Azure" Version="9.4.2" />
<PackageReference Include="Aspire.Hosting.Azure.AppContainers" Version="9.4.2" />
<PackageReference Include="Aspire.Hosting.Azure.KeyVault" Version="9.4.2" />
<PackageReference Include="Aspire.Hosting.Azure.Sql" Version="9.4.2" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.1" />
<PackageReference Include="Aspire.Hosting.Azure" Version="9.5.1" />
<PackageReference Include="Aspire.Hosting.Azure.AppContainers" Version="9.5.1" />
<PackageReference Include="Aspire.Hosting.Azure.KeyVault" Version="9.5.1" />
<PackageReference Include="Aspire.Hosting.Azure.Sql" Version="9.5.1" />
<PackageReference Include="AzureKeyVaultEmulator.Aspire.Hosting" Version="2.6.0" />
</ItemGroup>

Expand Down
18 changes: 15 additions & 3 deletions src/KITT.AppHost/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,23 @@
.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
var proposalsApi = builder.AddProject<Projects.KITT_Proposals_Web_Api>(ServiceNames.ProposalsApi)
.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<Projects.KITT_Web_App>(ServiceNames.WebApp)
Expand All @@ -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)
Expand Down
264 changes: 0 additions & 264 deletions src/KITT.Bot.Functions/.gitignore

This file was deleted.

Loading
Loading