Merge pull request #9 from FaustVX/master

Allow multiple `MonoGameContentControl`

.gitignore

@@ -221,7 +221,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -317,7 +317,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,5 +326,5 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/

.template.config/template.json

@@ -16,6 +16,7 @@
             ".git/**",
             "**/.idea/**",
             "**/*.user"
-        ]
+        ],
+        "source": "./MonoGame.WpfCore/"
     }]
-}
+}

MonoGame.WpfCore/App.xaml

@@ -1,9 +1,8 @@
-<Application 
+<Application
     x:Class="MonoGame.WpfCore.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
-
     </Application.Resources>
 </Application>

MonoGame.WpfCore/App.xaml.cs

@@ -1,8 +1,7 @@
 using System.Windows;
 
-namespace MonoGame.WpfCore
+namespace MonoGame.WpfCore;
+
+public partial class App : Application
 {
-    public partial class App : Application
-    {
-    }
 }

MonoGame.WpfCore/Content/Content.mgcb

@@ -23,4 +23,3 @@
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:monogame-logo.png
-

MonoGame.WpfCore/MainWindow.xaml

@@ -1,4 +1,4 @@
-<Window 
+<Window
     x:Class="MonoGame.WpfCore.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,13 +7,10 @@
     xmlns:monoGameControls="clr-namespace:MonoGame.WpfCore.MonoGameControls"
     xmlns:local="clr-namespace:MonoGame.WpfCore"
     mc:Ignorable="d"
-    Title="MonoGame.WpfCore" 
+    Title="MonoGame.WpfCore"
     WindowStartupLocation="CenterScreen"
     Width="800"
     Height="480">
-    <Window.DataContext>
-        <local:MainWindowViewModel />
-    </Window.DataContext>
 
     <DockPanel LastChildFill="True">
         <Menu DockPanel.Dock="Top">
@@ -42,6 +39,23 @@
             </MenuItem>
         </Menu>
 
-        <monoGameControls:MonoGameContentControl />
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <monoGameControls:MonoGameContentControl Grid.Column="0">
+                <monoGameControls:MonoGameContentControl.DataContext>
+                    <local:MainWindowViewModel />
+                </monoGameControls:MonoGameContentControl.DataContext>
+            </monoGameControls:MonoGameContentControl>
+
+            <monoGameControls:MonoGameContentControl Grid.Column="1">
+                <monoGameControls:MonoGameContentControl.DataContext>
+                    <local:MainWindowViewModel />
+                </monoGameControls:MonoGameContentControl.DataContext>
+            </monoGameControls:MonoGameContentControl>
+        </Grid>
     </DockPanel>
 </Window>

MonoGame.WpfCore/MainWindow.xaml.cs

@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace MonoGame.WpfCore
+namespace MonoGame.WpfCore;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }

MonoGame.WpfCore/MainWindowViewModel.cs

@@ -3,38 +3,37 @@
 using Microsoft.Xna.Framework.Graphics;
 using MonoGame.WpfCore.MonoGameControls;
 
-namespace MonoGame.WpfCore
+namespace MonoGame.WpfCore;
+
+public class MainWindowViewModel : MonoGameViewModel
 {
-    public class MainWindowViewModel : MonoGameViewModel
-    {
-        private SpriteBatch _spriteBatch;
-        private Texture2D _texture;
-        private Vector2 _position;
-        private float _rotation;
-        private Vector2 _origin;
-        private Vector2 _scale;
+    private SpriteBatch _spriteBatch = default!;
+    private Texture2D _texture = default!;
+    private Vector2 _position;
+    private float _rotation;
+    private Vector2 _origin;
+    private Vector2 _scale;
 
-        public override void LoadContent()
-        {
-            _spriteBatch = new SpriteBatch(GraphicsDevice);
-            _texture = Content.Load<Texture2D>("monogame-logo");
-        }
+    public override void LoadContent()
+    {
+        _spriteBatch = new SpriteBatch(GraphicsDevice);
+        _texture = Content.Load<Texture2D>("monogame-logo");
+    }
 
-        public override void Update(GameTime gameTime)
-        {
-            _position = GraphicsDevice.Viewport.Bounds.Center.ToVector2();
-            _rotation = (float)Math.Sin(gameTime.TotalGameTime.TotalSeconds) / 4f;
-            _origin = _texture.Bounds.Center.ToVector2();
-            _scale = Vector2.One;
-        }
+    public override void Update(GameTime gameTime)
+    {
+        _position = GraphicsDevice.Viewport.Bounds.Center.ToVector2();
+        _rotation = (float)Math.Sin(gameTime.TotalGameTime.TotalSeconds) / 4f;
+        _origin = _texture.Bounds.Center.ToVector2();
+        _scale = Vector2.One;
+    }
 
-        public override void Draw(GameTime gameTime)
-        {
-            GraphicsDevice.Clear(Color.CornflowerBlue);
+    public override void Draw(GameTime gameTime)
+    {
+        GraphicsDevice.Clear(Color.CornflowerBlue);
 
-            _spriteBatch.Begin();
-            _spriteBatch.Draw(_texture, _position, null, Color.White, _rotation, _origin, _scale, SpriteEffects.None, 0f);
-            _spriteBatch.End();
-        }
+        _spriteBatch.Begin();
+        _spriteBatch.Draw(_texture, _position, null, Color.White, _rotation, _origin, _scale, SpriteEffects.None, 0f);
+        _spriteBatch.End();
     }
-}
+}

MonoGame.WpfCore/MonoGame.WpfCore.csproj

@@ -1,17 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <LangVersion>10</LangVersion>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.7.1.189" />
-    <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.8" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" />
     <PackageReference Include="SharpDX" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>
     <MonoGameContentReference Include="**\*.mgcb" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Icon.ico" />
+    <None Remove="Icon.bmp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Icon.ico" />
+    <EmbeddedResource Include="Icon.bmp" />
+  </ItemGroup>
 </Project>