[commit] r2577 - in trunk: Install Install/Build SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties

Mon Jan 19 09:49:50 CST 2015

Author: ksmyth
Date: Mon Jan 19 09:49:50 2015
New Revision: 2577

Log:
Fix ISIS.GME.Common AssemblyFoldersEx

Modified:
   trunk/Install/Build/build.py
   trunk/Install/GME_bin.wxs
   trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs

Modified: trunk/Install/Build/build.py
==============================================================================

--- trunk/Install/Build/build.py	Thu Dec  4 10:26:03 2014	(r2576)
+++ trunk/Install/Build/build.py	Mon Jan 19 09:49:50 2015	(r2577)
@@ -238,7 +238,7 @@
     
     with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft", 0, _winreg.KEY_WOW64_32KEY | _winreg.KEY_WRITE | _winreg.KEY_READ) as ms:
         with _winreg.CreateKey(ms, r".NETFramework\v4.0.30319\AssemblyFoldersEx\ISIS.GME.Common") as key:
-            _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, os.path.join(os.environ['windir'], r"Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.4.0__1321e6b92842fe54"))
+            _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, os.path.join(os.environ['windir'], r"Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.5.0__1321e6b92842fe54"))
     
     sln_file = os.path.join(GME_ROOT, "Tools", "DumpWMF", "DumpWMF.sln")
     tools.build_VS(sln_file, "Release", arch='Any CPU', msbuild=(prefs['arch'] == 'x64' and tools.MSBUILD.replace('Framework', 'Framework64') or tools.MSBUILD))

Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs	Thu Dec  4 10:26:03 2014	(r2576)
+++ trunk/Install/GME_bin.wxs	Mon Jan 19 09:49:50 2015	(r2577)
@@ -782,7 +782,7 @@
           </RegistryKey>
 
           <RegistryKey Key='ISIS.GME.Common' >
-            <RegistryValue Type='string' Value='[WindowsFolder]Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.4.0__1321e6b92842fe54'/>
+            <RegistryValue Type='string' Value='[WindowsFolder]Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.5.0__1321e6b92842fe54'/>
           </RegistryKey>
         </RegistryKey>
       </Component>

Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs	Thu Dec  4 10:26:03 2014	(r2576)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs	Mon Jan 19 09:49:50 2015	(r2577)
@@ -23,5 +23,6 @@
 [assembly: Guid("eef84a03-3f78-4ea0-a366-f2a3e8caf27e")]
 
 // also change GME_bin.wxs and build.py AssemblyFoldersEx
+// FIXME: for version 1.0.6.0, change AssemblyTitle to ISIS.GME.Common
 [assembly: AssemblyVersion("1.0.5.0")]
 [assembly: AssemblyFileVersion("1.0.5.0")]
