diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj index 15b67569..53097e00 100644 --- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj +++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter.csproj @@ -59,9 +59,8 @@ - - False - E:\Entwicklung\NUnit\bin\net-2.0\framework\nunit.framework.dll + + ..\lib\NUnit-2.6.1\bin\nunit.framework.dll diff --git a/ANX.Framework.sln b/ANX.Framework.sln index 0557861a..45f5b20e 100644 --- a/ANX.Framework.sln +++ b/ANX.Framework.sln @@ -31,8 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SoundSystems", "SoundSystem EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.XAudio", "SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio.csproj", "{6A582788-C4D2-410C-96CD-177F75712D65}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xinput", "Samples\Xinput\Xinput.csproj", "{45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsGame", "Samples\WindowsGame\WindowsGame.csproj", "{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectConverter", "Tools\ProjectConverter\ProjectConverter.csproj", "{B5209A04-B2F8-4033-A5E7-545BE771214C}" @@ -283,17 +281,6 @@ Global {6A582788-C4D2-410C-96CD-177F75712D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {6A582788-C4D2-410C-96CD-177F75712D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU {6A582788-C4D2-410C-96CD-177F75712D65}.Release|x86.ActiveCfg = Release|Any CPU - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Debug|Any CPU.ActiveCfg = Debug|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Debug|Any CPU.Build.0 = Debug|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Debug|x86.ActiveCfg = Debug|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Debug|x86.Build.0 = Debug|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Release|Any CPU.ActiveCfg = Release|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Release|Mixed Platforms.Build.0 = Release|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Release|x86.ActiveCfg = Release|x86 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F}.Release|x86.Build.0 = Release|x86 {A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Any CPU.ActiveCfg = Debug|x86 {A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Any CPU.Build.0 = Debug|x86 {A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 @@ -715,7 +702,6 @@ Global {AAA20E99-A897-4C91-A23E-D02B8F08ACA5} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {BC79B021-10E4-4D01-945A-7048FFF53A22} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {FA6E229D-4504-47B1-8A23-2D3FCC13F778} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {A42413A9-5189-40CB-AACA-D50F24865431} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {05233BB1-444F-43F6-A3DF-B82AA924E094} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} diff --git a/Samples/SampleCatalog.xml b/Samples/SampleCatalog.xml index efd6d57a..b3ff6664 100644 --- a/Samples/SampleCatalog.xml +++ b/Samples/SampleCatalog.xml @@ -149,15 +149,6 @@ - - Xinput - A simple sample showing ANX using Xinput - Xinput\bin\Debug\Xinput.exe - Input - - Xinput - - diff --git a/Samples/Xinput/Assets/Logo.png b/Samples/Xinput/Assets/Logo.png deleted file mode 100644 index ab28e66b..00000000 Binary files a/Samples/Xinput/Assets/Logo.png and /dev/null differ diff --git a/Samples/Xinput/Assets/SmallLogo.png b/Samples/Xinput/Assets/SmallLogo.png deleted file mode 100644 index c4a32ab0..00000000 Binary files a/Samples/Xinput/Assets/SmallLogo.png and /dev/null differ diff --git a/Samples/Xinput/Assets/SplashScreen.png b/Samples/Xinput/Assets/SplashScreen.png deleted file mode 100644 index 8d204826..00000000 Binary files a/Samples/Xinput/Assets/SplashScreen.png and /dev/null differ diff --git a/Samples/Xinput/Assets/StoreLogo.png b/Samples/Xinput/Assets/StoreLogo.png deleted file mode 100644 index 55690e28..00000000 Binary files a/Samples/Xinput/Assets/StoreLogo.png and /dev/null differ diff --git a/Samples/Xinput/Manifest.appxmanifest b/Samples/Xinput/Manifest.appxmanifest deleted file mode 100644 index 1ae4de68..00000000 --- a/Samples/Xinput/Manifest.appxmanifest +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Xinput - ANX Developer Team - Assets\StoreLogo.png - - - 6.2.0 - 6.2.0 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/Xinput/Program.cs b/Samples/Xinput/Program.cs deleted file mode 100644 index 6e00c1c7..00000000 --- a/Samples/Xinput/Program.cs +++ /dev/null @@ -1,48 +0,0 @@ -#region Using Statements -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using SharpDX.XInput; - -#endregion - -// This file is part of the ANX.Framework created by the -// "ANX.Framework developer group" and released under the Ms-PL license. -// For details see: http://anxframework.codeplex.com/license - -namespace Xinput -{ - class Program - { - static void Main(string[] args) - { - Controller[] controller = new Controller[5]; - controller[0] = new Controller(UserIndex.One); - controller[1] = new Controller(UserIndex.Two); - controller[2] = new Controller(UserIndex.Three); - controller[3] = new Controller(UserIndex.Four); - controller[4] = new Controller(UserIndex.Any); - - foreach (Controller item in controller) - { - Console.WriteLine(item.IsConnected); - if (item.IsConnected) - { - Console.WriteLine(item.GetState().Gamepad.ToString()); - } - } - - if (controller[0].IsConnected) - { - var test = controller[0].GetCapabilities(DeviceQueryType.Gamepad); - for (int i = 0; i < 16; i++) - { - Console.WriteLine("{0,3} - {1}", i, ((GamepadButtonFlags)i).ToString()); - } - } - - Console.Read(); - } - } -} diff --git a/Samples/Xinput/Properties/AssemblyInfo.cs b/Samples/Xinput/Properties/AssemblyInfo.cs deleted file mode 100644 index f2f87e1c..00000000 --- a/Samples/Xinput/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Xinput")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Xinput")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("598f3d7b-0432-410b-88f5-ede1b129af42")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// übernehmen, indem Sie "*" eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Samples/Xinput/Xinput.csproj b/Samples/Xinput/Xinput.csproj deleted file mode 100644 index 634fc166..00000000 --- a/Samples/Xinput/Xinput.csproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F} - Exe - Properties - Xinput - Xinput - v4.0 - Client - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - anx.ico - - - bin\x86\DebugWin8\ - - - bin\x86\ReleaseWin8\ - TRACE - true - pdbonly - x86 - bin\Release\Xinput.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - - - - ..\..\lib\SharpDX\Bin\SharpDX.dll - - - ..\..\lib\SharpDX\Bin\SharpDX.XInput.dll - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/Xinput/Xinput_Linux.csproj b/Samples/Xinput/Xinput_Linux.csproj deleted file mode 100644 index e4ec9d4e..00000000 --- a/Samples/Xinput/Xinput_Linux.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F} - Exe - Properties - Xinput - Xinput - v4.0 - 512 - - - x86 - true - full - false - bin\Debug\ - TRACE;DEBUG;LINUX; - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE;LINUX; - prompt - 4 - - - anx.ico - - - bin\x86\DebugWin8\ - - - bin\x86\ReleaseWin8\ - TRACE;LINUX; - true - pdbonly - x86 - bin\Release\Xinput.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - - - - ..\..\lib\SharpDX\Bin\SharpDX.dll - - - ..\..\lib\SharpDX\Bin\SharpDX.XInput.dll - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/Xinput/Xinput_PSVita.csproj b/Samples/Xinput/Xinput_PSVita.csproj deleted file mode 100644 index fd16b19d..00000000 --- a/Samples/Xinput/Xinput_PSVita.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - Debug - x86 - 10.0.0 - 2.0 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F} - Exe - Properties - Xinput - Xinput - 512 - {69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - x86 - true - full - false - bin\Debug\ - TRACE;DEBUG;PSVITA; - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE;PSVITA; - prompt - 4 - - - anx.ico - - - bin\x86\DebugWin8\ - - - bin\x86\ReleaseWin8\ - TRACE;PSVITA; - true - pdbonly - x86 - bin\Release\Xinput.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - - - - ..\..\lib\SharpDX\Bin\SharpDX.dll - - - ..\..\lib\SharpDX\Bin\SharpDX.XInput.dll - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/Xinput/Xinput_WindowsMetro.csproj b/Samples/Xinput/Xinput_WindowsMetro.csproj deleted file mode 100644 index acb4db22..00000000 --- a/Samples/Xinput/Xinput_WindowsMetro.csproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {45D6F4DE-5BB6-4E86-8C44-F9CA307AE43F} - AppContainerExe - Properties - Xinput - Xinput - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - en-US - Test_TemporaryKey.pfx - - - x86 - true - full - false - bin\Debug\ - TRACE;DEBUG;WINDOWSMETRO; - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE;WINDOWSMETRO; - prompt - 4 - - - anx.ico - - - bin\x86\DebugWin8\ - - - bin\x86\ReleaseWin8\ - TRACE;WINDOWSMETRO; - true - pdbonly - x86 - bin\Release\Xinput.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - - - - ..\..\lib\SharpDX\Bin\SharpDX.dll - - - ..\..\lib\SharpDX\Bin\SharpDX.XInput.dll - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - 11.0 - - - \ No newline at end of file diff --git a/Samples/Xinput/anx.ico b/Samples/Xinput/anx.ico deleted file mode 100644 index f778e093..00000000 Binary files a/Samples/Xinput/anx.ico and /dev/null differ diff --git a/Tools/HLSLParser/HLSLParserTests/HLSLParserTests.csproj b/Tools/HLSLParser/HLSLParserTests/HLSLParserTests.csproj index 4a578f8b..56fe6d9b 100644 --- a/Tools/HLSLParser/HLSLParserTests/HLSLParserTests.csproj +++ b/Tools/HLSLParser/HLSLParserTests/HLSLParserTests.csproj @@ -31,7 +31,9 @@ 4 - + + ..\..\..\lib\NUnit-2.6.1\bin\nunit.framework.dll +