fix: upgrade to net7 and fable4

.config/dotnet-tools.json

@@ -3,16 +3,16 @@
   "isRoot": true,
   "tools": {
     "fable": {
-      "version": "3.7.0",
+      "version": "4.1.4",
       "commands": [
         "fable"
       ]
     },
-    "fantomas-tool": {
-      "version": "4.6.4",
+    "fantomas": {
+      "version": "6.1.1",
       "commands": [
         "fantomas"
       ]
     }
   }
-}
+}

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
-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
+RUN curl -sL https://deb.nodesource.com/setup_18.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
@@ -26,4 +26,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

.editorconfig

@@ -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

Build.fsproj

@@ -1,17 +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.22.0" />
-    <PackageReference Include="Fake.DotNet.Cli" Version="5.22.0" />
-    <PackageReference Include="Fake.IO.FileSystem" Version="5.22.0" />
-    <PackageReference Include="Farmer" Version="1.7.3" />
-    <PackageReference Update="FSharp.Core" Version="6.0.4" />
+    <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.24" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
-</Project>
+</Project>

dist/Fable.OpenLayers.js

@@ -1,486 +0,0 @@
-import { Union, Record } from "./fable_modules/fable-library.3.7.0/Types.js";
-import { bool_type, tuple_type, lambda_type, unit_type, float64_type, obj_type, union_type, array_type, int32_type, class_type, record_type, string_type } from "./fable_modules/fable-library.3.7.0/Reflection.js";
-import { keyValueList } from "./fable_modules/fable-library.3.7.0/MapUtil.js";
-import Projection from "ol/proj/Projection";
-import GeoJSON from "ol/format/GeoJSON";
-import MVT from "ol/format/MVT";
-import Stroke from "ol/style/Stroke";
-import Style from "ol/style/Style";
-import TileGrid from "ol/tilegrid/TileGrid";
-import WMTS from "ol/tilegrid/WMTS";
-import Vector from "ol/source/Vector";
-import XYZ from "ol/source/XYZ";
-import VectorTile from "ol/source/VectorTile";
-import TileWMS from "ol/source/TileWMS";
-import WMTS_1 from "ol/source/WMTS";
-import Tile from "ol/layer/Tile";
-import Vector_1 from "ol/layer/Vector";
-import VectorTile_1 from "ol/layer/VectorTile";
-import { Map as Map$, View } from "ol";
-
-export class Types_WMTSConfig extends Record {
-    constructor(layer, matrixSet) {
-        super();
-        this.layer = layer;
-        this.matrixSet = matrixSet;
-    }
-}
-
-export function Types_WMTSConfig$reflection() {
-    return record_type("Fable.OpenLayers.Types.WMTSConfig", [], Types_WMTSConfig, () => [["layer", string_type], ["matrixSet", string_type]]);
-}
-
-export class Ol {
-    constructor() {
-    }
-}
-
-export function Ol$reflection() {
-    return class_type("Fable.OpenLayers.Ol", void 0, Ol);
-}
-
-export class Imports_Proj {
-    constructor() {
-    }
-}
-
-export function Imports_Proj$reflection() {
-    return class_type("Fable.OpenLayers.Imports.Proj", void 0, Imports_Proj);
-}
-
-export class Imports_Style {
-    constructor() {
-    }
-}
-
-export function Imports_Style$reflection() {
-    return class_type("Fable.OpenLayers.Imports.Style", void 0, Imports_Style);
-}
-
-export class Imports_Format {
-    constructor() {
-    }
-}
-
-export function Imports_Format$reflection() {
-    return class_type("Fable.OpenLayers.Imports.Format", void 0, Imports_Format);
-}
-
-export class Imports_TileGrid {
-    constructor() {
-    }
-}
-
-export function Imports_TileGrid$reflection() {
-    return class_type("Fable.OpenLayers.Imports.TileGrid", void 0, Imports_TileGrid);
-}
-
-export class Imports_Source {
-    constructor() {
-    }
-}
-
-export function Imports_Source$reflection() {
-    return class_type("Fable.OpenLayers.Imports.Source", void 0, Imports_Source);
-}
-
-export class Imports_Layer {
-    constructor() {
-    }
-}
-
-export function Imports_Layer$reflection() {
-    return class_type("Fable.OpenLayers.Imports.Layer", void 0, Imports_Layer);
-}
-
-export class Imports_Extent {
-    constructor() {
-    }
-}
-
-export function Imports_Extent$reflection() {
-    return class_type("Fable.OpenLayers.Imports.Extent", void 0, Imports_Extent);
-}
-
-export class OlModule_Proj_ProjectionProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Code", "Unit", "Extent"];
-    }
-}
-
-export function OlModule_Proj_ProjectionProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Proj.ProjectionProps", [], OlModule_Proj_ProjectionProps, () => [[["Item", string_type]], [["Item", string_type]], [["Item", array_type(array_type(int32_type))]]]);
-}
-
-export function OlModule_Proj_projection(options) {
-    const opts = keyValueList(options, 1);
-    return new Projection(opts);
-}
-
-export class OlModule_Format_GeoJSONProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["DataProjection"];
-    }
-}
-
-export function OlModule_Format_GeoJSONProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Format.GeoJSONProps", [], OlModule_Format_GeoJSONProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Proj.IProjection")]]]);
-}
-
-export function OlModule_Format_geoJSON(options) {
-    const opts = keyValueList(options, 1);
-    return new GeoJSON(opts);
-}
-
-export function OlModule_Format_mvt() {
-    return new MVT();
-}
-
-export class OlModule_Style_StyleProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Fill", "Stroke", "Text", "ZIndex", "Geometry", "Image", "Renderer"];
-    }
-}
-
-export function OlModule_Style_StyleProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Style.StyleProps", [], OlModule_Style_StyleProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", int32_type]], [["Item", class_type("Fable.OpenLayers.Interfaces.Geom.IGeometry")]], [["Item", obj_type]], [["Item", obj_type]]]);
-}
-
-export class OlModule_Style_StrokeProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Color", "Width", "LineCap", "LineDash"];
-    }
-}
-
-export function OlModule_Style_StrokeProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Style.StrokeProps", [], OlModule_Style_StrokeProps, () => [[["Item", string_type]], [["Item", float64_type]], [["Item", string_type]], [["Item", array_type(float64_type)]]]);
-}
-
-export class OlModule_Style_FillProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Color"];
-    }
-}
-
-export function OlModule_Style_FillProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Style.FillProps", [], OlModule_Style_FillProps, () => [[["Item", string_type]]]);
-}
-
-export class OlModule_Style_TextProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Text", "Align", "Fill", "Stroke", "BackgroundFill", "BackgroundStroke", "Font", "Scale", "Padding", "Rotation"];
-    }
-}
-
-export function OlModule_Style_TextProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Style.TextProps", [], OlModule_Style_TextProps, () => [[["Item", string_type]], [["Item", string_type]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", string_type]], [["Item", float64_type]], [["Item", array_type(float64_type)]], [["Item", float64_type]]]);
-}
-
-export function OlModule_Style_stroke(options) {
-    const opts = keyValueList(options, 1);
-    return new Stroke(opts);
-}
-
-export function OlModule_Style_fill(options) {
-    const opts = keyValueList(options, 1);
-    return new Style(opts);
-}
-
-export function OlModule_Style_style(options) {
-    const opts = keyValueList(options, 1);
-    return new Style(opts);
-}
-
-export class OlModule_TileGrid_TileGridProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Extent", "Resolution", "MatrixIds"];
-    }
-}
-
-export function OlModule_TileGrid_TileGridProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.TileGrid.TileGridProps", [], OlModule_TileGrid_TileGridProps, () => [[["Item", array_type(float64_type)]], [["Item", array_type(float64_type)]], [["Item", array_type(float64_type)]]]);
-}
-
-export class OlModule_TileGrid_WMTSProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Extent", "Resolution", "MatrixIds"];
-    }
-}
-
-export function OlModule_TileGrid_WMTSProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.TileGrid.WMTSProps", [], OlModule_TileGrid_WMTSProps, () => [[["Item", array_type(float64_type)]], [["Item", array_type(float64_type)]], [["Item", array_type(float64_type)]]]);
-}
-
-export function OlModule_TileGrid_tileGrid(options) {
-    const opts = keyValueList(options, 1);
-    return new TileGrid(opts);
-}
-
-export function OlModule_TileGrid_wmts(options) {
-    const opts = keyValueList(options, 1);
-    return new WMTS(opts);
-}
-
-export class OlModule_Source_VectorProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Features"];
-    }
-}
-
-export function OlModule_Source_VectorProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Source.VectorProps", [], OlModule_Source_VectorProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Format.IFormat")]]]);
-}
-
-export class OlModule_Source_XYZProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Projection", "Url"];
-    }
-}
-
-export function OlModule_Source_XYZProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Source.XYZProps", [], OlModule_Source_XYZProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Proj.IProjection")]], [["Item", string_type]]]);
-}
-
-export class OlModule_Source_VectorTileProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["TileLoadFunction", "TileUrlFunction", "Projection", "Format", "TileGrid", "TileSize", "Url", "TilePixelRatio"];
-    }
-}
-
-export function OlModule_Source_VectorTileProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Source.VectorTileProps", [], OlModule_Source_VectorTileProps, () => [[["Item", lambda_type(class_type("Fable.OpenLayers.Interfaces.Tile.ITile"), lambda_type(string_type, unit_type))]], [["Item", lambda_type(tuple_type(array_type(int32_type), int32_type, class_type("Fable.OpenLayers.Interfaces.Proj.IProjection")), string_type)]], [["Item", class_type("Fable.OpenLayers.Interfaces.Proj.IProjection")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Format.IFormat")]], [["Item", class_type("Fable.OpenLayers.Interfaces.TileGrid.ITileGrid")]], [["Item", int32_type]], [["Item", string_type]], [["Item", int32_type]]]);
-}
-
-export class OlModule_Source_TileWMSProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Url", "Params", "ServerType", "Transition"];
-    }
-}
-
-export function OlModule_Source_TileWMSProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Source.TileWMSProps", [], OlModule_Source_TileWMSProps, () => [[["Item", string_type]], [["Item", obj_type]], [["Item", string_type]], [["Item", string_type]]]);
-}
-
-export class OlModule_Source_WMTSProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Url", "Layer", "Format", "Projection", "TileGrid", "WarpX", "Style"];
-    }
-}
-
-export function OlModule_Source_WMTSProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Source.WMTSProps", [], OlModule_Source_WMTSProps, () => [[["Item", string_type]], [["Item", string_type]], [["Item", class_type("Fable.OpenLayers.Interfaces.Format.IFormat")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Proj.IProjection")]], [["Item", class_type("Fable.OpenLayers.Interfaces.TileGrid.ITileGrid")]], [["Item", bool_type]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]]]);
-}
-
-export function OlModule_Source_vector(options) {
-    const opts = keyValueList(options, 1);
-    return new Vector(opts);
-}
-
-export function OlModule_Source_xyz(options) {
-    const opts = keyValueList(options, 1);
-    return new XYZ(opts);
-}
-
-export function OlModule_Source_vectorTile(options) {
-    const opts = keyValueList(options, 1);
-    return new VectorTile(opts);
-}
-
-export function OlModule_Source_tileWMS(options) {
-    const opts = keyValueList(options, 1);
-    return new TileWMS(opts);
-}
-
-export function OlModule_Source_wmts(options) {
-    const opts = keyValueList(options, 1);
-    return new WMTS_1(opts);
-}
-
-export class OlModule_Layer_VectorProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Source", "Style", "MinZoom"];
-    }
-}
-
-export function OlModule_Layer_VectorProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Layer.VectorProps", [], OlModule_Layer_VectorProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Source.ISource")]], [["Item", class_type("Fable.OpenLayers.Interfaces.Style.IStyle")]], [["Item", int32_type]]]);
-}
-
-export class OlModule_Layer_TileProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Source", "MinZoom"];
-    }
-}
-
-export function OlModule_Layer_TileProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Layer.TileProps", [], OlModule_Layer_TileProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Source.ISource")]], [["Item", int32_type]]]);
-}
-
-export class OlModule_Layer_VectorTileProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Source", "MinZoom", "TileGrid"];
-    }
-}
-
-export function OlModule_Layer_VectorTileProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Layer.VectorTileProps", [], OlModule_Layer_VectorTileProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Source.ISource")]], [["Item", int32_type]], [["Item", class_type("Fable.OpenLayers.Interfaces.TileGrid.ITileGrid")]]]);
-}
-
-export class OlModule_Layer_LayerProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Blur", "Radius"];
-    }
-}
-
-export function OlModule_Layer_LayerProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.Layer.LayerProps", [], OlModule_Layer_LayerProps, () => [[["Item", int32_type]], [["Item", int32_type]]]);
-}
-
-export function OlModule_Layer_LayerProps_XYZSource_Z3BA24FEC(x) {
-    return ["source", x];
-}
-
-export function OlModule_Layer_LayerProps_VectorTileSource_Z7991DE3E(x) {
-    return ["source", x];
-}
-
-export function OlModule_Layer_tile(options) {
-    const opts = keyValueList(options, 1);
-    return new Tile(opts);
-}
-
-export function OlModule_Layer_vector(options) {
-    const opts = keyValueList(options, 1);
-    return new Vector_1(opts);
-}
-
-export function OlModule_Layer_vectorTile(options) {
-    const opts = keyValueList(options, 1);
-    return new VectorTile_1(opts);
-}
-
-export class OlModule_ViewProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Projection", "Center", "Zoom", "OnClick"];
-    }
-}
-
-export function OlModule_ViewProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.ViewProps", [], OlModule_ViewProps, () => [[["Item", class_type("Fable.OpenLayers.Interfaces.Proj.IProjection")]], [["Item", array_type(float64_type)]], [["Item", int32_type]], [["Item", lambda_type(unit_type, unit_type)]]]);
-}
-
-export class OlModule_MapProps extends Union {
-    constructor(tag, ...fields) {
-        super();
-        this.tag = (tag | 0);
-        this.fields = fields;
-    }
-    cases() {
-        return ["Target", "Layers", "View"];
-    }
-}
-
-export function OlModule_MapProps$reflection() {
-    return union_type("Fable.OpenLayers.OlModule.MapProps", [], OlModule_MapProps, () => [[["Item", obj_type]], [["Item", array_type(class_type("Fable.OpenLayers.Interfaces.Layer.ILayer"))]], [["Item", class_type("Fable.OpenLayers.Interfaces.IView")]]]);
-}
-
-export function OlModule_view(options) {
-    const opts = keyValueList(options, 1);
-    return new View(opts);
-}
-
-export function OlModule_map(options) {
-    const opts = keyValueList(options, 1);
-    return new Map$(opts);
-}
-

