Skip to content

Commit 1717890

Browse files
EmptyKeysEmptyKeys
committed
MonoGame Basic Example Update
Update to UI 3.1
1 parent ab2242f commit 1717890

36 files changed

Lines changed: 1502 additions & 1129 deletions

‎BasicUI_MonoGame/.vs/BasicUI_MonoGame/v15/Server/sqlite3/db.lock‎

Whitespace-only changes.

‎BasicUI_MonoGame/.vs/BasicUI_MonoGame/v15/Server/sqlite3/storage.ide‎

4.75 MB
Binary file not shown.

‎BasicUI_MonoGame/.vs/BasicUI_MonoGame/v15/Server/sqlite3/storage.ide-shm‎

32 KB
Binary file not shown.

‎BasicUI_MonoGame/.vs/BasicUI_MonoGame/v15/Server/sqlite3/storage.ide-wal‎

1.84 MB
Binary file not shown.

‎BasicUI_MonoGame/BasicUI_MonoGame.sln‎

Lines changed: 57 additions & 425 deletions
Large diffs are not rendered by default.

‎BasicUI_MonoGame/BasicUI_MonoGame_Linux/BasicUI_MonoGame_Linux.csproj‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -11,8 +11,10 @@
1111
<RootNamespace>BasicUI_MonoGame_Linux</RootNamespace>
1212
<AssemblyName>BasicUI_MonoGame_Linux</AssemblyName>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1515
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1618
</PropertyGroup>
1719
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1820
<PlatformTarget>x86</PlatformTarget>
@@ -67,25 +69,20 @@
6769
<Compile Include="Properties\AssemblyInfo.cs" />
6870
</ItemGroup>
6971
<ItemGroup>
70-
<Reference Include="EmptyKeys.UserInterface, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
72-
<Private>True</Private>
72+
<Reference Include="EmptyKeys.UserInterface, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
73+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.1.0\lib\netstandard2.0\EmptyKeys.UserInterface.dll</HintPath>
7374
</Reference>
74-
<Reference Include="EmptyKeys.UserInterface.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
76-
<Private>True</Private>
75+
<Reference Include="EmptyKeys.UserInterface.Core, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
76+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.1.0\lib\netstandard2.0\EmptyKeys.UserInterface.Core.dll</HintPath>
7777
</Reference>
78-
<Reference Include="EmptyKeys.UserInterface.Debug, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
79-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
80-
<Private>True</Private>
78+
<Reference Include="EmptyKeys.UserInterface.Debug, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.1.0\lib\netstandard2.0\EmptyKeys.UserInterface.Debug.dll</HintPath>
8180
</Reference>
8281
<Reference Include="EmptyKeys.UserInterface.MonoGame, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
83-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MonoGame\AnyCPU\EmptyKeys.UserInterface.MonoGame.dll</HintPath>
84-
<Private>True</Private>
82+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.1.0\lib\netstandard2.0\EmptyKeys.UserInterface.MonoGame.dll</HintPath>
8583
</Reference>
86-
<Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
87-
<HintPath>..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
88-
<Private>True</Private>
84+
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
85+
<HintPath>..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
8986
</Reference>
9087
<Reference Include="System" />
9188
<Reference Include="System.Xml" />
@@ -102,12 +99,7 @@
10299
</Content>
103100
<Content Include="Icon.ico" />
104101
<Content Include="license.txt" />
105-
</ItemGroup>
106-
<ItemGroup>
107-
<ProjectReference Include="..\GameUILibrary\GameUILibrary.csproj">
108-
<Project>{556DEE67-1170-4F93-88DE-2175C97FCF3C}</Project>
109-
<Name>GameUILibrary</Name>
110-
</ProjectReference>
102+
<Content Include="shaders\DirectionalBlurShader.fx" />
111103
</ItemGroup>
112104
<ItemGroup>
113105
<Content Include="..\Content\bin\Linux\Click.xnb">
@@ -163,13 +155,26 @@
163155
<Link>x64\libSDL2-2.0.so.0</Link>
164156
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
165157
</Content>
166-
<None Include="MonoGame.Framework.dll.config">
167-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
168-
</None>
169158
<None Include="packages.config" />
170-
<None Include="shaders\DirectionalBlurShader.fx" />
159+
</ItemGroup>
160+
<ItemGroup>
161+
<ProjectReference Include="..\GameData\GameData.Standard.csproj">
162+
<Project>{d01c5caa-f771-4a3d-ac5f-ce61bafc7d64}</Project>
163+
<Name>GameData.Standard</Name>
164+
</ProjectReference>
165+
<ProjectReference Include="..\GameUILibrary\GameUILibrary.Standard.csproj">
166+
<Project>{03a66060-385b-4fe8-8ca7-c01d16d38011}</Project>
167+
<Name>GameUILibrary.Standard</Name>
168+
</ProjectReference>
171169
</ItemGroup>
172170
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
171+
<Import Project="..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets" Condition="Exists('..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" />
172+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
173+
<PropertyGroup>
174+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
175+
</PropertyGroup>
176+
<Error Condition="!Exists('..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets'))" />
177+
</Target>
173178
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
174179
Other similar extension points exist, see Microsoft.Common.targets.
175180
<Target Name="BeforeBuild">

‎BasicUI_MonoGame/BasicUI_MonoGame_Linux/MonoGame.Framework.dll.config‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎BasicUI_MonoGame/BasicUI_MonoGame_Linux/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

‎BasicUI_MonoGame/BasicUI_MonoGame_Linux/license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
The MIT License (MIT)
33

4-
Copyright (c) 2017 Empty Keys, Filip Dušek, www.emptykeys.com
4+
Copyright (c) 2018 Empty Keys, Filip Dušek, www.emptykeys.com
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎BasicUI_MonoGame/BasicUI_MonoGame_Linux/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EmptyKeysUI_MonoGame" version="3.0.0" targetFramework="net45" />
4-
<package id="MonoGame.Framework.DesktopGL" version="3.6.0.1625" targetFramework="net45" />
3+
<package id="EmptyKeysUI_MonoGame" version="3.1.0" targetFramework="net462" />
4+
<package id="MonoGame.Framework.DesktopGL" version="3.7.1.189" targetFramework="net462" />
55
</packages>

0 commit comments

Comments
 (0)