Skip to content
Open
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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<TargetDatabaseSet>True</TargetDatabaseSet>
<ProjectGuid>{d6b56a08-b5c2-4c8b-9e49-51994f67ff4b}</ProjectGuid>
<RunSqlCodeAnalysis>True</RunSqlCodeAnalysis>
<LangVersion>9.0</LangVersion>
<ProjectGuid>{718690b9-8e19-0b53-d189-44507ab89f16}</ProjectGuid>
<RunSqlCodeAnalysis>True</RunSqlCodeAnalysis>
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin</OutputPath>
</PropertyGroup>

<ItemGroup>
<Folder Include="User Defined Types" />
<Folder Include="Stored Procedures" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="RepoDb.SqlServer" />
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/backend/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#analysismode -->
Expand Down
32 changes: 16 additions & 16 deletions src/backend/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
<PackageVersion Include="AspNetCore.HealthChecks.Azure.IoTHub" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.EventGrid" Version="3.4.3" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.51.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.EventGrid" Version="3.6.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.1" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
<PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.2.0-preview.1.25105.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.5.57" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.50.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="170.2.70" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="RepoDb" Version="1.13.1" />
<PackageVersion Include="RepoDb.SqlServer" Version="1.13.1" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.3.0" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.9.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions src/backend/Functions/Ts.Functions.Tests/CacheProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ public CacheProvider()
{
var collection = new ServiceCollection();

#pragma warning disable EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
collection.AddHybridCache(options =>
{
options.DefaultEntryOptions = new HybridCacheEntryOptions
Expand All @@ -19,7 +18,6 @@ public CacheProvider()
LocalCacheExpiration = TimeSpan.FromDays(1)
};
});
#pragma warning restore EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.

_provider = collection.BuildServiceProvider();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<RootNamespace>TelemetryStash.Functions.Tests</RootNamespace>
Expand Down
54 changes: 0 additions & 54 deletions src/backend/Functions/Ts.Functions/Extensions/HttpClientLogger.cs

This file was deleted.

1 change: 0 additions & 1 deletion src/backend/Functions/Ts.Functions/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
{
services.AddApplicationInsights(context.Configuration);
services.ConfigureApplicationInsightsTelemetryFilter();
services.AddHttpClientLogger();

services.AddFunctionServices();
services.AddTelemetryDatabase(context.Configuration);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ public async Task RunAsync([EventGridTrigger] CloudEvent cloudEvent)

if (!environment.IsProduction())
{
logger.LogInformation("Received telemetry: {Telemetry}", json);
if (logger.IsEnabled(LogLevel.Information))
{
logger.LogInformation("Received telemetry: {Telemetry}", json);
}
}

var telemetry = JsonSerializer.Deserialize<TelemetryRequest>(json, JsonOptions)
Expand All @@ -42,7 +45,10 @@ public async Task RunAsync([EventGridTrigger] CloudEvent cloudEvent)
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to process telemetry. {EventData}", cloudEvent.Data);
if (logger.IsEnabled(LogLevel.Error))
{
logger.LogError(ex, "Failed to process telemetry. {EventData}", cloudEvent.Data);
}
throw;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/backend/Functions/Ts.Functions/Ts.Functions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<PackageReference Include="Microsoft.Extensions.Http" />
<PackageReference Include="System.Private.Uri" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Database\Ts.TelemetryDatabase\Ts.TelemetryDatabase.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type appServiceParams = {
family: 'B'
capacity: 1
}
linuxFxVersion: ('DOTNET-ISOLATED|9.0')
linuxFxVersion: ('DOTNET-ISOLATED|10.0')
resourceName: string
}

Expand All @@ -58,7 +58,7 @@ type functionParams = {
family: 'B'
capacity: 1
}
linuxFxVersion: ('DOTNET-ISOLATED|9.0')
linuxFxVersion: ('DOTNET-ISOLATED|10.0')
resourceName: string
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ param appParameters = {
family: 'F'
capacity: 1
}
linuxFxVersion: 'DOTNET-ISOLATED|9.0'
linuxFxVersion: 'DOTNET-ISOLATED|10.0'
resourceName: 'api'
}
functions: {
Expand All @@ -36,7 +36,7 @@ param appParameters = {
family: 'Y'
capacity: 0
}
linuxFxVersion: 'DOTNET-ISOLATED|9.0'
linuxFxVersion: 'DOTNET-ISOLATED|10.0'
resourceName: 'func'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param appParameters = {
family: 'F'
capacity: 1
}
linuxFxVersion: 'DOTNET-ISOLATED|9.0'
linuxFxVersion: 'DOTNET-ISOLATED|10.0'
resourceName: 'api'
}
functions: {
Expand All @@ -37,7 +37,7 @@ param appParameters = {
family: 'Y'
capacity: 0
}
linuxFxVersion: 'DOTNET-ISOLATED|9.0'
linuxFxVersion: 'DOTNET-ISOLATED|10.0'
resourceName: 'func'
}
}
Expand Down
99 changes: 0 additions & 99 deletions src/backend/TelemetryStash.Backend.sln

This file was deleted.

35 changes: 35 additions & 0 deletions src/backend/TelemetryStash.Backend.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Solution>
<Folder Name="/Api/">
<File Path="Api/README.md" />
</Folder>
<Folder Name="/Database/">
<File Path="Database/README.md" />
<Project Path="Database/Ts.Database.Tests/Ts.Database.Tests.csproj" />
<Project Path="Database/Ts.TelemetryDatabase.Sql/Ts.TelemetryDatabase.Sql.sqlproj">
<Build />
<Deploy />
</Project>
<Project Path="Database/Ts.TelemetryDatabase/Ts.TelemetryDatabase.csproj" />
</Folder>
<Folder Name="/Functions/">
<Project Path="Functions/Ts.Functions.Tests/Ts.Functions.Tests.csproj" />
<Project Path="Functions/Ts.Functions/Ts.Functions.csproj" />
</Folder>
<Folder Name="/Infrastructure/">
<Project Path="Infrastructure/Ts.Infrastructure/Ts.Infrastructure.msbuildproj" Type="13b669be-bb05-4ddf-9536-439f39a36129">
<Build Project="false" />
</Project>
</Folder>
<Folder Name="/Pipelines/">
<File Path="Pipelines/README.md" />
<Project Path="../../.github/Ts.Pipelines.GitHub.msbuildproj" Type="13b669be-bb05-4ddf-9536-439f39a36129" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="global.json" />
<File Path="NuGet.Config" />
<File Path="README.md" />
</Folder>
</Solution>
Loading
Loading