src/Fable.OpenLayers.fsproj

@@ -2,55 +2,55 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <IsPackable>true</IsPackable>
     <PackageId>Fable.OpenLayers</PackageId>
-    <Authors/>
-    <Company/>
+    <Authors />
+    <Company />
     <Version>2.13.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Types.fs"/>
-    <Compile Include="Interop.fs"/>
-    <Compile Include="Event.fs"/>
-    <Compile Include="Observable.fs"/>
-    <Compile Include="Object.fs"/>
-    <Compile Include="Collection.fs"/>
-    <Compile Include="Proj4.fs"/>
-    <Compile Include="Proj.fs"/>
-    <Compile Include="Animation.fs"/>
-    <Compile Include="Ol.fs"/>
-    <Compile Include="Geom.fs"/>
-    <Compile Include="Sphere.fs"/>
-    <Compile Include="Image.fs"/>
-    <Compile Include="Style.fs"/>
-    <Compile Include="Feature.fs"/>
-    <Compile Include="WebGL.fs"/>
-    <Compile Include="Render.fs"/>
-    <Compile Include="Renderer.fs"/>
-    <Compile Include="Format.fs"/>
-    <Compile Include="TileGrid.fs"/>
-    <Compile Include="Source.fs"/>
-    <Compile Include="Layer.fs"/>
-    <Compile Include="View.fs"/>
-    <Compile Include="Overlay.fs"/>
-    <Compile Include="Control.fs"/>
-    <Compile Include="Interaction.fs"/>
-    <Compile Include="Map.fs"/>
+    <Compile Include="Types.fs" />
+    <Compile Include="Interop.fs" />
+    <Compile Include="Event.fs" />
+    <Compile Include="Observable.fs" />
+    <Compile Include="Object.fs" />
+    <Compile Include="Collection.fs" />
+    <Compile Include="Proj4.fs" />
+    <Compile Include="Proj.fs" />
+    <Compile Include="Animation.fs" />
+    <Compile Include="Ol.fs" />
+    <Compile Include="Geom.fs" />
+    <Compile Include="Sphere.fs" />
+    <Compile Include="Image.fs" />
+    <Compile Include="Style.fs" />
+    <Compile Include="Feature.fs" />
+    <Compile Include="WebGL.fs" />
+    <Compile Include="Render.fs" />
+    <Compile Include="Renderer.fs" />
+    <Compile Include="Format.fs" />
+    <Compile Include="TileGrid.fs" />
+    <Compile Include="Source.fs" />
+    <Compile Include="Layer.fs" />
+    <Compile Include="View.fs" />
+    <Compile Include="Overlay.fs" />
+    <Compile Include="Control.fs" />
+    <Compile Include="Interaction.fs" />
+    <Compile Include="Map.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Fable.Browser.Dom" Version="2.10.0"/>
-    <PackageReference Include="Fable.Browser.WebGL" Version="1.1.0"/>
-    <PackageReference Include="Fable.Core" Version="3.7.0"/>
-    <PackageReference Update="FSharp.Core" Version="6.0.4"/>
+    <PackageReference Include="Fable.Browser.Dom" Version="2.14.0" />
+    <PackageReference Include="Fable.Browser.WebGL" Version="1.2.0" />
+    <PackageReference Include="Fable.Core" Version="4.0.0" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
   <PropertyGroup>
     <NpmDependencies>
