Replaces Adaptify.MSBuild with explicit adaptify invocation

.config/dotnet-tools.json

@@ -1,18 +1,24 @@
 {
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-      "paket": {
-        "version": "7.0.0-alpha003",
-        "commands": [
-          "paket"
-        ]
-      },
-      "aardpack": {
-        "version": "1.0.10",
-        "commands": [
-          "aardpack"
-        ]
-      }
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "paket": {
+      "version": "7.0.0-alpha003",
+      "commands": [
+        "paket"
+      ]
+    },
+    "aardpack": {
+      "version": "1.0.10",
+      "commands": [
+        "aardpack"
+      ]
+    },
+    "adaptify": {
+      "version": "1.2.0-prerelease2",
+      "commands": [
+        "adaptify"
+      ]
     }
-  }
+  }
+}

.gitignore

@@ -1,6 +1,5 @@
 bin/Release
 bin/Debug
-*.g.fs
 *.swp
 *.userprefs
 **/obj
@@ -30,35 +29,6 @@ src\Aardvark.OpcViewer.psess
 /src/PRo3D.DomainModel/bin/Release
 /src/PRo3D.Base/bin/Release
 /.paket/Paket.Restore.targets
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.XML
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.exe
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.exe.config
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.pdb
-/src/Aardvark.Opc.Viewer/bin/Debug/FSharp.Core.dll
-/src/Aardvark.Opc.Viewer/bin/Debug/FSharp.Core.xml
-/src/Aardvark.Opc.Viewer/bin/Debug/System.ValueTuple.dll
-/src/Aardvark.Opc.Viewer/bin/Release/Aardvark.Opc.Viewer.XML
-/src/Aardvark.Opc.Viewer/packages.config
-/src/Aardvark.Opc.Viewer/paket.references
-/src/packages/System.ValueTuple.4.3.1/System.ValueTuple.4.3.1.nupkg
-/src/packages/System.ValueTuple.4.3.1/ThirdPartyNotices.txt
-/src/packages/System.ValueTuple.4.3.1/dotnet_library_license.txt
-/src/packages/System.ValueTuple.4.3.1/lib/MonoAndroid10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/MonoTouch10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/netstandard1.0/.xml
-/src/packages/System.ValueTuple.4.3.1/lib/netstandard1.0/System.ValueTuple.dll
-/src/packages/System.ValueTuple.4.3.1/lib/portable-net40+sl4+win8+wp8/.xml
-/src/packages/System.ValueTuple.4.3.1/lib/portable-net40+sl4+win8+wp8/System.ValueTuple.dll
-/src/packages/System.ValueTuple.4.3.1/lib/xamarinios10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/xamarinmac20/_._
-/src/packages/System.ValueTuple.4.3.1/lib/xamarintvos10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/xamarinwatchos10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/MonoAndroid10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/MonoTouch10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarinios10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarinmac20/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarintvos10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarinwatchos10/_._
 /src/Aardvark.Opc.Viewer/bin/Release
 *.domaincache
 /.paket

AdaptifyHelpers.fs

@@ -0,0 +1,20 @@
+namespace Aardvark.Fake
+
+open System
+open System.IO
+
+module MsBuild =
+    open Microsoft.Build.Construction
+
+    let patchProject (projectFileName : string) = 
+        let p = ProjectRootElement.Open(projectFileName)
+        for g in p.ItemGroups do
+            for i in g.Items do
+                if i.ItemType = "Compile" && Path.GetExtension(i.Include) = ".fs" then
+                    // beside .fs file a .g.fs file?
+                    //let generatedFilePath = Path.Combine(Path.GetDirectoryName())
+                    printfn "%A" i.Include
+        ()
+
+    let test () =
+        patchProject "C:\Users\steinlechner\Desktop\PRo3D-nomsbuild\src\PRo3D.2D3DLinking\PRo3D.Linking.fsproj"

Build.fs

@@ -494,6 +494,10 @@ Target.create "CompileDebug" (fun _ ->
     )
 )
 
