Skip to content

Commit

Permalink
Fixes #430
Browse files Browse the repository at this point in the history
  • Loading branch information
@rds1983
rds1983 committed Nov 4, 2023
1 parent 359b1b2 commit f60453c
Show file tree
Hide file tree
Showing 16 changed files with 19 additions and 18 deletions.
7 changes: 4 additions & 3 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
<RootNamespace>Myra</RootNamespace>
<Description>UI Library for MonoGame, FNA and Stride</Description>
<VersionPrefix>1.5.2</VersionPrefix>
<XNAssetsVersion>0.7.0</XNAssetsVersion>
<FontStashSharpVersion>1.3.2</FontStashSharpVersion>
<XNAssetsVersion>0.7.1</XNAssetsVersion>
<FontStashSharpVersion>1.3.3</FontStashSharpVersion>
<LangVersion>8.0</LangVersion>
<InfoLundinMathVersion>1.2.6</InfoLundinMathVersion>
<MonoGameVersion>3.8.1.303</MonoGameVersion>
<MonoGameVersion>3.8.0.1641</MonoGameVersion>
<AppMonoGameVersion>3.8.1.303</AppMonoGameVersion>
<StrideVersion>4.1.0.1728</StrideVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion samples/Myra.Samples.AllWidgets/Myra.Samples.AllWidgets.MonoGame.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.AssetManagement/Myra.Samples.AssetManagement.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.CustomUIStylesheet/Myra.Samples.CustomUIStylesheet.MonoGame.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.CustomWidgets/Myra.Samples.CustomWidgets.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.GridContainer/Myra.Samples.GridContainer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.PlatformAgnostic/Myra.Samples.PlatformAgnostic.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.TextRendering/Myra.Samples.TextRendering.MonoGame.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Myra/Myra.MonoGame.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Myra</AssemblyName>
<PackageId>Myra</PackageId>
<OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/MyraPad/MyraPad.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(MonoGameVersion)" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="$(AppMonoGameVersion)" />
<PackageReference Include="System.CodeDom" Version="6.0.0" />
</ItemGroup>

Expand Down

0 comments on commit f60453c

Please sign in to comment.