[commit] r2154 - in trunk: Install SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Feb 15 13:30:20 CST 2013
Author: ksmyth
Date: Fri Feb 15 13:30:19 2013
New Revision: 2154
Log:
META-582: fix generation for bi-directional connections
Modified:
trunk/Install/GME_SDK.wxs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoHelper.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 Thu Feb 14 21:01:40 2013 (r2153)
+++ trunk/Install/GME_SDK.wxs Fri Feb 15 13:30:19 2013 (r2154)
@@ -186,12 +186,8 @@
<ProgId Id="MGA.Interpreter.CSharpDSMLGenerator" Description="MGA.Interpreter.CSharpDSMLGenerator" />
</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\1.0.5.0" Name="Class" Value="CSharpDSMLGenerator.CSharpDSMLGeneratorInterpreter" Type="string" Action="write" />
- <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32\1.0.5.0" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.5.0, Culture=neutral" Type="string" Action="write" />
- <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32\1.0.5.0" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
- <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32\1.0.5.0" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll]" 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.5.0, Culture=neutral" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.6.0, 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/Generator/FcoHelper.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoHelper.cs Thu Feb 14 21:01:40 2013 (r2153)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoHelper.cs Fri Feb 15 13:30:19 2013 (r2154)
@@ -521,11 +521,18 @@
MgaSimpleConnection simple = cp.Owner as MgaSimpleConnection;
if (simple != null)
{
- if (simple.MetaBase.Name == "ConnectorToDestination" ||
- (simple.MetaBase.Name == "SourceToConnector" &&
- string.IsNullOrEmpty(simple.StrAttrByName["srcRolename"])))
+ MgaFCO connector = null;
+ if (simple.MetaBase.Name == "ConnectorToDestination")
+ {
+ connector = simple.Src;
+ }
+ if (simple.MetaBase.Name == "SourceToConnector" &&
+ string.IsNullOrEmpty(simple.StrAttrByName["srcRolename"]))
+ {
+ connector = simple.Dst;
+ }
+ if (connector != null)
{
- MgaFCO connector = simple.Src;
foreach (MgaConnPoint cpConnector in connector.PartOfConns)
{
MgaSimpleConnection simpleConn = cpConnector.Owner as MgaSimpleConnection;
@@ -572,11 +579,18 @@
MgaSimpleConnection simple = cp.Owner as MgaSimpleConnection;
if (simple != null)
{
- if (simple.MetaBase.Name == "SourceToConnector" ||
- (simple.MetaBase.Name == "ConnectorToDestination" &&
- string.IsNullOrEmpty(simple.StrAttrByName["dstRolename"])))
+ MgaFCO connector = null;
+ if (simple.MetaBase.Name == "SourceToConnector")
+ {
+ connector = simple.Dst;
+ }
+ if (simple.MetaBase.Name == "ConnectorToDestination" &&
+ string.IsNullOrEmpty(simple.StrAttrByName["dstRolename"]))
+ {
+ connector = simple.Src;
+ }
+ if (connector != null)
{
- MgaFCO connector = simple.Dst;
foreach (MgaConnPoint cpConnector in connector.PartOfConns)
{
MgaSimpleConnection simpleConn = cpConnector.Owner as MgaSimpleConnection;
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Thu Feb 14 21:01:40 2013 (r2153)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Fri Feb 15 13:30:19 2013 (r2154)
@@ -33,6 +33,6 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
// Keep in sync with app.manifest and GME_SDK.wxs
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
// also change GME_SDK.wxs
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Thu Feb 14 21:01:40 2013 (r2153)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Fri Feb 15 13:30:19 2013 (r2154)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.5.0"
+ version="1.0.6.0"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
More information about the gme-commit
mailing list