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
26 changes: 10 additions & 16 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ItemGroup>
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="10.2.1" />
<PackageVersion Include="Asp.Versioning.OpenApi" Version="10.2.3" />
<PackageVersion Include="AspNet.Security.OAuth.Discord" Version="10.1.0" />
<PackageVersion Include="AspNet.Security.OAuth.Twitter" Version="10.1.0" />
<PackageVersion Include="AspNet.Security.OAuth.Discord" Version="11.0.0" />
<PackageVersion Include="AspNet.Security.OAuth.Twitter" Version="11.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
<PackageVersion Include="BCrypt.Net-Next" Version="4.2.1" />
Expand All @@ -21,14 +21,14 @@
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
<PackageVersion Include="MailKit" Version="5.0.0" />
<PackageVersion Include="MessagePack" Version="3.1.12" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="11.0.0-rc.3.26522.148" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="11.0.0" />
Comment thread
hhvrc marked this conversation as resolved.
Resolved
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="11.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="11.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="11.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="11.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.11.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.ResourceMonitoring" Version="10.11.0" />
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="4.0.1" />
Expand Down Expand Up @@ -57,10 +57,4 @@
<PackageVersion Include="TUnit" Version="1.81.10" />
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="10.105.9" />
</ItemGroup>
<ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' != 'true'">
<!-- Transitive from Microsoft.AspNetCore.DataProtection.EntityFrameworkCore; older versions have known CVEs, force the patched version.
Scoped to non-Web-SDK projects: Sdk.Web projects already get the patched assembly via the ASP.NET Core shared framework and NuGet
prunes an explicit reference there (NU1510). -->
<GlobalPackageReference Include="System.Security.Cryptography.Xml" Version="11.0.0-rc.3.26522.148" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions docker/API.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ COPY --link API/. API/
RUN dotnet publish --no-restore -c Release API/API.csproj -o /app

# final is the final runtime stage for running the app
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-rc.3-alpine3.24 AS final-api
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-alpine3.24 AS final-api
WORKDIR /app

COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
RUN apk update && apk add --no-cache openssl
RUN apk update && apk add --no-cache openssl libmsquic

COPY --link --from=build-api /app .
COPY docker/appsettings.API.json /app/appsettings.Container.json
Expand Down
2 changes: 1 addition & 1 deletion docker/Base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-rc.3-alpine3.24 AS build-common
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-alpine3.24 AS build-common
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
WORKDIR /src

COPY --link Common/*.csproj Common/
Expand Down
4 changes: 2 additions & 2 deletions docker/Cron.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ COPY --link Cron/. Cron/
RUN dotnet publish --no-restore -c Release Cron/Cron.csproj -o /app

# final is the final runtime stage for running the app
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-rc.3-alpine3.24 AS final-cron
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-alpine3.24 AS final-cron
WORKDIR /app

COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
RUN apk update && apk add --no-cache openssl
RUN apk update && apk add --no-cache openssl libmsquic

COPY --link --from=build-cron /app .
COPY docker/appsettings.Cron.json /app/appsettings.Container.json
Expand Down
4 changes: 2 additions & 2 deletions docker/LiveControlGateway.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ COPY --link LiveControlGateway/. LiveControlGateway/
RUN dotnet publish --no-restore -c Release LiveControlGateway/LiveControlGateway.csproj -o /app

# final is the final runtime stage for running the app
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-rc.3-alpine3.24 AS final-gateway
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-alpine3.24 AS final-gateway
WORKDIR /app

COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
RUN apk update && apk add --no-cache openssl
RUN apk update && apk add --no-cache openssl libmsquic

COPY --link --from=build-gateway /app .
COPY docker/appsettings.LiveControlGateway.json /app/appsettings.Container.json
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"sdk": {
"version": "11.0.100-rc.3.26522.148",
"version": "11.0.100",
"rollForward": "latestMinor",
"allowPrerelease": true
"allowPrerelease": false
},
"test": {
"runner": "Microsoft.Testing.Platform"
Expand Down
Loading