- added InputSystems to Windows 8 / Metro build (main build script)

- fixed some compile errors in XAudio SoundSystem when building for Windows 8 / Metro
- updated ProjectConverter to remove OggVorbis assemblies from project references when building for Windows 8 / Metro

ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj

@@ -63,6 +63,23 @@
     <Compile Include="ContentProcessor.cs" />
     <Compile Include="ContentProcessorAttribute.cs" />
     <Compile Include="ContentProcessorContext.cs" />
+    <Compile Include="Helpers\DX11MetroShaderCodeGenerator\CompiledPass.cs" />
+    <Compile Include="Helpers\DX11MetroShaderCodeGenerator\MetroCodeGenerator.cs" />
+    <Compile Include="Helpers\GL3\ShaderHelper.cs" />
+    <Compile Include="Helpers\GL3\ShaderData.cs" />
+    <Compile Include="Helpers\HLSLParser\CommentRemover.cs" />
+    <Compile Include="Helpers\HLSLParser\EffectBuffer.cs" />
+    <Compile Include="Helpers\HLSLParser\EffectFile.cs" />
+    <Compile Include="Helpers\HLSLParser\IShaderElement.cs" />
+    <Compile Include="Helpers\HLSLParser\Method.cs" />
+    <Compile Include="Helpers\HLSLParser\Parser.cs" />
+    <Compile Include="Helpers\HLSLParser\ParseTextWalker.cs" />
+    <Compile Include="Helpers\HLSLParser\Pass.cs" />
+    <Compile Include="Helpers\HLSLParser\Sampler.cs" />
+    <Compile Include="Helpers\HLSLParser\Structure.cs" />
+    <Compile Include="Helpers\HLSLParser\Technique.cs" />
+    <Compile Include="Helpers\HLSLParser\TypeDef.cs" />
+    <Compile Include="Helpers\HLSLParser\Variable.cs" />
     <Compile Include="Importer\EffectImporter.cs" />
     <Compile Include="ExternalReference.cs" />
     <Compile Include="Importer\FbxImporter.cs" />
@@ -146,17 +163,20 @@
     <Compile Include="Processors\VertexBufferContent.cs" />
     <Compile Include="Processors\VertexDeclarationContent.cs" />
     <Compile Include="Processors\VideoProcessor.cs" />
+    <Compile Include="Serialization\Compiler\ArrayWriter.cs" />
     <Compile Include="Serialization\Compiler\BuiltInTypeWriter.cs" />
     <Compile Include="Serialization\Compiler\ContentCompiler.cs" />
     <Compile Include="Serialization\Compiler\ContentTypeWriter.cs" />
     <Compile Include="Serialization\Compiler\ContentTypeWriterAttribute.cs" />
     <Compile Include="Serialization\Compiler\ContentWriter.cs" />
+    <Compile Include="Serialization\Compiler\EnumWriter.cs" />
     <Compile Include="Serialization\Compiler\GenericContentTypeWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\EffectWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\Texture2DWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\SpriteFontWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\TextureWriter.cs" />
+    <Compile Include="Serialization\Compiler\ListWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingBoxWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingSphereWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingFrustumWriter.cs" />
@@ -181,6 +201,7 @@
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\ObjectWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\StringWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\SingleWriter.cs" />
+    <Compile Include="Serialization\Compiler\SystemTypeWriters\CharWriter.cs" />
     <Compile Include="Serialization\Compiler\SystemTypeWriters\DateTimeWriter.cs" />
     <Compile Include="Serialization\Compiler\SystemTypeWriters\DecimalWriter.cs" />
     <Compile Include="Serialization\Compiler\SystemTypeWriters\NullableWriter.cs" />

ANX.Framework.Content.Pipeline/Properties/AssemblyInfo.cs

