Merge pull request #5526 from SickheadGames/release_3_6

Release 3.6

.gitignore

@@ -45,6 +45,9 @@ project.lock.json
 /MonoGame.Framework/MonoGame.Framework.WindowsUniversal.project.lock.json
 artifacts/
 
+# JetBrains Rider
+.idea/
+
 #Tooling
 _ReSharper*/
 *.resharper
@@ -93,3 +96,4 @@ Test/*.csproj
 *.zip
 
 Installers/MacOS/Scripts/Framework/postinstall
+IDE/MonoDevelop/MonoDevelop.MonoGame/templates/Common/MonoGame.Framework.dll.config

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "ThirdParty/Dependencies"]
  path = ThirdParty/Dependencies
  url = https://github.com/Mono-Game/MonoGame.Dependencies.git
+[submodule "ThirdParty/NVorbis"]
+ path = ThirdParty/NVorbis
+ url = https://github.com/ioctlLR/NVorbis.git

Build/Module.xml

@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Module>
  <Name>MonoGame.Framework</Name>
  <DefaultAction>Generate</DefaultAction>
  <DefaultLinuxPlatforms>Angle,Linux,WindowsGL</DefaultLinuxPlatforms>
  <DefaultMacOSPlatforms>Angle,MacOS,iOS,WindowsGL,Android,tvOS,Linux</DefaultMacOSPlatforms>
- <DefaultWindowsPlatforms>Android,Angle,Linux,Ouya,Windows8,Windows,WindowsGL,WindowsPhone,WindowsPhone81,WindowsUniversal,iOS,tvOS</DefaultWindowsPlatforms>
- <SupportedPlatforms>Android,Angle,Linux,Ouya,Windows8,Windows,WindowsGL,WindowsPhone,WindowsPhone81,WindowsUniversal,iOS,MacOS,Web,tvOS</SupportedPlatforms>
+ <DefaultWindowsPlatforms>Android,Angle,Linux,Windows8,Windows,WindowsGL,WindowsPhone81,WindowsUniversal,iOS,tvOS</DefaultWindowsPlatforms>
+ <SupportedPlatforms>Android,Angle,Linux,Windows8,Windows,WindowsGL,WindowsPhone81,WindowsUniversal,iOS,MacOS,Web,tvOS,PSVita,XBoxOne</SupportedPlatforms>
  <DisableSynchronisation>true</DisableSynchronisation>
+ <GenerateNuGetRepositories>false</GenerateNuGetRepositories>
  <Packages>
  <Package Uri="https-git://github.com/OutOfOrder/MonoKickstart.git" Folder="ThirdParty/Kickstart" GitRef="master" />
- <Package Uri="https-git://github.com/Mono-Game/MonoGame.Dependencies.git" Folder="ThirdParty/Dependencies" GitRef="master" />
+ <Package Uri="https-git://github.com/MonoGame/MonoGame.Dependencies.git" Folder="ThirdParty/Dependencies" GitRef="master" />
+ <Package Uri="https-git://github.com/ioctlLR/NVorbis.git" Folder="ThirdParty/NVorbis" GitRef="master" />
  </Packages>
- <FeatureSet>
- <Feature>PackageManagement</Feature>
- </FeatureSet>
 </Module>

Build/MonoDevelopPolicies.xml

@@ -1,4 +1,4 @@
 <Policies>
-  <TextStylePolicy inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
-  <CSharpFormattingPolicy IndentSwitchBody="True" IndentBlocksInsideExpressions="True" AnonymousMethodBraceStyle="NextLine" PropertyBraceStyle="NextLine" PropertyGetBraceStyle="NextLine" PropertySetBraceStyle="NextLine" EventBraceStyle="NextLine" EventAddBraceStyle="NextLine" EventRemoveBraceStyle="NextLine" StatementBraceStyle="NextLine" ElseNewLinePlacement="NewLine" CatchNewLinePlacement="NewLine" FinallyNewLinePlacement="NewLine" WhileNewLinePlacement="DoNotCare" ArrayInitializerWrapping="DoNotChange" ArrayInitializerBraceStyle="NextLine" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" NewLineBeforeConstructorInitializerColon="NewLine" NewLineAfterConstructorInitializerColon="SameLine" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" SpacesBeforeBrackets="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
+ <TextStylePolicy inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
+ <CSharpFormattingPolicy IndentSwitchSection="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceAfterMethodCallName="False" SpaceBeforeOpenSquareBracket="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
 </Policies>

Build/Projects/2MGFX.definition

@@ -106,6 +106,9 @@
  <Compile Include="..\..\MonoGame.Framework\Graphics\States\TextureFilter.cs">
  <Link>MonoGame.Framework\TextureFilter.cs</Link>
  </Compile>
+ <Compile Include="..\..\MonoGame.Framework\Graphics\States\TextureFilterMode.cs">
+ <Link>MonoGame.Framework\TextureFilterMode.cs</Link>
+ </Compile>
  <Compile Include="..\..\MonoGame.Framework\Graphics\Vertices\VertexElementUsage.cs">
  <Link>MonoGame.Framework\VertexElementUsage.cs</Link>
  </Compile>
@@ -160,7 +163,15 @@
  <Compile Include="..\..\MonoGame.Framework\Utilities\Hash.cs">
  <Link>MonoGame.Framework\Utilities\Hash.cs</Link>
  </Compile>
-
+
+ <!-- We also use a few types from the content pipeline. -->
+ <Compile Include="..\..\MonoGame.Framework.Content.Pipeline\ExternalTool.cs">
+ <Link>MonoGame.Framework.Content.Pipeline\ExternalTool.cs</Link>
+ </Compile>
+ <Compile Include="..\..\MonoGame.Framework.Content.Pipeline\LoadedTypeCollection.cs">
+ <Link>MonoGame.Framework.Content.Pipeline\LoadedTypeCollection.c</Link>
+ </Compile>
+
  <!-- A fake GraphicsDevice to satisfy some of the framework classes above! -->
  <Compile Include="MonoGame.Framework\GraphicsDevice.cs" />
 
@@ -184,6 +195,8 @@
  <Compile Include="SamplerStateInfo.cs" />
  <Compile Include="ShaderInfo.cs" />
  <Compile Include="ShaderProfile.cs" />
+ <Compile Include="ShaderProfile.OpenGL.cs" />
+ <Compile Include="ShaderProfile.DirectX.cs" />
  <Compile Include="TechniqueInfo.cs" />
  <Compile Include="TextureFilterType.cs" />
 
@@ -200,5 +213,6 @@
 
  <!-- The MGFX preprocessor -->
  <Compile Include="Preprocessor.cs" />
+
  </Files>
 </Project>

Build/Projects/FrameworkReferences.Net.definition

@@ -36,17 +36,6 @@
  <Reference Include="Lidgren.Network" />
  </Platform>
 
- <Platform Type="Ouya">
- <Reference Include="System" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Core" />
- <Reference Include="mscorlib" />
- <Reference Include="Lidgren.Network" />
- <Binary
- Name="Ouya.Console.Api"
- Path="ThirdParty/Dependencies/OUYA/Ouya.Console.Api.dll" />
- </Platform>
-
  <Platform Type="Windows">
  <Reference Include="System" />
  <Reference Include="System.Runtime.Serialization" />
@@ -66,17 +55,6 @@
  <Reference Include="Lidgren.Network" />
  </Platform>
 
- <Platform Type="WindowsPhone">
- <Reference Include="System" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="Microsoft.Xna.Framework.GamerServices">
- <Alias Platform="WindowsPhone">MicrosoftXnaGamerServices</Alias>
- </Reference>
- <Reference Include="Microsoft.Xna.Framework">
- <Alias Platform="WindowsPhone">MicrosoftXnaFramework</Alias>
- </Reference>
- </Platform>
-
  <Platform Type="WindowsPhone81">
  <Reference Include="System" />
  <Reference Include="System.Runtime.Serialization" />

Build/Projects/FrameworkReferences.definition

@@ -8,6 +8,9 @@
  <Reference Include="OpenTK-1.0" />
  </Platform>
  <Platform Type="tvOS">
+ <Reference Include="System" />
+ <Reference Include="System.ComponentModel.Composition" />
+ <Reference Include="System.Runtime.Serialization" />
  <Reference Include="System.Core" />
  <Reference Include="OpenTK-1.0" />
  </Platform>
@@ -16,12 +19,6 @@
  <Reference Include="System.Runtime.Serialization" />
  <Service Name="MonoGame.Framework/OpenGLGraphics">
  <Reference Include="System.Drawing" />
- <Binary
- Name="NVorbis"
- Path="ThirdParty/Dependencies/NVorbis/NVorbis.dll" />
- <Binary
- Name="OpenTK"
- Path="ThirdParty/Dependencies/OpenTK.dll" />
  </Service>
  </Platform>
 
@@ -48,17 +45,6 @@
  <Reference Include="System.Core" />
  </Platform>
 
- <Platform Type="Ouya">
- <Reference Include="System" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="mscorlib" />
- <Reference Include="OpenTK-1.0" />
- <Reference Include="System.Core" />
- <Binary
- Name="Ouya.Console.Api"
- Path="ThirdParty/Dependencies/OUYA/Ouya.Console.Api.dll" />
- </Platform>
-
  <Platform Type="Windows">
  <Reference Include="System" />
  <Reference Include="System.Runtime.Serialization" />
@@ -103,9 +89,6 @@
  <Reference Include="System.Web.Services" />
  <Reference Include="System.Windows.Forms" />
  <Reference Include="System.Xml" />
- <Binary
- Name="OpenTK"
- Path="ThirdParty/Dependencies/OpenTK.dll" />
  </Service>
  </Platform>
 
@@ -147,42 +130,9 @@
  <Reference Include="System.Web.Services" />
  <Reference Include="System.Windows.Forms" />
  <Reference Include="System.Xml" />
- <Binary
- Name="NVorbis"
- Path="ThirdParty/Dependencies/NVorbis/NVorbis.dll" />
- <Binary
- Name="OpenTK"
- Path="ThirdParty/Dependencies/OpenTK.dll" />
  </Service>
  </Platform>
 
- <Platform Type="WindowsPhone">
- <Reference Include="System" />
- <Reference Include="System.Runtime.Serialization" />
-
- <Binary
- Name="SharpDX"
- Path="ThirdParty/Dependencies/SharpDX/Windows Phone/$(Platform)/SharpDX.dll" />
- <Binary
- Name="SharpDX.Direct3D11"
- Path="ThirdParty/Dependencies/SharpDX/Windows Phone/$(Platform)/SharpDX.Direct3D11.dll" />
- <Binary
- Name="SharpDX.DXGI"
- Path="ThirdParty/Dependencies/SharpDX/Windows Phone/$(Platform)/SharpDX.DXGI.dll" />
- <Binary
- Name="SharpDX.MediaFoundation"
- Path="ThirdParty/Dependencies/SharpDX/Windows Phone/$(Platform)/SharpDX.MediaFoundation.dll" />
- <Binary
- Name="SharpDX.XAudio2"
- Path="ThirdParty/Dependencies/SharpDX/Windows Phone/$(Platform)/SharpDX.XAudio2.dll" />
- <Reference Include="Microsoft.Xna.Framework">
- <Alias Platform="WindowsPhone">MicrosoftXnaFramework</Alias>
- </Reference>
- <Reference Include="Microsoft.Xna.Framework.GamerServices">
- <Alias Platform="WindowsPhone">MicrosoftXnaGamerServices</Alias>
- </Reference>
- </Platform>
-
  <Platform Type="WindowsPhone81">
  <Reference Include="System" />
  <Reference Include="System.Runtime.Serialization" />
@@ -244,9 +194,6 @@
  <Reference Include="System.Web.Services" />
  <Reference Include="System.Windows.Forms" />
  <Reference Include="System.Xml" />
- <Binary
- Name="OpenTK"
- Path="ThirdParty/Dependencies/OpenTK.dll" />
  </Service>
 
 </ExternalProject>

Build/Projects/Lidgren.Network.References.definition

@@ -25,12 +25,6 @@
  <Reference Include="System.Xml" />
  </Platform>
 
- <Platform Type="Ouya">
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- </Platform>
-
  <Platform Type="Windows">
  <Reference Include="System" />
  <Reference Include="System.Core">

Build/Projects/Lidgren.Network.definition

@@ -3,7 +3,7 @@
  Name="Lidgren.Network"
  Path="ThirdParty/Lidgren.Network"
  Type="Library"
- Platforms="Android,Linux,MacOS,Ouya,Windows,WindowsGL,iOS">
+ Platforms="Android,Linux,MacOS,Windows,WindowsGL,iOS">
 
  <!--
  Using Protobuild in your own project? ProjectGuids are only in use here
@@ -17,7 +17,6 @@
  <Platform Name="iOS">734EAA48-F1CA-481A-B391-0285BC0E8B40</Platform>
  <Platform Name="Linux">758CB33D-6EBD-41EA-BB0C-55B1C97A325F</Platform>
  <Platform Name="MacOS">5C3DC4FF-FE5A-4B94-B4A6-6F79E63F3130</Platform>
- <Platform Name="Ouya">565129E0-4EE5-4F6F-B403-C3484C9740BE</Platform>
  <Platform Name="Windows">AE483C29-042E-4226-BA52-D247CE7676DA</Platform>
  <Platform Name="WindowsGL">AE483C29-042E-4226-BA52-D247CE7676DA</Platform>
  </ProjectGuids>
@@ -39,7 +38,6 @@
  <Platform Name="iOS">IOS;UNITY_4_5</Platform>
  <Platform Name="Linux">TRACE;UNITY_4_5</Platform>
  <Platform Name="MacOS">TRACE;MONOMAC;UNITY_4_5</Platform>
- <Platform Name="Ouya">ANDROID;UNITY_4_5</Platform>
  <Platform Name="Windows">TRACE;UNITY_4_5</Platform>
  <Platform Name="WindowsGL">TRACE;UNITY_4_5</Platform>
  </CustomDefinitions>

Build/Projects/MonoGame.Framework.Content.Pipeline.definition

@@ -56,8 +56,10 @@
  <Compile Include="Audio\AudioFileType.cs" />
  <Compile Include="Audio\AudioFormat.cs" />
  <Compile Include="Audio\AudioHelper.cs" />
+ <Compile Include="Audio\AudioProfile.cs" />
  <Compile Include="Audio\ConversionFormat.cs" />
  <Compile Include="Audio\ConversionQuality.cs" />
+ <Compile Include="Audio\DefaultAudioProfile.cs" />
 
 
  <!-- MonoGame.Framework.Content.Pipeline.Builder -->
@@ -91,6 +93,7 @@
  <Compile Include="Graphics\BoneWeightCollection.cs" />
  <Compile Include="Graphics\Font\CharacterRegion.cs" />
  <Compile Include="Graphics\Font\CharacterRegionTypeConverter.cs" />
+ <Compile Include="Graphics\DefaultTextureProfile.cs" />
  <Compile Include="Graphics\DualTextureMaterialContent.cs" />
  <Compile Include="Graphics\Dxt1BitmapContent.cs" />
  <Compile Include="Graphics\Dxt3BitmapContent.cs" />
@@ -112,6 +115,7 @@
  <Compile Include="Graphics\IndexCollection.cs" />
  <Compile Include="Graphics\IndirectPositionCollection.cs" />
  <Compile Include="Graphics\MaterialContent.cs" />
+ <Compile Include="Graphics\MeshBuilder.cs" />
  <Compile Include="Graphics\MeshContent.cs" />
  <Compile Include="Graphics\MeshHelper.cs" />
  <Compile Include="Graphics\MipmapChain.cs" />
@@ -131,6 +135,7 @@
  <Compile Include="Graphics\Texture3DContent.cs" />
  <Compile Include="Graphics\TextureContent.cs" />
  <Compile Include="Graphics\TextureCubeContent.cs" />
+ <Compile Include="Graphics\TextureProfile.cs" />
  <Compile Include="Graphics\TextureReferenceDictionary.cs" />
  <Compile Include="Graphics\VertexChannel.cs" />
  <Compile Include="Graphics\VertexChannelCollection.cs" />
@@ -280,6 +285,14 @@
  <Platforms>Windows</Platforms>
  <Link>Processors\MGFX\ShaderProfile.cs</Link>
  </Compile>
+ <Compile Include="..\Tools\2MGFX\ShaderProfile.OpenGL.cs">
+ <Platforms>Windows</Platforms>
+ <Link>Processors\MGFX\ShaderProfile.OpenGL.cs</Link>
+ </Compile>
+ <Compile Include="..\Tools\2MGFX\ShaderProfile.DirectX.cs">
+ <Platforms>Windows</Platforms>
+ <Link>Processors\MGFX\ShaderProfile.DirectX.cs</Link>
+ </Compile>
  <Compile Include="..\Tools\2MGFX\TechniqueInfo.cs">
  <Platforms>Windows</Platforms>
  <Link>Processors\MGFX\TechniqueInfo.cs</Link>
@@ -314,6 +327,7 @@
  <Compile Include="Serialization\Compiler\DoubleWriter.cs" />
  <Compile Include="Serialization\Compiler\DualTextureEffectWriter.cs" />
  <Compile Include="Serialization\Compiler\CompiledEffectContentWriter.cs" />
+ <Compile Include="Serialization\Compiler\EffectMaterialWriter.cs" />
  <Compile Include="Serialization\Compiler\EnumWriter.cs" />
  <Compile Include="Serialization\Compiler\EnvironmentMapEffectWriter.cs" />
  <Compile Include="Serialization\Compiler\ExternalReferenceWriter.cs" />
@@ -362,6 +376,7 @@
  <Compile Include="Serialization\Intermediate\ContentTypeSerializer.cs" />
  <Compile Include="Serialization\Intermediate\ContentTypeSerializerAttribute.cs" />
  <Compile Include="Serialization\Intermediate\ContentTypeSerializerT.cs" />
+ <Compile Include="Serialization\Intermediate\CurveKeyCollectionSerializer.cs" />
  <Compile Include="Serialization\Intermediate\DictionarySerializer.cs" /> 
  <Compile Include="Serialization\Intermediate\DoubleSerializer.cs" /> 
  <Compile Include="Serialization\Intermediate\ElementSerializerT.cs" /> 
@@ -380,6 +395,7 @@
  <Compile Include="Serialization\Intermediate\NamespaceAliasHelper.cs" />
  <Compile Include="Serialization\Intermediate\NonGenericIListSerializer.cs" />
  <Compile Include="Serialization\Intermediate\NullableSerializer.cs" />
+ <Compile Include="Serialization\Intermediate\PackedElementsHelper.cs" />
  <Compile Include="Serialization\Intermediate\PlaneSerializer.cs" />
  <Compile Include="Serialization\Intermediate\PointSerializer.cs" />
  <Compile Include="Serialization\Intermediate\QuaternionSerializer.cs" />
@@ -418,6 +434,7 @@
  <Compile Include="IContentImporter.cs" />
  <Compile Include="IContentProcessor.cs" />
  <Compile Include="InvalidContentException.cs" />
+ <Compile Include="LoadedTypeCollection.cs" />
  <Compile Include="Mp3Importer.cs" />
  <Compile Include="NamedValueDictionary.cs" />
  <Compile Include="OggImporter.cs" />