Skip to content

Commit

Permalink
major version upgrade (base now has proclist, domaintypes no longer (…
Browse files Browse the repository at this point in the history 
…breaking major verison upgrade here), xilium unpacks to appdata now)
  • Loading branch information
@haraldsteinlechner
haraldsteinlechner committed Mar 16, 2018
1 parent 01eceb4 commit 6ef54e2
Show file tree
Hide file tree
Showing 4 changed files with 124 additions and 123 deletions.
1 change: 1 addition & 0 deletions build.fsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open System.IO
open System.Diagnostics
open Aardvark.Fake

do MSBuildDefaults <- { MSBuildDefaults with Verbosity = Some Minimal }
do Environment.CurrentDirectory <- __SOURCE_DIRECTORY__

DefaultSetup.install ["src/Aardvark.Media.sln"]
Expand Down
42 changes: 21 additions & 21 deletions paket.dependencies
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ source https://vrvis.myget.org/F/aardvark_public/api/v3/index.json

nuget FSharp.Core ~> 4.0.0

nuget Aardvark.Base ~> 3.0.54
nuget Aardvark.Base.Incremental ~> 3.0.54
nuget Aardvark.Base.FSharp ~> 3.0.54
nuget Aardvark.Base.Essentials ~> 3.0.54

nuget Aardvark.Base.Rendering ~> 3.6.11
nuget Aardvark.Application.WinForms.GL ~> 3.6.11
nuget Aardvark.SceneGraph ~> 3.6.11
nuget Aardvark.SceneGraph.IO ~> 3.6.11
nuget Aardvark.Rendering.NanoVg ~> 3.6.11
nuget Aardvark.Rendering.Text ~> 3.6.11
nuget Aardvark.Rendering.Vulkan ~> 3.6.11
nuget Aardvark.GPGPU ~> 3.6.11

nuget Aardvark.Compiler.DomainTypes ~> 0.2.11
nuget Aardvark.Compiler.DomainTypes.MSBuild ~> 0.2.11
nuget Aardvark.Compiler.DomainTypeTool ~> 0.2.11

nuget Another.Unofficial.Xilium.CefGlue ~> 0.1.0
nuget Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies ~> 0.1.0
nuget Another.Unofficial.Xilium.CefGlue.WindowsForms ~> 0.1.0
nuget Aardvark.Base ~> 3.0.58
nuget Aardvark.Base.Incremental ~> 3.0.58
nuget Aardvark.Base.FSharp ~> 3.0.58
nuget Aardvark.Base.Essentials ~> 3.0.58

nuget Aardvark.Base.Rendering ~> 3.6.22
nuget Aardvark.Application.WinForms.GL ~> 3.6.22
nuget Aardvark.SceneGraph ~> 3.6.22
nuget Aardvark.SceneGraph.IO ~> 3.6.22
nuget Aardvark.Rendering.NanoVg ~> 3.6.22
nuget Aardvark.Rendering.Text ~> 3.6.22
nuget Aardvark.Rendering.Vulkan ~> 3.6.22
nuget Aardvark.GPGPU ~> 3.6.22

nuget Aardvark.Compiler.DomainTypes ~> 0.3.0
nuget Aardvark.Compiler.DomainTypes.MSBuild ~> 0.3.0
nuget Aardvark.Compiler.DomainTypeTool ~> 0.3.0

nuget Another.Unofficial.Xilium.CefGlue ~> 0.1.1
nuget Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies ~> 0.1.1
nuget Another.Unofficial.Xilium.CefGlue.WindowsForms ~> 0.1.1

