Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Aragas committed Nov 25, 2023
1 parent 4662f91 commit bf4fb00
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
13 changes: 8 additions & 5 deletions src/BUTR.CrashReportServer/BUTR.CrashReportServer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>false</ImplicitUsings>
<DefineConstants>$(DefineConstants);BUTRCRASHREPORT_DISABLE;BUTRCRASHREPORT_ENABLE_HTML_RENDERER</DefineConstants>
Expand All @@ -14,10 +14,13 @@

<ItemGroup>
<PackageReference Include="AspNetCore.Authentication.Basic" Version="7.0.0" />
<PackageReference Include="BUTR.CrashReport" Version="13.0.0.22" />
<PackageReference Include="BUTR.CrashReport.Bannerlord.Source" Version="13.0.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
<PackageReference Include="BUTR.CrashReport" Version="13.0.0.32" />
<PackageReference Include="BUTR.CrashReport.Bannerlord.Source" Version="13.0.0.32">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
Expand Down
2 changes: 2 additions & 0 deletions src/BUTR.CrashReportServer/Controllers/ReportController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public ActionResult<IEnumerable<FileMetadata>> GetFilenameDates(ICollection<stri

return Ok(_dbContext.Set<IdEntity>()
.Where(x => filenamesWithExtension.Contains(x.FileId))
.AsEnumerable()
.Select(x => new FileMetadata(x.FileId, x.CrashReportId, x.Version, x.Created.ToUniversalTime())));
}

Expand All @@ -177,6 +178,7 @@ public ActionResult<IEnumerable<FileMetadata>> GetNewCrashReportsDates([FromBody

return Ok(_dbContext.Set<IdEntity>()
.Where(x => x.Created > body.DateTime)
.AsEnumerable()
.Select(x => new FileMetadata(x.FileId, x.CrashReportId, x.Version, x.Created.ToUniversalTime())));
}
}
4 changes: 2 additions & 2 deletions src/BUTR.CrashReportServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src

COPY ["BUTR.CrashReportServer/BUTR.CrashReportServer.csproj", "BUTR.CrashReportServer/"]
Expand Down

0 comments on commit bf4fb00

Please sign in to comment.