Skip to content

Commit d762691

Browse files
EmptyKeysEmptyKeys
committed
Update of examples for new Monogame 3.8
Updated Monogame Win Desktop project and Empty Monogame Example
1 parent 16235ed commit d762691

26 files changed

Lines changed: 159 additions & 91 deletions

File tree

‎BasicUI_MonoGame/.vs/BasicUI_MonoGame/DesignTimeBuild/.dtbcache‎

299 KB
Binary file not shown.

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

2.06 MB
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

2.09 MB
Binary file not shown.

‎BasicUI_MonoGame/BasicUI_MonoGame_Win_Desktop/BasicUI_MonoGame_Win_Desktop.csproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -65,47 +65,47 @@
6565
<Compile Include="Properties\AssemblyInfo.cs" />
6666
</ItemGroup>
6767
<ItemGroup>
68-
<Reference Include="EmptyKeys.UserInterface, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.2.0\lib\netstandard2.0\EmptyKeys.UserInterface.dll</HintPath>
68+
<Reference Include="EmptyKeys.UserInterface, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.3.0\lib\netstandard2.0\EmptyKeys.UserInterface.dll</HintPath>
7070
</Reference>
71-
<Reference Include="EmptyKeys.UserInterface.Core, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
72-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.2.0\lib\netstandard2.0\EmptyKeys.UserInterface.Core.dll</HintPath>
71+
<Reference Include="EmptyKeys.UserInterface.Core, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.3.0\lib\netstandard2.0\EmptyKeys.UserInterface.Core.dll</HintPath>
7373
</Reference>
74-
<Reference Include="EmptyKeys.UserInterface.Debug, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.2.0\lib\netstandard2.0\EmptyKeys.UserInterface.Debug.dll</HintPath>
74+
<Reference Include="EmptyKeys.UserInterface.Debug, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.3.0\lib\netstandard2.0\EmptyKeys.UserInterface.Debug.dll</HintPath>
7676
</Reference>
77-
<Reference Include="EmptyKeys.UserInterface.MonoGame, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.2.0\lib\netstandard2.0\EmptyKeys.UserInterface.MonoGame.dll</HintPath>
77+
<Reference Include="EmptyKeys.UserInterface.MonoGame, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\packages\EmptyKeysUI_MonoGame.3.3.0\lib\netstandard2.0\EmptyKeys.UserInterface.MonoGame.dll</HintPath>
7979
</Reference>
80-
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
81-
<HintPath>..\packages\MonoGame.Framework.WindowsDX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
80+
<Reference Include="MonoGame.Framework, Version=3.8.0.1641, Culture=neutral, processorArchitecture=MSIL">
81+
<HintPath>..\packages\MonoGame.Framework.WindowsDX.3.8.0.1641\lib\net452\MonoGame.Framework.dll</HintPath>
8282
</Reference>
83-
<Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
84-
<HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
83+
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
84+
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
8585
</Reference>
86-
<Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
87-
<HintPath>..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
86+
<Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
87+
<HintPath>..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
8888
</Reference>
89-
<Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
90-
<HintPath>..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
89+
<Reference Include="SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
90+
<HintPath>..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
9191
</Reference>
92-
<Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
93-
<HintPath>..\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
92+
<Reference Include="SharpDX.Direct3D9, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
93+
<HintPath>..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll</HintPath>
9494
</Reference>
95-
<Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
96-
<HintPath>..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
95+
<Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
96+
<HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
9797
</Reference>
98-
<Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
99-
<HintPath>..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
98+
<Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
99+
<HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
100100
</Reference>
101-
<Reference Include="SharpDX.MediaFoundation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
102-
<HintPath>..\packages\SharpDX.MediaFoundation.4.0.1\lib\net45\SharpDX.MediaFoundation.dll</HintPath>
101+
<Reference Include="SharpDX.MediaFoundation, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
102+
<HintPath>..\packages\SharpDX.MediaFoundation.4.2.0\lib\net45\SharpDX.MediaFoundation.dll</HintPath>
103103
</Reference>
104-
<Reference Include="SharpDX.XAudio2, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
105-
<HintPath>..\packages\SharpDX.XAudio2.4.0.1\lib\net45\SharpDX.XAudio2.dll</HintPath>
104+
<Reference Include="SharpDX.XAudio2, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
105+
<HintPath>..\packages\SharpDX.XAudio2.4.2.0\lib\net45\SharpDX.XAudio2.dll</HintPath>
106106
</Reference>
107-
<Reference Include="SharpDX.XInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
108-
<HintPath>..\packages\SharpDX.XInput.4.0.1\lib\net45\SharpDX.XInput.dll</HintPath>
107+
<Reference Include="SharpDX.XInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
108+
<HintPath>..\packages\SharpDX.XInput.4.2.0\lib\net45\SharpDX.XInput.dll</HintPath>
109109
</Reference>
110110
<Reference Include="System" />
111111
<Reference Include="System.Xml" />
@@ -170,12 +170,12 @@
170170
<None Include="shaders\DirectionalBlurShader.fx" />
171171
</ItemGroup>
172172
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
173-
<Import Project="..\packages\MonoGame.Framework.WindowsDX.3.7.1.189\build\MonoGame.Framework.WindowsDX.targets" Condition="Exists('..\packages\MonoGame.Framework.WindowsDX.3.7.1.189\build\MonoGame.Framework.WindowsDX.targets')" />
173+
<Import Project="..\packages\MonoGame.Framework.WindowsDX.3.8.0.1641\build\MonoGame.Framework.WindowsDX.targets" Condition="Exists('..\packages\MonoGame.Framework.WindowsDX.3.8.0.1641\build\MonoGame.Framework.WindowsDX.targets')" />
174174
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
175175
<PropertyGroup>
176176
<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>
177177
</PropertyGroup>
178-
<Error Condition="!Exists('..\packages\MonoGame.Framework.WindowsDX.3.7.1.189\build\MonoGame.Framework.WindowsDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Framework.WindowsDX.3.7.1.189\build\MonoGame.Framework.WindowsDX.targets'))" />
178+
<Error Condition="!Exists('..\packages\MonoGame.Framework.WindowsDX.3.8.0.1641\build\MonoGame.Framework.WindowsDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Framework.WindowsDX.3.8.0.1641\build\MonoGame.Framework.WindowsDX.targets'))" />
179179
</Target>
180180
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
181181
Other similar extension points exist, see Microsoft.Common.targets.