@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.*")]
+[assembly: AssemblyVersion("1.1.2.*")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")]
 
 [assembly: InternalsVisibleTo("ANX.Framework.TestCenter")]

InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_WindowsMetro.csproj

@@ -23,7 +23,7 @@
     <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,7 +32,7 @@
     <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Sce.PlayStation.Core">

InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj

@@ -16,7 +16,7 @@
     <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -26,7 +26,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Debug\ModernUI</OutputPath>

RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj

@@ -23,7 +23,7 @@
     <DefineConstants>XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -34,7 +34,7 @@
     <DefineConstants>XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -65,13 +65,15 @@
     <Compile Include="SamplerStateGL3.cs" />
     <Compile Include="ShaderAttributeGL3.cs" />
     <Compile Include="ShaderByteCode.cs" />
-    <Compile Include="ShaderData.cs" />
-    <Compile Include="ShaderHelper.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
     <Compile Include="Texture2DGL3.cs" />
     <Compile Include="VertexBufferGL3.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework.Content.Pipeline\ANX.Framework.Content.Pipeline_WindowsMetro.csproj">
+      <Project>{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}</Project>
+      <Name>ANX.Framework.Content.Pipeline</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
       <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
       <Name>ANX.Framework</Name>

RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj

@@ -22,8 +22,8 @@
     <OutputPath>..\..\bin\Debug\ModernUI</OutputPath>
     <DefineConstants>XNAEXT DX10;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33,7 +33,7 @@
     <DefineConstants>XNAEXT DX10;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj

@@ -16,22 +16,22 @@
     <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\ModernUI</OutputPath>
-    <DefineConstants>XNAEXT DX11;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>DX11;XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\ModernUI</OutputPath>
-    <DefineConstants>XNAEXT DX11;TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>DX11;XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -44,10 +44,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX.csproj">
-      <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
-      <Name>ANX.BaseDirectX</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="SharpDX">

Samples/AlphaTestEffectSample/AlphaTestEffectSample_WindowsMetro.csproj

@@ -60,7 +60,7 @@
     <Compile Include="Game1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Game.ico" />
+    <Content Include="anx.ico" />
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   <ItemGroup>

Samples/AudioSample/AudioSample_WindowsMetro.csproj

@@ -46,7 +46,7 @@
     <Compile Include="Game1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Game.ico" />
+    <Content Include="anx.ico" />
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   <ItemGroup>

Samples/BasicEffectSample/BasicEffectSample_WindowsMetro.csproj

@@ -81,7 +81,7 @@
     <Compile Include="VertexTypes\VertexPositionNormalColor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Game.ico" />
+    <Content Include="anx.ico" />
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   <ItemGroup>

Samples/DualTextureSample/DualTextureSample_WindowsMetro.csproj

@@ -48,6 +48,7 @@
     <Compile Include="VertexDualTexture.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="anx.ico" />
     <Content Include="Game.ico" />
     <Content Include="GameThumbnail.png" />
   </ItemGroup>

Samples/RecordingSample/RecordingSample_WindowsMetro.csproj

@@ -69,7 +69,7 @@
     <Compile Include="Game1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Game.ico" />
+    <Content Include="anx.ico" />
     <Content Include="GameThumbnail.png">
       <XnaPlatformSpecific>true</XnaPlatformSpecific>
     </Content>

Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj

@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>anx.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -66,6 +69,9 @@
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="anx.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj

@@ -34,6 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>anx.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -64,6 +67,9 @@
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="anx.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Samples/WpfEditor/WpfEditor_WindowsMetro.csproj

@@ -35,6 +35,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>anx.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -104,6 +107,9 @@
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="anx.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj

@@ -20,26 +20,28 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\ModernUI</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\Release\ModernUI</OutputPath>
+    <OutputPath>..\bin\Release\ModernUI</OutputPath>
-    <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+    <Reference Include="OpenTK">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\OpenTK\OpenTK.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
+    <Reference Include="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Creator.cs" />
@@ -56,10 +58,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Support\OggUtils\OggUtils_WindowsMetro.csproj">
-      <Project>{ABECEC14-6BF4-4432-833C-69714EB4E8E6}</Project>
-      <Name>OggUtils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Support\WaveUtils\WaveUtils_WindowsMetro.csproj">
       <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
       <Name>WaveUtils</Name>

SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_WindowsMetro.csproj

@@ -23,7 +23,7 @@
     <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,7 +32,7 @@
     <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj

@@ -58,10 +58,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Support\OggUtils\OggUtils_WindowsMetro.csproj">
-      <Project>{ABECEC14-6BF4-4432-833C-69714EB4E8E6}</Project>
-      <Name>OggUtils</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

SoundSystems/ANX.SoundSystem.Windows.XAudio/XAudioOggInputStream.cs

@@ -1,4 +1,5 @@
-using System;
+#if !WINDOWSMETRO
+using System;
 using System.IO;
 using OggUtils;
 using SharpDX;
@@ -42,3 +43,4 @@ namespace ANX.SoundSystem.Windows.XAudio
         }
     }
 }
+#endif

SoundSystems/ANX.SoundSystem.Windows.XAudio/XAudioSong.cs

