Skip to content

Commit 1315937

Browse files
mikmogmikmog
committed
Upgrade .NET 10
1 parent 6b432f3 commit 1315937

File tree

17 files changed

+79
-1253
lines changed

17 files changed

+79
-1253
lines changed

‎src/backend/Database/Ts.TelemetryDatabase.Sql/Compares/SqlSchemaCompare.Dev.scmp‎

Lines changed: 0 additions & 1049 deletions
This file was deleted.

‎src/backend/Database/Ts.TelemetryDatabase.Sql/Ts.TelemetryDatabase.Sql.sqlproj‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,45 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.Build.Sql/0.2.0-preview" DefaultTargets="Build">
2+
<Project DefaultTargets="Build">
3+
<Sdk Name="Microsoft.Build.Sql" Version="2.1.0-preview.1" />
34
<PropertyGroup>
4-
<SqlTargetName>Ts.TelemetryDatabase.Sql</SqlTargetName>
5-
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
5+
<Name>Ts.TelemetryDatabase.Sql</Name>
6+
<DSP>Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider</DSP>
67
<ModelCollation>1033, CI</ModelCollation>
78
<TargetDatabaseSet>True</TargetDatabaseSet>
8-
<ProjectGuid>{d6b56a08-b5c2-4c8b-9e49-51994f67ff4b}</ProjectGuid>
9-
<RunSqlCodeAnalysis>True</RunSqlCodeAnalysis>
10-
<LangVersion>9.0</LangVersion>
9+
<ProjectGuid>{af0e2fa7-eff4-4df2-9ac0-3379880a27aa}</ProjectGuid>
1110
</PropertyGroup>
12-
1311
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1412
<OutputPath>bin</OutputPath>
1513
</PropertyGroup>
1614
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1715
<OutputPath>bin</OutputPath>
1816
</PropertyGroup>
19-
17+
<!-- This is necessary to ensure that VS properly restores the packages for the sql project, which is necessary for Microsoft.Build.Sql database projects. -->
18+
<Target Name="EnsureNuGetRestore" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildProjectDirectory)\obj\project.assets.json')">
19+
<Message Importance="high" Text="Running NuGet restore for SQL project $(MSBuildProjectName)..." />
20+
<Exec Command="dotnet restore "$(MSBuildProjectFile)"" ContinueOnError="false" />
21+
</Target>
2022
<ItemGroup>
21-
<Folder Include="User Defined Types" />
2223
<Folder Include="Stored Procedures" />
23-
<Folder Include="Tables" />
24-
<Folder Include="Compares" />
2524
<Folder Include="Stored Procedures\Device" />
2625
<Folder Include="Stored Procedures\Register" />
2726
<Folder Include="Stored Procedures\Telemetry" />
2827
<Folder Include="Security" />
28+
<Folder Include="Tables" />
29+
<Folder Include="User Defined Types" />
2930
</ItemGroup>
3031
<ItemGroup>
31-
<Build Remove="bin/**/*.sql" />
32-
<Build Remove="obj/**/*.sql" />
33-
<Build Include="User Defined Types\TelemetriesType.sql" />
3432
<Build Include="Tables\Devices.sql" />
3533
<Build Include="Tables\Registers.sql" />
3634
<Build Include="Tables\Telemetries.sql" />
3735
<Build Include="Tables\Timestamps.sql" />
36+
<Build Include="Security\create_user.sql" />
37+
<Build Include="Security\db_execute_procedure_role.sql" />
3838
<Build Include="Stored Procedures\Device\UpsertDevice.sql" />
3939
<Build Include="Stored Procedures\Register\GetOrCreateRegisters.sql" />
40-
<Build Include="Stored Procedures\Telemetry\UpsertTelemetry.sql" />
4140
<Build Include="Stored Procedures\Telemetry\GetTelemetryValues.sql" />
42-
<Build Include="Security\db_execute_procedure_role.sql" />
43-
<Build Include="Security\create_user.sql" />
41+
<Build Include="Stored Procedures\Telemetry\UpsertTelemetry.sql" />
4442
<Build Include="User Defined Types\RegistersType.sql" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<None Include="Compares\SqlSchemaCompare.Dev.scmp" />
43+
<Build Include="User Defined Types\TelemetriesType.sql" />
4844
</ItemGroup>
4945
</Project>

