Updated MvsSln 2.7 with Huid implementation:

3F · 3F · commit 1d66cba93cf9 · 2024-06-10T01:23:54.000+03:00
MvsSlnFeatureHuid=true 3F/MvsSln#51 (comment)
diff --git a/.vssbe b/.vssbe
@@ -73,17 +73,17 @@
           "TODO: option for expensive coreclr",
           "",
           "",
-          "#[\" Packages \"]",
+          "~ Packages",
           "",
           "#[( !(#[IO exists.file(\"packages/__checked\")]) )",
           "{",
-          "    #[File call(\"tools\\hmsbuild.bat\", \"-t:restore /v:q /nologo /p:Configuration=$(Configuration) /p:Platform=\\\"Any CPU\\\"\", 1000)]",
-          "        ",
           "    #[NuGet gnt.raw(\"/p:ngconfig=\\\"packages.config;PeViewer/packages.config;NSBin/packages.config;Wizard/packages.config\\\" /nologo /v:m /m:4\")]",
           "    ",
           "    #[IO copy.directory(\"\", \"packages/\", true)]",
           "    #[File write(\"packages/__checked\"): ]",
-          "}]"
+          "}]",
+          "",
+          "#[File scall(\"tools\\hmsbuild.bat\", \"~c $(Configuration) -t:restore /v:q /nologo\", 200)]"
         ]
       }
     },
diff --git a/MvsSln b/MvsSln
@@ -1 +1 @@
-Subproject commit 993dcc94d0615f80164ae8143daec9001a04f2f7
+Subproject commit 187f0e9bcc45458588c687dee433a7612182a38b
diff --git a/RGiesecke.DllExport.MSBuild/PostProc.cs b/RGiesecke.DllExport.MSBuild/PostProc.cs
@@ -203,7 +203,7 @@ private void PopulateProperties(IEnumerable<IXProject> projects, Func<string, st
         {
             foreach(var dep in projects)
             {
-                CallbackProperties.ForEach(p => AllocateItem(formatter(p), dep.GetProperty(p, false).evaluatedValue));
+                CallbackProperties.ForEach(p => AllocateItem(formatter(p), dep.GetProperty(p, false).evaluated));
             }
         }
 
diff --git a/Wizard/Extensions/XProjectExtension.cs b/Wizard/Extensions/XProjectExtension.cs
@@ -24,7 +24,7 @@ internal static class XProjectExtension
         /// <returns>The evaluated property value, which is never null.</returns>
         public static string GetPropertyValue(this IXProject xp, string name, bool localScope = false)
         {
-            return xp?.GetProperty(name, localScope).evaluatedValue;
+            return xp?.GetProperty(name, localScope).evaluated;
         }
 
         /// <summary>
@@ -36,7 +36,7 @@ public static string GetPropertyValue(this IXProject xp, string name, bool local
         /// <returns>The unevaluated property value, which is never null.</returns>
         public static string GetUnevaluatedPropertyValue(this IXProject xp, string name, bool localScope = false)
         {
-            return xp?.GetProperty(name, localScope).unevaluatedValue;
+            return xp?.GetProperty(name, localScope).unevaluated;
         }
 
         /// <summary>
diff --git a/Wizard/Project.cs b/Wizard/Project.cs
@@ -49,7 +49,7 @@ public bool Installed
             && !string.IsNullOrWhiteSpace(GetProperty(MSBuildProperties.DXP_ID));
 
         /// <inheritdoc cref="IProject.InternalError"/>
-        public string InternalError => XProject?.GetProperty(DxpIsolatedEnv.ERR_MSG, true).evaluatedValue;
+        public string InternalError => XProject?.GetProperty(DxpIsolatedEnv.ERR_MSG, true).evaluated;
 
         /// <inheritdoc cref="IProject.DxpIdent"/>
         public string DxpIdent
@@ -585,8 +585,8 @@ protected void RemoveDllExportLib()
                 }
 
                 // all obsolete packages - https://github.com/3F/DllExport/issues/65
-                if(!PublicKeyTokenLimit && refer.evaluatedInclude == "DllExport") {
-                    Log.send(this, $"Remove old reference no-pk:'{refer.evaluatedInclude}'", Message.Level.Info);
+                if(!PublicKeyTokenLimit && refer.evaluated == "DllExport") {
+                    Log.send(this, $"Remove old reference no-pk:'{refer.evaluated}'", Message.Level.Info);
                     XProject.RemoveItem(refer);
                 }
             }
diff --git a/Wizard/UI/Controls/PostProcControl.cs b/Wizard/UI/Controls/PostProcControl.cs
@@ -55,7 +55,7 @@ internal void LoadProperties(IXProject project)
             if(project == null) return;
 
             var props = project.GetProperties().ToArray(); // array prevents possible InvalidOperationException
-            dgvProperties.UIAction(g => props.ForEach(p => g.Rows.Add(p.name, p.evaluatedValue)));
+            dgvProperties.UIAction(g => props.ForEach(p => g.Rows.Add(p.name, p.evaluated)));
         }
 
         public PostProcControl() => InitializeComponent();
