Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-e519060c62bc58d74b02b7a83e98a0ea
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChaosEngine
ChaosEngine authored Oct 8, 2024
2 parents 9f1aa56 + 770d0de commit a810ac3
Show file tree
Hide file tree
Showing 26 changed files with 307 additions and 271 deletions.
2 changes: 1 addition & 1 deletion Caching-MySQL
Submodule Caching-MySQL updated 2 files
+7 −2 README.md
+7 −7 test/Pomelo.Extensions.Caching.MySql.Tests/Pomelo.Extensions.Caching.MySql.Tests.csproj
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN dotnet publish -c $BUILD_CONFIG --self-contained -r linux-x64 \

FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-bookworm-slim
WORKDIR /app
ENV USER=nobody TZ=Europe/Warsaw
ENV USER=nobody
ARG BUILD_CONFIG=${BUILD_CONFIG:-Release}
COPY --from=build --chown="$USER":"$USER" /build/DotnetPlayground.Web/bin/$BUILD_CONFIG/net8.0/linux-x64/publish/ /build/startApp.sh ./

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.alpine
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN dotnet publish -c $BUILD_CONFIG --self-contained -r linux-musl-x64 \
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine
RUN apk add tzdata
WORKDIR /app
ENV USER=nobody TZ=Europe/Warsaw
ENV USER=nobody
ARG BUILD_CONFIG=${BUILD_CONFIG:-Release}
COPY --from=build --chown="$USER":"$USER" /build/DotnetPlayground.Web/bin/$BUILD_CONFIG/net8.0/linux-musl-x64/publish/ /build/startApp.sh ./

Expand Down
18 changes: 9 additions & 9 deletions DotnetPlayground.Tests/DotnetPlayground.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions DotnetPlayground.Web/Areas/Identity/Pages/Account/Login.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@
ViewData["Title"] = "Log in";
}

@section headElements
{
<environment include="Development">
<link rel="stylesheet" href="~/css/icons.css" asp-append-version="true" />
</environment>
<environment exclude="Development">
<link rel="stylesheet" href="~/css/icons.min.css" asp-append-version="true" />
</environment>
}

<h2>@ViewData["Title"]</h2>
<div class="row">
<div class="col-md-6">
Expand Down
10 changes: 10 additions & 0 deletions DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
ViewData["ActivePage"] = ManageNavPages.ExternalLogins;
}

@section headElements
{
<environment include="Development">
<link rel="stylesheet" href="~/css/icons.css" asp-append-version="true" />
</environment>
<environment exclude="Development">
<link rel="stylesheet" href="~/css/icons.min.css" asp-append-version="true" />
</environment>
}

<partial name="_StatusMessage" for="StatusMessage" />
@if (Model.CurrentLogins?.Count > 0)
{
Expand Down
5 changes: 4 additions & 1 deletion DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
Layout = "/Areas/Identity/Pages/_Layout.cshtml";
}
}

@section headElements
{
@RenderSection("headElements", required: false)
}
<h2>Manage your account</h2>

<div>
Expand Down
38 changes: 20 additions & 18 deletions DotnetPlayground.Web/DotnetPlayground.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,27 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.6" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" Condition="$(DefineConstants.Contains('INCLUDE_POSTGRES'))" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.10">
<ExcludeAssets>buildTransitive</ExcludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.10" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" Condition="$(DefineConstants.Contains('INCLUDE_POSTGRES'))" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" Condition="$(DefineConstants.Contains('INCLUDE_MYSQL'))" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.23.40" Condition="$(DefineConstants.Contains('INCLUDE_ORACLE'))" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.23.60" Condition="$(DefineConstants.Contains('INCLUDE_ORACLE'))" />
<PackageReference Include="IdentityManager2.AspNetIdentity" Version="1.0.0" />
<PackageReference Include="Lib.AspNetCore.ServerTiming" Version="6.0.0" />
<!--<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.16.2" Condition="$(DefineConstants.Contains('INCLUDE_COSMOSDB'))" />-->
<PackageReference Include="MongoDB.Driver" Version="2.27.0" Condition="$(DefineConstants.Contains('INCLUDE_MONGODB'))" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.68.0.3421" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.6" />
<PackageReference Include="MessagePack" Version="2.5.171" />
<PackageReference Include="MongoDB.Driver" Version="2.29.0" Condition="$(DefineConstants.Contains('INCLUDE_MONGODB'))" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.68.0.3556" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.10" />
<PackageReference Include="MessagePack" Version="2.5.172" />
</ItemGroup>

