From 489de53e6b6cdb9d509b0b7f14a5d4a00ef2ec09 Mon Sep 17 00:00:00 2001 From: scantor Date: Mon, 29 Oct 2012 20:49:23 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPOST-78 git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3811 cb58f699-b61c-0410-a6fe-9272a202ed29 --- Shibboleth.sln | 4 ++-- msi/WiX/Installer.vcxproj | 1 + msi/WiX/MergeModules/OpenSAML-schemas.wxs | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Shibboleth.sln b/Shibboleth.sln index fcbdbaf..f5d8be1 100644 --- a/Shibboleth.sln +++ b/Shibboleth.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server Modules", "Server Modules", "{26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}" diff --git a/msi/WiX/Installer.vcxproj b/msi/WiX/Installer.vcxproj index 4b7ae61..df53903 100644 --- a/msi/WiX/Installer.vcxproj +++ b/msi/WiX/Installer.vcxproj @@ -68,6 +68,7 @@ del *64.wixpdb + diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs index ed8504b..eca7bf7 100644 --- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs +++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs @@ -176,6 +176,9 @@ + + + -- 2.1.4