From 0d49da88224e476d7227ab6c9a88a4dea1c339a0 Mon Sep 17 00:00:00 2001
From: Glatzemann <glatzemann@users.noreply.github.com>
Date: Tue, 20 Nov 2012 15:27:43 +0000
Subject: [PATCH] - fixed some enumeration values - fixed some build issues
 (tools) - fixed some installer issues (msi) - fixed some ANXStatusComparer
 issues - changed some tools icons

---
 .../Audio/AudioFileType.cs                    |   6 +--
 .../Audio/ConversionFormat.cs                 |   8 ++--
 .../Graphics/FontDescriptionStyle.cs          |   6 +--
 .../MaterialProcessorDefaultEffect.cs         |  10 ++---
 .../TextureProcessorOutputFormat.cs           |   6 +--
 Installer/anx.wxs                             |   7 +++-
 .../ANXStatusComparer.csproj                  |   6 +++
 Tools/ANXStatusComparer/Configuration.cs      |   3 +-
 Tools/ANXStatusComparer/Program.cs            |  39 +++++++++++++++++-
 .../Properties/AssemblyInfo.cs                |   6 +--
 Tools/ANXStatusComparer/SampleConfigFile.xml  |   3 +-
 Tools/ANXStatusComparer/anx.ico               | Bin 0 -> 4286 bytes
 Tools/ContentBuilder/ContentBuilder.csproj    |   6 +++
 Tools/ContentBuilder/anx.ico                  | Bin 0 -> 4286 bytes
 build/ANX.Framework.build                     |   3 +-
 15 files changed, 82 insertions(+), 27 deletions(-)
 create mode 100644 Tools/ANXStatusComparer/anx.ico
 create mode 100644 Tools/ContentBuilder/anx.ico

diff --git a/ANX.Framework.Content.Pipeline/Audio/AudioFileType.cs b/ANX.Framework.Content.Pipeline/Audio/AudioFileType.cs
index d832b94d..cc4de1d1 100644
--- a/ANX.Framework.Content.Pipeline/Audio/AudioFileType.cs
+++ b/ANX.Framework.Content.Pipeline/Audio/AudioFileType.cs
@@ -11,8 +11,8 @@ namespace ANX.Framework.Content.Pipeline.Audio
 {
     public enum AudioFileType
     {
-        Mp3,
-        Wav,
-        Wma,
+        Wav = 0,
+        Mp3 = 1,
+        Wma = 2,
     }
 }
diff --git a/ANX.Framework.Content.Pipeline/Audio/ConversionFormat.cs b/ANX.Framework.Content.Pipeline/Audio/ConversionFormat.cs
index 274732b1..598754b8 100644
--- a/ANX.Framework.Content.Pipeline/Audio/ConversionFormat.cs
+++ b/ANX.Framework.Content.Pipeline/Audio/ConversionFormat.cs
@@ -11,9 +11,9 @@ namespace ANX.Framework.Content.Pipeline.Audio
 {
     public enum ConversionFormat
     {
-        Adpcm,
-        Pcm,
-        WindowsMedia,
-        Xma,
+        Pcm = 0,
+        Adpcm = 1,
+        WindowsMedia = 2,
+        Xma = 3,
     }
 }
diff --git a/ANX.Framework.Content.Pipeline/Graphics/FontDescriptionStyle.cs b/ANX.Framework.Content.Pipeline/Graphics/FontDescriptionStyle.cs
index e344ed4a..235aaa74 100644
--- a/ANX.Framework.Content.Pipeline/Graphics/FontDescriptionStyle.cs
+++ b/ANX.Framework.Content.Pipeline/Graphics/FontDescriptionStyle.cs
@@ -15,8 +15,8 @@ namespace ANX.Framework.Content.Pipeline.Graphics
     [Flags]
     public enum FontDescriptionStyle
     {
-        Bold,
-        Italic,
-        Regular,
+        Regular = 0,
+        Bold = 1,
+        Italic = 2,
     }
 }