<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
Expand All @@ -77,9 +79,9 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)'=='Debug'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.31" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.35" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions DotnetPlayground.Web/Pages/WebCamGallery.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/blueimp-gallery/3.4.0/css/blueimp-gallery.min.css" integrity="sha512-8z9zEPEYVxCX7hdM+6hA0RMSW42V+XtqsyXSbNkujXYclFqhRV8J4+MasIpuYZODoHJuQgxGjcRKm//sWEQm6w==" crossorigin="anonymous"
asp-fallback-href="~/lib/blueimp-gallery/css/blueimp-gallery.min.css"
asp-fallback-test-class="blueimp-gallery" asp-fallback-test-property="position" asp-fallback-test-value="fixed" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.12.0/video-js.min.css" integrity="sha512-qdNDoWK29TwXVKBtiWgkyY6zUC/2Ml5mVT6tQr7cPBraxBnSNgPuKt484AHwTqOBZmm4LPG+qBp3F3/419kzAA==" crossorigin="anonymous" referrerpolicy="no-referrer"
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.18.1/video-js.min.css" integrity="sha512-J3tx4ssoARFr4U9VmZmQe2q672q0jUeYizJW3vglkOBTlQ/N6kF3eVqZZzaey/TdIXH69s3HYe2nQwyxK/Emzw==" crossorigin="anonymous" referrerpolicy="no-referrer"
asp-fallback-href="~/lib/video.js/video-js.min.css"
asp-fallback-test-class="video-js" asp-fallback-test-property="position" asp-fallback-test-value="relative" />
</environment>
Expand Down Expand Up @@ -137,7 +137,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/blueimp-gallery/3.4.0/js/blueimp-gallery.min.js" integrity="sha512-Tt9Ui0O6Sg6FjAK5XpAIM7PCMhaXCL+i13IHLZYuluoDXlesfg+JzVI86rgUU2YnfEz2ZEDHXkRkPnHlyWnqzg==" crossorigin="anonymous"
asp-fallback-src="~/lib/blueimp-gallery/js/blueimp-gallery.min.js"
asp-fallback-test="window.jQuery && window.blueimp"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.12.0/alt/video.core.novtt.min.js" integrity="sha512-Ge2v3kusPKpj4BTKTIg1hCXVDEmc4gGDvGS6zIPAfiBnBkxhcU8sc+w30MloRknqq7WKFc2uWzbe9erNnARMVg==" crossorigin="anonymous" referrerpolicy="no-referrer"
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.18.1/alt/video.core.novtt.min.js" integrity="sha512-4HUYny+ThwG/q7Rf0xmeNlPqTsVkDXcdx0n68vTNzf2guv6RsDAw2gx0ot0xAgdyegi3l43ENnAAfcxuhCcaUw==" crossorigin="anonymous" referrerpolicy="no-referrer"
asp-fallback-src="~/lib/video.js/alt/video.core.novtt.min.js"
asp-fallback-test="window.jQuery && videojs.options"></script>
<script type="text/javascript" src="~/js/WebCamGallery.min.js" asp-append-version="true"></script>
Expand Down
4 changes: 2 additions & 2 deletions DotnetPlayground.Web/Views/Hashes/VirtualScroll.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<link rel="stylesheet" href="~/lib/bootstrap-table/bootstrap-table.min.css" />
</environment>
<environment exclude="Development">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.23.0/bootstrap-table.min.css" integrity="sha512-pipgbnEeqbV1palK8tQa01GGrlxB6p/x2R3zhijtN3sVZ8FQj+dUgTlmFVcpdXYmnjoa5Y8aANuiP7x/mb4DKA==" crossorigin="anonymous" referrerpolicy="no-referrer"
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.css" integrity="sha256-Zc495ljCDy5GSTUwzyTFOT2gICkEmTkh4jGpmUFlIHU=" crossorigin="anonymous" referrerpolicy="no-referrer"
asp-fallback-href="~/lib/bootstrap-table/bootstrap-table.min.css"
asp-fallback-test-class="bootstrap-table fullscreen" asp-fallback-test-property="position" asp-fallback-test-value="fixed" />
</environment>
Expand All @@ -56,7 +56,7 @@
<script src="~/js/VirtualScroll.js" asp-append-version="true"></script>
</environment>
<environment exclude="Development">
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.23.0/bootstrap-table.min.js" integrity="sha512-6h9xN7Sj/Mk5HLFz2wNJFfvOYtzSNqzAR0t/cwYFbAL2/pmgQF8XWIlfjJNolpRolqjG4+0Yu/mFXUqmDEF96Q==" crossorigin="anonymous" referrerpolicy="no-referrer"
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.js" integrity="sha256-9llzQawTdpdXVTnRNn1VrEj8mHvtFa4q0aW7vtgt8Mw=" crossorigin="anonymous" referrerpolicy="no-referrer"
asp-fallback-src="~/lib/bootstrap-table/bootstrap-table.min.js"
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.bootstrapTable">
</script>
Expand Down
2 changes: 1 addition & 1 deletion DotnetPlayground.Web/Views/Home/Contact.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<script src="~/lib/chance/chance.min.js" type="text/javascript"></script>
</environment>
<environment exclude="Development">
<script src="https://cdn.jsdelivr.net/npm/[email protected].11/dist/chance.min.js" integrity="sha256-XNg4f2HteQQm/WuPYzkZ223Z7fkMCGxHcJL8k5D3ed0=" crossorigin="anonymous"
<script src="https://cdn.jsdelivr.net/npm/[email protected].12/dist/chance.min.js" integrity="sha256-XNg4f2HteQQm/WuPYzkZ223Z7fkMCGxHcJL8k5D3ed0=" crossorigin="anonymous"
asp-fallback-src="~/lib/chance/chance.min.js"
asp-fallback-test="window.chance"></script>
</environment>
Expand Down
Loading

0 comments on commit a810ac3

Please sign in to comment.