Merged PR 1028022: Merge xerces to feature

The latest round of ES changes that I had to make to get NuGet package publishing working.  You can see what the release logs look like here: https://microsoft.visualstudio.com/xPlatAppx/_apps/hub/ms.vss-releaseManagement-web.hub-explorer?definitionId=2&releaseId=17&_a=release-logs and you can find the published package here: https://microsoft.visualstudio.com/xPlatAppx/_packaging?feed=xPlatAppx&_a=feed .

CMakeLists.txt

@@ -57,6 +57,7 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "0")
 SET(VERSION_PATCH "0")
+SET(GIT_BRANCH_NAME "master")
 
 ## Git (and its revision)
 find_package(Git) # QUIET) # if we don't find git or FindGit.cmake is not on the system we ignore it.
@@ -67,18 +68,31 @@ find_package(Git) # QUIET) # if we don't find git or FindGit.cmake is not on the
 ## The Git module will trigger a reconfiguration for each pull that will bring a new revision on the local repository
 SET(VCS_REVISION "-1")
 IF(GIT_FOUND)
+    MESSAGE (STATUS "--------------------------------")
+    MESSAGE (STATUS "xPlatAppx")
+    MESSAGE (STATUS "--------------------------------")    
     include(GetGitRevisionDescription)
     get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-    MESSAGE(STATUS "GIT branch ${GIT_REFSPEC}")
+    MESSAGE(STATUS "GIT refspec ${GIT_REFSPEC}")
     MESSAGE(STATUS "GIT revision ${GIT_SHA1}")
     set (VCS_REVISION ${GIT_SHA1})
 
     git_describe(GIT_DESCRIPTION)
     MESSAGE(STATUS "GIT Description '${GIT_DESCRIPTION}'" )
-    string(REGEX MATCH "v([0-9]+)\\.([0-9]+)\\-([0-9]+)" _dummy "${GIT_DESCRIPTION}")
+    string(REGEX MATCH "v([0-9]+)\\.([0-9]+)\\-([0-9]+)" _dummy1 "${GIT_DESCRIPTION}")
     SET(VERSION_MAJOR ${CMAKE_MATCH_1})
     SET(VERSION_MINOR ${CMAKE_MATCH_2})
     SET(VERSION_PATCH ${CMAKE_MATCH_3})
+
+    IF(NOT ${GIT_REFSPEC})
+        string(REGEX MATCH "refs/heads/([a-zA-Z0-9_/]+)" _dummy2 ${GIT_REFSPEC})
+        SET(GIT_BRANCH_NAME ${CMAKE_MATCH_1})
+    ELSE()
+        # VSO doesn't checkout a branch do a pull, it checks out a hash and does a pull
+        SET(GIT_BRANCH_NAME "master")
+    ENDIF()
+
+    MESSAGE(STATUS "GIT branch name '${GIT_BRANCH_NAME}'" )
 ELSE()
     MESSAGE("git not found.")
 ENDIF()
@@ -86,7 +100,12 @@ ENDIF()
 # Set the version number of your project here (format is MAJOR.MINOR.PATCHLEVEL - e.g. 1.0.0)
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 MESSAGE (STATUS "xPlatAppx version ${VERSION}")
+MESSAGE (STATUS "xPlatAppx branch name ${GIT_BRANCH_NAME}")
 
+# Configure Package.nuspec
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Package.nuspec.cmakein ${CMAKE_CURRENT_BINARY_DIR}/Package.nuspec CRLF)
+MESSAGE (STATUS "Package.Nuspec created")
+MESSAGE (STATUS "--------------------------------")
 # Mac needed variables 
 # [TODO: adapt as needed]
 SET(CMAKE_MACOSX_RPATH ON)
@@ -96,6 +115,13 @@ SET(CMAKE_MACOSX_RPATH ON)
 #SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_subdirectory(lib)
+MESSAGE (STATUS " ")
+MESSAGE (STATUS "--------------------------------")
+MESSAGE (STATUS "xPlatAppx")
+MESSAGE (STATUS "--------------------------------")
+MESSAGE (STATUS "libs processed")
 add_subdirectory(src)
-
+MESSAGE (STATUS "src processed")
 ADD_DEPENDENCIES(SRC LIBS)
+MESSAGE (STATUS "dependencies added")
+MESSAGE (STATUS "DONE!")

LICENSE

@@ -0,0 +1,26 @@
+This file is based on or incorporates material from the projects listed below 
+(Third Party IP). The original copyright notice and the license under which 
+Microsoft received such Third Party IP, are set forth below. Such licenses and 
+notices are provided for informational purposes only. Microsoft licenses the 
+Third Party IP to you under the licensing terms for the Microsoft product. 
+Microsoft reserves all other rights not expressly granted under this agreement,
+whether by implication, estoppel or otherwise.
+
+Third Party Programs: The software may include third party programs that 
+Microsoft, not the third party, licenses to you under this agreement. Notices, 
+if any, for the third party programs are included for your information only.
+
+Provided for Informational Purposes Only
+Apache 2.0 License
+
+Licensed under the Apache License, Version 2.0 (the License); you may not use 
+this file except in compliance with the License. You may obtain a copy of the 
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED 
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions 
+and limitations under the License.

Package.nuspec.cmakein

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Microsoft.xPlat.AppxPackaging</id>
+    <version>${VERSION}</version>
+    <authors>psmith@microsoft.com</authors>
+    <owners>Xplat-appX@service.microsoft.com</owners>
+    <projectUrl>https://aka.ms/xPlatAppx</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Cross platform implementation of AppxPackaging.dll</description>
+    <releaseNotes>TODO: automate release note propogation here...</releaseNotes>
+    <copyright>Copyright (C) 2017 Microsoft</copyright>
+    <tags>xPlatAppx Appx AppxPackaging</tags>
+    <dependencies />
+  </metadata>
+</package>

makemac

@@ -2,5 +2,9 @@
 # script to build on mac
 mkdir .vs
 cd .vs
+
+# clean up any old builds of xPlatAppx modules
+find . -name *xPlatAppx* -d | xargs rm -r
+
 cmake -DMACOS=on ..
 make

makewin32.cmd

@@ -1,6 +1,8 @@
 REM HUZZA FOR: https://dmerej.info/blog/post/cmake-visual-studio-and-the-command-line/
-md .vs
+if not exist .vs md .vs
 cd .vs
+if exist CMakeFiles rd /s /q CMakeFiles
+if exist CMakeCache.txt del CMakeCache.txt
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
 cmake -DWIN32=on -G"NMake Makefiles" ..
 nmake

src/xPlatAppx/CMakeLists.txt

@@ -17,7 +17,7 @@ ELSE()
 	set (DirectoryObject PAL/FileSystem/POSIX/DirectoryObject.cpp)
 ENDIF()
 
-MESSAGE("PAL: DirectoryObject = ${DirectoryObject}")
+MESSAGE (STATUS "PAL: DirectoryObject = ${DirectoryObject}")
 
 set(LIB_PUBLIC_HEADERS
     ../inc/AppxPackaging.hpp
@@ -74,7 +74,7 @@ set_target_properties(${LIBRARY_NAME} PROPERTIES
 	PUBLIC_HEADER "${LIB_HEADERS}" # specify the public headers
 )
 
-MESSAGE("xPlatAppx takes a static dependency on zlib")
+MESSAGE(STATUS "xPlatAppx takes a static dependency on zlib")
 include_directories(
 	${include_directories}
 	${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/zlib