oceanbox/fvcomstats
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

feat: update to net8.0

Browse Source
This commit is contained in:
Jonas Juselius
2024-04-23 09:22:29 +02:00
parent 4667027960
commit aa1cb92d96
6 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.devcontainer/Dockerfile
View File

@@ -1,10 +1,11 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0
FROM mcr.microsoft.com/dotnet/sdk:8.0
# Add keys and sources lists
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" \
| tee /etc/apt/sources.list.d/yarn.list
RUN apt-get update && apt-get install -y ca-certificates gnupg
RUN mkdir -p /etc/apt/keyrings
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
ENV NODE_MAJOR=20
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
# Install node, 7zip, yarn, git, process tools
RUN apt-get update \

5
Build.fsproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include=".build/Helpers.fs" />
@@ -11,6 +11,7 @@
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
<PackageReference Include="Farmer" Version="1.7.18" />
<PackageReference Include="Farmer" Version="1.8.9" />
<PackageReference Update="FSharp.Core" Version="8.0.200" />
</ItemGroup>
</Project>

4
Dockerfile
View File

@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet/runtime:7.0
FROM mcr.microsoft.com/dotnet/runtime:8.0
RUN rm /etc/ssl/openssl.cnf
COPY deploy/ /app
WORKDIR /app
CMD /app/FvcomStats
CMD /app/FvcomStats

13
fvcomstats.def
View File

@@ -1,15 +1,16 @@
Bootstrap: docker
From: mcr.microsoft.com/dotnet/sdk:7.0
From: mcr.microsoft.com/dotnet/sdk:8.0
Stage: build
%files
. /build
%post
curl -sL https://deb.nodesource.com/setup_18.x | bash
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" \
| tee /etc/apt/sources.list.d/yarn.list
apt-get update && apt-get install -y ca-certificates gnupg
mkdir -p /etc/apt/keyrings
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
NODE_MAJOR=20
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
# Install node, 7zip, yarn, git, process tools
apt update \
@@ -27,7 +28,7 @@ Stage: build
dotnet run bundle
Bootstrap: docker
From: mcr.microsoft.com/dotnet/runtime:7.0
From: mcr.microsoft.com/dotnet/runtime:8.0
Stage: runtime
%files from build

21
src/FvcomStats.fsproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Version>1.1.0</Version>
</PropertyGroup>
<ItemGroup>
@@ -15,16 +15,15 @@
<Compile Include="Main.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="FSharp.Data" Version="6.0.1-beta002" />
<PackageReference Include="FSharp.Stats" Version="0.4.12-preview.1" />
<PackageReference Include="FSharpPlus" Version="1.4.0" />
<PackageReference Include="Serilog" Version="3.0.0-dev-01926" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00907" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.3-dev-00262" />
<PackageReference Include="Argu" Version="6.2.3" />
<PackageReference Include="FSharp.Data" Version="6.4.0" />
<PackageReference Include="FSharp.Stats" Version="0.5.0" />
<PackageReference Include="FSharpPlus" Version="1.6.1" />
<PackageReference Include="Oceanbox.FvcomKit" Version="5.5.3" />
<PackageReference Include="sdslite-o" Version="2.7.2" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
<PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\submodules\Oceanbox.FvcomKit\src\Oceanbox.FvcomKit.fsproj" />
</ItemGroup>
</Project>

5
test/Tests.fsproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Tests.fs" />
@@ -11,6 +11,7 @@
<ProjectReference Include="..\src\FvcomStats.fsproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Expecto" Version="9.0.4" />
<PackageReference Include="Expecto" Version="10.2.1" />
<PackageReference Update="FSharp.Core" Version="8.0.200" />
</ItemGroup>
</Project>