[msi] Pull in MSI changes from Mono 5.2 branch

(cherry picked from commit 929575bb0eba1139b786690e719844c4ef52b7db)

diff --git a/packaging/Windows/defs/managed-components b/packaging/Windows/defs/managed-components
index ae98eefdd2e128635e5d84ed8489cafdb41e4703..87f293f7b798633a7f736bd8d6ffc37622d90179 100755 (executable)
--- a/packaging/Windows/defs/managed-components
+++ b/packaging/Windows/defs/managed-components
@@ -21,7 +21,7 @@ download()
        report "Downloading x64 hostfxr.dll"
        wget --quiet -O ${REPODIR}/hostfxr-x64.zip https://www.nuget.org/api/v2/package/runtime.win-x64.Microsoft.NETCore.DotNetHostResolver/2.0.0-preview2-25407-01 || error "*** Could not download 64bit hostfxr.dll ***"
        report "Downloading x86 hostfxr.dll"
-       wget --quiet -O ${REPODIR}/hostfxr-x86.zip https://www.nuget.org/api/v2/package/runtime.win-x86.Microsoft.NETCore.DotNetHostResolver/2.0.0-preview2-25407-01 || error "*** Could not download 64bit hostfxr.dll ***"
+       wget --quiet -O ${REPODIR}/hostfxr-x86.zip https://www.nuget.org/api/v2/package/runtime.win-x86.Microsoft.NETCore.DotNetHostResolver/2.0.0-preview2-25407-01 || error "*** Could not download 32bit hostfxr.dll ***"
        report "Copying Mono MDK for Mac"
        cp $1 ${REPODIR}/mono.xar
 }

diff --git a/packaging/Windows/defs/mono b/packaging/Windows/defs/mono
index aa7f81f83400cc76e2150b4d3331fbc960d43d7f..f540c8d6bb59b7ad94a55ad335cb23095067136f 100755 (executable)
--- a/packaging/Windows/defs/mono
+++ b/packaging/Windows/defs/mono
@@ -56,6 +56,7 @@ install()
        cp -a msvc/build/sgen/Win32/bin/Release/mono-2.0-sgen.dll       ${INSTALLDIR}/bin/
        cp -a msvc/build/sgen/Win32/lib/Release/mono-2.0-sgen.lib       ${INSTALLDIR}/lib/
        cp -a msvc/build/sgen/Win32/bin/Release/mono-2.0-sgen.pdb       ${INSTALLDIR}/lib/
+       cp -a msvc/build/sgen/Win32/bin/Release/libmono-static-sgen.lib ${INSTALLDIR}/lib/
        cp -a msvc/build/sgen/Win32/bin/Release/MonoPosixHelper.dll     ${INSTALLDIR}/bin/
        cp -a msvc/build/sgen/Win32/lib/Release/MonoPosixHelper.lib     ${INSTALLDIR}/lib/
        cp -a msvc/build/sgen/Win32/bin/Release/MonoPosixHelper.pdb     ${INSTALLDIR}/lib/
@@ -64,6 +65,7 @@ install()
        cp -a msvc/build/boehm/Win32/bin/Release/mono-2.0-boehm.dll     ${INSTALLDIR}/bin/
        cp -a msvc/build/boehm/Win32/lib/Release/mono-2.0-boehm.lib     ${INSTALLDIR}/lib/
        cp -a msvc/build/boehm/Win32/bin/Release/mono-2.0-boehm.pdb     ${INSTALLDIR}/lib/
+       cp -a msvc/build/boehm/Win32/bin/Release/libmono-static-boehm.lib       ${INSTALLDIR}/lib/
        cp -a ${INSTALLDIR}/bin/mono-sgen.exe   ${INSTALLDIR}/bin/mono.exe
        cp -a ${INSTALLDIR}/bin/mono-sgen.pdb   ${INSTALLDIR}/bin/mono.pdb
        popd

diff --git a/packaging/Windows/defs/mono64 b/packaging/Windows/defs/mono64
index 2d7dcc5f8d852b91b05fa4a9552a9b24f74c7731..ece2bb24b7756af1ec44e6a7f89157bcb7162b83 100755 (executable)
--- a/packaging/Windows/defs/mono64
+++ b/packaging/Windows/defs/mono64
@@ -56,6 +56,7 @@ install()
        cp -a msvc/build/sgen/x64/bin/Release/mono-2.0-sgen.dll ${INSTALLDIR}/bin/
        cp -a msvc/build/sgen/x64/lib/Release/mono-2.0-sgen.lib ${INSTALLDIR}/lib/
        cp -a msvc/build/sgen/x64/bin/Release/mono-2.0-sgen.pdb ${INSTALLDIR}/lib/
+       cp -a msvc/build/sgen/x64/bin/Release/libmono-static-sgen.lib   ${INSTALLDIR}/lib/
        cp -a msvc/build/sgen/x64/bin/Release/MonoPosixHelper.dll       ${INSTALLDIR}/bin/
        cp -a msvc/build/sgen/x64/lib/Release/MonoPosixHelper.lib       ${INSTALLDIR}/lib/
        cp -a msvc/build/sgen/x64/bin/Release/MonoPosixHelper.pdb       ${INSTALLDIR}/lib/