removed Adaptify.MSBuild from paket.references, updated adaptify tool…

…, switched to older dotnet in global.json, removed backup fsproj file
pro3d-space · Dec 22, 2022 · d74f6f3 · d74f6f3
1 parent 36ff489
commit d74f6f3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 51 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "adaptify": {
-      "version": "1.1.8",
+      "version": "1.2.0-prerelease2",
       "commands": [
         "adaptify"
       ]

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.203",
+    "version": "6.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/runAdaptify.cmd b/runAdaptify.cmd
@@ -1 +1,8 @@
-dotnet adaptify --local --force "C:\Users\steinlechner\Desktop\PRo3D-nomsbuild\src\PRo3D.Viewer\PRo3D.Viewer.fsproj"
+dotnet paket restore
+dotnet adaptify --local --lenses --force --addToProject src\**\*.fsproj !src\PRo3D.CorrelationPanels\PRo3D.CorrelationPanels.fsproj
+REM dotnet adaptify --local --force --addToProject src/**/*.fsproj
+REM msbuild -t:restore src\PRo3D.sln
+REM dotnet adaptify --local --force --addToProject src\PRo3D.Base\PRo3D.Base.fsproj
+REM dotnet build src\PRo3D.Base\PRo3D.Base.fsproj
+REM dotnet adaptify --local --force --addToProject src\PRo3D.Core\PRo3D.Core.fsproj
+REM dotnet build src\PRo3D.Base\PRo3D.Core.fsproj
diff --git a/src/PRo3D.Base/paket.references b/src/PRo3D.Base/paket.references
@@ -7,7 +7,7 @@ Aardvark.SceneGraph
 Aardvark.SceneGraph.Opc
 Aardvark.Rendering.Text
 
-Adaptify.MSBuild
+//Adaptify.MSBuild
 
 Aardvark.UI
 Aardvark.UI.Primitives

diff --git a/src/PRo3D.Lite/paket.references b/src/PRo3D.Lite/paket.references
@@ -13,7 +13,7 @@ Aardvark.SceneGraph
 Aardvark.SceneGraph.IO
 Aardvark.Rendering.Text
 
-Adaptify.MSBuild
+//Adaptify.MSBuild
 
 FsPickler
 FsPickler.Json

diff --git a/src/PRo3D.SimulatedViews/PRo3D - Backup.SimulatedViews.fsproj b/src/PRo3D.SimulatedViews/PRo3D - Backup.SimulatedViews.fsproj