Merge branch 'dev/rel/1.7'

.gitattributes

@@ -0,0 +1,7 @@
+
+# Our batch files requires CRLF for correct work.
+# https://github.com/3F/hMSBuild/issues/2
+
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.tpl text eol=crlf

.release.version

@@ -1 +1 @@
- 
+beta4

.version

@@ -1 +1 @@
-1.6.6
+1.7.0

3rd-party.txt

@@ -1,5 +1,5 @@
-DllExport  [ github.com/3F/DllExport ]
-- - - - - - - - - - - - - - - - - - - 
+DllExport - https://github.com/3F/DllExport
+- - - - - - - - - - - - - - - - - - - - - - 
 
 # Third-party software components
 
@@ -21,13 +21,15 @@ DllExport  [ github.com/3F/DllExport ]
 
             * https://github.com/3F/Conari
 
-        ### GetNuTool core & hMSBuild logic 
+        ### GetNuTool + hMSBuild 
 
-              As an main core for new manager.
+              As the main core for new manager 
+              and helpers for modern SDK-based projects.
 
             * https://github.com/3F/GetNuTool
             * https://github.com/3F/hMSBuild
 
+
     ## Dev Dependencies includes the following tools for src:
 
         * vsSolutionBuildEvent
@@ -41,3 +43,17 @@ DllExport  [ github.com/3F/DllExport ]
 
         * GetNuTool
             https://github.com/3F/GetNuTool
+
+
+    ## Graphics
+
+        ### The Visual Studio image library 
+
+            (Visual Studio 2017; 28 November 2017)
+            Over 1,000 images can be used to create applications that look visually consistent with Microsoft software:
+            https://docs.microsoft.com/en-us/visualstudio/designers/the-visual-studio-image-library?view=vs-2017
+
+            License Terms:
+
+            * ./Resources/vsico/Visual Studio 2017 Image Library EULA.RTF
+              https://download.microsoft.com/download/0/6/0/0607D8EA-9BB7-440B-A36A-A24EB8C9C67E/Visual%20Studio%202017%20Image%20Library%20EULA.RTF 

DllExport.sln

@@ -23,10 +23,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{E623294B-0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{44F550ED-6D5E-45CB-8FD0-CBB35051B8E1}"
 	ProjectSection(SolutionItems) = preProject
-		tools\build.targets = tools\build.targets
 		tools\DllExport.nuspec = tools\DllExport.nuspec
 		tools\gnt.bat = tools\gnt.bat
 		tools\hMSBuild.bat = tools\hMSBuild.bat
+		tools\init.ps1 = tools\init.ps1
 		tools\net.r_eg.DllExport.targets = tools\net.r_eg.DllExport.targets
 	EndProjectSection
 EndProject

Manager/batch/.compressor

@@ -92,7 +92,7 @@
                 var vdict = gencomb(cdict, 2, (int i) => { return char.IsLetter(cdict[i]) || cdict[i] == '_'; });
 
                 // to skip processing for:
-                var exvar = new[] { "__p_call", "wMgrArgs", "wSlnDir", "wPkgPath", "wMetaLib", "wMetaCor", "wDxpTarget", "wAction", "wSlnFile", "wRootPath", "ngserver" };
+                var exvar = new[] { "__p_call", "wMgrArgs", "wPkgVer", "wProxy", "wSlnDir", "wPkgPath", "wMetaLib", "wMetaCor", "wDxpTarget", "wAction", "wSlnFile", "wRootPath", "ngserver" };
 
                 const string VNAME  = "[a-z_][a-z_0-9]+";
                 const string VERS   = "[Minified version]";

Manager/batch/Manager.bat

@@ -125,10 +125,10 @@ echo.
 echo Licensed under the MIT license
 @echo https://github.com/3F/DllExport
 echo.
-echo Based on hMSBuild and includes GetNuTool core: https://github.com/3F
+echo Based on hMSBuild, MvsSln, +GetNuTool: https://github.com/3F
 echo.
 @echo.
-@echo Usage: DllExport [args to DllExport] [args to GetNuTool core]
+@echo Usage: DllExport [args to DllExport] [args to GetNuTool]
 echo ------
 echo.
 echo Arguments:
@@ -271,6 +271,7 @@ set key=!arg[%idx%]!
     ) else if [!key!]==[-proxy] ( set /a "idx+=1" & call :eval arg[!idx!] v
 
         set proxy=!v!
+        set wProxy=!v!
 
         goto continue
     ) else if [!key!]==[-pkg-link] ( set /a "idx+=1" & call :eval arg[!idx!] v
@@ -369,6 +370,7 @@ if defined dxpVersion (
         set "dxpVersion="
     )
 )