-      <NpmPackage Name="ol" Version="gte 6.14.1" ResolutionStrategy="Max"/>
+      <NpmPackage Name="ol" Version="gte 6.14.1" ResolutionStrategy="Max" />
     </NpmDependencies>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="*.fsproj; *.fs" PackagePath="fable/"/>
+    <Content Include="*.fsproj; *.fs" PackagePath="fable/" />
   </ItemGroup>
-</Project>
+</Project>

src/packages.lock.json

@@ -1,48 +1,48 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net7.0": {
       "Fable.Browser.Dom": {
         "type": "Direct",
-        "requested": "[2.10.0, )",
-        "resolved": "2.10.0",
-        "contentHash": "DGbAzVcWYTfiYoShbbMpd75BpngbIFTjHeMoFPCtRGKORUMg11TLKiXoCxbwyjrCuXDKPNSlKjio1i66WgNGgA==",
+        "requested": "[2.14.0, )",
+        "resolved": "2.14.0",
+        "contentHash": "R85V6jNb/xTwe47hHLYevsu4l8ZZrU4Nfg9CxD4vj33eXqwZa6W0l0MsyKh3+8cPV7yiZgegrRWVfr7axY0rzA==",
         "dependencies": {
           "FSharp.Core": "4.7.2",
-          "Fable.Browser.Blob": "1.2.0",
+          "Fable.Browser.Blob": "1.3.0",
           "Fable.Browser.Event": "1.5.0",
-          "Fable.Browser.WebStorage": "1.1.0",
+          "Fable.Browser.WebStorage": "1.2.0",
           "Fable.Core": "3.2.8"
         }
       },
       "Fable.Browser.WebGL": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
