diff --git a/Directory.Build.props b/Directory.Build.props index cde99f8d..d927b6e0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,12 +7,13 @@ Myra UI Library for MonoGame, FNA and Stride 1.5.6 - 0.7.1 - 1.3.6 + 0.7.3 + 1.3.8 8.0 1.2.6 3.8.0.1641 - 3.8.1.303 + 3.8.2.1105 4.2.0.2067 + net8.0 \ No newline at end of file diff --git a/buildBinaryDistribution.ps1 b/buildBinaryDistribution.ps1 index 074f9682..899b7449 100644 --- a/buildBinaryDistribution.ps1 +++ b/buildBinaryDistribution.ps1 @@ -12,9 +12,9 @@ New-Item -ItemType directory -Path "ZipPackage\Assets\fonts" New-Item -ItemType directory -Path "ZipPackage\Assets\images" function Copy-Sample([string]$SampleName) { - Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net6.0\Myra.Samples.$SampleName.exe" -Destination "ZipPackage" - Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net6.0\Myra.Samples.$SampleName.dll" -Destination "ZipPackage" - Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net6.0\Myra.Samples.$SampleName.runtimeconfig.json" -Destination "ZipPackage" + Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net8.0\Myra.Samples.$SampleName.exe" -Destination "ZipPackage" + Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net8.0\Myra.Samples.$SampleName.dll" -Destination "ZipPackage" + Copy-Item -Path "samples\Myra.Samples.$SampleName\bin\MonoGame\Release\net8.0\Myra.Samples.$SampleName.runtimeconfig.json" -Destination "ZipPackage" } # Copy-Item -Path files @@ -34,20 +34,20 @@ Copy-Sample "ObjectEditor" Copy-Item -Path "samples\Myra.Samples.ObjectEditor\image.png" -Destination "ZipPackage" Copy-Sample "TextRendering" Copy-Item -Path "samples\Stylesheets\*" -Destination "ZipPackage\Stylesheets\" -Recurse -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\System.CodeDom.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MyraPad.exe" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MyraPad.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MyraPad.runtimeconfig.json" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\FontStashSharp.*" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\StbImageSharp.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\StbTrueTypeSharp.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\Cyotek.Drawing.BitmapFont.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\AssetManagementBase.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\DdsKtxXna.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\XNAssets.MonoGame.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\info.lundin.math.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\MonoGame.Framework.dll" -Destination "ZipPackage" -Copy-Item -Path "src\MyraPad\bin\Release\net6.0\runtimes" -Destination "ZipPackage" -Recurse +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\System.CodeDom.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MyraPad.exe" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MyraPad.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MyraPad.runtimeconfig.json" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\FontStashSharp.*" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\StbImageSharp.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\StbTrueTypeSharp.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\Cyotek.Drawing.BitmapFont.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\AssetManagementBase.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\DdsKtxXna.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\XNAssets.MonoGame.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\info.lundin.math.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\MonoGame.Framework.dll" -Destination "ZipPackage" +Copy-Item -Path "src\MyraPad\bin\Release\net8.0\runtimes" -Destination "ZipPackage" -Recurse # Compress Rename-Item "ZipPackage" "Myra.$version" diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.FNA.Core.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.FNA.Core.csproj index c888f097..15659957 100644 --- a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.FNA.Core.csproj +++ b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.FNA.Core.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + $(AppTargetFramework) bin\FNA.Core\$(Configuration) $(DefineConstants);FNA; diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj index eb8966da..09c521b9 100644 --- a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj +++ b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) $(DefineConstants);MONOGAME Myra.Samples.AllWidgets diff --git a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.Stride.csproj b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.Stride.csproj index 2139d329..f17d3550 100644 --- a/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.Stride.csproj +++ b/samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.Stride.csproj @@ -1,13 +1,13 @@  Exe - net8.0 + $(AppTargetFramework) bin\Stride\$(Configuration) $(DefineConstants);STRIDE - + diff --git a/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj b/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj index 25673d3f..9a32fe6c 100644 --- a/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj +++ b/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj @@ -1,6 +1,6 @@  - net6.0-android + $(AppTargetFramework)-android 23 Exe $(DefineConstants);MONOGAME;ANDROID diff --git a/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj b/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj index 692d4806..29907dbf 100644 --- a/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj +++ b/samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.FNA.Core.csproj b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.FNA.Core.csproj index 54d7ff7a..4a8783ab 100644 --- a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.FNA.Core.csproj +++ b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.FNA.Core.csproj @@ -3,7 +3,7 @@ Exe Myra.Samples.CustomUIStylesheet Myra.Samples.CustomUIStylesheet - net8.0 + $(AppTargetFramework) bin\FNA.Core\$(Configuration) $(DefineConstants);FNA diff --git a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj index cf070983..c036ff2d 100644 --- a/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj +++ b/samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj @@ -3,7 +3,7 @@ WinExe Myra.Samples.CustomUIStylesheet Myra.Samples.CustomUIStylesheet - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj b/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj index b4d9732c..44606bde 100644 --- a/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj +++ b/samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj b/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj index b4d9732c..44606bde 100644 --- a/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj +++ b/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj b/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj index 38390364..23b594a6 100644 --- a/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj +++ b/samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj b/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj index b4d9732c..44606bde 100644 --- a/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj +++ b/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj b/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj index b4d9732c..44606bde 100644 --- a/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj +++ b/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.FNA.Core.csproj b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.FNA.Core.csproj index 72885232..f051e9c1 100644 --- a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.FNA.Core.csproj +++ b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.FNA.Core.csproj @@ -3,7 +3,7 @@ Exe Myra.Samples.Notepad Myra.Samples.Notepad - net8.0 + $(AppTargetFramework) $(DefineConstants);FNA; bin\FNA.Core\$(Configuration) diff --git a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj index 4ae02e3d..187853b1 100644 --- a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj +++ b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj @@ -3,7 +3,7 @@ Exe Myra.Samples.Notepad Myra.Samples.Notepad - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj b/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj index 54806f1b..f209cd1f 100644 --- a/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj +++ b/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj b/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj index fab9ef55..e96a6c66 100644 --- a/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj +++ b/samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj @@ -3,7 +3,7 @@ WinExe Myra.Samples.AllWidgets Myra.Samples.AllWidgets - net6.0 + $(AppTargetFramework) $(DefineConstants);PLATFORM_AGNOSTIC diff --git a/samples/Myra.Samples.Silk.NET.TrippyGL/Myra.Samples.Silk.NET.TrippyGL.csproj b/samples/Myra.Samples.Silk.NET.TrippyGL/Myra.Samples.Silk.NET.TrippyGL.csproj index 38ee92b2..a09447ac 100644 --- a/samples/Myra.Samples.Silk.NET.TrippyGL/Myra.Samples.Silk.NET.TrippyGL.csproj +++ b/samples/Myra.Samples.Silk.NET.TrippyGL/Myra.Samples.Silk.NET.TrippyGL.csproj @@ -3,7 +3,7 @@ Exe Myra.Samples.AllWidgets Myra.Samples.AllWidgets - net6.0 + $(AppTargetFramework) diff --git a/samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj b/samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj index da260ef2..a9cfc1ae 100644 --- a/samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj +++ b/samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj @@ -3,7 +3,7 @@ Exe Myra.Samples.AllWidgets Myra.Samples.AllWidgets - net6.0 + $(AppTargetFramework) true diff --git a/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj b/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj index e47fb181..6d626304 100644 --- a/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj +++ b/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) diff --git a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.FNA.Core.csproj b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.FNA.Core.csproj index 2f89d663..e950345a 100644 --- a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.FNA.Core.csproj +++ b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.FNA.Core.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + $(AppTargetFramework) bin\FNA.Core\$(Configuration) $(DefineConstants);FNA; Myra.Samples.TextRendering diff --git a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj index 05de9418..18d3241c 100644 --- a/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj +++ b/samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) $(DefineConstants);MONOGAME Myra.Samples.TextRendering diff --git a/src/Myra.Tests/Myra.Tests.FNA.Core.csproj b/src/Myra.Tests/Myra.Tests.FNA.Core.csproj index 6bae88f5..3d940357 100644 --- a/src/Myra.Tests/Myra.Tests.FNA.Core.csproj +++ b/src/Myra.Tests/Myra.Tests.FNA.Core.csproj @@ -1,7 +1,7 @@  $(DefineConstants);FNA - net8.0 + $(AppTargetFramework) bin\MonoGame\$(Configuration) Library Myra.Tests diff --git a/src/Myra.Tests/Myra.Tests.MonoGame.csproj b/src/Myra.Tests/Myra.Tests.MonoGame.csproj index ab257c00..5c54b698 100644 --- a/src/Myra.Tests/Myra.Tests.MonoGame.csproj +++ b/src/Myra.Tests/Myra.Tests.MonoGame.csproj @@ -1,7 +1,7 @@  $(DefineConstants);MONOGAME - net8.0-windows + $(AppTargetFramework)-windows bin\MonoGame\$(Configuration) Library Myra.Tests diff --git a/src/Myra/Graphics2D/UI/Containers/SplitPane.cs b/src/Myra/Graphics2D/UI/Containers/SplitPane.cs index 67050f19..581dd2ab 100644 --- a/src/Myra/Graphics2D/UI/Containers/SplitPane.cs +++ b/src/Myra/Graphics2D/UI/Containers/SplitPane.cs @@ -103,9 +103,9 @@ public override void OnTouchMoved() secondProportion = _layout.RowsProportions[handleIndex + 1]; } - if (fp >= 0) + var fp2 = firstProportion.Value + secondProportion.Value - fp; + if (fp >= 0 && fp2 >= 0) { - var fp2 = firstProportion.Value + secondProportion.Value - fp; firstProportion.Value = fp; secondProportion.Value = fp2; FireProportionsChanged(); diff --git a/src/Myra/Myra.FNA.Core.csproj b/src/Myra/Myra.FNA.Core.csproj index 46bfa81a..3dac95cb 100644 --- a/src/Myra/Myra.FNA.Core.csproj +++ b/src/Myra/Myra.FNA.Core.csproj @@ -1,7 +1,7 @@  $(DefineConstants);FNA - net8.0 + $(AppTargetFramework) Myra Myra.FNA.Core bin\FNA.Core\$(Configuration) diff --git a/src/Myra/Myra.PlatformAgnostic.csproj b/src/Myra/Myra.PlatformAgnostic.csproj index 4c868682..9bcf5b5e 100644 --- a/src/Myra/Myra.PlatformAgnostic.csproj +++ b/src/Myra/Myra.PlatformAgnostic.csproj @@ -19,6 +19,5 @@ - \ No newline at end of file diff --git a/src/Myra/Myra.Stride.csproj b/src/Myra/Myra.Stride.csproj index 9b70554e..9d068aec 100644 --- a/src/Myra/Myra.Stride.csproj +++ b/src/Myra/Myra.Stride.csproj @@ -1,7 +1,7 @@  $(DefineConstants);STRIDE - net8.0 + $(AppTargetFramework) Myra.Stride Myra bin\Stride\$(Configuration) diff --git a/src/MyraPad/MyraPad.FNA.Core.csproj b/src/MyraPad/MyraPad.FNA.Core.csproj index 2cfe6d2c..fc10b42c 100644 --- a/src/MyraPad/MyraPad.FNA.Core.csproj +++ b/src/MyraPad/MyraPad.FNA.Core.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + $(AppTargetFramework) MyraPad MyraPad bin\FNA.Core\$(Configuration) diff --git a/src/MyraPad/MyraPad.csproj b/src/MyraPad/MyraPad.csproj index 9b3f5058..53bd5191 100644 --- a/src/MyraPad/MyraPad.csproj +++ b/src/MyraPad/MyraPad.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + $(AppTargetFramework) MyraPad MyraPad $(DefineConstants);MONOGAME