+set wPkgVer=!dxpVersion!
 
 if z%wAction%==zUpgrade (
     call :dbgprint "Upgrade is on"
@@ -522,7 +524,7 @@ if defined xmgrtest (
 
 :: keep it as the last one-line command before final exit!
 if defined mgrUp (
-    (copy /B/Y "!wPkgPath!\\DllExport.bat" "!fManager!" > nul) && ( echo Manager has been updated. & exit /B !EXIT_CODE! ) || ( echo -mgr-up failed. & exit /B %ERRORLEVEL% )
+    (copy /B/Y "!wPkgPath!\\DllExport.bat" "!fManager!" > nul) && ( echo Manager has been updated. & exit /B 0 ) || ( (echo -mgr-up failed:!EXIT_CODE! 1>&2) & exit /B 1 )
 )
 
 exit /B !EXIT_CODE!

Manager/batch/Manager.offline.bat

@@ -1,52 +1,40 @@
 @echo off
 
-:: Copyright (c) 2016-2020  Denis Kuzmin [ [email protected] ] GitHub/3F
-:: Licensed under the MIT license
 :: https://github.com/3F/DllExport
 :: ---
 :: Offline version - wrapper
 
 :: - :: - - - - - - - - - - - - - - -
 
-:: the command when no arguments at all
+:: Activated version to use
+set "pkgVersion=actual"
+
+:: Use command when no arguments to this wrapper
 set "defaultCommand=-action Configure"
 
-:: common directory with offline packages
-set "pkgsDir=packages.offline"
+:: Where offline packages are stored
+set "pkgsDir=packages"
+
+
+
+
+
+
 
-:: DllExport package
-set "unpackedPkg=DllExport"
 
-:: DllExport Manager
-set "mgrFile=DllExport.bat"
 
 
 :: - - - - - - - - - - - - - - -
 setlocal enableDelayedExpansion
 
 set args=%*
+set "__=DllExport"
+if not defined args set args=%defaultCommand%
 
-call :isEmptyOrWhitespace args _is
-if [!_is!]==[1] (
-    set args=%defaultCommand%
+if "%pkgVersion%"=="actual" (
+    call ".\\%pkgsDir%\\%__%\\%__%" -packages %pkgsDir% -dxp-version actual !args!
+) else (
+    call ".\\%pkgsDir%\\%__%.%pkgVersion%\\%__%" -packages %pkgsDir% !args!
 )
 
-call .\%pkgsDir%\%unpackedPkg%\%mgrFile% -packages %pkgsDir% -dxp-version actual !args!
-
 exit /B %ERRORLEVEL%
-
-
-
-:isEmptyOrWhitespace
-:: Usage: call :isEmptyOrWhitespace input output(1/0)
-setlocal enableDelayedExpansion
-set "_v=!%1!"
-
-if not defined _v endlocal & set /a %2=1 & exit /B 0
-
-set _v=%_v: =%
-set "_v= %_v%"
-if [^%_v:~1,1%]==[] endlocal & set /a %2=1 & exit /B 0
-
-endlocal & set /a %2=0
-exit /B 0

MetadataCore/MetadataCore.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.6.5</Version>
+    <Version>1.7.0</Version>
     <MetadataFxPath>..\MetadataFx\</MetadataFxPath>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard1.1</TargetFramework>
     <RootNamespace>net.r_eg.DllExport</RootNamespace>
     <AssemblyName>DllExport</AssemblyName>
     <SignAssembly>true</SignAssembly>

MetadataFx/AssemblyInfo.cs

@@ -12,4 +12,4 @@
 [assembly: Guid("E0E525D9-49F8-4641-910F-E9D01821AB15")]
 
 //[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyVersion("1.6.6.*")]
+[assembly: AssemblyVersion("1.7.0.*")]

MetadataFx/DllExportAttribute.cs

@@ -67,7 +67,6 @@ 00000600  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
     /// About our meta-information in user-code:
     /// https://github.com/3F/DllExport/issues/16
     /// </summary>
-    [Serializable]
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
     public sealed class DllExportAttribute: Attribute
     {