updated base, fshade and rendering

aardvark-platform · Jun 13, 2020 · feeafb4 · feeafb4
1 parent 7ab407b
commit feeafb4
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 171 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,6 +16,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Build
       run: sh ./build.sh
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -13,9 +13,9 @@ on:
 jobs:
   build:
 
-    runs-on: macos
+    runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Build
       run: bash ./build.sh
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,6 +16,6 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Build
       run: .\build.cmd
diff --git a/build.cmd b/build.cmd
@@ -3,7 +3,7 @@ SETLOCAL
 PUSHD %~dp0
 
 IF NOT exist .paket\paket.exe (
-	dotnet tool install Paket --tool-path .paket 
+	dotnet tool install Paket --tool-path .paket --version [5.242.2] 
 )
 
 if NOT exist paket.lock (

diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ ! -f .paket/paket ]; then
-    dotnet tool install Paket --tool-path .paket
+    dotnet tool install Paket --tool-path .paket --version [5.242.2]
 fi
 
 ./.paket/paket restore 

diff --git a/paket.dependencies b/paket.dependencies
@@ -6,30 +6,30 @@ nuget FSharp.Core                       >= 4.6.2 lowest_matching: true
 nuget Microsoft.NETFramework.ReferenceAssemblies ~> 1.0.0
 nuget FSharp.Data                       ~> 3.0.0
 
-nuget FSharp.Data.Adaptive              ~> 0.0.17
+nuget FSharp.Data.Adaptive              ~> 1.0.0
 
 nuget Aardvark.Base.TypeProviders       ~> 4.5.14
-nuget Aardvark.Base                     ~> 5.0.5
-nuget Aardvark.Base.Incremental         ~> 5.0.5
-nuget Aardvark.Base.FSharp              ~> 5.0.5
-nuget Aardvark.Base.Essentials          ~> 5.0.5
-
-nuget Aardvark.Base.Rendering           ~> 5.0.0
-nuget Aardvark.Application.WinForms.GL  ~> 5.0.0
-nuget Aardvark.Application.Slim.GL      ~> 5.0.0
-nuget Aardvark.SceneGraph               ~> 5.0.0
-nuget Aardvark.SceneGraph.IO            ~> 5.0.0
-nuget Aardvark.SceneGraph.Opc           ~> 5.0.0
-nuget Aardvark.Rendering.Text           ~> 5.0.0
-nuget Aardvark.Rendering.Vulkan         ~> 5.0.0
-nuget Aardvark.GPGPU                    ~> 5.0.0
-
-nuget Adaptify.Core                     ~> 0.0.39
-nuget Adaptify.MSBuild                  ~> 0.0.39
+nuget Aardvark.Base                     ~> 5.0.11
+nuget Aardvark.Base.Incremental         ~> 5.0.11
+nuget Aardvark.Base.FSharp              ~> 5.0.11
+nuget Aardvark.Base.Essentials          ~> 5.0.11
+
+nuget Aardvark.Base.Rendering           ~> 5.0.7
+nuget Aardvark.Application.WinForms.GL  ~> 5.0.7
+nuget Aardvark.Application.Slim.GL      ~> 5.0.7
+nuget Aardvark.SceneGraph               ~> 5.0.7
+nuget Aardvark.SceneGraph.IO            ~> 5.0.7
+nuget Aardvark.SceneGraph.Opc           ~> 5.0.7
+nuget Aardvark.Rendering.Text           ~> 5.0.7
+nuget Aardvark.Rendering.Vulkan         ~> 5.0.7
+nuget Aardvark.GPGPU                    ~> 5.0.7
+
+nuget Adaptify.Core                     ~> 1.0.0
+nuget Adaptify.MSBuild                  ~> 1.0.0
 
 nuget Aether                            ~> 8.3.1
-nuget FsPickler                         ~> 5.2.2
-nuget FsPickler.Json                    ~> 5.2.2
+nuget FsPickler                         ~> 5.3.2
+nuget FsPickler.Json                    ~> 5.3.2
 
 nuget TurboJpegWrapper                  ~> 1.5.2
 nuget Suave                             ~> 2.5.5