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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:
- publish

precommit:
image: mcr.microsoft.com/dotnet/sdk:9.0-alpine
image: mcr.microsoft.com/dotnet/sdk:10.0-alpine
stage: test
except:
- public
Expand All @@ -40,7 +40,7 @@ precommit:
- pre-commit run stylelint --all-files

build_web:
image: mcr.microsoft.com/dotnet/sdk:9.0-alpine
image: mcr.microsoft.com/dotnet/sdk:10.0-alpine
stage: build
except:
- public
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# to access webapp
# http://localhost:1234

FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1

WORKDIR /app
Expand All @@ -36,7 +36,7 @@ RUN echo "{\"Demo\": true, \"solr\": {\"atlas_address\": \"$SOLR/solr/atlas\", \

RUN dotnet publish -c Release -o out web.csproj

FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine

ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
Expand Down
10 changes: 5 additions & 5 deletions web.Tests/web.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
<ItemGroup>
<PackageReference Include="BrowserStackLocal" Version="3.0.0" />
<PackageReference Include="MartinCostello.BrowserStack.Automate" Version="4.2.1" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="9.0.14" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />

<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Selenium.WebDriver" Version="4.43.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.14">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
16 changes: 8 additions & 8 deletions web/web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
<!-- Pin IdentityModel to 8.x to resolve version conflict between ITfoxtec (pulls 7.x) and JwtBearer 9.x (needs 8.x) -->
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.17.0" />
<PackageReference Include="ITfoxtec.Identity.Saml2" Version="4.17.0" />
Expand All @@ -46,18 +46,18 @@
<PackageReference Include="LigerShark.WebOptimizer.AutoPrefixer" Version="7.1.8-beta" />
<PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.477" />
<PackageReference Include="Markdig" Version="0.45.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="10.0.8" />
<PackageReference
Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore"
Version="9.0.14"
Version="10.0.8"
/>
<PackageReference
Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
Version="9.0.14"
Version="10.0.8"
/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.14">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -68,7 +68,7 @@
<PackageReference Include="SolrNet.Core" Version="1.2.1" />
<PackageReference Include="SolrNet.Microsoft.DependencyInjection" Version="1.2.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
<PackageReference Include="System.Text.Json" Version="9.0.14" />
<PackageReference Include="System.Text.Json" Version="10.0.8" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="WebMarkupMin.AspNetCore5" Version="2.17.0" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.23.0.137933">
Expand Down
Loading