oceanbox/Sputnik
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

feat: upgrade to net7.0

Browse Source
This commit is contained in:
Jonas Juselius
2023-03-10 14:07:18 +01:00
parent 8b7a6ca8e1
commit 953f1ff72b
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.devcontainer/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0
FROM mcr.microsoft.com/dotnet/sdk:7.0
# Add keys and sources lists
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash
@@ -16,7 +16,7 @@ RUN apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*
# Install dotnet tools
RUN dotnet tool install fable -g
RUN dotnet tool install fable -g --prerelease
# Trouble brewing
RUN rm /etc/ssl/openssl.cnf

3
.gitignore vendored
View File

@@ -11,7 +11,8 @@ release.sh
.idea/
*.orig
*.DotSettings.user
deploy
deploy/
.ionide/
*.db
build.fsx.lock
dist/

11
Build.fsproj
View File

@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include=".build/Helpers.fs" />
<Compile Include=".build/Build.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fake.Core.Target" Version="5.20.4" />
<PackageReference Include="Fake.DotNet.Cli" Version="5.20.4" />
<PackageReference Include="Fake.IO.FileSystem" Version="5.20.4" />
<PackageReference Include="Farmer" Version="1.6.26" />
<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" />
</ItemGroup>
</Project>

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/runtime:6.0
FROM mcr.microsoft.com/dotnet/runtime:7.0
RUN rm /etc/ssl/openssl.cnf
COPY deploy/ /app

14
src/Sputnik.fsproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<Version>1.0.0</Version>
</PropertyGroup>
@@ -17,12 +17,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="FSharp.Data" Version="4.2.7" />
<PackageReference Include="FSharpPlus" Version="1.2.2" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
<PackageReference Include="Thoth.Json.Net" Version="8.0.0" />
<PackageReference Include="FSharp.Data" Version="6.0.1-beta002" />
<PackageReference Include="FSharpPlus" Version="1.4.0" />
<PackageReference Include="Serilog" Version="3.0.0-dev-01921" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00907" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.3-dev-00262" />
<PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../submodules/Oceanbox.FvcomKit/src/Oceanbox.FvcomKit.fsproj" />

2
submodules/Oceanbox.FvcomKit

Submodule submodules/Oceanbox.FvcomKit updated: b1a6225f5e...86384bfd9f

2
test/Tests.fsproj
View File

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