+Target.create "AddAdaptifyPackages" (fun _ -> 
+    MsBuild.test()
+)
+
 Target.create "CompileInstruments" (fun _ ->
     let cfg = "Debug" //if config.debug then "Debug" else "Release"
 

Build.fsproj

@@ -4,11 +4,16 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup> 
     <None Include="paket.dependencies" />
     <None Include="paket.references" />
+    <Compile Include="AdaptifyHelpers.fs" />
     <Compile Include="Helpers.fs" />
     <Compile Include="Build.fs" />
   </ItemGroup>
+  <ItemGroup>
+	<PackageReference Include="Microsoft.Build" Version="15.1.548" ExcludeAssets="runtime" />
+	<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" ExcludeAssets="runtime" />
+  </ItemGroup>
   <Import Project=".paket\Paket.Restore.targets" />
 </Project>

runAdaptify.cmd

@@ -0,0 +1,3 @@
+REM dotnet tool update --local adaptify --version 1.2.0-prerelease2
+dotnet paket restore
+dotnet adaptify --local --lenses --force --addToProject src\**\*.fsproj !src\PRo3D.CorrelationPanels\PRo3D.CorrelationPanels.fsproj

scripts/printProjects.fsx

@@ -0,0 +1,38 @@
+//#r "nuget: Microsoft.Build.Locator"
+
+//open Microsoft.Build.Locator
+//do MSBuildLocator.RegisterInstance(MSBuildLocator.QueryVisualStudioInstances() |> Seq.sortByDescending (fun i -> i.Version) |> Seq.head)
+
+#r "nuget: Microsoft.Build, 17.4.0"
+#r "nuget: Microsoft.Build.Utilities.Core, 17.4.0"
+open System
+open System.IO
+
+
+let root = Path.Combine(__SOURCE_DIRECTORY__, "..")
+let src = Path.Combine(root, "src")
+
+let projectFiles = 
+    Directory.EnumerateFiles(src, "*.fsproj", SearchOption.AllDirectories)
+    |> Seq.toArray
+
+
+
+
+module MsBuild =
+    open Microsoft.Build
+    open Microsoft.Build.Evaluation
+
+    let test () = 
+        let options = Microsoft.Build.Construction.ProjectRootElement.Open("C:\Users\steinlechner\Desktop\PRo3D-nomsbuild\src\PRo3D.2D3DLinking\PRo3D.Linking.fsproj")
+        ()
+
+
+let genRunAdaptifyScript () =
+    let adaptifyCalls =
+        projectFiles
+        |> Array.map (fun projFile -> 
+            sprintf "dotnet adaptify --local --force %s" (Path.GetRelativePath(root, projFile))
+        )
+    let runAdaptify = adaptifyCalls |> String.concat Environment.NewLine
+    File.WriteAllText(Path.Combine(root, "runAdaptify.cmd"), runAdaptify)

src/PRo3D.2D3DLinking/Linking/LinkingModel.g.fs

@@ -0,0 +1,55 @@
+//924fa8f3-80e2-5e42-4791-7b19f269b110
+//029ccd70-f150-f5a2-b247-64d41766f295
+#nowarn "49" // upper case patterns
+#nowarn "66" // upcast is unncecessary
+#nowarn "1337" // internal types
+#nowarn "1182" // value is unused
+namespace rec PRo3D.Linking
+
+open System
+open FSharp.Data.Adaptive
+open Adaptify
+open PRo3D.Linking
+[<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
+type AdaptiveLinkingModel(value : LinkingModel) =
+    let _frustums_ = FSharp.Data.Adaptive.cval(value.frustums)
+    let _instrumentParameter_ = FSharp.Data.Adaptive.cmap(value.instrumentParameter)
+    let _trafo_ = FSharp.Data.Adaptive.cval(value.trafo)
+    let _pickingPos_ = FSharp.Data.Adaptive.cval(value.pickingPos)
+    let _filterProducts_ = FSharp.Data.Adaptive.cmap(value.filterProducts)
+    let _overlayFeature_ = FSharp.Data.Adaptive.cval(value.overlayFeature)
+    let _frustumOpacity_ = FSharp.Data.Adaptive.cval(value.frustumOpacity)
+    let mutable __value = value
+    let __adaptive = FSharp.Data.Adaptive.AVal.custom((fun (token : FSharp.Data.Adaptive.AdaptiveToken) -> __value))
+    static member Create(value : LinkingModel) = AdaptiveLinkingModel(value)
+    static member Unpersist = Adaptify.Unpersist.create (fun (value : LinkingModel) -> AdaptiveLinkingModel(value)) (fun (adaptive : AdaptiveLinkingModel) (value : LinkingModel) -> adaptive.Update(value))
+    member __.Update(value : LinkingModel) =
+        if Microsoft.FSharp.Core.Operators.not((FSharp.Data.Adaptive.ShallowEqualityComparer<LinkingModel>.ShallowEquals(value, __value))) then
+            __value <- value
+            __adaptive.MarkOutdated()
+            _frustums_.Value <- value.frustums
+            _instrumentParameter_.Value <- value.instrumentParameter
+            _trafo_.Value <- value.trafo
+            _pickingPos_.Value <- value.pickingPos
+            _filterProducts_.Value <- value.filterProducts
+            _overlayFeature_.Value <- value.overlayFeature
+            _frustumOpacity_.Value <- value.frustumOpacity
+    member __.Current = __adaptive
+    member __.frustums = _frustums_ :> FSharp.Data.Adaptive.aval<FSharp.Data.Adaptive.HashMap<Microsoft.FSharp.Core.string, LinkingFeature>>
+    member __.instrumentParameter = _instrumentParameter_ :> FSharp.Data.Adaptive.amap<PRo3D.Minerva.Instrument, InstrumentParameter>
+    member __.trafo = _trafo_ :> FSharp.Data.Adaptive.aval<Aardvark.Base.Trafo3d>
+    member __.pickingPos = _pickingPos_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.Option<Aardvark.Base.V3d>>
+    member __.filterProducts = _filterProducts_ :> FSharp.Data.Adaptive.amap<PRo3D.Minerva.Instrument, Microsoft.FSharp.Core.bool>
+    member __.overlayFeature = _overlayFeature_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.Option<LinkingFeatureDisplay>>
+    member __.frustumOpacity = _frustumOpacity_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>
+[<AutoOpen; System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
+module LinkingModelLenses = 
+    type LinkingModel with
+        static member frustums_ = ((fun (self : LinkingModel) -> self.frustums), (fun (value : FSharp.Data.Adaptive.HashMap<Microsoft.FSharp.Core.string, LinkingFeature>) (self : LinkingModel) -> { self with frustums = value }))
+        static member instrumentParameter_ = ((fun (self : LinkingModel) -> self.instrumentParameter), (fun (value : FSharp.Data.Adaptive.HashMap<PRo3D.Minerva.Instrument, InstrumentParameter>) (self : LinkingModel) -> { self with instrumentParameter = value }))
+        static member trafo_ = ((fun (self : LinkingModel) -> self.trafo), (fun (value : Aardvark.Base.Trafo3d) (self : LinkingModel) -> { self with trafo = value }))
+        static member pickingPos_ = ((fun (self : LinkingModel) -> self.pickingPos), (fun (value : Microsoft.FSharp.Core.Option<Aardvark.Base.V3d>) (self : LinkingModel) -> { self with pickingPos = value }))
+        static member filterProducts_ = ((fun (self : LinkingModel) -> self.filterProducts), (fun (value : FSharp.Data.Adaptive.HashMap<PRo3D.Minerva.Instrument, Microsoft.FSharp.Core.bool>) (self : LinkingModel) -> { self with filterProducts = value }))
+        static member overlayFeature_ = ((fun (self : LinkingModel) -> self.overlayFeature), (fun (value : Microsoft.FSharp.Core.Option<LinkingFeatureDisplay>) (self : LinkingModel) -> { self with overlayFeature = value }))
+        static member frustumOpacity_ = ((fun (self : LinkingModel) -> self.frustumOpacity), (fun (value : Microsoft.FSharp.Core.float) (self : LinkingModel) -> { self with frustumOpacity = value }))
+

src/PRo3D.2D3DLinking/Model.g.fs

@@ -0,0 +1,96 @@
+//93fbd891-117a-a73c-7586-39c98ce970c0
+//85ed4e70-22e4-d775-e619-62f1a52c2126
+#nowarn "49" // upper case patterns
+#nowarn "66" // upcast is unncecessary
+#nowarn "1337" // internal types
+#nowarn "1182" // value is unused
+namespace rec LinkingTestApp
+
+open System
+open FSharp.Data.Adaptive
+open Adaptify
+open LinkingTestApp
+[<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
+type AdaptiveModel(value : Model) =
+    let _cameraState_ = Aardvark.UI.Primitives.AdaptiveCameraControllerState(value.cameraState)
+    let _mainFrustum_ = FSharp.Data.Adaptive.cval(value.mainFrustum)
+    let _overlayFrustum_ = FSharp.Data.Adaptive.cval(value.overlayFrustum)
+    let _fillMode_ = FSharp.Data.Adaptive.cval(value.fillMode)
+    let _boxes_ = FSharp.Data.Adaptive.cval(value.boxes)
+    let _opcInfos_ =
+        let inline __arg2 (m : OpcViewer.Base.Picking.AdaptiveOpcData) (v : OpcViewer.Base.Picking.OpcData) =
+            m.Update(v)
+            m
+        FSharp.Data.Traceable.ChangeableModelMap(value.opcInfos, (fun (v : OpcViewer.Base.Picking.OpcData) -> OpcViewer.Base.Picking.AdaptiveOpcData(v)), __arg2, (fun (m : OpcViewer.Base.Picking.AdaptiveOpcData) -> m))
+    let _threads_ = FSharp.Data.Adaptive.cval(value.threads)
+    let _dockConfig_ = FSharp.Data.Adaptive.cval(value.dockConfig)
+    let _pickingModel_ = OpcViewer.Base.Picking.AdaptivePickingModel(value.pickingModel)
+    let _pickedPoint_ = FSharp.Data.Adaptive.cval(value.pickedPoint)
+    let _planePoints_ =
+        let inline __arg2 (o : System.Object) (v : FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>) =
+            (unbox<FSharp.Data.Adaptive.clist<Aardvark.Base.V3d>> o).Value <- v
+            o
+        let inline __arg5 (o : System.Object) (v : FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>) =
+            (unbox<FSharp.Data.Adaptive.clist<Aardvark.Base.V3d>> o).Value <- v
+            o
+        Adaptify.FSharp.Core.AdaptiveOption<FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>, FSharp.Data.Adaptive.alist<Aardvark.Base.V3d>, FSharp.Data.Adaptive.alist<Aardvark.Base.V3d>>(value.planePoints, (fun (v : FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>) -> FSharp.Data.Adaptive.clist(v) :> System.Object), __arg2, (fun (o : System.Object) -> unbox<FSharp.Data.Adaptive.clist<Aardvark.Base.V3d>> o :> FSharp.Data.Adaptive.alist<Aardvark.Base.V3d>), (fun (v : FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>) -> FSharp.Data.Adaptive.clist(v) :> System.Object), __arg5, (fun (o : System.Object) -> unbox<FSharp.Data.Adaptive.clist<Aardvark.Base.V3d>> o :> FSharp.Data.Adaptive.alist<Aardvark.Base.V3d>))
+    let _pickingActive_ = FSharp.Data.Adaptive.cval(value.pickingActive)
+    let _linkingModel_ = PRo3D.Linking.AdaptiveLinkingModel(value.linkingModel)
+    let _minervaModel_ = PRo3D.Minerva.AdaptiveMinervaModel(value.minervaModel)
+    let mutable __value = value
+    let __adaptive = FSharp.Data.Adaptive.AVal.custom((fun (token : FSharp.Data.Adaptive.AdaptiveToken) -> __value))
+    static member Create(value : Model) = AdaptiveModel(value)
+    static member Unpersist = Adaptify.Unpersist.create (fun (value : Model) -> AdaptiveModel(value)) (fun (adaptive : AdaptiveModel) (value : Model) -> adaptive.Update(value))
+    member __.Update(value : Model) =
+        if Microsoft.FSharp.Core.Operators.not((FSharp.Data.Adaptive.ShallowEqualityComparer<Model>.ShallowEquals(value, __value))) then
+            __value <- value
+            __adaptive.MarkOutdated()
+            _cameraState_.Update(value.cameraState)
+            _mainFrustum_.Value <- value.mainFrustum
+            _overlayFrustum_.Value <- value.overlayFrustum
+            _fillMode_.Value <- value.fillMode
+            _boxes_.Value <- value.boxes
+            _opcInfos_.Update(value.opcInfos)
+            _threads_.Value <- value.threads
+            _dockConfig_.Value <- value.dockConfig
+            _pickingModel_.Update(value.pickingModel)
+            _pickedPoint_.Value <- value.pickedPoint
+            _planePoints_.Update(value.planePoints)
+            _pickingActive_.Value <- value.pickingActive
+            _linkingModel_.Update(value.linkingModel)
+            _minervaModel_.Update(value.minervaModel)
+    member __.Current = __adaptive
+    member __.cameraState = _cameraState_
+    member __.mainFrustum = _mainFrustum_ :> FSharp.Data.Adaptive.aval<Aardvark.Rendering.Frustum>
+    member __.overlayFrustum = _overlayFrustum_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.Option<Aardvark.Rendering.Frustum>>
+    member __.fillMode = _fillMode_ :> FSharp.Data.Adaptive.aval<Aardvark.Rendering.FillMode>
+    member __.patchHierarchies = __value.patchHierarchies
+    member __.boxes = _boxes_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Collections.list<Aardvark.Base.Box3d>>
+    member __.opcInfos = _opcInfos_ :> FSharp.Data.Adaptive.amap<Aardvark.Base.Box3d, OpcViewer.Base.Picking.AdaptiveOpcData>
+    member __.threads = _threads_ :> FSharp.Data.Adaptive.aval<FSharp.Data.Adaptive.ThreadPool<Action>>
+    member __.dockConfig = _dockConfig_ :> FSharp.Data.Adaptive.aval<Aardvark.UI.Primitives.DockConfig>
+    member __.pickingModel = _pickingModel_
+    member __.pickedPoint = _pickedPoint_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.Option<Aardvark.Base.V3d>>
+    member __.planePoints = _planePoints_ :> FSharp.Data.Adaptive.aval<Adaptify.FSharp.Core.AdaptiveOptionCase<FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>, FSharp.Data.Adaptive.alist<Aardvark.Base.V3d>, FSharp.Data.Adaptive.alist<Aardvark.Base.V3d>>>
+    member __.pickingActive = _pickingActive_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.bool>
+    member __.linkingModel = _linkingModel_
+    member __.minervaModel = _minervaModel_
+[<AutoOpen; System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
+module ModelLenses = 
+    type Model with
+        static member cameraState_ = ((fun (self : Model) -> self.cameraState), (fun (value : Aardvark.UI.Primitives.CameraControllerState) (self : Model) -> { self with cameraState = value }))
+        static member mainFrustum_ = ((fun (self : Model) -> self.mainFrustum), (fun (value : Aardvark.Rendering.Frustum) (self : Model) -> { self with mainFrustum = value }))
+        static member overlayFrustum_ = ((fun (self : Model) -> self.overlayFrustum), (fun (value : Microsoft.FSharp.Core.Option<Aardvark.Rendering.Frustum>) (self : Model) -> { self with overlayFrustum = value }))
+        static member fillMode_ = ((fun (self : Model) -> self.fillMode), (fun (value : Aardvark.Rendering.FillMode) (self : Model) -> { self with fillMode = value }))
+        static member patchHierarchies_ = ((fun (self : Model) -> self.patchHierarchies), (fun (value : Microsoft.FSharp.Collections.list<Aardvark.SceneGraph.Opc.PatchHierarchy>) (self : Model) -> { self with patchHierarchies = value }))
+        static member boxes_ = ((fun (self : Model) -> self.boxes), (fun (value : Microsoft.FSharp.Collections.list<Aardvark.Base.Box3d>) (self : Model) -> { self with boxes = value }))
+        static member opcInfos_ = ((fun (self : Model) -> self.opcInfos), (fun (value : FSharp.Data.Adaptive.HashMap<Aardvark.Base.Box3d, OpcViewer.Base.Picking.OpcData>) (self : Model) -> { self with opcInfos = value }))
+        static member threads_ = ((fun (self : Model) -> self.threads), (fun (value : FSharp.Data.Adaptive.ThreadPool<Action>) (self : Model) -> { self with threads = value }))
+        static member dockConfig_ = ((fun (self : Model) -> self.dockConfig), (fun (value : Aardvark.UI.Primitives.DockConfig) (self : Model) -> { self with dockConfig = value }))
+        static member pickingModel_ = ((fun (self : Model) -> self.pickingModel), (fun (value : OpcViewer.Base.Picking.PickingModel) (self : Model) -> { self with pickingModel = value }))
+        static member pickedPoint_ = ((fun (self : Model) -> self.pickedPoint), (fun (value : Microsoft.FSharp.Core.Option<Aardvark.Base.V3d>) (self : Model) -> { self with pickedPoint = value }))
+        static member planePoints_ = ((fun (self : Model) -> self.planePoints), (fun (value : Microsoft.FSharp.Core.Option<FSharp.Data.Adaptive.IndexList<Aardvark.Base.V3d>>) (self : Model) -> { self with planePoints = value }))
+        static member pickingActive_ = ((fun (self : Model) -> self.pickingActive), (fun (value : Microsoft.FSharp.Core.bool) (self : Model) -> { self with pickingActive = value }))
+        static member linkingModel_ = ((fun (self : Model) -> self.linkingModel), (fun (value : PRo3D.Linking.LinkingModel) (self : Model) -> { self with linkingModel = value }))
+        static member minervaModel_ = ((fun (self : Model) -> self.minervaModel), (fun (value : PRo3D.Minerva.MinervaModel) (self : Model) -> { self with minervaModel = value }))
+