Skip to content

Commit ec2e117

Browse files
author
SadConsole
authored
Merge pull request #243 from SadConsole/develop
8.99.3 release to support MonoGame 3.8 release.
2 parents 24c461e + 71777dd commit ec2e117

File tree

14 files changed

+96
-25
lines changed

14 files changed

+96
-25
lines changed

‎ChangeLog.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 08/14/2020 V8.99.3
2+
3+
- Added `Settings.FullScreenPreventScaleChangeForNone` to keep `ToggleFullScreen` in `None` resize mode. (thanks ASCII Guy)
4+
- Added `ParseCommandClearEffect` with string parser command `ceffect` or `ce`. (thanks regulark)
5+
- Updated templates.
6+
- Update to MonoGame 3.8.
7+
18
## 07/13/2020 V8.99.2
29

310
- Added DrawImageComponent.

‎src/DemoProject/DesktopDX/DemoProject.DirectX.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
</PropertyGroup>
4646
<ItemGroup>
4747
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
48-
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\..\..\packages\MonoGame.Framework.WindowsDX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
48+
<Reference Include="MonoGame.Framework, Version=3.8.0.1641, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\MonoGame.Framework.WindowsDX.3.8.0.1641\lib\net452\MonoGame.Framework.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5252
<HintPath>..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -104,12 +104,12 @@
104104
</ItemGroup>
105105
<Import Project="..\SharedCode\DemoProject.projitems" Label="Shared" />
106106
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
107-
<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')" />
107+
<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')" />
108108
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
109109
<PropertyGroup>
110110
<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>
111111
</PropertyGroup>
112-
<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'))" />
112+
<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'))" />
113113
</Target>
114114
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
115115
Other similar extension points exist, see Microsoft.Common.targets.

‎src/DemoProject/DesktopDX/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MonoGame.Framework.WindowsDX" version="3.7.1.189" targetFramework="net461" />
3+
<package id="MonoGame.Framework.WindowsDX" version="3.8.0.1641" targetFramework="net472" />
44
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
55
<package id="SharpDX" version="4.0.1" targetFramework="net461" />
66
<package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net461" />

‎src/DemoProject/DesktopGL/DemoProject.OpenGL.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<StartupObject>StarterProject.Program</StartupObject>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\..\..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
48+
<Reference Include="MonoGame.Framework, Version=3.8.0.1641, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\MonoGame.Framework.DesktopGL.3.8.0.1641\lib\net452\MonoGame.Framework.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5252
<HintPath>..\..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -96,12 +96,12 @@
9696
</ItemGroup>
9797
<Import Project="..\SharedCode\DemoProject.projitems" Label="Shared" />
9898
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
99-
<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')" />
99+
<Import Project="..\..\..\packages\MonoGame.Framework.DesktopGL.3.8.0.1641\build\MonoGame.Framework.DesktopGL.targets" Condition="Exists('..\..\..\packages\MonoGame.Framework.DesktopGL.3.8.0.1641\build\MonoGame.Framework.DesktopGL.targets')" />
100100
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
101101
<PropertyGroup>
102102
<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>
103103
</PropertyGroup>
104-
<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'))" />
104+
<Error Condition="!Exists('..\..\..\packages\MonoGame.Framework.DesktopGL.3.8.0.1641\build\MonoGame.Framework.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MonoGame.Framework.DesktopGL.3.8.0.1641\build\MonoGame.Framework.DesktopGL.targets'))" />
105105
</Target>
106106
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
107107
Other similar extension points exist, see Microsoft.Common.targets.

‎src/DemoProject/DesktopGL/packages.config‎

Lines changed: 1 addition & 1 deletion
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="MonoGame.Framework.DesktopGL" version="3.7.1.189" targetFramework="net461" />
3+
<package id="MonoGame.Framework.DesktopGL" version="3.8.0.1641" targetFramework="net472" />
44
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
55
</packages>

