Added support of global namespaces - Issue #47. Use Direct-Mod if C…

…ecil will not process this correctly.
3F · Aug 11, 2017 · 8517887 · 8517887
1 parent 0e0db7b
commit 8517887
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 19 deletions.
diff --git a/NSBin/Rmod.cs b/NSBin/Rmod.cs
@@ -70,7 +70,7 @@ public ISender Log
         public static bool IsValidNS(string name)
         {
             if(String.IsNullOrWhiteSpace(name)) {
-                return false;
+                return true;
             }
 
             return Regex.IsMatch(name, "^[a-z_][a-z_0-9.]*$", RegexOptions.IgnoreCase)
@@ -211,7 +211,7 @@ protected virtual string nsRule(string name)
             // Regex.Replace(name, @"[\.\s]{1,}", ".").Trim(new char[] { '.', ' ' });
 
             if(IsValidNS(name)) {
-                return name.Replace(" ", "");
+                return name?.Replace(" ", "") ?? String.Empty;
             }
             return DEFAULT_NS;
         }

diff --git a/Wizard/Project.cs b/Wizard/Project.cs
@@ -103,7 +103,8 @@ public virtual string MetaLib
                         Path.Combine(
                             Config.Wizard.PkgPath,
                             "gcache",
-                            ProjectGuid,
+                            "metalib",
+                            Config.Namespace,
                             Path.GetFileName(Config.Wizard.MetaLib)
                         )
                    );
@@ -313,12 +314,12 @@ protected void CfgCompiler()
 
         protected void Reset(bool properties)
         {
+            RemoveDllExportLib();
+
             if(properties) {
                 RemoveProperties(ConfigProperties.Keys.ToArray());
                 ConfigProperties.Clear();
             }
-
-            RemoveDllExportLib();
         }
 
         protected bool CmpPublicKeyTokens(string pkToken, string pkTokenAsm)
@@ -346,6 +347,7 @@ protected void AddDllExportLib()
 
             var lib = MetaLib;
             Log.send(this, $"Add meta library: '{lib}'", Message.Level.Info);