diff --git a/ANX.Framework.Content.Pipeline/Processors/MaterialProcessorDefaultEffect.cs b/ANX.Framework.Content.Pipeline/Processors/MaterialProcessorDefaultEffect.cs
index 7f77d12c..4e823a96 100644
--- a/ANX.Framework.Content.Pipeline/Processors/MaterialProcessorDefaultEffect.cs
+++ b/ANX.Framework.Content.Pipeline/Processors/MaterialProcessorDefaultEffect.cs
@@ -11,10 +11,10 @@ namespace ANX.Framework.Content.Pipeline.Processors
 {
     public enum MaterialProcessorDefaultEffect
     {
-        AlphaTestEffect,
-        BasicEffect,
-        DualTextureEffect,
-        EnvironmentMapEffect,
-        SkinnedEffect,
+        BasicEffect = 0,
+        SkinnedEffect = 1,
+        EnvironmentMapEffect = 2,
+        DualTextureEffect = 3,
+        AlphaTestEffect = 4,
     }
 }
diff --git a/ANX.Framework.Content.Pipeline/Processors/TextureProcessorOutputFormat.cs b/ANX.Framework.Content.Pipeline/Processors/TextureProcessorOutputFormat.cs
index bcd622b9..e119d2fb 100644
--- a/ANX.Framework.Content.Pipeline/Processors/TextureProcessorOutputFormat.cs
+++ b/ANX.Framework.Content.Pipeline/Processors/TextureProcessorOutputFormat.cs
@@ -11,8 +11,8 @@ namespace ANX.Framework.Content.Pipeline.Processors
 {
     public enum TextureProcessorOutputFormat
     {
-        Color,
-        DxtCompressed,
-        NoChange,
+        NoChange = 0,
+        Color = 1,
+        DxtCompressed = 2,
     }
 }
diff --git a/Installer/anx.wxs b/Installer/anx.wxs
index 153821db..2100d136 100644
--- a/Installer/anx.wxs
+++ b/Installer/anx.wxs
@@ -9,6 +9,7 @@
            UpgradeCode="{7A54B375-318B-40B7-ABF7-60BB50689361}">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Icon Id="ANX.icon" SourceFile="..\media\anx.ico" />
+    <Property Id="ARPPRODUCTICON" Value="ANX.icon" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <Media Id='1' Cabinet='ANX.Framework.cab' EmbedCab='yes' />
@@ -207,9 +208,9 @@
     <ComponentGroup Id="Tools" Directory="TOOLSFOLDER">
       <Component Id='ANX.Tools' Guid='{4EC562B1-DCE2-48C8-A29A-3EC6C1F588E0}'>
         <File Id='ANXStatusComparer' Name='asc.exe' DiskId='1' Source='../bin/Release/asc.exe' />
-        <File Id='ANXStatusComparerStyleSheet' Name='SummaryStyle.css' DiskId='1' Source='../bin/SummaryStyle.css' />
+        <File Id='ANXStatusComparerStyleSheet' Name='SummaryStyle.css' DiskId='1' Source='../bin/Release/SummaryStyle.css' />
         <File Id='ContentBuilder' Name='ContentBuilder.exe' DiskId='1' Source='../bin/Release/ContentBuilder.exe' />
-        <File Id='ProjectConverter' Name='ProjectConverter.exe' DiskId='1' Source='../bin/tools/ProjectConverter.exe' />
+        <File Id='ProjectConverter' Name='ProjectConverter.exe' DiskId='1' Source='../bin/Release/ProjectConverter.exe' />
         <File Id='XNBInspector' Name='ANX.Tools.XNBInspector.exe' DiskId='1' Source='../bin/Release/ANX.Tools.XNBInspector.exe' />
         <File Id='AnxSampleBrowser' Name='ANXSampleBrowser.exe' DiskId='1' Source='../bin/Release/ANXSampleBrowser.exe' />
 
@@ -294,9 +295,11 @@
       <Component Id='ANX.PlatformSystem.Windows' Guid='{0D0EBDD1-9F95-40CE-B314-7A502BC84A2F}'>
         <File Id='anx.platformsystem.windows' Name='ANX.PlatformSystem.Windows.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Windows.dll' />
       </Component>
