[commit] r2683 - in trunk: Install Install/Build SDK/DotNet/DsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Classes SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Interfaces SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties Tests/GPyUnit/DsmlGeneratorTest
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Jun 26 11:06:56 CDT 2017
Author: ksmyth
Date: Mon Jun 26 11:06:56 2017
New Revision: 2683
Log:
CSharpDsmlGenerator: add Archetype, All{Dst,Src}Connections to FCO interface
Modified:
trunk/Install/Build/build.py
trunk/Install/GME_SDK.wxs
trunk/Install/GME_bin.wxs
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/ISIS.GME.Common/Classes/FCO.cs
trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Interfaces/FCO.cs
trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj
trunk/Tests/GPyUnit/DsmlGeneratorTest/packages.config
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/Install/Build/build.py Mon Jun 26 11:06:56 2017 (r2683)
@@ -240,7 +240,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.6.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.7.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_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/Install/GME_SDK.wxs Mon Jun 26 11:06:56 2017 (r2683)
@@ -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.16.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.17.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/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/Install/GME_bin.wxs Mon Jun 26 11:06:56 2017 (r2683)
@@ -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.6.0__1321e6b92842fe54'/>
+ <RegistryValue Type='string' Value='[WindowsFolder]Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.7.0__1321e6b92842fe54'/>
</RegistryKey>
</RegistryKey>
</Component>
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/Properties/AssemblyInfo.cs Mon Jun 26 11:06:56 2017 (r2683)
@@ -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.16.1")]
-[assembly: AssemblyFileVersion("1.0.16.1")]
+[assembly: AssemblyVersion("1.0.17.1")]
+[assembly: AssemblyFileVersion("1.0.17.1")]
Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/app.manifest Mon Jun 26 11:06:56 2017 (r2683)
@@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="CSharpDSMLGenerator"
- version="1.0.16.1"
+ version="1.0.17.1"
publicKeyToken="1321e6b92842fe54"
processorArchitecture="msil" />
<clrClass
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.Runtime.nuspec Mon Jun 26 11:06:56 2017 (r2683)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator.Runtime</id>
- <version>1.0.16.1</version>
+ <version>1.0.17.1</version>
<title>GME DSMLGenerator Runtime</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
@@ -11,8 +11,8 @@
<iconUrl>http://repo.isis.vanderbilt.edu/GME/GME.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Libraries required to use the generated domain-specific API</description>
- <releaseNotes>Initial release</releaseNotes>
- <copyright>Copyright 2013 ISIS, Vanderbilt University</copyright>
+ <releaseNotes></releaseNotes>
+ <copyright>Copyright 2017 ISIS, Vanderbilt University</copyright>
<tags>GME</tags>
<dependencies>
<dependency id="GME.PIAs" version="1.0.1.0" />
Modified: trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/GME.DSMLGenerator.nuspec Mon Jun 26 11:06:56 2017 (r2683)
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>GME.DSMLGenerator</id>
- <version>1.0.16.1</version>
+ <version>1.0.17.1</version>
<title>GME DSMLGenerator</title>
<authors>ISIS, Vanderbilt University</authors>
<owners>ksmyth</owners>
@@ -11,8 +11,8 @@
<iconUrl>http://repo.isis.vanderbilt.edu/GME/GME.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Generates C# code for a MetaGME paradigm</description>
- <releaseNotes>Initial release</releaseNotes>
- <copyright>Copyright 2013 ISIS, Vanderbilt University</copyright>
+ <releaseNotes></releaseNotes>
+ <copyright>Copyright 2017 ISIS, Vanderbilt University</copyright>
<tags>GME</tags>
<dependencies>
<dependency id="GME.PIAs" version="1.0.1.0" />
Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Classes/FCO.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Classes/FCO.cs Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Classes/FCO.cs Mon Jun 26 11:06:56 2017 (r2683)
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using GME.MGA;
+using ISIS.GME.Common.Interfaces;
namespace ISIS.GME.Common.Classes
{
@@ -14,7 +15,7 @@
/// <summary>
/// Note: If you write domain specific code, do NOT use this.
/// </summary>
- public virtual ISIS.GME.Common.Interfaces.FCO ArcheType
+ public ISIS.GME.Common.Interfaces.FCO ArcheType
{
get
{
@@ -75,41 +76,41 @@
get { return Utils.ReferencedBy<Classes.Reference>(Impl as IMgaFCO); }
}
- ///// <summary>
- ///// This property must be implemented in the derived class.
- ///// </summary>
- //public virtual IEnumerable<ISIS.GME.Common.Interfaces.FCO> InstanceCollection
- //{
- // get
- // {
- // throw new NotSupportedException(
- // "This property must be implemented in the derived class.");
- // }
- //}
-
- ///// <summary>
- ///// This property must be implemented in the derived class.
- ///// </summary>
- //public virtual IEnumerable<ISIS.GME.Common.Interfaces.FCO> DerivedCollection
- //{
- // get
- // {
- // throw new NotSupportedException(
- // "This property must be implemented in the derived class.");
- // }
- //}
-
- ///// <summary>
- ///// This property must be implemented in the derived class.
- ///// </summary>
- //public virtual IEnumerable<ISIS.GME.Common.Interfaces.FCO> SubtypeCollection
- //{
- // get
- // {
- // throw new NotSupportedException(
- // "This property must be implemented in the derived class.");
- // }
- //}
+ ///// <summary>
+ ///// This property must be implemented in the derived class.
+ ///// </summary>
+ //public virtual IEnumerable<ISIS.GME.Common.Interfaces.FCO> InstanceCollection
+ //{
+ // get
+ // {
+ // throw new NotSupportedException(
+ // "This property must be implemented in the derived class.");
+ // }
+ //}
+
+ ///// <summary>
+ ///// This property must be implemented in the derived class.
+ ///// </summary>
+ //public virtual IEnumerable<ISIS.GME.Common.Interfaces.FCO> DerivedCollection
+ //{
+ // get
+ // {
+ // throw new NotSupportedException(
+ // "This property must be implemented in the derived class.");
+ // }
+ //}
+
+ ///// <summary>
+ ///// This property must be implemented in the derived class.
+ ///// </summary>
+ //public virtual IEnumerable<ISIS.GME.Common.Interfaces.FCO> SubtypeCollection
+ //{
+ // get
+ // {
+ // throw new NotSupportedException(
+ // "This property must be implemented in the derived class.");
+ // }
+ //}
- }
+ }
}
Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Interfaces/FCO.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Interfaces/FCO.cs Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Interfaces/FCO.cs Mon Jun 26 11:06:56 2017 (r2683)
@@ -10,6 +10,11 @@
/// </summary>
public interface FCO : Base
{
+ ISIS.GME.Common.Interfaces.FCO ArcheType
+ {
+ get;
+ }
+
bool IsInstance
{
get;
@@ -29,5 +34,15 @@
{
get;
}
- }
+
+ IEnumerable<ISIS.GME.Common.Interfaces.Connection> AllSrcConnections
+ {
+ get;
+ }
+
+ IEnumerable<ISIS.GME.Common.Interfaces.Connection> AllDstConnections
+ {
+ get;
+ }
+ }
}
Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs Mon Jun 26 11:06:56 2017 (r2683)
@@ -23,5 +23,5 @@
[assembly: Guid("eef84a03-3f78-4ea0-a366-f2a3e8caf27e")]
// also change GME_bin.wxs and build.py AssemblyFoldersEx
-[assembly: AssemblyVersion("1.0.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.0.7.0")]
+[assembly: AssemblyFileVersion("1.0.7.0")]
Modified: trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj
==============================================================================
--- trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/Tests/GPyUnit/DsmlGeneratorTest/DsmlGeneratorTest.csproj Mon Jun 26 11:06:56 2017 (r2683)
@@ -60,15 +60,15 @@
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
- <Reference Include="ISIS.GME.Common, Version=1.0.6.0, Culture=neutral, PublicKeyToken=1321e6b92842fe54, processorArchitecture=MSIL">
+ <Reference Include="ISIS.GME.Common, Version=1.0.7.0, Culture=neutral, PublicKeyToken=1321e6b92842fe54, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.16.1\lib\net40\ISIS.GME.Common.dll</HintPath>
+ <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.17.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.1.0, Culture=neutral, PublicKeyToken=1321e6b92842fe54, processorArchitecture=MSIL">
- <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.16.1\lib\net40\MgaMeta.dll</HintPath>
+ <HintPath>packages\GME.DSMLGenerator.Runtime.1.0.17.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 Mon Jun 26 11:06:51 2017 (r2682)
+++ trunk/Tests/GPyUnit/DsmlGeneratorTest/packages.config Mon Jun 26 11:06:56 2017 (r2683)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="GME.DSMLGenerator.Runtime" version="1.0.16.1" targetFramework="net40-Client" />
+ <package id="GME.DSMLGenerator.Runtime" version="1.0.17.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