oceanbox/Oceanbox.GeoJson
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

feat: upgrade to net7.0

Browse Source
This commit is contained in:
Jonas Juselius
2023-03-01 18:15:02 +01:00
parent 10e1f21a74
commit e37f4bea85
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.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

2
.gitlab-ci.yml
View File

@@ -4,6 +4,6 @@ variables:
include:
- project: oceanbox/gitlab-ci
ref: main
ref: v2
file: DotnetPackage.gitlab-ci.yml

10
Build.fsproj
View File

@@ -1,16 +1,16 @@
<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" />
</ItemGroup>
</Project>

8
src/GeoJson.fs
View File

@@ -180,10 +180,10 @@ with
}
static member create (box: float array) =
{
MinX = box.[0]
MinY = box.[1]
MaxX = box.[2]
MaxY = box.[3]
MinX = box[0]
MinY = box[1]
MaxX = box[2]
MaxY = box[3]
}
static member amend box1 box2 =
{

18
src/Oceanbox.GeoJson.fsproj
View File

@@ -2,24 +2,24 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<IsPackable>true</IsPackable>
<PackageId>Oceanbox.GeoJson</PackageId>
<Authors/>
<Company/>
<Authors />
<Company />
<Version>1.0.0</Version>
</PropertyGroup>
<ItemGroup>
<Compile Include="GeoJson.fs"/>
<Compile Include="GeoJson.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Data" Version="4.2.7"/>
<PackageReference Include="FSharpPlus" Version="1.2.2"/>
<PackageReference Include="Thoth.Json" Version="7.0.0"/>
<PackageReference Include="Thoth.Json.Net" Version="8.0.0"/>
<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" />
</ItemGroup>
<ItemGroup>
<Content Include="*.fsproj; *.fs" PackagePath="fable/"/>
<Content Include="*.fsproj; *.fs" PackagePath="fable/" />
</ItemGroup>
</Project>

38
src/packages.lock.json
View File

@@ -1,36 +1,36 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"FSharp.Core": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
"requested": "[7.0.200, )",
"resolved": "7.0.200",
"contentHash": "NmgUnpNH6Zu9B0SPIhojyo38gnPdkdYFYQfbd6zosEH32kbGY/g/Klk7PfOWe1NAe/O1YOMmK9KhwQ2OWsWEbg=="
},
"FSharp.Data": {
"type": "Direct",
"requested": "[4.2.7, )",
"resolved": "4.2.7",
"contentHash": "gQO0u0q1z9wXOkSmL7TVQLspAGR/S2Vm3CDPStEHCcTQyivkgoZie0IsB2Zyl2inC+hmQa/jcVQNQjo7XB7Ujg==",
"requested": "[5.0.2, )",
"resolved": "5.0.2",
"contentHash": "eQBiOwlk6p8nVehcrxRK/22BwZXzJ2IkHXuqjIZ9Km0bH90WhBoF7OFdLWenc6dYizQmKv3qKIMCkKfVBepi0A==",
"dependencies": {
"FSharp.Core": "4.7.2"
"FSharp.Core": "5.0.1"
}
},
"FSharpPlus": {
"type": "Direct",
"requested": "[1.2.2, )",
"resolved": "1.2.2",
"contentHash": "YzWFuAua/OCevT05FoWSInP3i6DGAwRqyJd0DtFWSisPI6LAqCMTWaj5hT4BDLDabvricVZ5VD/FWfSNubL6Gg==",
"requested": "[1.4.0, )",
"resolved": "1.4.0",
"contentHash": "He6WVVTZpeMQNBlFHniemTSCWITKgwLIgmznNt2kw0U9G/xWSx7USdssGXd2FGmcpk2FlHInYZNwUw848tI0SQ==",
"dependencies": {
"FSharp.Core": "4.6.2"
"FSharp.Core": "6.0.6"
}
},
"Thoth.Json": {
"type": "Direct",
"requested": "[7.0.0, )",
"resolved": "7.0.0",
"contentHash": "0aJtAcjK8Ljx8tSUxHUxZQDInOGtPwGkB+fD9MSrBooe0eqseQAHNSD51CttK5kytqXM6YHPXPN6UFW65GdZFg==",
"requested": "[10.0.0, )",
"resolved": "10.0.0",
"contentHash": "7FOR03CDATObwaHW/daCX1S6xFNSraywXdFCtrV3SEypTyk+qYe9XRYGDBa5Ywp6FkKj6poBXKD9HJRLhK4zog==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Core": "3.1.6"
@@ -38,12 +38,12 @@
},
"Thoth.Json.Net": {
"type": "Direct",
"requested": "[8.0.0, )",
"resolved": "8.0.0",
"contentHash": "C/b+8g/xUTJTn7pbKC4bMAOy2tyolXAuHTXguT5TNzDKQ6sjnUfFa9B81fTt9PuUOdWFLyRKlXASuFhSQciJGQ==",
"requested": "[11.0.0, )",
"resolved": "11.0.0",
"contentHash": "ugheFKMHRO3ReobCENha5J6uexPrp+Bn2d+WEcFbXaA77sNBWtTlx2StB+7lX8prMqdvO5uqlPeHlg+9dSpkNg==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Core": "[3.0.0, 4.0.0)",
"Fable.Core": "3.1.6",
"Newtonsoft.Json": "11.0.2"
}
},

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" />