Skip to content

Commit

Permalink
Moving on to vvvv 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
azeno committed Apr 11, 2024
1 parent 03f5a4d commit 208d5b9
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PackageOutputPath>$(MsBuildThisFileDirectory)bin\</PackageOutputPath>

<!-- Used VL version -->
<VLVersion>2023.5.2</VLVersion>
<VLVersion>2024.6.0</VLVersion>
<VLShortVersion>$(VLVersion.Substring(5))</VLShortVersion>

<!-- Version information -->
Expand Down
2 changes: 1 addition & 1 deletion VL.CEF.Renderer/VL.CEF.Renderer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<OutputPath>bin</OutputPath>
Expand Down
8 changes: 4 additions & 4 deletions VL.CEF.Skia/VL.CEF.Skia.vl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Document xmlns:p="property" Id="FgyU0uYKYnINLXJUYAW0B1" LanguageVersion="2022.5.0-0683-g91567c285a" Version="0.128">
<NugetDependency Id="A2Y9F8qzKsrNqR2gVhultA" Location="VL.CoreLib" Version="2022.5.0-0683-g91567c285a" />
<Document xmlns:p="property" xmlns:r="reflection" Id="FgyU0uYKYnINLXJUYAW0B1" LanguageVersion="2023.5.2" Version="0.128">
<NugetDependency Id="A2Y9F8qzKsrNqR2gVhultA" Location="VL.CoreLib" Version="2023.5.2" />
<Patch Id="BZs5A6rRdrDOhDYS793S2G">
<Canvas Id="R7DKrVtvAwqMt5QhpdeTYK" DefaultCategory="CEF" CanvasType="FullCategory">
<!--
Expand Down Expand Up @@ -112,7 +112,7 @@
</Patch>
</Node>
</Patch>
<NugetDependency Id="Pa4n9gMiHfyPAmP1MTQUEf" Location="VL.Skia" Version="2022.5.0-0683-g91567c285a" />
<PlatformDependency Id="V00Dw32yWnSOJVwytTbLQb" Location="./lib/net6.0-windows/VL.CEF.Skia.dll" />
<NugetDependency Id="Pa4n9gMiHfyPAmP1MTQUEf" Location="VL.Skia" Version="2023.5.2" />
<PlatformDependency Id="V00Dw32yWnSOJVwytTbLQb" Location="./lib/net8.0-windows/VL.CEF.Skia.dll" />
<NugetDependency Id="Knu810rkN45OuFmlmqfa99" Location="VL.CEF" IsForward="true" Version="0.0.0" />
</Document>
2 changes: 1 addition & 1 deletion VL.CEF.Skia/src/VL.CEF.Skia.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputPath>..\lib</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

Expand Down
10 changes: 5 additions & 5 deletions VL.CEF.Stride/VL.CEF.Stride.vl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Document xmlns:p="property" Id="Le6ulaD4AYHNsgZQTPWgw1" LanguageVersion="2022.5.0-0683-g91567c285a" Version="0.128">
<NugetDependency Id="A2Y9F8qzKsrNqR2gVhultA" Location="VL.CoreLib" Version="2022.5.0-0683-g91567c285a" />
<Document xmlns:p="property" xmlns:r="reflection" Id="Le6ulaD4AYHNsgZQTPWgw1" LanguageVersion="2023.5.2" Version="0.128">
<NugetDependency Id="A2Y9F8qzKsrNqR2gVhultA" Location="VL.CoreLib" Version="2023.5.2" />
<Patch Id="BZs5A6rRdrDOhDYS793S2G">
<Canvas Id="R7DKrVtvAwqMt5QhpdeTYK" DefaultCategory="CEF" CanvasType="FullCategory">
<!--
Expand Down Expand Up @@ -112,8 +112,8 @@
</Patch>
</Node>
</Patch>
<NugetDependency Id="HPbFYrmwgPhPvXgZqFEIvs" Location="VL.Stride" Version="2022.5.0-0683-g91567c285a" />
<NugetDependency Id="IB2zAnzlQFnPHn5Uo120Vw" Location="Stride.Rendering" Version="4.1.0.1805" />
<PlatformDependency Id="V00Dw32yWnSOJVwytTbLQb" Location="./lib/net6.0-windows/VL.CEF.Stride.dll" />
<NugetDependency Id="HPbFYrmwgPhPvXgZqFEIvs" Location="VL.Stride" Version="2023.5.2" />
<NugetDependency Id="IB2zAnzlQFnPHn5Uo120Vw" Location="Stride.Rendering" Version="4.1.0.1838" />
<PlatformDependency Id="V00Dw32yWnSOJVwytTbLQb" Location="./lib/net8.0-windows/VL.CEF.Stride.dll" />
<NugetDependency Id="B2j9g6TO1esQANElMPYnOG" Location="VL.CEF" IsForward="true" Version="0.0.0" />
</Document>
2 changes: 1 addition & 1 deletion VL.CEF.Stride/src/VL.CEF.Stride.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputPath>..\lib</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

Expand Down
4 changes: 2 additions & 2 deletions VL.CEF/VL.CEF.vl
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,6 @@
</Patch>
</Node>
</Patch>
<PlatformDependency Id="V00Dw32yWnSOJVwytTbLQb" Location="./lib/net6.0/VL.CEF.dll" />
<PlatformDependency Id="Q0yqA5E83E6OSTFokLf2FS" Location="./lib/net6.0/Xilium.CefGlue.dll" />
<PlatformDependency Id="V00Dw32yWnSOJVwytTbLQb" Location="./lib/net8.0/VL.CEF.dll" />
<PlatformDependency Id="Q0yqA5E83E6OSTFokLf2FS" Location="./lib/net8.0/Xilium.CefGlue.dll" />
</Document>
2 changes: 1 addition & 1 deletion VL.CEF/src/VL.CEF.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputPath>..\lib</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

Expand Down
6 changes: 3 additions & 3 deletions VL.CEF/src/VL.CEF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<copyright>$copyright$</copyright>
<tags>$tags$</tags>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="net8.0">
</group>
</dependencies>
</metadata>
<files>
<file src="..\lib\net6.0\VL.CEF.dll" target="lib\net6.0" />
<file src="..\lib\net6.0\Xilium.CefGlue.dll" target="lib\net6.0" />
<file src="..\lib\net8.0\VL.CEF.dll" target="lib\net8.0" />
<file src="..\lib\net8.0\Xilium.CefGlue.dll" target="lib\net8.0" />
<file src="..\*.vl" target="" />
<file src="..\help\**" target="help" />
<file src="..\..\VL.CEF.Renderer\bin\**" target="renderer" />
Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand Down

0 comments on commit 208d5b9

Please sign in to comment.