+<!--
       <Component Id='ANX.PlatformSystem.Linux' Guid='{6781BD15-B2DB-41B7-B628-CAF0D95D584D}'>
         <File Id='anx.platformsystem.linux' Name='ANX.PlatformSystem.Linux.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Linux.dll' />
       </Component>
+-->      
     </ComponentGroup>
 	</Fragment>
 </Wix>
\ No newline at end of file
diff --git a/Tools/ANXStatusComparer/ANXStatusComparer.csproj b/Tools/ANXStatusComparer/ANXStatusComparer.csproj
index 1813d376..4c7f10dc 100644
--- a/Tools/ANXStatusComparer/ANXStatusComparer.csproj
+++ b/Tools/ANXStatusComparer/ANXStatusComparer.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.Xml.Linq" />
@@ -66,6 +69,9 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="anx.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.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.
diff --git a/Tools/ANXStatusComparer/Configuration.cs b/Tools/ANXStatusComparer/Configuration.cs
index e970577f..82eed033 100644
--- a/Tools/ANXStatusComparer/Configuration.cs
+++ b/Tools/ANXStatusComparer/Configuration.cs
@@ -55,9 +55,10 @@ namespace ANXStatusComparer
 		#endregion
 
 		#region Constructor
-        public Configuration(String[] anxAssemblies, String stylesheet)
+        public Configuration(String[] anxAssemblies, String[] xnaAssemblies, String stylesheet)
         {
             this.AnxAssemblies = anxAssemblies;
+            this.XnaAssemblies = xnaAssemblies;
             this.OutputType = "html";
             this.StylesheetFile = stylesheet;
         }
diff --git a/Tools/ANXStatusComparer/Program.cs b/Tools/ANXStatusComparer/Program.cs
index 8701d15a..f8ae2508 100644
--- a/Tools/ANXStatusComparer/Program.cs
+++ b/Tools/ANXStatusComparer/Program.cs
@@ -3,6 +3,10 @@ using System.Diagnostics;
 using System.IO;
 using ANXStatusComparer.Data;
 using ANXStatusComparer.Output;
+using Microsoft.Win32;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -33,7 +37,14 @@ namespace ANXStatusComparer
             } 
             else
 			{
-                config = new Configuration(new String[] { Path.Combine(Environment.CurrentDirectory, "ANX.Framework.dll") }, Path.Combine(Environment.CurrentDirectory, "SummaryStyle.css"));
+                string currentAssemblyDirectoryName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+                config = new Configuration(new String[] { Path.Combine(currentAssemblyDirectoryName, "ANX.Framework.dll"),
+                                                          Path.Combine(currentAssemblyDirectoryName, "ANX.Framework.Content.Pipeline.dll")
+                                                        },
+                                           GetDefaultXnaAssemblies(),
+                                           Path.Combine(currentAssemblyDirectoryName, "SummaryStyle.css")
+                                          );
 			}
 			#endregion
 
@@ -61,5 +72,31 @@ namespace ANXStatusComparer
 			}
 		}
 		#endregion
+
+        private static string[] GetDefaultXnaAssemblies()
+        {
+            HashSet<string> assemblies = new HashSet<string>();
+
+            var xna32 = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\XNA\Game Studio\v4.0", "InstallPath", null);
+            var xna64 = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\XNA\Game Studio\v4.0", "InstallPath", null);
+
+            if (xna32 != null)
+            {
+                foreach (string file in Directory.EnumerateFiles(Path.Combine(xna32.ToString(), @"References\Windows\x86"), "*.dll", SearchOption.AllDirectories))
+                {
+                    assemblies.Add(file);
+                }
+            }
+
+            if (xna64 != null)
+            {
+                foreach (string file in Directory.EnumerateFiles(Path.Combine(xna64.ToString(), @"References\Windows\x86"), "*.dll", SearchOption.AllDirectories))
+                {
+                    assemblies.Add(file);
+                }
+            }
+
+            return assemblies.ToArray();
+        }
 	}
 }
