From 4826e3c2d1c87fa2db7e6f048e659b1e7bde6227 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Wed, 4 Apr 2007 20:44:25 +0000
Subject: [PATCH] Fixed project and solution issues which were keeping us from
 building 32bit and 64bit packages on a 64bit Windows platform.

---
 CASA-auth-token/client/authclient.sln         |  2 +-
 .../mechanisms/krb5/windows/krb5.vcproj       | 10 +++---
 .../library/mechanisms/pwd/windows/pwd.vcproj | 18 +++++-----
 .../client/library/windows/client.vcproj      | 22 ++++++------
 .../authtokenclient64_msm.vdproj              | 36 ++++++++++++++++---
 5 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/CASA-auth-token/client/authclient.sln b/CASA-auth-token/client/authclient.sln
index 69164fba..e9b1de43 100644
--- a/CASA-auth-token/client/authclient.sln
+++ b/CASA-auth-token/client/authclient.sln
@@ -126,7 +126,6 @@ Global
 		{6034EBF1-0838-45C4-A538-A41A31EC8F46}.Debug|x64.ActiveCfg = Debug|x64
 		{6034EBF1-0838-45C4-A538-A41A31EC8F46}.Release|Any CPU.ActiveCfg = Release|Win32
 		{6034EBF1-0838-45C4-A538-A41A31EC8F46}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6034EBF1-0838-45C4-A538-A41A31EC8F46}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{6034EBF1-0838-45C4-A538-A41A31EC8F46}.Release|Win32.ActiveCfg = Release|Win32
 		{6034EBF1-0838-45C4-A538-A41A31EC8F46}.Release|x64.ActiveCfg = Release|x64
 		{1BA1FC97-5AF1-4506-A7FD-EBFD46D361A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -166,6 +165,7 @@ Global
 		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Debug|x64.ActiveCfg = Debug
 		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Release|Any CPU.ActiveCfg = Release
 		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Release|Mixed Platforms.ActiveCfg = Release
+		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Release|Mixed Platforms.Build.0 = Release
 		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Release|Win32.ActiveCfg = Release
 		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Release|Win32.Build.0 = Release
 		{E62A1388-82C9-4AE8-B29E-C9C808B05425}.Release|x64.ActiveCfg = Release
diff --git a/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
index 53287c64..107dbae9 100644
--- a/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
+++ b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32 -D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;..\..\..\..\..\..\CASA\include;&quot;$(CASA)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;$(CASA32_SDK_DIR)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -99,7 +99,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\&#x0D;&#x0A;copy Krb5Authenticate.conf \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\Krb5Authenticate.conf&#x0D;&#x0A;copy $(OutDir)\krb5mech.dll \&quot;Program Files&quot;\novell\casa\lib\krb5mech.dll&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -130,7 +130,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32 -D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;..\..\..\..\..\..\CASA\include;&quot;$(CASA)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;$(CASA32_SDK_DIR)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32 -D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;..\..\..\..\..\..\CASA\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;$(CASA32_SDK_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -296,7 +296,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32 -D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;..\..\..\..\..\..\CASA\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;$(CASA32_SDK_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
index 359aaa68..76f18541 100644
--- a/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
+++ b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;..\..\..\..\..\..\CASA\include;..\..\..\..\..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)micasadk\Release&quot;;&quot;$(CASA)\include&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;&quot;$(CASA32_SDK_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 				AdditionalDependencies="micasa.lib"
 				OutputFile="$(OutDir)/pwmech.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;..\..\..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)\micasadk\Release&quot;;&quot;$(CASA)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(CASA32_SDK_DIR)\lib&quot;"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/pw.pdb"
@@ -100,7 +100,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\&#x0D;&#x0A;copy PwdAuthenticate.conf \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\PwdAuthenticate.conf&#x0D;&#x0A;copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -131,7 +131,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;..\..\..\..\..\..\CASA\include;..\..\..\..\..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)micasadk\Release&quot;;&quot;$(CASA)\include&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;&quot;$(CASA64_SDK_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -156,7 +156,7 @@
 				AdditionalDependencies="micasa.lib"
 				OutputFile="$(OutDir)/pwmech.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;..\..\..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)\micasadk\Release&quot;;&quot;$(CASA)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(CASA64_SDK_DIR)\lib&quot;"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/pw.pdb"
@@ -215,7 +215,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;..\..\..\..\..\..\CASA\include;..\..\..\..\..\..\..\..\CASA\micasadk\Release"
+				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;&quot;$(CASA32_SDK_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -238,7 +238,7 @@
 				AdditionalDependencies="micasa.lib"
 				OutputFile="$(OutDir)/pwmech.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;..\..\..\..\..\..\CASA\micasadk\Release"
+				AdditionalLibraryDirectories="&quot;$(CASA32_SDK_DIR)\lib&quot;"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				SubSystem="0"
@@ -299,7 +299,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;..\..\..\..\..\..\CASA\include;..\..\..\..\..\..\..\..\CASA\micasadk\Release"
+				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;&quot;$(CASA64_SDK_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -322,7 +322,7 @@
 				AdditionalDependencies="micasa.lib"
 				OutputFile="$(OutDir)/pwmech.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;..\..\..\..\..\..\CASA\micasadk\Release"
+				AdditionalLibraryDirectories="&quot;$(CASA64_SDK_DIR)\lib&quot;"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				SubSystem="0"
diff --git a/CASA-auth-token/client/library/windows/client.vcproj b/CASA-auth-token/client/library/windows/client.vcproj
index 411372a6..718e73a7 100644
--- a/CASA-auth-token/client/library/windows/client.vcproj
+++ b/CASA-auth-token/client/library/windows/client.vcproj
@@ -45,8 +45,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MSC_VER"
+				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;$(CASA32_SDK_DIR)\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -72,7 +72,7 @@
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatmt.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/casa_authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)\lib&quot;;&quot;$(CASA)\lib\Release&quot;;&quot;$(CASA)\micasadk\Release&quot;;&quot;$(EXPAT)\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;$(MS_SDK_DIR)\lib&quot;;&quot;$(CASA32_SDK_DIR)\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;&quot;$(EXPAT)\StaticLibs&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;copy $(OutDir)\casa_authtoken.dll \&quot;Program Files&quot;\novell\casa\lib\casa_authtoken.dll&#x0D;&#x0A;copy $(SolutionDir)\lib\windows\casa_authtoken.lib \&quot;Program Files&quot;\novell\casa\lib\casa_authtoken.lib&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -135,7 +135,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include;&quot;$(CASA)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
+				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;$(CASA64_SDK_DIR)\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;&quot;$(EXPAT)\source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -162,7 +162,7 @@
 				AdditionalDependencies="ws2_32.lib &quot;$(MS_SDK_DIR)\lib\amd64\winhttp.lib&quot; libexpatmt.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/casa_authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs\x64&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)\lib&quot;;&quot;$(CASA)\lib\Release&quot;;&quot;$(CASA)\micasadk\Release&quot;;&quot;$(EXPAT)\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;$(CASA64_SDK_DIR)\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs\x64&quot;;&quot;$(EXPAT)\StaticLibs&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
@@ -223,8 +223,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MSC_VER"
+				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;$(CASA32_SDK_DIR)\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -246,7 +246,7 @@
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatmt.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/casa_authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
+				AdditionalLibraryDirectories="&quot;$(MS_SDK_DIR)\lib&quot;;&quot;$(CASA32_SDK_DIR)\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				SubSystem="0"
@@ -308,7 +308,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
+				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;$(CASA64_SDK_DIR)\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -331,7 +331,7 @@
 				AdditionalDependencies="ws2_32.lib &quot;$(MS_SDK_DIR)\lib\amd64\winhttp.lib&quot; libexpatmt.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/casa_authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs\x64&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
+				AdditionalLibraryDirectories="&quot;$(CASA64_SDK_DIR)\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs\x64&quot;"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				SubSystem="0"
diff --git a/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj b/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj
index 512ccc62..f25912de 100644
--- a/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj
@@ -39,6 +39,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_7F67D8557F592D43809C494C4B7E2552"
+        "OwnerKey" = "8:_50C15B4896B94AAD8CF7A676F541BD89"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_8E623C85FD4143F3B09460457E8ED6CA"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -158,6 +164,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7F67D8557F592D43809C494C4B7E2552"
+            {
+            "SourcePath" = "8:Secur32.dll"
+            "TargetName" = "8:Secur32.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB044A7714A346268747D2E57B364BD9"
             {
             "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\Krb5Authenticate.conf"
@@ -377,7 +403,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4744A4EB6B904673B8897294AB8C6162"
             {
-            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
@@ -405,7 +431,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_50C15B4896B94AAD8CF7A676F541BD89"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\x64\\release\\krb5mech.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -433,7 +459,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_75519C9025D94CC496F276E698CE3AF8"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\windows\\x64\\release\\casa_authtoken.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
@@ -461,7 +487,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E623C85FD4143F3B09460457E8ED6CA"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\x64\\release\\pwmech.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -489,7 +515,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1C37E2154994C29B02FDD9C90635B26"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\windows\\x64\\release\\casa_authtoken.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"