diff --git a/Wizard/UI/SimpleConfFormater.cs b/Wizard/UI/SimpleConfFormater.cs
@@ -39,17 +39,17 @@ public string Parse(IProject prj)
             sb.AppendLine($"PostProc.Type: {prj.Config.PostProc.Type}");
             sb.AppendLine($"PostProc.ProcEnv: {prj.Config.PostProc.GetProcEnvAsString()}");
             sb.AppendLine($"PostProc.Cmd: {prj.Config.PostProc.Cmd}");
-            sb.AppendLine($"SignAssembly: {prj.XProject.GetProperty("SignAssembly").unevaluatedValue}");
+            sb.AppendLine($"SignAssembly: {prj.XProject.GetProperty("SignAssembly").unevaluated}");
             sb.AppendLine($"Identifier: {prj.DxpIdent}");
             sb.AppendLine($"Instance: {Assembly.GetEntryAssembly().Location}");
             sb.AppendLine($"Project path: {prj.XProject.ProjectFullPath}");
             sb.AppendLine($"Action: {prj.Config.Wizard.Type}");
-            sb.AppendLine($"PlatformTarget: {prj.XProject.GetProperty("PlatformTarget").unevaluatedValue}");
-            sb.AppendLine($"TargetFramework: {prj.XProject.GetProperty("TargetFramework").unevaluatedValue}");
-            sb.AppendLine($"TargetFrameworks: {prj.XProject.GetProperty("TargetFrameworks").unevaluatedValue}");
-            sb.AppendLine($"TargetFrameworkVersion: {prj.XProject.GetProperty("TargetFrameworkVersion").unevaluatedValue}");
-            sb.AppendLine($"RootNamespace: {prj.XProject.GetProperty("RootNamespace").unevaluatedValue}");
-            sb.AppendLine($"AssemblyName: {prj.XProject.GetProperty("AssemblyName").unevaluatedValue}");
+            sb.AppendLine($"PlatformTarget: {prj.XProject.GetProperty("PlatformTarget").unevaluated}");
+            sb.AppendLine($"TargetFramework: {prj.XProject.GetProperty("TargetFramework").unevaluated}");
+            sb.AppendLine($"TargetFrameworks: {prj.XProject.GetProperty("TargetFrameworks").unevaluated}");
+            sb.AppendLine($"TargetFrameworkVersion: {prj.XProject.GetProperty("TargetFrameworkVersion").unevaluated}");
+            sb.AppendLine($"RootNamespace: {prj.XProject.GetProperty("RootNamespace").unevaluated}");
+            sb.AppendLine($"AssemblyName: {prj.XProject.GetProperty("AssemblyName").unevaluated}");
             sb.AppendLine($"MgrArgs: {prj.Config.Wizard.MgrArgs}");
             sb.AppendLine($"MetaLib: {prj.Config.Wizard.MetaLib}");
             sb.AppendLine($"MetaCor: {prj.Config.Wizard.MetaCor}");
diff --git a/build.bat b/build.bat
@@ -1,15 +1,6 @@
 @echo off
 
-set cim=packages\vsSolutionBuildEvent\cim.cmd
-
 set reltype=%~1
 if not defined reltype set reltype=Release
 
-call tools/gnt /p:wpath="%cd%" /p:ngconfig="packages.config" /nologo /v:m /m:6 || goto err
-call %cim% /v:m /m:4 /p:Configuration="%reltype%" || goto err
-
-exit /B 0
-
-:err
-echo. Build failed. 1>&2
-exit /B 1
+tools\gnt & packages\vsSolutionBuildEvent\cim.cmd ~x ~c %reltype%
diff --git a/redefine.props b/redefine.props
@@ -3,6 +3,10 @@
   <PropertyGroup Label="MvsSln">
     <OverrideMvsSlnTFM>net40;netstandard2.0</OverrideMvsSlnTFM>
     <OverrideMvsSlnTestTFM>net6</OverrideMvsSlnTestTFM>