+            //XProject.AddReference("DllExport", lib, false);
             XProject.AddReference(lib, false);
 
             AddRestoreDxp(

diff --git a/Wizard/UI/ConfiguratorForm.cs b/Wizard/UI/ConfiguratorForm.cs
@@ -64,8 +64,8 @@ public ConfiguratorForm(IExecutor exec)
             projectItems.Browse  =
             projectItems.OpenUrl = OpenUrl;
 
-            projectItems.NamespaceValidate = (string str) => {
-                return DDNS.IsValidNS(str);
+            projectItems.NamespaceValidate = (string ns) => {
+                return DDNS.IsValidNS(ns?.Trim());
             };
 
             RenderSlnFiles();
@@ -191,7 +191,12 @@ private void comboBoxSln_SelectedIndexChanged(object sender, EventArgs e)
 
         private void btnApply_Click(object sender, EventArgs e)
         {
-            foreach(var prj in projectItems.Data) {
+            foreach(var prj in projectItems.Data)
+            {
+                if(!DDNS.IsValidNS(prj.Config.Namespace)) {
+                    MessageBox.Show($"Fix incorrect namespace before continue:\n\n'{prj.Config.Namespace}'", "Incorrect data", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return;
+                }
                 prj.Configure(ActionType.Configure);
             }
             Close();

diff --git a/Wizard/UI/Controls/ProjectItemControl.cs b/Wizard/UI/Controls/ProjectItemControl.cs
@@ -24,7 +24,6 @@
 
 using System;
 using System.ComponentModel;
-using System.IO;
 using System.Windows.Forms;
 
 namespace net.r_eg.DllExport.Wizard.UI.Controls
@@ -68,7 +67,6 @@ public Action<string> Browse
         public ComboBox Namespaces
         {
             get => comboNS;
-            set => comboNS = value;
         }
 
         /// <summary>
@@ -132,6 +130,16 @@ public int Order
             set;
         }
 
+        public void SetNamespace(string name, bool addIfNotExists = true)
+        {
+            name = name?.Trim() ?? String.Empty;
+
+            if(addIfNotExists && !Namespaces.Items.Contains(name)) {
+                Namespaces.Items.Add(name);
+            }
+            Namespaces.Text = name;
+        }
+
         public ProjectItemControl(IProject project)
         {
             this.project = project;

diff --git a/Wizard/UI/Controls/ProjectItemsControl.cs b/Wizard/UI/Controls/ProjectItemsControl.cs
@@ -163,8 +163,8 @@ private void ConfigureControl(ProjectItemControl control, IProject project)
 
             control.Namespaces.MaxLength = project.Config.NSBuffer;
 
-            if(!String.IsNullOrWhiteSpace(project.Config.Namespace)) {
-                control.Namespaces.Text = project.Config.Namespace;
+            if(project.Installed) {
+                control.SetNamespace(project.Config.Namespace, true);
             }
         }
 
@@ -174,7 +174,7 @@ private IProject ConfigureProject(IProject project, ProjectItemControl control)
             project.Config.UseCecil     = control.UseCecil;
             project.Config.Platform     = control.Platform;
             project.Config.Compiler     = control.Compiler;
-            project.Config.Namespace    = control.Namespaces.Text;
+            project.Config.Namespace    = control.Namespaces.Text.Trim();
 
             return project;
         }

diff --git a/Wizard/UserConfig.cs b/Wizard/UserConfig.cs
@@ -211,7 +211,10 @@ protected Platform GetPlatform(string value)
 
         private string GetValue(string property, IXProject project)
         {
-            return project?.GetProperty(property).evaluatedValue;
+            //TODO: update MvsSln
+            //NOTE: MS describes this as 'the evaluated property value, which is never null'
+            //      But, this is not true ! >(  .NETFramework\v4.0\Microsoft.Build.dll - Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a
+            return project?.GetProperty(property).evaluatedValue ?? String.Empty;
         }
     }
 }
diff --git a/tools/net.r_eg.DllExport.targets b/tools/net.r_eg.DllExport.targets
@@ -11,17 +11,18 @@
     <DllExportVSRoot Condition="'$(DllExportVSRoot)' == ''">$(DevEnvDir)\..\..\</DllExportVSRoot>
     <DllExportVSBin Condition="'$(DllExportVSBin)' == ''">$(DllExportVSRoot)Common7\IDE\</DllExportVSBin>
 
-    <DllExportLibPath Condition="'$(DllExportLibPath)' == ''">gcache\$(ProjectGuid)\</DllExportLibPath>
+    <DllExportLibPath Condition="'$(DllExportLibPath)' == ''">gcache\metalib\$(DllExportNamespace)\</DllExportLibPath>
     <DllExportToolsPath Condition="'$(DllExportToolsPath)' == ''">tools\</DllExportToolsPath>
 
-    <DllExportNamespace Condition="'$(DllExportNamespace)' == ''">System.Runtime.InteropServices</DllExportNamespace>
+    <DllExportNamespace Condition="'$(DllExportNamespace)' == ''"></DllExportNamespace>
     <DllExportLibFullPath Condition="'$(DllExportLibFullPath)' == ''">$(DllExportRootPkg)$(DllExportLibPath)</DllExportLibFullPath>
     <DllExportMetaLibAttr Condition="'$(DllExportMetaLibAttr)' == ''">DllExportAttribute</DllExportMetaLibAttr>
     <DllExportMetaLibName Condition="'$(DllExportMetaLibName)' == ''">DllExport.dll</DllExportMetaLibName>
     <DllExportMetaLibFullPath Condition="'$(DllExportMetaLibFullPath)' == ''">$(DllExportLibFullPath)$(DllExportMetaLibName)</DllExportMetaLibFullPath>
-    <DllExportDDNSCecil Condition="'$(DllExportDDNSCecil)' == ''">true</DllExportDDNSCecil>
-    <DllExportOurILAsm Condition="'$(DllExportOurILAsm)' == ''">true</DllExportOurILAsm>
     <DllExportOurILAsmPath Condition="'$(DllExportOurILAsmPath)' == ''">$(DllExportRootPkg)$(DllExportToolsPath)coreclr\</DllExportOurILAsmPath>
+
+    <DllExportAttributeFullName Condition="'$(DllExportNamespace)' != ''">$(DllExportNamespace).$(DllExportMetaLibAttr)</DllExportAttributeFullName>
+    <DllExportAttributeFullName Condition="'$(DllExportNamespace)' == ''">$(DllExportMetaLibAttr)</DllExportAttributeFullName>
   </PropertyGroup>
 
   <Target Name="DllExportMod" BeforeTargets="PostBuildEvent" DependsOnTargets="GetFrameworkPaths">
@@ -41,6 +42,8 @@
       <DllExportTargetFrameworkVersion Condition="'$(DllExportTargetFrameworkVersion)' == ''">$(TargetFrameworkVersion)</DllExportTargetFrameworkVersion>
       <DllExportSdkPath Condition="'$(DllExportSdkPath)' == ''">$(TargetFrameworkSDKToolsDirectory)</DllExportSdkPath>
       <DllExportSkipOnAnyCpu Condition="'$(DllExportSkipOnAnyCpu)' == ''">$(NoDllExportsForAnyCpu)</DllExportSkipOnAnyCpu>
+      <DllExportDDNSCecil Condition="'$(DllExportDDNSCecil)' == ''">true</DllExportDDNSCecil>
+      <DllExportOurILAsm Condition="'$(DllExportOurILAsm)' == ''">true</DllExportOurILAsm>
       <DllExportOrdinalsBase Condition="'$(DllExportOrdinalsBase)' == ''">1</DllExportOrdinalsBase>
       <DllExportGenExpLib Condition="'$(DllExportGenExpLib)' == ''">false</DllExportGenExpLib>
       <DllExportOurILAsmPath Condition="'$(DllExportOurILAsm)' != 'true'"></DllExportOurILAsmPath>
@@ -51,7 +54,7 @@
     <DllExportAppDomainIsolatedTask 
           Platform="$(DllExportPlatform)"
           CpuType="$(DllExportCpuType)"
-          DllExportAttributeFullName="$(DllExportNamespace).$(DllExportMetaLibAttr)"
+          DllExportAttributeFullName="$(DllExportAttributeFullName)"
           EmitDebugSymbols="$(DllExportEmitDebugSymbols)"
           LeaveIntermediateFiles="$(DllExportLeaveIntermediateFiles)"
           Timeout="$(DllExportTimeout)"