Skip to content

Commit 36fecc7

Browse files
rds1983rds1983
committed
Some refactoring
1 parent 3f5a2f3 commit 36fecc7

File tree

12 files changed

+355
-400
lines changed

12 files changed

+355
-400
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
<RootNamespace>Myra</RootNamespace>
88
<Description>UI Library for MonoGame, FNA and Stride</Description>
99
<VersionPrefix>1.5.10</VersionPrefix>
10-
<XNAssetsVersion>0.7.7</XNAssetsVersion>
11-
<FontStashSharpVersion>1.4.1</FontStashSharpVersion>
12-
<LangVersion>8.0</LangVersion>
10+
<XNAssetsVersion>0.8.2</XNAssetsVersion>
11+
<FontStashSharpVersion>1.5.2</FontStashSharpVersion>
1312
<InfoLundinMathVersion>1.2.6</InfoLundinMathVersion>
1413
<MonoGameVersion>3.8.0.1641</MonoGameVersion>
15-
<AppMonoGameVersion>3.8.4</AppMonoGameVersion>
14+
<AppMonoGameVersion>3.8.4.1</AppMonoGameVersion>
1615
<StrideVersion>4.2.0.2067</StrideVersion>
1716
<AppTargetFramework>net8.0</AppTargetFramework>
1817
</PropertyGroup>

‎build/Myra.FNA.Core.sln‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyraPad.FNA.Core", "..\src\
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Myra.Samples.TextRendering.FNA.Core", "..\samples\Myra.Samples.TextRendering\Myra.Samples.TextRendering.FNA.Core.csproj", "{D963B41E-DF39-44A3-878B-857C8A3CB5F6}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XNAssets.FNA.Core", "..\..\XNAssets\src\XNAssets.FNA.Core.csproj", "{1609F0D5-B26B-41F1-B004-8C6BE9D11440}"
21-
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Myra.Samples.Notepad.FNA.Core", "..\samples\Myra.Samples.Notepad\Myra.Samples.Notepad.FNA.Core.csproj", "{F7D9FC22-B28D-494B-873D-96920E477552}"
2321
EndProject
2422
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Myra.Samples.CustomUIStylesheet.FNA.Core", "..\samples\Myra.Samples.CustomUIStylesheet\Myra.Samples.CustomUIStylesheet.FNA.Core.csproj", "{41A030C8-B98D-425A-9E62-AE069255D7E9}"
2523
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DdsKtxXna.FNA.Core", "..\..\DdsKtxXna\DdsKtxXna\DdsKtxXna.FNA.Core.csproj", "{A28F13C3-64D4-44F6-AF27-FB866F52C332}"
27-
EndProject
2824
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "..\..\FNA\FNA.Core.csproj", "{D05855F7-6D79-4646-94D8-C17662F2E8AB}"
2925
EndProject
26+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XNAssets.FNA.Core", "..\..\XNAssets\src\XNAssets\XNAssets.FNA.Core.csproj", "{11F5497E-0369-6518-2932-1CBC719F9555}"
29+
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XNAssets.FontStashSharp.FNA.Core", "..\..\XNAssets\src\XNAssets.FontStashSharp\XNAssets.FontStashSharp.FNA.Core.csproj", "{B4DF4D50-A964-9562-86A1-5568854CF7DE}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|Any CPU = Debug|Any CPU
@@ -57,10 +59,6 @@ Global
5759
{D963B41E-DF39-44A3-878B-857C8A3CB5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
5860
{D963B41E-DF39-44A3-878B-857C8A3CB5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
5961
{D963B41E-DF39-44A3-878B-857C8A3CB5F6}.Release|Any CPU.Build.0 = Release|Any CPU
60-
{1609F0D5-B26B-41F1-B004-8C6BE9D11440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61-
{1609F0D5-B26B-41F1-B004-8C6BE9D11440}.Debug|Any CPU.Build.0 = Debug|Any CPU
62-
{1609F0D5-B26B-41F1-B004-8C6BE9D11440}.Release|Any CPU.ActiveCfg = Release|Any CPU
63-
{1609F0D5-B26B-41F1-B004-8C6BE9D11440}.Release|Any CPU.Build.0 = Release|Any CPU
6462
{F7D9FC22-B28D-494B-873D-96920E477552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6563
{F7D9FC22-B28D-494B-873D-96920E477552}.Debug|Any CPU.Build.0 = Debug|Any CPU
6664
{F7D9FC22-B28D-494B-873D-96920E477552}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,23 +67,31 @@ Global
6967
{41A030C8-B98D-425A-9E62-AE069255D7E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
7068
{41A030C8-B98D-425A-9E62-AE069255D7E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
7169
{41A030C8-B98D-425A-9E62-AE069255D7E9}.Release|Any CPU.Build.0 = Release|Any CPU
72-
{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73-
{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Debug|Any CPU.Build.0 = Debug|Any CPU
74-
{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Release|Any CPU.ActiveCfg = Release|Any CPU
75-
{A28F13C3-64D4-44F6-AF27-FB866F52C332}.Release|Any CPU.Build.0 = Release|Any CPU
7670
{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7771
{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
7872
{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
7973
{D05855F7-6D79-4646-94D8-C17662F2E8AB}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{11F5497E-0369-6518-2932-1CBC719F9555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{11F5497E-0369-6518-2932-1CBC719F9555}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{11F5497E-0369-6518-2932-1CBC719F9555}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{11F5497E-0369-6518-2932-1CBC719F9555}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{B4DF4D50-A964-9562-86A1-5568854CF7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{B4DF4D50-A964-9562-86A1-5568854CF7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{B4DF4D50-A964-9562-86A1-5568854CF7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{B4DF4D50-A964-9562-86A1-5568854CF7DE}.Release|Any CPU.Build.0 = Release|Any CPU
8082
EndGlobalSection
8183
GlobalSection(SolutionProperties) = preSolution
8284
HideSolutionNode = FALSE
8385
EndGlobalSection
8486
GlobalSection(NestedProjects) = preSolution
8587
{08F5F0B8-6573-46DF-BBCB-AB8E22731880} = {D17FD092-A553-4770-A7A5-822661193436}
88+
{94F1DDDF-5DF9-4033-B60C-1B33E963AEA5} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
8689
{D963B41E-DF39-44A3-878B-857C8A3CB5F6} = {D17FD092-A553-4770-A7A5-822661193436}
8790
{F7D9FC22-B28D-494B-873D-96920E477552} = {D17FD092-A553-4770-A7A5-822661193436}
8891
{41A030C8-B98D-425A-9E62-AE069255D7E9} = {D17FD092-A553-4770-A7A5-822661193436}
92+
{D05855F7-6D79-4646-94D8-C17662F2E8AB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
93+
{11F5497E-0369-6518-2932-1CBC719F9555} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
94+
{B4DF4D50-A964-9562-86A1-5568854CF7DE} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
8995
EndGlobalSection
9096
GlobalSection(ExtensibilityGlobals) = postSolution
9197
SolutionGuid = {A9C9D369-EE58-4E9D-B9FE-63023B644741}

‎samples/Myra.Samples.Silk.NET/Myra.Samples.Silk.NET.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
<TargetFramework>$(AppTargetFramework)</TargetFramework>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
</PropertyGroup>
9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
10-
<LangVersion>9.0</LangVersion>
11-
</PropertyGroup>
12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13-
<LangVersion>9.0</LangVersion>
14-
</PropertyGroup>
159

1610
<ItemGroup>
1711
<PackageReference Include="Silk.NET.Input" Version="2.16.0" />

0 commit comments

Comments
 (0)