@@ -17,8 +17,10 @@ namespace ANX.SoundSystem.Windows.XAudio
     [Developer("AstrorEnales")]
     public class XAudioSong : ISong
     {
+#if !WINDOWSMETRO
         private FileStream oggFileStream;
         private XAudioOggInputStream oggStream;
+#endif
         private SourceVoice source;
         private readonly AudioBuffer[] buffers = new AudioBuffer[2];
         private int nextBufferIndex;
@@ -53,6 +55,7 @@ namespace ANX.SoundSystem.Windows.XAudio
             PlayPosition = TimeSpan.Zero;
             State = MediaState.Stopped;
 
+#if !WINDOWSMETRO
             oggFileStream = File.Open(filepath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
             oggStream = new XAudioOggInputStream(oggFileStream);
             var format = new WaveFormat(oggStream.SampleRate, 16, oggStream.Channels);
@@ -61,6 +64,7 @@ namespace ANX.SoundSystem.Windows.XAudio
 
             for (int index = 0; index < buffers.Length; index++)
                 buffers[index] = new AudioBuffer { Stream = new DataStream(XAudioOggInputStream.BufferLength, false, true) };
+#endif
         }
 
         private void StreamBuffer(IntPtr handle)
@@ -126,12 +130,15 @@ namespace ANX.SoundSystem.Windows.XAudio
         internal void Rewind()
         {
             PlayPosition = TimeSpan.Zero;
+#if !WINDOWSMETRO
             oggFileStream.Position = 0;
             oggStream = new XAudioOggInputStream(oggFileStream);
+#endif
         }
 
         internal bool Stream()
         {
+#if !WINDOWSMETRO
             AudioBuffer currentBuffer = buffers[nextBufferIndex];
             currentBuffer.Stream.Position = 0;
             int size = oggStream.Read(currentBuffer.Stream);
@@ -145,15 +152,27 @@ namespace ANX.SoundSystem.Windows.XAudio
             nextBufferIndex = (nextBufferIndex + 1) % buffers.Length;
 
             return true;
+#else
+            return false;
+#endif
         }
 
         public void Dispose()
         {
+#if !WINDOWSMETRO
             if (oggFileStream != null)
+            {
                 oggFileStream.Close();
+                oggFileStream.Dispose();
+                oggFileStream = null;
+            }
+
+            if (oggStream != null)
+            {
+                oggStream = null;
+            }
+#endif
 
-            oggFileStream = null;
-            oggStream = null;
             if (source != null)
             {
                 source.FlushSourceBuffers();

Tools/ProjectConverter/Platforms/MetroConverter.cs

@@ -62,6 +62,7 @@ namespace ProjectConverter.Platforms
                                                            "ANX.SoundSystem.OpenAL",
                                                            "ANX.InputDevices.Windows.XInput",
                                                            "System.Windows.Forms",
+                                                           "OggUtils",
                                                          };
 
 		protected override void ConvertProjectReference(XElement element)

Tools/ProjectConverter/ProjectConverter.csproj

@@ -33,8 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
+    <Reference Include="nunit.framework, Version=2.6.1.12217, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\lib\NUnit-2.6.1\bin\nunit.framework.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\NUnit-2.6.1\bin\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml.Linq" />
@@ -70,7 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework.Content.Pipeline\ANX.Framework.Content.Pipeline.csproj">
-      <Project>{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}</Project>
+      <Project>{2dafdfc1-223b-4741-87bb-be3d0a7617db}</Project>
       <Name>ANX.Framework.Content.Pipeline</Name>
     </ProjectReference>
   </ItemGroup>

Tools/ProjectConverter/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.3.*")]
+[assembly: AssemblyVersion("1.2.4.*")]
-[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.4.0")]

Tools/StockShaderCodeGenerator/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.7.*")]
+[assembly: AssemblyVersion("0.8.8.*")]
-[assembly: AssemblyFileVersion("0.8.7.0")]
+[assembly: AssemblyFileVersion("0.8.8.0")]

build/ANX.Framework.build

@@ -340,7 +340,9 @@
           <arg value="/p:OutputPath=${build.dir.tools}" />
           <arg value="/p:AllowUnsafeBlocks=true" />
           <arg value="/p:SolutionDir=${build.solution_dir}" />
+<!--          
           <arg value='/p:DefineConstants="${project.anx.directives}"' />
+-->          
           <arg value="/clp:ErrorsOnly" />
           <arg value="/nologo" />
           <arg value="${projectFile}" />

build/ANX.InputSystem.build

@@ -39,6 +39,7 @@
     <if test="${project.anx.metro}">
       <fileset id="inputsystem_files" basedir="../InputSystems/">
         <include name="**/*ModernUI*_WindowsMetro.csproj" />
+        <include name="**/ANX.InputSystem.*_WindowsMetro.csproj" />
         <exclude name="**/*PsVita*.csproj" />
         <exclude name="**/*Kinect*.csproj" />
         <exclude name="**/*Linux*.csproj" />