‎src/DemoProject/SharedCode/DemoProjectCoreApp.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -19,8 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.4" />
23-
<PackageReference Include="MonoGame.Framework.DesktopGL.Core" Version="3.7.0.7" />
22+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
2423
</ItemGroup>
2524

2625
<ItemGroup>

‎src/DemoProject/SharedCode/Program.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ private static void Init()
9595
// We'll instead use our demo consoles that show various features of SadConsole.
9696
Global.CurrentScreen = MainConsole;
9797

98+
//var con = new Console(10, 10);
99+
//con.Print("[c:b]test");
100+
//Global.CurrentScreen = con;
101+
98102
// Initialize the windows
99103
_characterWindow = new Windows.CharacterViewer();
100104
}

‎src/SadConsole/ColoredString.Commands.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ public static ColoredString Parse(string value, int surfaceIndex = -1, CellSurfa
8282
case "sg":
8383
commandObject = new ParseCommandSetGlyph(commandParams);
8484
break;
85+
case "ceffect":
86+
case "ce":
87+
commandObject = new ParseCommandClearEffect(commandParams, commandStacks);
88+
break;
8589
default:
8690
break;
8791
}

‎src/SadConsole/SadConsole.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SadConsole</AssemblyName>
66
<DocumentationFile>SadConsole.xml</DocumentationFile>
7-
<AssemblyVersion>8.99.2.0</AssemblyVersion>
8-
<Version>8.99.2</Version>
7+
<AssemblyVersion>8.99.3.0</AssemblyVersion>
8+
<Version>8.99.3</Version>
99
<Version Condition="'$(Configuration)'=='Debug'">$(Version)-debug</Version>
1010
<Authors>Thraka</Authors>
1111
<Company>SadLogic</Company>
@@ -15,7 +15,7 @@
1515
<Copyright>Copyright © 2020 Steve De George JR (Thraka)</Copyright>
1616
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1717
<PackageId>SadConsole</PackageId>
18-
<PackageReleaseNotes>Fix xml docs</PackageReleaseNotes>
18+
<PackageReleaseNotes>Upgrade MonoGame to 3.8.</PackageReleaseNotes>
1919
<PackageIcon>icon.png</PackageIcon>
2020
<PackageIconUrl>https://raw.githubusercontent.com/SadConsole/SadConsole/d110fc4a0dfdaa25496c973518ea6a14a563e191/images/oD8yyro5.png</PackageIconUrl>
2121
<RepositoryUrl>https://github.com/SadConsole/SadConsole</RepositoryUrl>
@@ -26,6 +26,7 @@
2626
<IncludeSymbols>true</IncludeSymbols>
2727
<IncludeSource>true</IncludeSource>
2828
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
29+
<EmbedAllSources>true</EmbedAllSources>
2930
<PackageTags>monogame;roguelike;cli;xna;game;development;console;ansi;ascii;standard</PackageTags>
3031
</PropertyGroup>
3132

@@ -55,16 +56,16 @@
5556
<EmbeddedResource Include="Resources\IBM8x16.png" />
5657
<EmbeddedResource Include="Resources\IBM.font" />
5758
<None Include="Resources\readme.txt" pack="true" PackagePath="." />
58-
<None Include="Resources\icon.png" Pack="true" PackagePath="\"/>
59+
<None Include="Resources\icon.png" Pack="true" PackagePath="\" />
5960
</ItemGroup>
6061

6162
<ItemGroup>
62-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
63+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6364
</ItemGroup>
6465

6566
<ItemGroup>
6667
<PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" PrivateAssets="All" />
67-
<PackageReference Include="MonoGame.Framework.DesktopGL.Core" Version="3.7.0.7" PrivateAssets="All" />
68+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" PrivateAssets="All" />
6869
<PackageReference Include="newtonsoft.json" Version="11.*" />
6970
</ItemGroup>
7071

‎src/SadConsole/SadConsole.xml‎

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)