-        "resolved": "1.1.0",
-        "contentHash": "9CjfatZUCUTaPgLgbssZQZNaip2lqzjwowxM4g94LvfFMCGYmQoPabpYCQkVXegCytXvTHu25WPZmeWhmh/P7A==",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "IsuRlErvZLcRymxd4St0RQnUq7fQDbT+e+Fip0MMqTfoSch60/qEKr4uvReRNtP9xI+hO+RD9OsC9qRXqIqw1A==",
         "dependencies": {
           "FSharp.Core": "4.7.2",
-          "Fable.Browser.Dom": "2.10.0",
+          "Fable.Browser.Dom": "2.11.0",
           "Fable.Browser.Event": "1.5.0",
           "Fable.Core": "3.1.5"
         }
       },
       "Fable.Core": {
         "type": "Direct",
-        "requested": "[3.7.0, )",
-        "resolved": "3.7.0",
-        "contentHash": "T+67w7XUaqHp2Lm9ESvrPoy7MrCFOYpUg6ASX4F+E1XDDnH+ElW2t1Jt+FjahRZZk6cS14i8JACte57P32FW9Q=="
+        "requested": "[4.0.0, )",
+        "resolved": "4.0.0",
+        "contentHash": "crDLkyN4xADgnCqIneMUGVDo2oS92W4oufbIH/jwc8Fk7nIH6pS/Ds1rBB4R1jUfU1WM1k9GEPa4Up8cNj5VYw=="
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.4, )",
-        "resolved": "6.0.4",
-        "contentHash": "CYqAfmO7JvN38M+ACkstS8taVfl8C0mCkvSiBAshfKuu2Nut6+8MuFU7Wahu09wGIyFPlRz5ArFWxSOM5mhMSA=="
+        "requested": "[7.0.300, )",
+        "resolved": "7.0.300",
+        "contentHash": "8vvItREJ1l5lcp3vBCSJ1mFevVAhR48I34DuF/EoUa7o1KlFpQpagyuZkVYMAsHPIjdp47ZxM9sI4eqeXaeWkA=="
       },
       "Fable.Browser.Blob": {
         "type": "Transitive",
-        "resolved": "1.2.0",
-        "contentHash": "bM4zbtIeycTFFCH7o4WuN28W70dTxNTMZiMvR70XUTYrBnbz7GpS5XxzUy5caDB4l7s2l7wiuVDhh52t7NXxDg==",
+        "resolved": "1.3.0",
+        "contentHash": "UDVl31aW99qa2NygpxlBRQ7KWUWhF6MuWTZIRB96sSZZxrs46lKYGuL+V8QMd4mKjgeU+02GgUH0tN84NeBATg==",
         "dependencies": {
           "FSharp.Core": "4.7.2",
           "Fable.Core": "3.0.0"
@@ -69,8 +69,8 @@
       },
       "Fable.Browser.WebStorage": {
         "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "tGktTk6QHIOeX7JtG5ISem1p9Rc1iYkgcbpIEzHS2YuvpOa9YomUKABU0Lraz4GMjAGxhhNvAXLRry2w89HdVQ==",
+        "resolved": "1.2.0",
+        "contentHash": "T41JtXnYNzJRXDRndy3FiNNPRp5nnWA6JIMY063wMk+2GOv9MhdPTdTURTtMdBUcX907Gm/hRULVARyedsWM8g==",
         "dependencies": {
           "FSharp.Core": "4.7.2",
           "Fable.Browser.Event": "1.5.0",

test/Tests.fsproj

@@ -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" />
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\src\Fable.OpenLayers.fsproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Expecto" Version="9.0.4" />
-    <PackageReference Update="FSharp.Core" Version="6.0.4" />
+    <PackageReference Include="Expecto" Version="10.1.0" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
-</Project>
+</Project>