diff --git a/InputSystems/ANX.InputDevices.Windows.ModernUI/SupportedPlatformsImpl.cs b/InputSystems/ANX.InputDevices.Windows.ModernUI/SupportedPlatformsImpl.cs
index c1a26300..d4487cf4 100644
--- a/InputSystems/ANX.InputDevices.Windows.ModernUI/SupportedPlatformsImpl.cs
+++ b/InputSystems/ANX.InputDevices.Windows.ModernUI/SupportedPlatformsImpl.cs
@@ -13,7 +13,7 @@ namespace ANX.InputDevices.Windows.ModernUI
{
return new PlatformName[]
{
- PlatformName.Windows8
+ PlatformName.Windows8ModernUI
};
}
}
diff --git a/InputSystems/ANX.InputDevices.Windows.XInput/FormatConverter.cs b/InputSystems/ANX.InputDevices.Windows.XInput/FormatConverter.cs
index cb9403d0..5c433973 100644
--- a/InputSystems/ANX.InputDevices.Windows.XInput/FormatConverter.cs
+++ b/InputSystems/ANX.InputDevices.Windows.XInput/FormatConverter.cs
@@ -268,9 +268,9 @@ namespace ANX.InputDevices.Windows.XInput
return GamePadType.DancePad;
case DeviceSubType.DrumKit:
return GamePadType.DrumKit;
- case DeviceSubType.FlightSick:
+ case DeviceSubType.FlightSick:
return GamePadType.FlightStick;
- case DeviceSubType.Gamepad:
+ case DeviceSubType.Gamepad:
return GamePadType.GamePad;
case DeviceSubType.Guitar:
return GamePadType.Guitar;
diff --git a/Samples/AudioSample/AudioSample_WindowsMetro.csproj b/Samples/AudioSample/AudioSample_WindowsMetro.csproj
index a592ca13..99fe0617 100644
--- a/Samples/AudioSample/AudioSample_WindowsMetro.csproj
+++ b/Samples/AudioSample/AudioSample_WindowsMetro.csproj
@@ -54,10 +54,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/BasicEffectSample/BasicEffectSample_WindowsMetro.csproj b/Samples/BasicEffectSample/BasicEffectSample_WindowsMetro.csproj
index 3e6aa715..bd9eb358 100644
--- a/Samples/BasicEffectSample/BasicEffectSample_WindowsMetro.csproj
+++ b/Samples/BasicEffectSample/BasicEffectSample_WindowsMetro.csproj
@@ -80,10 +80,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/DualTextureSample/DualTextureSample_WindowsMetro.csproj b/Samples/DualTextureSample/DualTextureSample_WindowsMetro.csproj
index 1995359f..890f112e 100644
--- a/Samples/DualTextureSample/DualTextureSample_WindowsMetro.csproj
+++ b/Samples/DualTextureSample/DualTextureSample_WindowsMetro.csproj
@@ -56,10 +56,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj b/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj
index 8c9edbd8..b2f7167f 100644
--- a/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj
+++ b/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj
@@ -81,10 +81,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/Kinect/Kinect_WindowsMetro.csproj b/Samples/Kinect/Kinect_WindowsMetro.csproj
index cfb8f2c9..ab678b1f 100644
--- a/Samples/Kinect/Kinect_WindowsMetro.csproj
+++ b/Samples/Kinect/Kinect_WindowsMetro.csproj
@@ -82,10 +82,6 @@
{E5D69E75-D77C-493F-BBDA-6F9E73B82549}
ANX.InputDevices.Windows.Kinect
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj b/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj
index ebdf5beb..67cb41dc 100644
--- a/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj
+++ b/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj
@@ -77,10 +77,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj b/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj
index 2ffc6d64..b9a81c77 100644
--- a/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj
+++ b/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj
@@ -77,10 +77,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/Primitives/Primitives_WindowsMetro.csproj b/Samples/Primitives/Primitives_WindowsMetro.csproj
index 9d324c34..d5eb83ba 100644
--- a/Samples/Primitives/Primitives_WindowsMetro.csproj
+++ b/Samples/Primitives/Primitives_WindowsMetro.csproj
@@ -78,10 +78,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj b/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj
index cf3d6f88..53752d9e 100644
--- a/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj
+++ b/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj
@@ -79,10 +79,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}
ANX.InputSystem.Recording
diff --git a/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj b/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj
index 812a3195..d113dbe5 100644
--- a/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj
+++ b/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj
@@ -79,10 +79,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/SimpleNoContent/Properties/Resources.Designer.cs b/Samples/SimpleNoContent/Properties/Resources.Designer.cs
deleted file mode 100644
index efb39311..00000000
--- a/Samples/SimpleNoContent/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.17929
-//
-// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-// der Code erneut generiert wird.
-//
-//------------------------------------------------------------------------------
-
-namespace SimpleNoContent.Properties {
- using System;
-
-
- ///
- /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
- ///
- // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
- // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
- // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
- // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- ///
- /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SimpleNoContent.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
- /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/Samples/SimpleNoContent/Properties/Resources.resx b/Samples/SimpleNoContent/Properties/Resources.resx
deleted file mode 100644
index ffecec85..00000000
--- a/Samples/SimpleNoContent/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/Samples/SimpleNoContent/Properties/Settings.Designer.cs b/Samples/SimpleNoContent/Properties/Settings.Designer.cs
deleted file mode 100644
index 46398bde..00000000
--- a/Samples/SimpleNoContent/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.17929
-//
-// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-// der Code erneut generiert wird.
-//
-//------------------------------------------------------------------------------
-
-namespace SimpleNoContent.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/Samples/SimpleNoContent/Properties/Settings.settings b/Samples/SimpleNoContent/Properties/Settings.settings
deleted file mode 100644
index abf36c5d..00000000
--- a/Samples/SimpleNoContent/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/Samples/SimpleNoContent/SimpleNoContent.csproj b/Samples/SimpleNoContent/SimpleNoContent.csproj
index 3b1915e4..ce1ad377 100644
--- a/Samples/SimpleNoContent/SimpleNoContent.csproj
+++ b/Samples/SimpleNoContent/SimpleNoContent.csproj
@@ -47,25 +47,6 @@
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- True
- Resources.resx
- True
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- True
- Settings.settings
- True
-
diff --git a/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj b/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj
index 1154ddc1..cf9324c1 100644
--- a/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj
+++ b/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj
@@ -58,10 +58,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj b/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj
index 8ea35ac4..b14df112 100644
--- a/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj
+++ b/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj
@@ -87,10 +87,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/TextRendering/TextRendering_WindowsMetro.csproj b/Samples/TextRendering/TextRendering_WindowsMetro.csproj
index 634dd64f..4d2655c3 100644
--- a/Samples/TextRendering/TextRendering_WindowsMetro.csproj
+++ b/Samples/TextRendering/TextRendering_WindowsMetro.csproj
@@ -79,10 +79,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj b/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj
index 13093ce9..74c223af 100644
--- a/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj
+++ b/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj
@@ -78,10 +78,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
index b2cf9dbd..95b16865 100644
--- a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
+++ b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
@@ -59,10 +59,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
index c46c0211..694f8de6 100644
--- a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
+++ b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
@@ -98,10 +98,6 @@
{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}
ANX.InputDevices.OpenTK
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}
ANX.InputSystem.Recording
diff --git a/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj b/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj
index 0e8ab079..9b356283 100644
--- a/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj
+++ b/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj
@@ -99,10 +99,6 @@
{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}
ANX.Framework
-
- {60D08399-244F-46A3-91F1-4CFD26D961A3}
- ANX.InputDevices.Windows.XInput
-
{49066074-3B7B-4A55-B122-6BD33AB73558}
ANX.InputSystem.Standard
diff --git a/Tools/ProjectConverter/Platforms/MetroConverter.cs b/Tools/ProjectConverter/Platforms/MetroConverter.cs
index 9aea649b..2674d8d3 100644
--- a/Tools/ProjectConverter/Platforms/MetroConverter.cs
+++ b/Tools/ProjectConverter/Platforms/MetroConverter.cs
@@ -46,22 +46,31 @@ namespace ProjectConverter.Platforms
#endregion
#region ConvertProjectReference
+ private static String[] IgnoreAssemblies = new[] { "ANX.RenderSystem.Windows.DX10",
+ "ANX.RenderSystem.GL3",
+ "ANX.PlatformSystem.Windows",
+ "ANX.RenderSystem.Windows.DX11",
+ "ANX.SoundSystem.OpenAL",
+ "ANX.InputDevices.Windows.XInput",
+ "System.Windows.Forms",
+ };
+
protected override void ConvertProjectReference(XElement element)
{
XAttribute includeAttribute = element.Attribute("Include");
if (includeAttribute != null)
{
- string value = includeAttribute.Value;
- if (value.Contains("ANX.RenderSystem.Windows.DX10") ||
- value.Contains("ANX.RenderSystem.GL3") ||
- value.Contains("ANX.PlatformSystem.Windows") ||
- value.Contains("ANX.RenderSystem.Windows.DX11") ||
- value.Contains("ANX.SoundSystem.OpenAL"))
- {
- element.Remove();
- }
+ string value = includeAttribute.Value;
+ foreach (string ignoreAssembly in IgnoreAssemblies)
+ {
+ if (value.Contains(ignoreAssembly))
+ {
+ element.Remove();
+ }
+ }
}
}
+
#endregion
#region ConvertMainPropertyGroup
diff --git a/Tools/ProjectConverter/Properties/AssemblyInfo.cs b/Tools/ProjectConverter/Properties/AssemblyInfo.cs
index 461c717a..dd4ff349 100644
--- a/Tools/ProjectConverter/Properties/AssemblyInfo.cs
+++ b/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.02.0.0")]
-[assembly: AssemblyFileVersion("1.02.0.0")]
+[assembly: AssemblyVersion("1.2.1.*")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 5ae477f8..b0d65114 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -192,7 +192,7 @@
-
+
@@ -664,14 +664,9 @@
-
-
-