Fixes Possible incorrect Sdk-based project types via hMSBuild

#123 3F/MvsSln#23
3F · Nov 4, 2019 · c0a67ab · c0a67ab
1 parent ce8047a
commit c0a67ab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Manager/batch/Manager.bat b/Manager/batch/Manager.bat
@@ -499,6 +499,10 @@ if not defined xMSBuild (
 )
 
 if not defined xmgrtest (
+
+    REM :: Possible incorrect Sdk-based project types, https://github.com/3F/DllExport/pull/123
+    if not defined gMsbPath if defined wPkgPath set xMSBuild="!wPkgPath!\\hMSBuild"
+
     call :dbgprint "Target: " xMSBuild wzTarget
     !xMSBuild! /nologo /v:m /m:4 !wzTarget!
 )

diff --git a/Manager/batch/tests.bat b/Manager/batch/tests.bat
@@ -128,11 +128,11 @@ set appl=%app% -pkg-link "..\..\DllExport.$version$.nupkg"
     endlocal
 
     setlocal 
-        echo Test case 13: special symbols for -sln-file, -metalib, -dxp-target & set "%flagName%=13"
+        echo Test case 13: special symbols for -sln-file, -metacor, -metalib, -dxp-target & set "%flagName%=13"
 
         set _arg="crazy' dir&name!356~`@#$^(+)_=-;[.]{,}"
 
-        call %appl% -action Configure -sln-file %_arg% -metalib %_arg% -dxp-target %_arg%
+        call %appl% -action Configure -sln-file %_arg% -metacor %_arg% -metalib %_arg% -dxp-target %_arg%
 
     endlocal
 
@@ -159,8 +159,8 @@ set appl=%app% -pkg-link "..\..\DllExport.$version$.nupkg"
     setlocal 
         echo Test case 16: checking for -dxp-version, -server, -proxy  & set "%flagName%=16"
 
-        call %mgrFile% -action Default -dxp-version 1.6.0
-        call %app% -action Default -dxp-version 1.6.0 -server "https://127.0.0.1:8082/" -proxy "guest:[email protected]:7428" 
+        call %mgrFile% -action Default -dxp-version 1.6.5
+        call %app% -action Default -dxp-version 1.6.5 -server "https://127.0.0.1:8082/" -proxy "guest:[email protected]:7428" 
         :: -pe-exp-list "bin\Debug\regXwild.dll"
 
     endlocal

diff --git a/Manager/batch/tests.targets b/Manager/batch/tests.targets
@@ -119,8 +119,8 @@
   </Target>
 
   <Target Name="testCase16">
-    <Error Text="dxpVersion: $(dxpVersion) == 1.6.0" Condition="'$(dxpVersion)' != '1.6.0'" />
-    <Message Text="dxpVersion: $(dxpVersion) == 1.6.0" Importance="High" />
+    <Error Text="dxpVersion: $(dxpVersion) == 1.6.5" Condition="'$(dxpVersion)' != '1.6.5'" />
+    <Message Text="dxpVersion: $(dxpVersion) == 1.6.5" Importance="High" />
 
     <Error Text="pkgSrv: $(pkgSrv) == $(DataDefSrv)" Condition="'$(pkgSrv)' != '$(DataDefSrv)'" />
     <Message Text="pkgSrv: $(pkgSrv) == $(DataDefSrv)" Importance="High" />

diff --git a/Wizard/Project.cs b/Wizard/Project.cs
@@ -650,7 +650,7 @@ protected void RemoveProperties(params string[] names)
             foreach(string name in names)
             {
                 if(!String.IsNullOrWhiteSpace(name)) {
-                    Log.send(this, $"'{ProjectPath}' Remove old properties: '{name}'", Message.Level.Trace);
+                    // Log.send(this, $"'{ProjectPath}' Remove old properties: '{name}'", Message.Level.Trace);
                     while(XProject.RemoveProperty(name, true)) { }
                 }
             }