feat: update to net8.0

This commit is contained in:
2024-06-18 09:30:37 +02:00
parent 67d2b57b4f
commit 77fc0a7d78
6 changed files with 48 additions and 46 deletions

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 \
@@ -15,8 +16,8 @@ RUN apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
# Install dotnet tools
RUN dotnet tool install fable -g
# # Install dotnet tools
# RUN dotnet tool install fable -g
# Trouble brewing
RUN rm /etc/ssl/openssl.cnf
@@ -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

View File

@@ -8,25 +8,27 @@ trim_trailing_whitespace = true
insert_final_newline = false
[*.fs]
max_line_length=120
max_line_lengt = 120
# Feliz style
fsharp_single_argument_web_mode=true
fsharp_space_before_colon=false
fsharp_max_if_then_else_short_width=60
fsharp_max_infix_operator_expression=50
fsharp_max_record_width=70
fsharp_max_record_number_of_items=1
fsharp_max_array_or_list_width=70
fsharp_max_array_or_list_number_of_items=1
fsharp_max_value_binding_width=70
fsharp_max_function_binding_width=40
fsharp_max_dot_get_expression_width=50
fsharp_multiline_block_brackets_on_same_column=true
fsharp_newline_between_type_definition_and_members=false
fsharp_max_elmish_width=40
fsharp_align_function_signature_to_indentation=false
fsharp_alternative_long_member_definitions=false
fsharp_multi_line_lambda_closing_newline=false
fsharp_disable_elmish_syntax=false
fsharp_keep_indent_in_branch=false
fsharp_blank_lines_around_nested_multiline_expressions=false
fsharp_single_argument_web_mod = true
fsharp_space_before_colo = false
fsharp_max_if_then_else_short_widt = 60
fsharp_max_infix_operator_expressio = 50
fsharp_max_record_widt = 70
fsharp_max_record_number_of_item = 1
fsharp_max_array_or_list_widt = 70
fsharp_max_array_or_list_number_of_item = 1
fsharp_max_value_binding_widt = 70
fsharp_max_function_binding_widt = 40
fsharp_max_dot_get_expression_widt = 50
fsharp_multiline_block_brackets_on_same_colum = true
fsharp_multiline_bracket_style = stroustrup
fsharp_newline_before_multiline_computation_expression = true
fsharp_newline_between_type_definition_and_member = false
fsharp_max_elmish_widt = 40
fsharp_align_function_signature_to_indentatio = false
fsharp_alternative_long_member_definition = false
fsharp_multi_line_lambda_closing_newlin = false
fsharp_disable_elmish_synta = false
fsharp_keep_indent_in_branc = false
fsharp_blank_lines_around_nested_multiline_expression = false

View File

@@ -1,9 +1,8 @@
variables:
DEPLOY_NAME: default
DEPLOY_NAMESPACE: default
PROJECT_NAME: oceanbox.geojson
SKIP_TESTS: "true"
include:
- project: oceanbox/gitlab-ci
ref: v2
file: DotnetPackage.gitlab-ci.yml
ref: v3
file: DotnetPackage.gitlab-ci.yml

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,6 @@
<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.11" />
</ItemGroup>
</Project>
</Project>

View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>true</IsPackable>
<PackageId>Oceanbox.GeoJson</PackageId>
<Authors/>
@@ -13,12 +13,12 @@
<Compile Include="GeoJson.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Data" Version="5.0.2" />
<PackageReference Include="FSharpPlus" Version="1.4.0" />
<PackageReference Include="Thoth.Json" Version="10.0.0" />
<PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
<PackageReference Include="FSharp.Data" Version="6.4.0" />
<PackageReference Include="FSharpPlus" Version="1.6.1" />
<PackageReference Include="Thoth.Json" Version="10.2.0" />
<PackageReference Include="Thoth.Json.Net" Version="12.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="*.fsproj; *.fs" PackagePath="fable/" />
</ItemGroup>
</Project>
</Project>

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,6 @@
<ProjectReference Include="..\src\Oceanbox.GeoJson.fsproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Expecto" Version="9.0.4" />
<PackageReference Include="Expecto" Version="10.2.1" />
</ItemGroup>
</Project>
</Project>