fix: Bump to dotnet 9

This commit is contained in:
2025-08-04 09:19:21 +02:00
parent 09bf1af0cd
commit 12905d4049
12 changed files with 76 additions and 103 deletions

View File

@@ -3,16 +3,25 @@
"isRoot": true,
"tools": {
"fable": {
"version": "3.7.0",
"version": "4.25.0",
"commands": [
"fable"
]
],
"rollForward": false
},
"fantomas-tool": {
"version": "4.6.4",
"commands": [
"fantomas"
]
],
"rollForward": false
},
"fantomas": {
"version": "7.0.3",
"commands": [
"fantomas"
],
"rollForward": false
}
}
}
}

View File

@@ -1,21 +1,27 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0
FROM mcr.microsoft.com/dotnet/sdk:9.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
# Bun version
ARG BUN_INSTALL=/usr/local
ARG BUN_VERSION=bun-v1.2.16
# Install node, 7zip, yarn, git, process tools
# Install 7zip, git and process tools
RUN apt-get update \
&& apt-get install -y nodejs p7zip-full git procps ssh-client
&& apt-get install -y p7zip-full git procps ssh-client
# Install Bun
RUN set -eux; \
curl -fsSL https://bun.sh/install > /usr/local/bin/install-bun \
&& chmod +x /usr/local/bin/install-bun \
&& /usr/local/bin/install-bun $BUN_VERSION debug-info
ENV BUN_INSTALL=/usr/local
# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
# Install dotnet tools
# Install Fable
RUN dotnet tool install fable -g
# Trouble brewing

9
.envrc Normal file
View File

@@ -0,0 +1,9 @@
#!/usr/bin/env bash
# the shebang is ignored, but nice for editors
if type -P lorri &>/dev/null; then
eval "$(lorri direnv)"
else
echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]'
use nix
fi

View File

@@ -1,10 +1,11 @@
variables:
DEPLOY_NAME: default
DEPLOY_NAMESPACE: default
SDK_VERSION: 9.0
SKIP_TESTS: "true"
include:
- project: oceanbox/gitlab-ci
ref: v2
ref: v4.1
file: DotnetPackage.gitlab-ci.yml
inputs:
project-name: matplotlib.colormaps
project-dir: .

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include=".build/Helpers.fs" />

View File

@@ -1,6 +1,6 @@
MIT License
Copyright (c) 2020 Serit Tromsø AS
Copyright (c) 2025 Oceanbox AS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@@ -1,78 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{18F5723D-FB1B-4D5F-8836-77CA33C017AE}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
LICENSE = LICENSE
Dockerfile = Dockerfile
.gitlab-ci.yml = .gitlab-ci.yml
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "Build.fsproj", "{3E2150F1-DFAB-4F7D-933B-84F61932888A}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "src", "src/Matplotlib.ColorMaps.fsproj", "{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "test", "test\Tests.fsproj", "{2CADBE9A-0C72-43B2-B1D3-4368636E1741}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Debug|x64.ActiveCfg = Debug|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Debug|x64.Build.0 = Debug|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Debug|x86.Build.0 = Debug|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Release|Any CPU.Build.0 = Release|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Release|x64.ActiveCfg = Release|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Release|x64.Build.0 = Release|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Release|x86.ActiveCfg = Release|Any CPU
{3E2150F1-DFAB-4F7D-933B-84F61932888A}.Release|x86.Build.0 = Release|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Debug|x64.ActiveCfg = Debug|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Debug|x64.Build.0 = Debug|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Debug|x86.ActiveCfg = Debug|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Debug|x86.Build.0 = Debug|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Release|Any CPU.Build.0 = Release|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Release|x64.ActiveCfg = Release|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Release|x64.Build.0 = Release|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Release|x86.ActiveCfg = Release|Any CPU
{BDE6C194-7D6A-4A6A-8D0C-3473AD6DA9B8}.Release|x86.Build.0 = Release|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Debug|x64.ActiveCfg = Debug|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Debug|x64.Build.0 = Debug|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Debug|x86.ActiveCfg = Debug|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Debug|x86.Build.0 = Debug|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Release|Any CPU.Build.0 = Release|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Release|x64.ActiveCfg = Release|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Release|x64.Build.0 = Release|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Release|x86.ActiveCfg = Release|Any CPU
{2CADBE9A-0C72-43B2-B1D3-4368636E1741}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6BF820E4-B494-4D35-B95C-C7F675222454}
EndGlobalSection
EndGlobal

16
Matplotlib.ColorMaps.slnx Normal file
View File

@@ -0,0 +1,16 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/Solution Items/">
<File Path=".gitlab-ci.yml" />
<File Path="Dockerfile" />
<File Path="LICENSE" />
<File Path="README.md" />
</Folder>
<Project Path="Build.fsproj" />
<Project Path="src/Matplotlib.ColorMaps.fsproj" />
<Project Path="test/Tests.fsproj" />
</Solution>

10
shell.nix Normal file
View File

@@ -0,0 +1,10 @@
{
pkgs ? import <nixpkgs> { },
}:
pkgs.mkShellNoCC {
buildInputs = [
pkgs.dotnetCorePackages.sdk_9_0
pkgs.bun
pkgs.nodejs_latest
];
}

View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<IsPackable>true</IsPackable>
<PackageId>Matplotlib.ColorMaps</PackageId>

View File

@@ -1,12 +1,12 @@
{
"version": 1,
"dependencies": {
"net7.0": {
"net9.0": {
"FSharp.Core": {
"type": "Direct",
"requested": "[7.0.200, )",
"resolved": "7.0.200",
"contentHash": "NmgUnpNH6Zu9B0SPIhojyo38gnPdkdYFYQfbd6zosEH32kbGY/g/Klk7PfOWe1NAe/O1YOMmK9KhwQ2OWsWEbg=="
"requested": "[9.0.300, )",
"resolved": "9.0.300",
"contentHash": "TVt2J7RCE1KCS2IaONF+p8/KIZ1eHNbW+7qmKF6hGoD4tXl+o07ja1mPtFjMqRa5uHMFaTrGTPn/m945WnDLiQ=="
}
}
}

View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Tests.fs" />