oceanbox/batman
6
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

feat: upgrade to net8.0 and remove fvcomkit as submodule

Browse Source
This commit is contained in:
Jonas Juselius
2024-03-06 13:50:24 +01:00
parent 68c4cda207
commit 5ed41cef35
7 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.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_14.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 \
@@ -26,4 +27,4 @@ ENV PATH="/root/.dotnet/tools:${PATH}"
# Copy endpoint specific user settings into container to specify
# .NET Core should be used as the runtime.
COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json

4
.gitmodules vendored
View File

@@ -1,4 +0,0 @@
[submodule "submodules/Oceanbox.FvcomKit"]
path = submodules/Oceanbox.FvcomKit
url = ../Oceanbox.FvcomKit
shallow = true

8
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,7 +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 Update="FSharp.Core" Version="7.0.300-beta.23114.3" />
<PackageReference Include="Farmer" Version="1.8.8" />
<PackageReference Update="FSharp.Core" Version="8.0.200" />
</ItemGroup>
</Project>
</Project>

5
Dockerfile
View File

@@ -1,5 +1,4 @@
FROM mcr.microsoft.com/dotnet/dotnet:7.0
RUN rm /etc/ssl/openssl.cnf
FROM mcr.microsoft.com/dotnet/dotnet:8.0
RUN apt update \
&& apt install -y libnetcdf-dev \
@@ -10,4 +9,4 @@ RUN apt update \
COPY dist/ /app
WORKDIR /app
CMD /app/Batman
CMD /app/Batman

15
batman.def
View File

@@ -1,5 +1,5 @@
Bootstrap: docker
From: mcr.microsoft.com/dotnet/sdk:7.0
From: mcr.microsoft.com/dotnet/sdk:8.0
Stage: build
%files
@@ -7,10 +7,11 @@ Stage: build
~/.nuget/NuGet/NuGet.Config /build/NuGet.Config
%post
curl -sL https://deb.nodesource.com/setup_16.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 \
@@ -28,7 +29,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
@@ -43,4 +44,4 @@ Stage: runtime
&& rm -rf /var/lib/apt/lists/*
%runscript
exec /app/Batman "$@"
exec /app/Batman "$@"

24
src/Batman.fsproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<Version>1.1.6</Version>
</PropertyGroup>
@@ -16,19 +16,17 @@
<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="Argu" Version="6.2.2" />
<PackageReference Include="FSharp.Data" Version="6.3.0" />
<PackageReference Include="FSharp.Stats" Version="0.5.0" />
<PackageReference Include="FSharpPlus" Version="1.6.1" />
<PackageReference Include="KDTree" Version="1.4.1" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="5.0.0" />
<PackageReference Include="Serilog" Version="3.0.0-dev-01901" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00907" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.3-dev-00262" />
<PackageReference Include="Oceanbox.FvcomKit" Version="5.5.3" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
<PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
<PackageReference Update="FSharp.Core" Version="7.0.300-beta.23114.3" />
<PackageReference Update="FSharp.Core" Version="8.0.200" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\submodules\Oceanbox.FvcomKit\src\Oceanbox.FvcomKit.fsproj" />
</ItemGroup>
</Project>
</Project>

1
submodules/Oceanbox.FvcomKit

Submodule submodules/Oceanbox.FvcomKit deleted from 86384bfd9f