[commit] r2663 - in trunk: Install SDK/DotNet/DsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties SDK/DotNet/DsmlGenerator/MgaMeta SDK/DotNet/DsmlGenerator/MgaMeta/Properties Tests/GPyUnit/DsmlGeneratorTest
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Feb 15 17:56:05 CST 2017
Author: ksmyth
Date: Wed Feb 15 17:56:05 2017
New Revision: 2663
Log:
DsmlGenerator: fix bug with creating FCOs with a role
Modified:
trunk/Install/GME_SDK.wxs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec
trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
trunk/SDK/DotNet/DsmlGenerator/MgaMeta/DsmlModel.cs
trunk/SDK/DotNet/DsmlGenerator/MgaMeta/Properties/AssemblyInfo.cs
trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj
trunk/Tests/GPyUnit/DsmlGeneratorTest/packages.config
Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/Install/GME_SDK.wxs Wed Feb 15 17:56:05 2017 (r2663)
@@ -24,7 +24,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.3, Culture=neutral" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.15.1, 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/FcoRoles.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Generator/FcoRoles.cs Wed Feb 15 17:56:05 2017 (r2663)
@@ -86,7 +86,8 @@
int roleMetaRef = Configuration.DsmlModel.GetChildRoleRef(
Configuration.GetKindName(parent as MgaObject),
- Configuration.GetKindName(Subject));
+ Configuration.GetKindName(Subject),
+ role);
codeMemberField.InitExpression = new CodePrimitiveExpression(roleMetaRef);
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Wed Feb 15 17:56:05 2017 (r2663)
@@ -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.3")]
-[assembly: AssemblyFileVersion("1.0.14.3")]
+[assembly: AssemblyVersion("1.0.15.1")]
+[assembly: AssemblyFileVersion("1.0.15.1")]
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Wed Feb 15 17:56:05 2017 (r2663)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.14.3"
+ version="1.0.15.1"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec Wed Feb 15 17:56:05 2017 (r2663)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator.Runtime</id>
- <version>1.0.14.1</version>
+ <version>1.0.15.1</version>
<title>GME DSMLGenerator Runtime</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Wed Feb 15 17:56:05 2017 (r2663)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator</id>
- <version>1.0.14.3</version>
+ <version>1.0.15.1</version>
<title>GME DSMLGenerator</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
Modified: trunk/SDK/DotNet/DsmlGenerator/MgaMeta/DsmlModel.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/MgaMeta/DsmlModel.cs Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/MgaMeta/DsmlModel.cs Wed Feb 15 17:56:05 2017 (r2663)
@@ -119,7 +119,30 @@
return 0;
}
- public static paradigm GetParadigm(string filename)
+ public int GetChildRoleRef(
+ string parentKindName,
+ string childKindName,
+ string roleName)
+ {
+
+ foreach (var item in Paradigm.folder.Items.OfType<model>())
+ {
+ if (item.name == parentKindName)
+ {
+ foreach (var r in item.role)
+ {
+ if (r.kind == childKindName && r.name == roleName)
+ {
+ return int.Parse(r.metaref);
+ }
+ }
+ }
+ }
+ //throw new InvalidDataException();
+ return 0;
+ }
+
+ public static paradigm GetParadigm(string filename)
{
XmlReaderSettings settings = new XmlReaderSettings()
{
Modified: trunk/SDK/DotNet/DsmlGenerator/MgaMeta/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/MgaMeta/Properties/AssemblyInfo.cs Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/SDK/DotNet/DsmlGenerator/MgaMeta/Properties/AssemblyInfo.cs Wed Feb 15 17:56:05 2017 (r2663)
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
Modified: trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj
==============================================================================
--- trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj Wed Feb 15 17:56:05 2017 (r2663)
@@ -62,13 +62,13 @@
</Reference>
<Reference Include="ISIS.GME.Common, Version=1.0.5.0, Culture=neutral, PublicKeyToken=1321e6b92842fe54, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.14.1\lib\net40\ISIS.GME.Common.dll</HintPath>
+ <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.15.1\lib\net40\ISIS.GME.Common.dll</HintPath>
</Reference>
<Reference Include="ISIS.GME.Dsml.BidirConnection">
<HintPath>..\ISIS.GME.Dsml.BidirConnection.dll</HintPath>
</Reference>
<Reference Include="MgaMeta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1321e6b92842fe54, processorArchitecture=MSIL">
- <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.14.1\lib\net40\MgaMeta.dll</HintPath>
+ <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.15.1\lib\net40\MgaMeta.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Modified: trunk/Tests/GPyUnit/DsmlGeneratorTest/packages.config
==============================================================================
--- trunk/Tests/GPyUnit/DsmlGeneratorTest/packages.config Fri Jan 27 13:01:48 2017 (r2662)
+++ trunk/Tests/GPyUnit/DsmlGeneratorTest/packages.config Wed Feb 15 17:56:05 2017 (r2663)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="GME.DSMLGenerator.Runtime" version="1.0.14.1" targetFramework="net40-Client" />
+ <package id="GME.DSMLGenerator.Runtime" version="1.0.15.1" targetFramework="net40-Client" />
<package id="GME.PIAs" version="1.0.1.0" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
More information about the gme-commit
mailing list