[commit] r2534 - in trunk: Install SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep 24 09:54:59 2014
New Revision: 2534

Log:
CSharpDSMLGenerator: tolerate xmes with old MetaGME versions

Modified:
   trunk/Install/GME_SDK.wxs
   trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj
   trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLTask.cs
   trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
   trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest

Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs	Wed Sep 17 12:35:34 2014	(r2533)
+++ trunk/Install/GME_SDK.wxs	Wed Sep 24 09:54:59 2014	(r2534)
@@ -187,7 +187,7 @@
       </Class>
       <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
       <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Class" Value="CSharpDSMLGenerator.CSharpDSMLGeneratorInterpreter" Type="string" Action="write" />
-      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.14.1, Culture=neutral" Type="string" Action="write" />
+      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.14.2, Culture=neutral" Type="string" Action="write" />
       <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
       <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll]" Type="string" Action="write" />
       <RegistryValue Root="HKCR" Key="Component Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Name="0" Value=".NET Category" Type="string" Action="write" />

Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj	Wed Sep 17 12:35:34 2014	(r2533)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj	Wed Sep 24 09:54:59 2014	(r2534)
@@ -144,6 +144,7 @@
   <ItemGroup>
     <None Include="app.manifest" />
     <None Include="AssemblySignature.snk" />
+    <None Include="GME.DSMLGenerator.nuspec" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLTask.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLTask.cs	Wed Sep 17 12:35:34 2014	(r2533)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLTask.cs	Wed Sep 24 09:54:59 2014	(r2534)
@@ -75,8 +75,7 @@
                     try
                     {
                         MgaProject project = new MgaProject();
-                        bool ro;
-                        project.Open("MGA=" + InputFile, out ro);
+                        project.OpenEx("MGA=" + InputFile, "MetaGME", null);
                         try
                         {
                             project.BeginTransactionInNewTerr(transactiontype_enum.TRANSACTION_NON_NESTED);
@@ -162,8 +161,7 @@
                 try
                 {
                     MgaProject project = new MgaProject();
-                    bool ro;
-                    project.Open("MGA=" + InputFile, out ro);
+                    project.OpenEx("MGA=" + InputFile, "MetaGME", null);
                     try
                     {
                         string rootName;

Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs	Wed Sep 17 12:35:34 2014	(r2533)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs	Wed Sep 24 09:54:59 2014	(r2534)
@@ -35,5 +35,5 @@
 
 // Keep in sync with app.manifest, GME_SDK.wxs, and GME.DSMLGenerator.nuspec
 // Do not end with .0: NuGet gallery will strip it!
-[assembly: AssemblyVersion("1.0.14.1")]
-[assembly: AssemblyFileVersion("1.0.14.1")]
+[assembly: AssemblyVersion("1.0.14.2")]
+[assembly: AssemblyFileVersion("1.0.14.2")]

Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest	Wed Sep 17 12:35:34 2014	(r2533)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest	Wed Sep 24 09:54:59 2014	(r2534)
@@ -3,7 +3,7 @@
   <assemblyIdentity
                type="win32"
                name="CSharpDSMLGenerator"
-               version="1.0.14.1"
+               version="1.0.14.2"
                publicKeyToken="1321e6b92842fe54"
                processorArchitecture="msil" />
   <clrClass