Skip to content

Commit 3369331

Browse files
committed
Update
1 parent ad45f67 commit 3369331

20 files changed

+223315
-13
lines changed

CollisionGrid/CollisionGrid.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<HintPath>..\packages\MonoGame.Extended.0.5.149\lib\MonoGame.Extended.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="MonoGame.Framework, Version=3.5.1.1679, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\MonoGame.Framework.WindowsDX.3.5.1.1679\lib\net40\MonoGame.Framework.dll</HintPath>
46-
<Private>True</Private>
44+
<Reference Include="MonoGame.Framework, Version=3.6.0.1060, Culture=neutral, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\Test\_EXTERNAL_LIBRARIES\MonoGame\MonoGame.Framework.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Core" />

CollisionGrid/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<packages>
33
<package id="JetBrains.Annotations" version="10.1.4" targetFramework="net45" />
44
<package id="MonoGame.Extended" version="0.5.149" targetFramework="net45" />
5-
<package id="MonoGame.Framework.WindowsDX" version="3.5.1.1679" targetFramework="net461" />
65
<package id="System.Runtime" version="4.0.20" targetFramework="net461" />
76
</packages>

Test/Main.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// ***************************************************************************
2727

2828
using System;
29-
using System.Security.Principal;
29+
using System.Windows.Forms;
3030
using Microsoft.Xna.Framework;
3131
using Microsoft.Xna.Framework.Graphics;
3232

@@ -47,12 +47,18 @@ public Main()
4747
GraphicsDeviceManager.PreferredBackBufferWidth = MIN_SCREEN_RESOLUTION_WIDTH;
4848
GraphicsDeviceManager.PreferredBackBufferHeight = MIN_SCREEN_RESOLUTION_HEIGHT;
4949
GraphicsDeviceManager.IsFullScreen = false;
50+
GraphicsDeviceManager.PreparingDeviceSettings += PrepareDeviceSettings;
5051

5152
Window.AllowUserResizing = true;
5253
Window.Position = Point.Zero;
5354
IsMouseVisible = true;
5455
}
5556

57+
void PrepareDeviceSettings(object sender, PreparingDeviceSettingsEventArgs e)
58+
{
59+
e.GraphicsDeviceInformation.GraphicsProfile = GraphicsProfile.Reach;
60+
}
61+
5662
protected override void Initialize()
5763
{
5864
DrawableGrid grid = new DrawableGrid(this, new SpriteBatch(GraphicsDevice), 700, 700, 40, 40);

Test/Test.csproj

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@
1212
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15+
<PublishUrl>publish\</PublishUrl>
16+
<Install>true</Install>
17+
<InstallFrom>Disk</InstallFrom>
18+
<UpdateEnabled>false</UpdateEnabled>
19+
<UpdateMode>Foreground</UpdateMode>
20+
<UpdateInterval>7</UpdateInterval>
21+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
22+
<UpdatePeriodically>false</UpdatePeriodically>
23+
<UpdateRequired>false</UpdateRequired>
24+
<MapFileExtensions>true</MapFileExtensions>
25+
<ApplicationRevision>0</ApplicationRevision>
26+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27+
<IsWebBootstrapper>false</IsWebBootstrapper>
28+
<UseApplicationTrust>false</UseApplicationTrust>
29+
<BootstrapperEnabled>true</BootstrapperEnabled>
1530
</PropertyGroup>
1631
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1732
<DebugSymbols>true</DebugSymbols>
@@ -35,17 +50,22 @@
3550
<PropertyGroup>
3651
<StartupObject>Test.Program</StartupObject>
3752
</PropertyGroup>
53+
<PropertyGroup>
54+
<ApplicationManifest>app.manifest</ApplicationManifest>
55+
</PropertyGroup>
3856
<ItemGroup>
3957
<Reference Include="MonoGame.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4058
<HintPath>..\packages\MonoGame.Extended.0.5.149\lib\MonoGame.Extended.dll</HintPath>
4159
<Private>True</Private>
4260
</Reference>
43-
<Reference Include="MonoGame.Framework, Version=3.5.1.1679, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MonoGame.Framework.WindowsDX.3.5.1.1679\lib\net40\MonoGame.Framework.dll</HintPath>
45-
<Private>True</Private>
61+
<Reference Include="MonoGame.Framework, Version=3.6.0.1060, Culture=neutral, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>_EXTERNAL_LIBRARIES\MonoGame\MonoGame.Framework.dll</HintPath>
4664
</Reference>
4765
<Reference Include="System" />
4866
<Reference Include="System.Core" />
67+
<Reference Include="System.Drawing" />
68+
<Reference Include="System.Windows.Forms" />
4969
<Reference Include="System.Xml.Linq" />
5070
<Reference Include="System.Data.DataSetExtensions" />
5171
<Reference Include="Microsoft.CSharp" />
@@ -66,9 +86,47 @@
6686
</ProjectReference>
6787
</ItemGroup>
6888
<ItemGroup>
69-
<None Include="app.config" />
89+
<None Include="app.manifest" />
7090
<None Include="packages.config" />
7191
</ItemGroup>
92+
<ItemGroup>
93+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\external\OpenTK.dll" />
94+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\Lidgren.Network.dll" />
95+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\Lidgren.Network.xml" />
96+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\MonoGame.Framework.dll" />
97+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\MonoGame.Framework.Net.dll" />
98+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\MonoGame.Framework.Net.xml" />
99+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.Direct2D1.dll" />
100+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.Direct2D1.xml" />
101+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.Direct3D11.dll" />
102+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.Direct3D11.xml" />
103+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.Direct3D9.dll" />
104+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.Direct3D9.xml" />
105+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.dll" />
106+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.DXGI.dll" />
107+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.DXGI.xml" />
108+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.MediaFoundation.dll" />
109+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.MediaFoundation.xml" />
110+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.RawInput.dll" />
111+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.RawInput.xml" />
112+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.XAudio2.dll" />
113+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.XAudio2.xml" />
114+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.XInput.dll" />
115+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.XInput.xml" />
116+
<Content Include="_EXTERNAL_LIBRARIES\MonoGame\SharpDX.xml" />
117+
</ItemGroup>
118+
<ItemGroup>
119+
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
120+
<Visible>False</Visible>
121+
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
122+
<Install>true</Install>
123+
</BootstrapperPackage>
124+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
125+
<Visible>False</Visible>
126+
<ProductName>.NET Framework 3.5 SP1</ProductName>
127+
<Install>false</Install>
128+
</BootstrapperPackage>
129+
</ItemGroup>
72130
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
73131
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
74132
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)