‎src/backend/Database/Ts.TelemetryDatabase/Ts.TelemetryDatabase.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
77
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
88
<PackageReference Include="RepoDb.SqlServer" />
9-
<PackageReference Include="System.Text.RegularExpressions" />
109
</ItemGroup>
1110

1211
<ItemGroup>

‎src/backend/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#analysismode -->

‎src/backend/Directory.Packages.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
<PackageVersion Include="AspNetCore.HealthChecks.Azure.IoTHub" Version="9.0.0" />
77
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
88
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
9-
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
9+
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
1010
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
1111
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
12-
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
13-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.EventGrid" Version="3.4.3" />
12+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.51.0" />
13+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.EventGrid" Version="3.6.0" />
1414
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
1515
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
16-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.1" />
16+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
1717
<PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
18-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
19-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
20-
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.2.0-preview.1.25105.6" />
21-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.2" />
22-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
23-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
24-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.2" />
25-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.2" />
18+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.50.0" />
19+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
20+
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.0.0" />
21+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
22+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
23+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
24+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.0" />
25+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
2626
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2727
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.5.57" />
2828
<PackageVersion Include="NSubstitute" Version="5.3.0" />

‎src/backend/Functions/Ts.Functions.Tests/CacheProvider.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public CacheProvider()
1010
{
1111
var collection = new ServiceCollection();
1212

13-
#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.
1413
collection.AddHybridCache(options =>
1514
{
1615
options.DefaultEntryOptions = new HybridCacheEntryOptions
@@ -19,7 +18,6 @@ public CacheProvider()
1918
LocalCacheExpiration = TimeSpan.FromDays(1)
2019
};
2120
});
22-
#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.
2321

2422
_provider = collection.BuildServiceProvider();
2523
}

‎src/backend/Functions/Ts.Functions.Tests/Ts.Functions.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
84
<IsPackable>false</IsPackable>
95
<IsTestProject>true</IsTestProject>
106
<RootNamespace>TelemetryStash.Functions.Tests</RootNamespace>

‎src/backend/Functions/Ts.Functions/Extensions/HttpClientLogger.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎src/backend/Functions/Ts.Functions/Program.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
{
1717
services.AddApplicationInsights(context.Configuration);
1818
services.ConfigureApplicationInsightsTelemetryFilter();
19-
services.AddHttpClientLogger();
2019

2120
services.AddFunctionServices();
2221
services.AddTelemetryDatabase(context.Configuration);

‎src/backend/Functions/Ts.Functions/TelemetryTrigger/TelemetryTrigger.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ public async Task RunAsync([EventGridTrigger] CloudEvent cloudEvent)
3232

3333
if (!environment.IsProduction())
3434
{
35-
logger.LogInformation("Received telemetry: {Telemetry}", json);
35+
if (logger.IsEnabled(LogLevel.Information))
36+
{
37+
logger.LogInformation("Received telemetry: {Telemetry}", json);
38+
}
3639
}
3740

3841
var telemetry = JsonSerializer.Deserialize<TelemetryRequest>(json, JsonOptions)
@@ -42,7 +45,10 @@ public async Task RunAsync([EventGridTrigger] CloudEvent cloudEvent)
4245
}
4346
catch (Exception ex)
4447
{
45-
logger.LogError(ex, "Failed to process telemetry. {EventData}", cloudEvent.Data);
48+
if (logger.IsEnabled(LogLevel.Error))
49+
{
50+
logger.LogError(ex, "Failed to process telemetry. {EventData}", cloudEvent.Data);
51+
}
4652
throw;
4753
}
4854
}

0 commit comments

Comments
 (0)