‎BasicUI_MonoGame/BasicUI_MonoGame_Win_Desktop/app.config‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
4+
<runtime>
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentity name="SharpDX.DXGI" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
8+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
9+
</dependentAssembly>
10+
<dependentAssembly>
11+
<assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
12+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
13+
</dependentAssembly>
14+
<dependentAssembly>
15+
<assemblyIdentity name="SharpDX.Direct3D11" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
17+
</dependentAssembly>
18+
<dependentAssembly>
19+
<assemblyIdentity name="SharpDX.MediaFoundation" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
20+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
21+
</dependentAssembly>
22+
<dependentAssembly>
23+
<assemblyIdentity name="SharpDX.XInput" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
25+
</dependentAssembly>
26+
<dependentAssembly>
27+
<assemblyIdentity name="SharpDX.XAudio2" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
29+
</dependentAssembly>
30+
</assemblyBinding>
31+
</runtime>
32+
</configuration>

‎BasicUI_MonoGame/BasicUI_MonoGame_Win_Desktop/packages.config‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EmptyKeysUI_MonoGame" version="3.2.0" targetFramework="net462" />
4-
<package id="MonoGame.Framework.WindowsDX" version="3.7.1.189" targetFramework="net462" />
5-
<package id="SharpDX" version="4.0.1" targetFramework="net462" />
6-
<package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net462" />
7-
<package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net462" />
8-
<package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net462" />
9-
<package id="SharpDX.DXGI" version="4.0.1" targetFramework="net462" />
10-
<package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net462" />
11-
<package id="SharpDX.MediaFoundation" version="4.0.1" targetFramework="net462" />
12-
<package id="SharpDX.XAudio2" version="4.0.1" targetFramework="net462" />
13-
<package id="SharpDX.XInput" version="4.0.1" targetFramework="net462" />
3+
<package id="EmptyKeysUI_MonoGame" version="3.3.0" targetFramework="net462" />
4+
<package id="MonoGame.Framework.WindowsDX" version="3.8.0.1641" targetFramework="net462" />
5+
<package id="SharpDX" version="4.2.0" targetFramework="net462" />
6+
<package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net462" />
7+
<package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net462" />
8+
<package id="SharpDX.Direct3D9" version="4.2.0" targetFramework="net462" />
9+
<package id="SharpDX.DXGI" version="4.2.0" targetFramework="net462" />
10+
<package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net462" />
11+
<package id="SharpDX.MediaFoundation" version="4.2.0" targetFramework="net462" />
12+
<package id="SharpDX.XAudio2" version="4.2.0" targetFramework="net462" />
13+
<package id="SharpDX.XInput" version="4.2.0" targetFramework="net462" />
1414
</packages>

‎BasicUI_MonoGame/GameData/GameData.Standard.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="EmptyKeysUI_MonoGame" Version="3.2.0" />
10+
<PackageReference Include="EmptyKeysUI_MonoGame" Version="3.3.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎BasicUI_MonoGame/GameUILibrary/GameUILibrary.Standard.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="EmptyKeysUI_MonoGame" Version="3.2.0" />
8+
<PackageReference Include="EmptyKeysUI_MonoGame" Version="3.3.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎BasicUI_MonoGame/GameUILibrary/GeneratedUI/BasicUI.xaml.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace EmptyKeys.UserInterface.Generated {
2424
using EmptyKeys.UserInterface.Themes;
2525

2626

27-
[GeneratedCodeAttribute("Empty Keys UI Generator", "3.1.0.0")]
27+
[GeneratedCodeAttribute("Empty Keys UI Generator", "3.3.0.0")]
2828
public partial class BasicUI : UIRoot {
2929

3030
private Grid e_0;
@@ -80,10 +80,6 @@ private void InitializeComponent() {
8080
this.e_1.Children.Add(this.logo);
8181
this.logo.Name = "logo";
8282
this.logo.HorizontalAlignment = HorizontalAlignment.Center;
83-
DirectionalBlurEffect logo_dbef = new DirectionalBlurEffect();
84-
logo_dbef.Angle = 0F;
85-
logo_dbef.BlurAmount = 0.002F;
86-
this.logo.Effect = logo_dbef;
8783
BitmapImage logo_bm = new BitmapImage();
8884
logo_bm.TextureAsset = "Images/EmptyKeysLogoTextSmall";
8985
this.logo.Source = logo_bm;

0 commit comments

Comments
 (0)