nuget FsPickler ~> 4.0.0
nuget FsPickler.Json ~> 4.0.0
Expand Down
176 changes: 88 additions & 88 deletions paket.lock
View file
Original file line number Diff line number Diff line change
@@ -1,147 +1,147 @@
RESTRICTION: == net45
NUGET
remote: https://vrvis.myget.org/F/aardvark_public/api/v3/index.json
Aardvark.Application (3.6.11)
Aardvark.Application (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Base.Rendering (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Application.WinForms (3.6.11)
Aardvark.Application (3.6.11)
Aardvark.Application.WinForms (3.6.22)
Aardvark.Application (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Base.Rendering (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Application.WinForms.GL (3.6.11)
Aardvark.Application (3.6.11)
Aardvark.Application.WinForms (3.6.11)
Aardvark.Application.WinForms.GL (3.6.22)
Aardvark.Application (3.6.22)
Aardvark.Application.WinForms (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.Base.Rendering (3.6.22)
Aardvark.Base.Runtime (>= 3.0.54 < 3.1)
Aardvark.Rendering.GL (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Rendering.GL (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Base (3.0.56)
Aardvark.Base (3.0.58)
DevILSharp (>= 0.1.1 < 0.2)
Aardvark.Base.Essentials (3.0.56)
Aardvark.Base (3.0.56)
Aardvark.Base.Essentials (3.0.58)
Aardvark.Base (3.0.58)
DevILSharp (>= 0.1.1 < 0.2)
System.Collections.Immutable (>= 1.2)
System.Reactive.Linq (>= 3.0 < 3.1)
Aardvark.Base.FSharp (3.0.56)
Aardvark.Base (3.0.56)
Aardvark.Base.FSharp (3.0.58)
Aardvark.Base (3.0.58)
DevILSharp (>= 0.1.1 < 0.2)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Base.Incremental (3.0.56)
Aardvark.Base (3.0.56)
Aardvark.Base.Essentials (3.0.56)
Aardvark.Base.FSharp (3.0.56)
Aardvark.Base.Incremental (3.0.58)
Aardvark.Base (3.0.58)
Aardvark.Base.Essentials (3.0.58)
Aardvark.Base.FSharp (3.0.58)
DevILSharp (>= 0.1.1 < 0.2)
FSharp.Core (>= 4.0 < 4.1)
System.Reactive.Core (>= 3.0 < 3.1)
System.Reactive.Interfaces (>= 3.0 < 3.1)
System.Reactive.Linq (>= 3.0 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.Base.Rendering (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
FShade.Core (>= 3.3.22 < 3.4)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Base.Runtime (3.0.56)
Aardvark.Base (3.0.56)
Aardvark.Base.Essentials (3.0.56)
Aardvark.Base.FSharp (3.0.56)
Aardvark.Base.Incremental (3.0.56)
Aardvark.Base.Runtime (3.0.58)
Aardvark.Base (3.0.58)
Aardvark.Base.Essentials (3.0.58)
Aardvark.Base.FSharp (3.0.58)
Aardvark.Base.Incremental (3.0.58)
DevILSharp (>= 0.1.1 < 0.2)
FSharp.Core (>= 4.0 < 4.1)
System.Reactive.Core (>= 3.0 < 3.1)
System.Reactive.Interfaces (>= 3.0 < 3.1)
System.Reactive.Linq (>= 3.0 < 3.1)
Aardvark.Compiler.DomainTypes (0.2.11)
Aardvark.Base.Incremental (>= 3.0.48 < 3.1)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Compiler.DomainTypes.MSBuild (0.2.11)
Aardvark.Compiler.DomainTypes (0.2.11)
Aardvark.Compiler.DomainTypeTool (0.2.11)
Aardvark.Compiler.DomainTypes (0.2.11)
Aardvark.GPGPU (3.6.11)
Aardvark.Compiler.DomainTypes (0.3.0)
Aardvark.Base.Incremental (>= 3.0.58 < 3.1)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Compiler.DomainTypes.MSBuild (0.3.0)
Aardvark.Compiler.DomainTypes (0.3)
Aardvark.Compiler.DomainTypeTool (0.3.0)
Aardvark.Compiler.DomainTypes (0.3)
Aardvark.GPGPU (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Base.Rendering (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.Rendering.GL (3.6.11)
Aardvark.Rendering.GL (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.Base.Rendering (3.6.22)
Aardvark.Base.Runtime (>= 3.0.54 < 3.1)
FShade (>= 3.3.22 < 3.4)
FShade (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
FSharp.Quotations.Evaluator (>= 1.0.6 < 1.1)
Aardvark.Rendering.NanoVg (3.6.11)
Aardvark.Rendering.NanoVg (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.Base.Rendering (3.6.22)
Aardvark.Base.Runtime (>= 3.0.54 < 3.1)
Aardvark.Rendering.GL (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Rendering.GL (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
FSharp.Quotations.Evaluator (>= 1.0.6 < 1.1)
NanoVgSharp (>= 2.1 < 2.2)
Aardvark.Rendering.Text (3.6.11)
Aardvark.Rendering.Text (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.SceneGraph (3.6.11)
Aardvark.Base.Rendering (3.6.22)
Aardvark.SceneGraph (3.6.22)
CommonMark.NET (>= 0.12 < 0.13)
FShade.Core (>= 3.3.22 < 3.4)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Unofficial.LibTessDotNet (>= 1.0 < 1.1)
Aardvark.Rendering.Vulkan (3.6.11)
Aardvark.Rendering.Vulkan (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.Base.Rendering (3.6.22)
Aardvark.Base.Runtime (>= 3.0.54 < 3.1)
FShade (>= 3.3.22 < 3.4)
FShade (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
FSharp.Quotations.Evaluator (>= 1.0.6 < 1.1)
GLSLangSharp (>= 0.3.9 < 0.4)
Aardvark.SceneGraph (3.6.11)
Aardvark.SceneGraph (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Base.Rendering (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Aardvark.SceneGraph.IO (3.6.11)
Aardvark.SceneGraph.IO (3.6.22)
Aardvark.Base.Incremental (>= 3.0.54 < 3.1)
Aardvark.Base.Rendering (3.6.11)
Aardvark.SceneGraph (3.6.11)
FShade.Core (>= 3.3.22 < 3.4)
Aardvark.Base.Rendering (3.6.22)
Aardvark.SceneGraph (3.6.22)
FShade.Core (>= 3.3.25 < 3.4)
FSharp.Core (>= 4.0 < 4.1)
Unofficial.AssimpNet (>= 3.3.3 < 3.4)
Another.Unofficial.Xilium.CefGlue (0.1.0)
Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies (0.1.0)
Another.Unofficial.Xilium.CefGlue (0.1.1)
Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies (0.1.1)
SharpZipLib (>= 0.86 < 0.87)
Another.Unofficial.Xilium.CefGlue.WindowsForms (0.1.0)
Another.Unofficial.Xilium.CefGlue (0.1)
FShade (3.3.22)
FShade.Core (3.3.22)
FShade.GLSL (3.3.22)
FShade.Imperative (3.3.22)
FShade.SpirV (3.3.22)
FShade.Core (3.3.22)
Aardvark.Base (>= 3.0.48 < 3.1)
Aardvark.Base.FSharp (>= 3.0.48 < 3.1)
FShade.Imperative (>= 3.3.22)
FSharp.Core (>= 4.0 < 4.1)
FShade.GLSL (3.3.22)
Aardvark.Base (>= 3.0.48 < 3.1)
Aardvark.Base.FSharp (>= 3.0.48 < 3.1)
FShade.Core (>= 3.3.22)
FShade.Imperative (>= 3.3.22)
FSharp.Core (>= 4.0 < 4.1)
FShade.Imperative (3.3.22)
Aardvark.Base (>= 3.0.48 < 3.1)
Aardvark.Base.FSharp (>= 3.0.48 < 3.1)
Another.Unofficial.Xilium.CefGlue.WindowsForms (0.1.1)
Another.Unofficial.Xilium.CefGlue (0.1.1)
FShade (3.3.25)
FShade.Core (3.3.25)
FShade.GLSL (3.3.25)
FShade.Imperative (3.3.25)
FShade.SpirV (3.3.25)
FShade.Core (3.3.25)
Aardvark.Base (>= 3.0.57 < 3.1)
Aardvark.Base.FSharp (>= 3.0.57 < 3.1)
FShade.Imperative (>= 3.3.25)
FSharp.Core (>= 4.0 < 4.1)
FShade.GLSL (3.3.25)
Aardvark.Base (>= 3.0.57 < 3.1)
Aardvark.Base.FSharp (>= 3.0.57 < 3.1)
FShade.Core (>= 3.3.25)
FShade.Imperative (>= 3.3.25)
FSharp.Core (>= 4.0 < 4.1)
FShade.Imperative (3.3.25)
Aardvark.Base (>= 3.0.57 < 3.1)
Aardvark.Base.FSharp (>= 3.0.57 < 3.1)
FSharp.Core (>= 4.0 < 4.1)
FsPickler (>= 4.0 < 4.1)
FShade.SpirV (3.3.22)
Aardvark.Base (>= 3.0.48 < 3.1)
Aardvark.Base.FSharp (>= 3.0.48 < 3.1)
FShade.Core (>= 3.3.22)
FShade.Imperative (>= 3.3.22)
FShade.SpirV (3.3.25)
Aardvark.Base (>= 3.0.57 < 3.1)
Aardvark.Base.FSharp (>= 3.0.57 < 3.1)
FShade.Core (>= 3.3.25)
FShade.Imperative (>= 3.3.25)
FSharp.Core (>= 4.0 < 4.1)
GLSLangSharp (0.3.9)
Aardvark.Base (>= 3.0.35)
Expand Down
28 changes: 14 additions & 14 deletions src/Aardvark.Cef.WinForms.Process/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>


<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.0.0" />
</dependentAssembly>
</assemblyBinding><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding></runtime>
</configuration>

0 comments on commit 6ef54e2

Please sign in to comment.