From 8881369976ee5e058ffb1e0e8ec6a8d447bdb992 Mon Sep 17 00:00:00 2001 From: "SND\\AstrorEnales_cp" Date: Sun, 12 Aug 2012 22:17:56 +0000 Subject: [PATCH] Fixed the Metro converter so that executables are correctly converted. Still need to generate the certificate and add the Assets --- ...mework.ContentPipeline_WindowsMetro.csproj | 4 ++ ...X.Framework.TestCenter_WindowsMetro.csproj | 3 ++ .../ANX.Framework_WindowsMetro.csproj | 3 ++ ...NX.InputDevices.OpenTK_WindowsMetro.csproj | 3 ++ .../ANX.InputDevices.Test_WindowsMetro.csproj | 3 ++ ...Devices.Windows.Kinect_WindowsMetro.csproj | 3 ++ ...Devices.Windows.XInput_WindowsMetro.csproj | 3 ++ ....InputSystem.Recording_WindowsMetro.csproj | 3 ++ ...X.InputSystem.Standard_WindowsMetro.csproj | 3 ++ ...aSystem.Windows.OpenAL_WindowsMetro.csproj | 3 ++ ...X.PlatformSystem.Linux_WindowsMetro.csproj | 3 ++ ...X.PlatformSystem.Metro_WindowsMetro.csproj | 3 ++ ....PlatformSystem.PsVita_WindowsMetro.csproj | 3 ++ ...PlatformSystem.Windows_WindowsMetro.csproj | 3 ++ ...derSystem.Windows.DX10_WindowsMetro.csproj | 3 ++ ...nderSystem.Windows.GL3_WindowsMetro.csproj | 3 ++ ...NX.RenderSystem.PsVita_WindowsMetro.csproj | 3 ++ ...derSystem.Windows.DX11_WindowsMetro.csproj | 3 ++ ...erSystem.Windows.Metro_WindowsMetro.csproj | 2 + .../KeyboardSample_WindowsMetro.csproj | 12 +++-- Samples/Kinect/Kinect_WindowsMetro.csproj | 12 +++-- .../ModelSample_WindowsMetro.csproj | 12 +++-- .../MultiRenderTarget_WindowsMetro.csproj | 12 +++-- .../Primitives/Primitives_WindowsMetro.csproj | 12 +++-- .../RecordingSample_WindowsMetro.csproj | 12 +++-- .../RenderTarget_WindowsMetro.csproj | 12 +++-- .../SimpleSprite_WindowsMetro.csproj | 16 +++--- .../StencilBuffer_WindowsMetro.csproj | 12 +++-- .../TextRendering_WindowsMetro.csproj | 12 +++-- .../VertexIndexBuffer_WindowsMetro.csproj | 12 +++-- .../WindowsFormsEditor_WindowsMetro.csproj | 10 ++-- .../WindowsGame_WindowsMetro.csproj | 16 +++--- .../WpfEditor/WpfEditor_WindowsMetro.csproj | 10 ++-- Samples/Xinput/Xinput_WindowsMetro.csproj | 10 ++-- ...ANX.SoundSystem.OpenAL_WindowsMetro.csproj | 3 ++ ...dSystem.Windows.XAudio_WindowsMetro.csproj | 3 ++ .../ANXStatusComparer_WindowsMetro.csproj | 10 ++-- .../Platforms/MetroConverter.cs | 53 ++++++++++++++++--- .../ProjectConverter_WindowsMetro.csproj | 14 ++--- ...ockShaderCodeGenerator_WindowsMetro.csproj | 10 ++-- 40 files changed, 250 insertions(+), 82 deletions(-) diff --git a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline_WindowsMetro.csproj b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline_WindowsMetro.csproj index 904e504d..3de11e6a 100644 --- a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline_WindowsMetro.csproj +++ b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline_WindowsMetro.csproj @@ -9,6 +9,9 @@ ANX.Framework.ContentPipeline ANX.Framework.ContentPipeline {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + 512 + Test_TemporaryKey.pfx true @@ -98,4 +101,5 @@ 11.0 + \ No newline at end of file diff --git a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj index 0874825a..d14bff96 100644 --- a/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj +++ b/ANX.Framework.TestCenter/ANX.Framework.TestCenter_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.Framework.TestCenter 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -174,4 +176,5 @@ 11.0 + \ No newline at end of file diff --git a/ANX.Framework/ANX.Framework_WindowsMetro.csproj b/ANX.Framework/ANX.Framework_WindowsMetro.csproj index afd765d9..890e7a72 100644 --- a/ANX.Framework/ANX.Framework_WindowsMetro.csproj +++ b/ANX.Framework/ANX.Framework_WindowsMetro.csproj @@ -31,6 +31,8 @@ ANX.Framework ANX.Framework {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx @@ -506,4 +508,5 @@ 11.0 + \ No newline at end of file diff --git a/InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK_WindowsMetro.csproj b/InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK_WindowsMetro.csproj index 698a640d..e2bc9b75 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK_WindowsMetro.csproj +++ b/InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.InputDevices.OpenTK 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -87,4 +89,5 @@ 11.0 + \ No newline at end of file diff --git a/InputSystems/ANX.InputDevices.Test/ANX.InputDevices.Test_WindowsMetro.csproj b/InputSystems/ANX.InputDevices.Test/ANX.InputDevices.Test_WindowsMetro.csproj index 03260802..fe98fa7a 100644 --- a/InputSystems/ANX.InputDevices.Test/ANX.InputDevices.Test_WindowsMetro.csproj +++ b/InputSystems/ANX.InputDevices.Test/ANX.InputDevices.Test_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.InputDevices.Test 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -81,4 +83,5 @@ 11.0 + \ No newline at end of file diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj index 64e9bc43..ea48108b 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.InputDevices.Windows.Kinect 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -104,4 +106,5 @@ 11.0 + \ No newline at end of file diff --git a/InputSystems/ANX.InputDevices.Windows.XInput/ANX.InputDevices.Windows.XInput_WindowsMetro.csproj b/InputSystems/ANX.InputDevices.Windows.XInput/ANX.InputDevices.Windows.XInput_WindowsMetro.csproj index da687e26..00b1ad9a 100644 --- a/InputSystems/ANX.InputDevices.Windows.XInput/ANX.InputDevices.Windows.XInput_WindowsMetro.csproj +++ b/InputSystems/ANX.InputDevices.Windows.XInput/ANX.InputDevices.Windows.XInput_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.InputDevices.Windows.XInput 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -90,4 +92,5 @@ 11.0 + \ No newline at end of file diff --git a/InputSystems/ANX.InputSystem.Recording/ANX.InputSystem.Recording_WindowsMetro.csproj b/InputSystems/ANX.InputSystem.Recording/ANX.InputSystem.Recording_WindowsMetro.csproj index 685dac50..b777ad98 100644 --- a/InputSystems/ANX.InputSystem.Recording/ANX.InputSystem.Recording_WindowsMetro.csproj +++ b/InputSystems/ANX.InputSystem.Recording/ANX.InputSystem.Recording_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.InputSystem.Recording 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -82,4 +84,5 @@ 11.0 + \ No newline at end of file diff --git a/InputSystems/ANX.InputSystem.Standard/ANX.InputSystem.Standard_WindowsMetro.csproj b/InputSystems/ANX.InputSystem.Standard/ANX.InputSystem.Standard_WindowsMetro.csproj index f0ed091b..660c7ada 100644 --- a/InputSystems/ANX.InputSystem.Standard/ANX.InputSystem.Standard_WindowsMetro.csproj +++ b/InputSystems/ANX.InputSystem.Standard/ANX.InputSystem.Standard_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.InputSystem.Standard 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -77,4 +79,5 @@ 11.0 + \ No newline at end of file diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj index 0f08228a..0cc518c5 100644 --- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj +++ b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.MediaSystem.Windows.OpenAL 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -74,4 +76,5 @@ 11.0 + \ No newline at end of file diff --git a/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj index 11f2ac6c..fac332a4 100644 --- a/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj +++ b/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.PlatformSystem.Linux 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -64,4 +66,5 @@ 11.0 + \ No newline at end of file diff --git a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj index e6415766..a4021670 100644 --- a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj +++ b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.PlatformSystem.Metro 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -59,4 +61,5 @@ 11.0 + \ No newline at end of file diff --git a/PlatformSystems/ANX.PlatformSystem.PsVita/ANX.PlatformSystem.PsVita_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.PsVita/ANX.PlatformSystem.PsVita_WindowsMetro.csproj index 3295e560..beca5c44 100644 --- a/PlatformSystems/ANX.PlatformSystem.PsVita/ANX.PlatformSystem.PsVita_WindowsMetro.csproj +++ b/PlatformSystems/ANX.PlatformSystem.PsVita/ANX.PlatformSystem.PsVita_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.PlatformSystem.PsVita 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -65,4 +67,5 @@ 11.0 + \ No newline at end of file diff --git a/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj index 6219918f..c977250f 100644 --- a/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj +++ b/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.PlatformSystem.Windows 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -66,4 +68,5 @@ 11.0 + \ No newline at end of file diff --git a/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj b/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj index 6b741452..2d12b273 100644 --- a/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj +++ b/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.RenderSystem.Windows.DX10 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -116,4 +118,5 @@ 11.0 + \ No newline at end of file diff --git a/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj b/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj index b739c7f7..fc179c18 100644 --- a/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj +++ b/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.RenderSystem.Windows.GL3 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -88,4 +90,5 @@ 11.0 + \ No newline at end of file diff --git a/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_WindowsMetro.csproj b/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_WindowsMetro.csproj index 30a73117..df581a32 100644 --- a/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_WindowsMetro.csproj +++ b/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.RenderSystem.PsVita 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -69,4 +71,5 @@ 11.0 + \ No newline at end of file diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj index 3c51a8da..793f42f5 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.RenderSystem.Windows.DX11 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -119,4 +121,5 @@ 11.0 + \ No newline at end of file diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj index a53e8107..672c8b5b 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj +++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj @@ -13,6 +13,7 @@ en-US 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Test_TemporaryKey.pfx true @@ -100,4 +101,5 @@ 11.0 + \ No newline at end of file diff --git a/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj b/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj index 4b699563..584f5370 100644 --- a/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj +++ b/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties KeyboardSample KeyboardSample - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -136,12 +138,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/Kinect/Kinect_WindowsMetro.csproj b/Samples/Kinect/Kinect_WindowsMetro.csproj index f1c57cd6..aba2038d 100644 --- a/Samples/Kinect/Kinect_WindowsMetro.csproj +++ b/Samples/Kinect/Kinect_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties Kinect Kinect - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -137,12 +139,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj b/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj index a118b059..8f35f12f 100644 --- a/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj +++ b/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties ModelSample ModelSample - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -140,12 +142,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj b/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj index 8e54f24c..27af5e86 100644 --- a/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj +++ b/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties MultiRenderTarget MultiRenderTarget - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -131,12 +133,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/Primitives/Primitives_WindowsMetro.csproj b/Samples/Primitives/Primitives_WindowsMetro.csproj index 3b93ccd6..64d19b3f 100644 --- a/Samples/Primitives/Primitives_WindowsMetro.csproj +++ b/Samples/Primitives/Primitives_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties Primitives Primitives - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -141,12 +143,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj b/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj index 6ff36fe1..c91e14ac 100644 --- a/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj +++ b/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties RecordingSample RecordingSample - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -138,12 +140,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj b/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj index 346594e4..f90bd117 100644 --- a/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj +++ b/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties RenderTarget RenderTarget - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -142,12 +144,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj b/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj index aeb35ecc..d292782a 100644 --- a/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj +++ b/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties SimpleSprite SimpleSprite - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -116,9 +118,7 @@ true - - - + - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj b/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj index 43fae65f..e78014d5 100644 --- a/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj +++ b/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties StencilBuffer StencilBuffer - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -146,12 +148,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/TextRendering/TextRendering_WindowsMetro.csproj b/Samples/TextRendering/TextRendering_WindowsMetro.csproj index 4a2d7a0f..7e7aa1ef 100644 --- a/Samples/TextRendering/TextRendering_WindowsMetro.csproj +++ b/Samples/TextRendering/TextRendering_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties TextRendering TextRendering - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -142,12 +144,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj b/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj index c3482a4c..fe8f9083 100644 --- a/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj +++ b/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties VertexIndexBuffer VertexIndexBuffer - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -137,12 +139,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj index 8f872f81..32b3fe0f 100644 --- a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj +++ b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj @@ -12,6 +12,8 @@ WindowsFormsEditor 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -86,12 +88,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj index 47cfacc5..7aab2677 100644 --- a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj +++ b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj @@ -9,7 +9,9 @@ Properties WindowsGame1 WindowsGame1 - Disk + en-US + 512 + Test_TemporaryKey.pfx true @@ -159,9 +161,7 @@ true - - - + AddInSelector.cs @@ -180,12 +180,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj b/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj index 6e73fc47..1734c3f9 100644 --- a/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj +++ b/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj @@ -13,6 +13,8 @@ 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + en-US + Test_TemporaryKey.pfx x86 @@ -126,12 +128,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Samples/Xinput/Xinput_WindowsMetro.csproj b/Samples/Xinput/Xinput_WindowsMetro.csproj index 95264570..060b5433 100644 --- a/Samples/Xinput/Xinput_WindowsMetro.csproj +++ b/Samples/Xinput/Xinput_WindowsMetro.csproj @@ -12,6 +12,8 @@ Xinput 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -82,12 +84,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj index 70bffd23..c1b0ab89 100644 --- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj +++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.SoundSystem.OpenAL 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -83,4 +85,5 @@ 11.0 + \ No newline at end of file diff --git a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj index 9539f92b..f4e0e6ee 100644 --- a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj +++ b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj @@ -12,6 +12,8 @@ ANX.SoundSystem.Windows.XAudio 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx true @@ -82,4 +84,5 @@ 11.0 + \ No newline at end of file diff --git a/Tools/ANXStatusComparer/ANXStatusComparer_WindowsMetro.csproj b/Tools/ANXStatusComparer/ANXStatusComparer_WindowsMetro.csproj index edf32284..22ce488c 100644 --- a/Tools/ANXStatusComparer/ANXStatusComparer_WindowsMetro.csproj +++ b/Tools/ANXStatusComparer/ANXStatusComparer_WindowsMetro.csproj @@ -12,6 +12,8 @@ asc 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -92,12 +94,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Tools/ProjectConverter/Platforms/MetroConverter.cs b/Tools/ProjectConverter/Platforms/MetroConverter.cs index f9a53291..6dc5c963 100644 --- a/Tools/ProjectConverter/Platforms/MetroConverter.cs +++ b/Tools/ProjectConverter/Platforms/MetroConverter.cs @@ -41,9 +41,13 @@ namespace ProjectConverter.Platforms ChangeOrCreateNodeValue(element, "ProjectTypeGuids", "{BC8A1FFA-BEE3-4634-8014-F334798102B3};" + "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"); + ChangeOrCreateNodeValue(element, "DefaultLanguage", "en-US"); + ChangeOrCreateNodeValue(element, "FileAlignment", "512"); - //ChangeOrCreateNodeValue(element, "TargetFrameworkVersion", "4.5"); - //ChangeOrCreateNodeValue(element, "TargetPlatformVersion", "8.0"); + // TODO: generate cert + ChangeOrCreateNodeValue(element, "PackageCertificateKeyFile", + "Test_TemporaryKey.pfx"); + DeleteNodeIfExists(element, "TargetFrameworkVersion"); DeleteNodeIfExists(element, "TargetPlatformVersion"); @@ -69,6 +73,7 @@ namespace ProjectConverter.Platforms DeleteNodeIfExists(element, "IsWebBootstrapper"); DeleteNodeIfExists(element, "UseApplicationTrust"); DeleteNodeIfExists(element, "BootstrapperEnabled"); + DeleteNodeIfExists(element, "InstallFrom"); XElement outputTypeNode = GetOrCreateNode(element, "OutputType"); string outputTypeValue = outputTypeNode.Value.ToLower(); @@ -95,6 +100,17 @@ namespace ProjectConverter.Platforms { bootstrapper.Remove(); } + + XName noneName = XName.Get("None", element.Name.NamespaceName); + + var noneElements = element.Elements(noneName); + foreach (XElement noneNode in noneElements) + { + if (noneNode.Attribute("Include").Value == "app.config") + { + noneNode.Remove(); + } + } } #endregion @@ -110,9 +126,25 @@ namespace ProjectConverter.Platforms protected override void PostConvert() { string namespaceName = currentProject.Root.Name.NamespaceName; - + + AddAppManifestAndCertNode(namespaceName); + AddMetroVersionNode(namespaceName); - AddAppManifestNode(namespaceName); + AddCommonPropsNode(namespaceName); + } + #endregion + + #region AddCommonPropsNode + private void AddCommonPropsNode(string namespaceName) + { + XName importName = XName.Get("Import", namespaceName); + XElement commonPropsNode = new XElement(importName); + commonPropsNode.Add(new XAttribute("Project", + @"$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props")); + commonPropsNode.Add(new XAttribute("Condition", + @"Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\" + + "Microsoft.Common.props')")); + currentProject.Root.Add(commonPropsNode); } #endregion @@ -130,8 +162,8 @@ namespace ProjectConverter.Platforms } #endregion - #region AddAppManifestNode - private void AddAppManifestNode(string namespaceName) + #region AddAppManifestAndCertNode + private void AddAppManifestAndCertNode(string namespaceName) { if(isCurrentProjectExecutable == false) return; @@ -139,12 +171,19 @@ namespace ProjectConverter.Platforms XName itemGroupName = XName.Get("ItemGroup", namespaceName); XName appxManifestName = XName.Get("AppxManifest", namespaceName); XName subTypeName = XName.Get("SubType", namespaceName); + XName noneName = XName.Get("None", namespaceName); XElement newItemGroup = new XElement(itemGroupName); + + XElement noneGroup = new XElement(noneName); + noneGroup.Add(new XAttribute("Include", "Test_TemporaryKey.pfx")); + XElement appManifestElement = new XElement(appxManifestName); - newItemGroup.Add(appManifestElement); appManifestElement.Add(new XAttribute("Include", "Manifest.appxmanifest")); appManifestElement.Add(new XElement(subTypeName, "Designer")); + + newItemGroup.Add(noneGroup); + newItemGroup.Add(appManifestElement); currentProject.Root.Add(newItemGroup); } #endregion diff --git a/Tools/ProjectConverter/ProjectConverter_WindowsMetro.csproj b/Tools/ProjectConverter/ProjectConverter_WindowsMetro.csproj index d1fb7eb4..da2b3964 100644 --- a/Tools/ProjectConverter/ProjectConverter_WindowsMetro.csproj +++ b/Tools/ProjectConverter/ProjectConverter_WindowsMetro.csproj @@ -12,6 +12,8 @@ ProjectConverter 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -74,9 +76,7 @@ - - - + - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file diff --git a/Tools/StockShaderCodeGenerator/StockShaderCodeGenerator_WindowsMetro.csproj b/Tools/StockShaderCodeGenerator/StockShaderCodeGenerator_WindowsMetro.csproj index 3e25b3a4..02fbeb1d 100644 --- a/Tools/StockShaderCodeGenerator/StockShaderCodeGenerator_WindowsMetro.csproj +++ b/Tools/StockShaderCodeGenerator/StockShaderCodeGenerator_WindowsMetro.csproj @@ -12,6 +12,8 @@ sscg 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + en-US + Test_TemporaryKey.pfx x86 @@ -95,12 +97,14 @@ --> - - 11.0 - + Designer + + 11.0 + + \ No newline at end of file