+
+    <!-- https://github.com/3F/DllExport/issues/171 -->
+    <!-- https://github.com/3F/MvsSln/issues/51 -->
+    <MvsSlnFeatureHuid>true</MvsSlnFeatureHuid>
   </PropertyGroup>
 
 </Project>
diff --git a/vsSolutionBuildEvent.bat b/vsSolutionBuildEvent.bat
@@ -1,5 +1,4 @@
 @echo off
 
 :: Visual Studio IDE plugin: https://github.com/3F/vsSolutionBuildEvent/releases/latest
-
-tools\gnt vsSolutionBuildEvent & packages\vsSolutionBuildEvent\GUI.bat
+tools\gnt vsSolutionBuildEvent & packages\vsSolutionBuildEvent\GUI

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private void PopulateProperties(IEnumerable<IXProject> projects, Func<string, st`
`203`	`203`	`{`
`204`	`204`	`foreach(var dep in projects)`
`205`	`205`	`{`
`206`		`- CallbackProperties.ForEach(p => AllocateItem(formatter(p), dep.GetProperty(p, false).evaluatedValue));`
	`206`	`+ CallbackProperties.ForEach(p => AllocateItem(formatter(p), dep.GetProperty(p, false).evaluated));`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ internal static class XProjectExtension`
`24`	`24`	`/// <returns>The evaluated property value, which is never null.</returns>`
`25`	`25`	`public static string GetPropertyValue(this IXProject xp, string name, bool localScope = false)`
`26`	`26`	`{`
`27`		`- return xp?.GetProperty(name, localScope).evaluatedValue;`
	`27`	`+ return xp?.GetProperty(name, localScope).evaluated;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/// <summary>`
`@@ -36,7 +36,7 @@ public static string GetPropertyValue(this IXProject xp, string name, bool local`
`36`	`36`	`/// <returns>The unevaluated property value, which is never null.</returns>`
`37`	`37`	`public static string GetUnevaluatedPropertyValue(this IXProject xp, string name, bool localScope = false)`
`38`	`38`	`{`
`39`		`- return xp?.GetProperty(name, localScope).unevaluatedValue;`
	`39`	`+ return xp?.GetProperty(name, localScope).unevaluated;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public bool Installed`
`49`	`49`	`&& !string.IsNullOrWhiteSpace(GetProperty(MSBuildProperties.DXP_ID));`
`50`	`50`
`51`	`51`	`/// <inheritdoc cref="IProject.InternalError"/>`
`52`		`- public string InternalError => XProject?.GetProperty(DxpIsolatedEnv.ERR_MSG, true).evaluatedValue;`
	`52`	`+ public string InternalError => XProject?.GetProperty(DxpIsolatedEnv.ERR_MSG, true).evaluated;`
`53`	`53`
`54`	`54`	`/// <inheritdoc cref="IProject.DxpIdent"/>`
`55`	`55`	`public string DxpIdent`
`@@ -585,8 +585,8 @@ protected void RemoveDllExportLib()`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`// all obsolete packages - https://github.com/3F/DllExport/issues/65`
`588`		`- if(!PublicKeyTokenLimit && refer.evaluatedInclude == "DllExport") {`
`589`		`- Log.send(this, $"Remove old reference no-pk:'{refer.evaluatedInclude}'", Message.Level.Info);`
	`588`	`+ if(!PublicKeyTokenLimit && refer.evaluated == "DllExport") {`
	`589`	`+ Log.send(this, $"Remove old reference no-pk:'{refer.evaluated}'", Message.Level.Info);`
`590`	`590`	`XProject.RemoveItem(refer);`
`591`	`591`	`}`
`592`	`592`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ internal void LoadProperties(IXProject project)`
`55`	`55`	`if(project == null) return;`
`56`	`56`
`57`	`57`	`var props = project.GetProperties().ToArray(); // array prevents possible InvalidOperationException`
`58`		`- dgvProperties.UIAction(g => props.ForEach(p => g.Rows.Add(p.name, p.evaluatedValue)));`
	`58`	`+ dgvProperties.UIAction(g => props.ForEach(p => g.Rows.Add(p.name, p.evaluated)));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public PostProcControl() => InitializeComponent();`