Update deps; move to .NET 7
- Update local htmx to v1.9.2 - Get version from assembly
This commit is contained in:
parent
c697001736
commit
3df5c71d81
|
@ -1,7 +1,9 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Version>3.1.1</Version>
|
<Version>3.2</Version>
|
||||||
|
<DebugType>embedded</DebugType>
|
||||||
|
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||||
<NoWarn>3391</NoWarn>
|
<NoWarn>3391</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -17,15 +19,15 @@
|
||||||
<Compile Include="Program.fs" />
|
<Compile Include="Program.fs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FSharp.SystemTextJson" Version="0.19.13" />
|
<PackageReference Include="FSharp.SystemTextJson" Version="1.1.23" />
|
||||||
<PackageReference Include="FunctionalCuid" Version="1.0.0" />
|
<PackageReference Include="FunctionalCuid" Version="1.0.0" />
|
||||||
<PackageReference Include="Giraffe" Version="6.0.0" />
|
<PackageReference Include="Giraffe" Version="6.0.0" />
|
||||||
<PackageReference Include="Giraffe.Htmx" Version="1.8.0" />
|
<PackageReference Include="Giraffe.Htmx" Version="1.9.2" />
|
||||||
<PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.0" />
|
<PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.2" />
|
||||||
<PackageReference Include="LiteDB" Version="5.0.13" />
|
<PackageReference Include="LiteDB" Version="5.0.16" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.5" />
|
||||||
<PackageReference Include="NodaTime" Version="3.1.2" />
|
<PackageReference Include="NodaTime" Version="3.1.2" />
|
||||||
<PackageReference Update="FSharp.Core" Version="6.0.5" />
|
<PackageReference Update="FSharp.Core" Version="7.0.300" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="wwwroot\" />
|
<Folder Include="wwwroot\" />
|
||||||
|
|
|
@ -30,3 +30,13 @@ let noResults heading link buttonText text =
|
||||||
/// Create a date with a span tag, displaying the relative date with the full date/time in the tooltip
|
/// Create a date with a span tag, displaying the relative date with the full date/time in the tooltip
|
||||||
let relativeDate (date : Instant) now (tz : DateTimeZone) =
|
let relativeDate (date : Instant) now (tz : DateTimeZone) =
|
||||||
span [ _title (date.InZone(tz).ToDateTimeOffset().ToString ("f", null)) ] [ Dates.formatDistance now date |> str ]
|
span [ _title (date.InZone(tz).ToDateTimeOffset().ToString ("f", null)) ] [ Dates.formatDistance now date |> str ]
|
||||||
|
|
||||||
|
/// The version of myPrayerJournal
|
||||||
|
let version =
|
||||||
|
let v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version
|
||||||
|
seq {
|
||||||
|
string v.Major
|
||||||
|
if v.Minor > 0 then
|
||||||
|
$".{v.Minor}"
|
||||||
|
if v.Revision > 0 then $".{v.Revision}"
|
||||||
|
} |> Seq.reduce (+)
|
||||||
|
|
|
@ -95,7 +95,7 @@ let toaster =
|
||||||
let htmlFoot =
|
let htmlFoot =
|
||||||
footer [ _class "container-fluid" ] [
|
footer [ _class "container-fluid" ] [
|
||||||
p [ _class "text-muted text-end" ] [
|
p [ _class "text-muted text-end" ] [
|
||||||
str "myPrayerJournal v3.1.1"
|
str $"myPrayerJournal {version}"
|
||||||
br []
|
br []
|
||||||
em [] [
|
em [] [
|
||||||
small [] [
|
small [] [
|
||||||
|
|
66
src/MyPrayerJournal/wwwroot/script/htmx.min.js
vendored
66
src/MyPrayerJournal/wwwroot/script/htmx.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user