Fixed FNA.Core

rds1983 · Aug 21, 2024 · 88cf89d · 88cf89d
1 parent cb10b07
commit 88cf89d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/build/Myra.FNA.Core.sln b/build/Myra.FNA.Core.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.1.32328.378
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D17FD092-A553-4770-A7A5-822661193436}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "..\..\FNA\FNA.Core.csproj", "{FB3FB9D6-52B2-464E-9C11-EF31B2573426}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Myra.FNA.Core", "..\src\Myra\Myra.FNA.Core.csproj", "{032CDE6F-256B-4545-BD4C-4396E90AF5CF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Myra.Tests.FNA.Core", "..\src\Myra.Tests\Myra.Tests.FNA.Core.csproj", "{088FC617-30F8-4ED8-BB4E-076C3107E0B2}"
@@ -27,16 +25,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Myra.Samples.CustomUIStyles
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DdsKtxXna.FNA.Core", "..\..\DdsKtxXna\DdsKtxXna\DdsKtxXna.FNA.Core.csproj", "{A28F13C3-64D4-44F6-AF27-FB866F52C332}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "..\..\FNA\FNA.Core.csproj", "{D05855F7-6D79-4646-94D8-C17662F2E8AB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FB3FB9D6-52B2-464E-9C11-EF31B2573426}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{FB3FB9D6-52B2-464E-9C11-EF31B2573426}.Debug|Any CPU.Build.0 = Debug|x64
-		{FB3FB9D6-52B2-464E-9C11-EF31B2573426}.Release|Any CPU.ActiveCfg = Release|x64
-		{FB3FB9D6-52B2-464E-9C11-EF31B2573426}.Release|Any CPU.Build.0 = Release|x64
 		{032CDE6F-256B-4545-BD4C-4396E90AF5CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{032CDE6F-256B-4545-BD4C-4396E90AF5CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{032CDE6F-256B-4545-BD4C-4396E90AF5CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,6 +73,10 @@ Global
 		{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);FNA;</DefineConstants>
   </PropertyGroup>

diff --git 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 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.CustomUIStylesheet</AssemblyName>
     <RootNamespace>Myra.Samples.CustomUIStylesheet</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);FNA</DefineConstants>
   </PropertyGroup>

diff --git 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 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>Myra.Samples.Notepad</AssemblyName>
     <RootNamespace>Myra.Samples.Notepad</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DefineConstants>$(DefineConstants);FNA;</DefineConstants>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
   </PropertyGroup>

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>
     <DefineConstants>$(DefineConstants);FNA;</DefineConstants>
     <AssemblyName>Myra.Samples.TextRendering</AssemblyName>

diff --git a/samples/UI/labelWithEllipsis.xmmp b/samples/UI/labelWithEllipsis.xmmp
@@ -0,0 +1,5 @@
+<Project>
+  <Panel>
+    <Label Text="Some Long Text Some Long Text" Wrap="True" AutoEllipsisMethod="Character" AutoEllipsisString="..." Width="125" Height="40" Background="#5756D5FF" Id="_label" />
+  </Panel>
+</Project>
diff --git a/src/MyraPad/MyraPad.FNA.Core.csproj b/src/MyraPad/MyraPad.FNA.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>MyraPad</AssemblyName>
     <RootNamespace>MyraPad</RootNamespace>
     <OutputPath>bin\FNA.Core\$(Configuration)</OutputPath>