diff --git a/Tools/ANXStatusComparer/Properties/AssemblyInfo.cs b/Tools/ANXStatusComparer/Properties/AssemblyInfo.cs
index f8f4757f..776fc423 100644
--- a/Tools/ANXStatusComparer/Properties/AssemblyInfo.cs
+++ b/Tools/ANXStatusComparer/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ANX Developer Team")]
 [assembly: AssemblyProduct("ANXStatusComparer")]
-[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011")]
+[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011 - 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/Tools/ANXStatusComparer/SampleConfigFile.xml b/Tools/ANXStatusComparer/SampleConfigFile.xml
index 78757c88..4e0f41d4 100644
--- a/Tools/ANXStatusComparer/SampleConfigFile.xml
+++ b/Tools/ANXStatusComparer/SampleConfigFile.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Config>
   <ANXAssemblies>
-    <Assembly>ANX.Framework.dll</Assembly>
+    <Assembly>..\bin\Debug\ANX.Framework.dll</Assembly>
+    <Assembly>..\bin\Debug\ANX.Framework.Content.Pipeline.dll</Assembly>
   </ANXAssemblies>
   <XNAAssemblies>
     <Assembly>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.dll</Assembly>
diff --git a/Tools/ANXStatusComparer/anx.ico b/Tools/ANXStatusComparer/anx.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f778e093f714bdf1bb42bf296c863c837d5fafc9
GIT binary patch
literal 4286
zcmchbOH30{6oyY*I>WS0X$viG6bvN1LW~;;8s*iPu!Xf6jqVJIk=V$iQ)A*IK@b!O
z5*O-14JNuWqKP8lYpGkK!AID*keHaTARO<Ra)-HNr|))}(=)wi?)m<E=H8j<0NB{4
zx*F&k9{2!408r12H9<QwYPZ@D5wbCs&m}j7=gDY4n;hBp(b&!5#o)wGB$L^Gu{0Rj
zmAC&QS+O)EVi!w8GIpUgq{A+hhD_M`){qT5Um9{@=c<9TJ-xFi?-|jpwB-s0N57yy
z@*D$$3m6>#j=sJ*ELY#@R&n{0wkEUHz}d8>y~iIRKy2G=gN*xu*(;3^7+Tb{a2EM;
z^{v3Cwsfx#Mz+>({0G`y{o8z|#nW>S0|PJPeCGX;d4U&*E(^c8wp1F-Y~D|*zaa3X
zW;zF7wR%@v`iP+$tE?Wcw{3VSAwO9itk~4Y-F-{o+dXG7H1$ho5Z~cHfp+&9-F&B?
z>Tx~}?#*>b#-={LzGsX-Y|x;h_v8~Hzq8gDk1@@&LY%X?H)^2!C;jFzvk%SuM!R2}
z1I{`XUEyhTbxontIf>3)0|tFDlo~Hu=HvM_4O{o`WPCba-g{NZFRTgU`q<jHyZbRT
zv6@r^=WF$Eir>q*HnaEi+%@r4bW}#LWakh%cdIDX#?U5-H7Gmv*pjcY4bKdzGz13U
zBiPOh8oWpD3;CTjQ6cUMPYH28CNrBq1I0CTEm@t5k{uBtzf?Djm9u|zhSEMM#GSQK
zJ(h}{js|!4jF2B7iq4uCDhDS~X`4o=!El{q^S~yb!{EqgU4zxQIh%W{I?#Nwmy0z>
zH4nW<A8Pz`*{L*mdhclCO2y@I<<Lah*M83Cp4GuEH~l{!f@9y%du$Gsj+>|)xQ@zx
zX04-G+Hws`_l;;?X&uvIuEV1_JsVqT;PWY&&$Q-z+-4uw(79~2E)r?T7n^IzL_@yW
znP?~!ThP$hk?>p;nr+bFkxd$k#Wre?8amz(x7ci>2DzdAMb7`fH&w)qHpKNR#I-WS
z6&Z2Cff%!~Hv@p10O|%n+d4qi8bH|!fV=?Uh|z0>t&R2<SlbGV(J^!^^`X9$L(4@u
MDK{~QMNG#22i)7kYXATM

literal 0
HcmV?d00001

diff --git a/Tools/ContentBuilder/ContentBuilder.csproj b/Tools/ContentBuilder/ContentBuilder.csproj
index 23b0b438..4e0f276b 100644
--- a/Tools/ContentBuilder/ContentBuilder.csproj
+++ b/Tools/ContentBuilder/ContentBuilder.csproj
@@ -53,6 +53,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>anx.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -77,6 +80,9 @@
       <Name>ANX.Framework</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="anx.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.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.
diff --git a/Tools/ContentBuilder/anx.ico b/Tools/ContentBuilder/anx.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f778e093f714bdf1bb42bf296c863c837d5fafc9
GIT binary patch
literal 4286
zcmchbOH30{6oyY*I>WS0X$viG6bvN1LW~;;8s*iPu!Xf6jqVJIk=V$iQ)A*IK@b!O
z5*O-14JNuWqKP8lYpGkK!AID*keHaTARO<Ra)-HNr|))}(=)wi?)m<E=H8j<0NB{4
zx*F&k9{2!408r12H9<QwYPZ@D5wbCs&m}j7=gDY4n;hBp(b&!5#o)wGB$L^Gu{0Rj
zmAC&QS+O)EVi!w8GIpUgq{A+hhD_M`){qT5Um9{@=c<9TJ-xFi?-|jpwB-s0N57yy
z@*D$$3m6>#j=sJ*ELY#@R&n{0wkEUHz}d8>y~iIRKy2G=gN*xu*(;3^7+Tb{a2EM;
z^{v3Cwsfx#Mz+>({0G`y{o8z|#nW>S0|PJPeCGX;d4U&*E(^c8wp1F-Y~D|*zaa3X
zW;zF7wR%@v`iP+$tE?Wcw{3VSAwO9itk~4Y-F-{o+dXG7H1$ho5Z~cHfp+&9-F&B?
z>Tx~}?#*>b#-={LzGsX-Y|x;h_v8~Hzq8gDk1@@&LY%X?H)^2!C;jFzvk%SuM!R2}
z1I{`XUEyhTbxontIf>3)0|tFDlo~Hu=HvM_4O{o`WPCba-g{NZFRTgU`q<jHyZbRT
zv6@r^=WF$Eir>q*HnaEi+%@r4bW}#LWakh%cdIDX#?U5-H7Gmv*pjcY4bKdzGz13U
zBiPOh8oWpD3;CTjQ6cUMPYH28CNrBq1I0CTEm@t5k{uBtzf?Djm9u|zhSEMM#GSQK
zJ(h}{js|!4jF2B7iq4uCDhDS~X`4o=!El{q^S~yb!{EqgU4zxQIh%W{I?#Nwmy0z>
zH4nW<A8Pz`*{L*mdhclCO2y@I<<Lah*M83Cp4GuEH~l{!f@9y%du$Gsj+>|)xQ@zx
zX04-G+Hws`_l;;?X&uvIuEV1_JsVqT;PWY&&$Q-z+-4uw(79~2E)r?T7n^IzL_@yW
znP?~!ThP$hk?>p;nr+bFkxd$k#Wre?8amz(x7ci>2DzdAMb7`fH&w)qHpKNR#I-WS
z6&Z2Cff%!~Hv@p10O|%n+d4qi8bH|!fV=?Uh|z0>t&R2<SlbGV(J^!^^`X9$L(4@u
MDK{~QMNG#22i)7kYXATM

literal 0
HcmV?d00001

diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 265acd36..59fcf67b 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -405,8 +405,9 @@
       <in>
         <items basedir="../Tools/">
           <include name="**/*.csproj" />
+<!--
           <exclude name="**/ProjectConverter.csproj" />
-
+-->
           <exclude name="**/*ANX.ContentCompiler.GUI*.csproj" if="${project.anx.metro}" />
           <exclude name="**/*ContentBuilder*.csproj" if="${project.anx.metro}" />
           <exclude name="**/*ANXStatusComparer*.csproj" if="${project.anx.metro}" />