Merge branch 'main' into v54

aardvark-platform · May 2, 2023 · b1d51dc · b1d51dc
2 parents fc30d91 + e3c5082
commit b1d51dc
Show file tree

Hide file tree

Showing 40 changed files with 534 additions and 822 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
     "isRoot": true,
     "tools": {
       "paket": {
-        "version": "7.0.0-alpha003",
+        "version": "7.1.5",
         "commands": [
           "paket"
         ]
       },
       "aardpack": {
-        "version": "1.0.11",
+        "version": "1.0.19",
         "commands": [
           "aardpack"
         ]

diff --git a/.github/global.json b/.github/global.json
@@ -0,0 +1,7 @@
+{
+    "sdk": {
+      "version": "6.0.0",
+      "rollForward": "latestFeature",
+      "allowPrerelease": false
+    }
+}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,10 +16,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Copy global.json
+      run: cp ./.github/global.json .
     - name: Install Dotnet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.100'
+        global-json-file: global.json
     - name: Build
       run: sh ./build.sh
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -16,10 +16,12 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Copy global.json
+      run: cp ./.github/global.json .
     - name: Install Dotnet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.100'
+        global-json-file: global.json
     - name: Build
       run: ./build.sh
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,8 +2,9 @@ name: Publish
 on:
   push:
     branches:
-      - master
+      - main
       - v54
+      - giraffeBackend
     paths:
       - RELEASE_NOTES.md
       - .github/workflows/publish.yml
@@ -13,11 +14,13 @@ jobs:
     runs-on: windows-latest
     steps:  
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Copy global.json
+        run: cp ./.github/global.json .
       - name: Install Dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '6.0.100'
+          global-json-file: global.json
       - name: Restore Tools
         run: dotnet tool restore
       - name: Restore
@@ -27,13 +30,13 @@ jobs:
       #   run: generate.cmd
       - name: Build
         shell: cmd
-        run: dotnet build -c Release src\Aardvark.Media.sln
+        run: dotnet build -c Release src\Aardvark.Media.NoExamples.slnf
       - name: Pack
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: dotnet aardpack src\Aardvark.Media.sln --notag
+        run: dotnet aardpack src\Aardvark.Media.NoExamples.slnf --notag
       - name: Upload Packages
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: packages
           path: bin\pack

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,10 +16,12 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Copy global.json
+      run: cp ./.github/global.json .
     - name: Install Dotnet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.100'
+        global-json-file: global.json
     - name: Build
       run: .\build.cmd
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -17,6 +17,10 @@
 - Updated Fomantic-UI to 2.8.8
 - Fixed and improved resource management
 
+### 5.3.5
+- Fixed assembly version of packages due to missing Aardvark.Build reference (was 1.0.0.0)
+- Fixed CEF packages
+
 ### 5.3.4
 - Updated to Aardvark.Rendering 5.3
 

diff --git a/build.sh b/build.sh
@@ -2,4 +2,4 @@
 
 dotnet tool restore
 dotnet paket restore
-dotnet build src/Aardvark.Media.NonWindows.sln
+dotnet build src/Aardvark.Media.NonWindows.slnf
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,34 +1,34 @@
 source https://api.nuget.org/v3/index.json
-framework: netstandard2.0, net471, netcoreapp3.1, net6.0
+framework: auto-detect
 
 storage: none
 
-nuget Aardvark.Build                    ~> 1.0.11
+nuget Aardvark.Build                    ~> 1.0.19
 
 nuget FSharp.Core                       >= 5.0.1 lowest_matching: true
 nuget Microsoft.NETFramework.ReferenceAssemblies ~> 1.0.0
 nuget FSharp.Data                       ~> 3.0.0
 
-nuget FSharp.Data.Adaptive              ~> 1.2.8
+nuget FSharp.Data.Adaptive              ~> 1.2.13
 
 // base
 nuget Aardvark.Base.TypeProviders       ~> 4.5.15
 
-nuget Aardvark.Base                     ~> 5.2.13
-nuget Aardvark.Base.Incremental         ~> 5.2.13
-nuget Aardvark.Base.FSharp              ~> 5.2.13
-nuget Aardvark.Base.Essentials          ~> 5.2.13
+nuget Aardvark.Base                     ~> 5.2.21
+nuget Aardvark.Base.Incremental         ~> 5.2.21
+nuget Aardvark.Base.FSharp              ~> 5.2.21
+nuget Aardvark.Base.Essentials          ~> 5.2.21
 
 // rendering
-nuget Aardvark.Rendering                ~> 5.3.0
-nuget Aardvark.Application.WinForms.GL  ~> 5.3.0
-nuget Aardvark.Application.Slim.GL      ~> 5.3.0
-nuget Aardvark.SceneGraph               ~> 5.3.0
-nuget Aardvark.SceneGraph.IO            ~> 5.3.0
-nuget Aardvark.SceneGraph.Opc           ~> 5.3.0
-nuget Aardvark.Rendering.Text           ~> 5.3.0
-nuget Aardvark.Rendering.Vulkan         ~> 5.3.0
-nuget Aardvark.GPGPU                    ~> 5.3.0
+nuget Aardvark.Rendering                ~> 5.3.6
+nuget Aardvark.Application.WinForms.GL  ~> 5.3.6
+nuget Aardvark.Application.Slim.GL      ~> 5.3.6
+nuget Aardvark.SceneGraph               ~> 5.3.6
+nuget Aardvark.SceneGraph.IO            ~> 5.3.6
+nuget Aardvark.SceneGraph.Opc           ~> 5.3.6
+nuget Aardvark.Rendering.Text           ~> 5.3.6
+nuget Aardvark.Rendering.Vulkan         ~> 5.3.6
+nuget Aardvark.GPGPU                    ~> 5.3.6
 
 // algodat (just used for an example atm)
 nuget Aardvark.Geometry.Intersection    ~> 5.2.0
@@ -51,9 +51,9 @@ nuget Suave                             ~> 2.5.6
 nuget Aardium                           ~> 2.0.10-prerelease0007
 nuget Chiron
 
-nuget Another.Unofficial.Xilium.CefGlue                          ~> 0.3.0
-nuget Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies ~> 0.3.0
-nuget Another.Unofficial.Xilium.CefGlue.WindowsForms             ~> 0.3.0
+nuget Another.Unofficial.Xilium.CefGlue                          ~> 0.4.0
+nuget Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies ~> 0.4.0
+nuget Another.Unofficial.Xilium.CefGlue.WindowsForms             ~> 0.4.0
 
 nuget Giraffe                  ~> 5.0.0
 nuget Saturn                   ~> 0.15.0