diff --git a/CASA/jwrapper/jnsscs/jnsscs.vcproj b/CASA/jwrapper/jnsscs/jnsscs.vcproj index da817519..daf72ec1 100644 --- a/CASA/jwrapper/jnsscs/jnsscs.vcproj +++ b/CASA/jwrapper/jnsscs/jnsscs.vcproj @@ -82,7 +82,7 @@ OutputFile=".\Release/jmicasa.dll" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\Release" + AdditionalLibraryDirectories="..\..\micasadk\Release" ProgramDatabaseFile=".\Release/jnsscs.pdb" ImportLibrary=".\Release/jnsscs.lib" TargetMachine="1" @@ -178,7 +178,7 @@ OutputFile=".\Debug/jmicasa.dll" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\Release" + AdditionalLibraryDirectories="..\..\micasadk\Release" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/jnsscs.pdb" ImportLibrary=".\Debug/jnsscs.lib" diff --git a/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj b/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj index 9e8fb32a..68c4236d 100644 --- a/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj +++ b/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj @@ -33,66 +33,12 @@ } "Entry" { - "MsmKey" = "8:_52179197002254A68EACB031EA8E0D62" - "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_52179197002254A68EACB031EA8E0D62" - "OwnerKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC" - "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC" - "OwnerKey" = "8:_8C67B5EDEB55DE3F71D20D5669166174" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6F5143A35711D14A06EDE31F04D74B53" - "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6F5143A35711D14A06EDE31F04D74B53" - "OwnerKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_6F5143A35711D14A06EDE31F04D74B53" - "OwnerKey" = "8:_52179197002254A68EACB031EA8E0D62" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_718042C617DB414B91C69D1ACCD99A42" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7B574E73CEF5460FB51F5A341F81EA9A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8C67B5EDEB55DE3F71D20D5669166174" - "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_9630BD80B06842BB9DE27916F038665C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -123,8 +69,8 @@ } "Entry" { - "MsmKey" = "8:_BFB5523F92C62717D5FFB02E609341F7" - "OwnerKey" = "8:_384A908A3DE54B359C611011C2A2AA97" + "MsmKey" = "8:_C34F29E46C0F02D960C72638E2711F3B" + "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -142,25 +88,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8C67B5EDEB55DE3F71D20D5669166174" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_52179197002254A68EACB031EA8E0D62" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6F5143A35711D14A06EDE31F04D74B53" + "OwnerKey" = "8:_C34F29E46C0F02D960C72638E2711F3B" "MsmSig" = "8:_UNDEFINED" } } @@ -274,150 +202,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_52179197002254A68EACB031EA8E0D62" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.16397, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_52179197002254A68EACB031EA8E0D62" - { - "Name" = "8:AppModule.NamedPipes.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AppModule.NamedPipes.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15" - "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:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_65E7F678A98BB9AED57C6D474140DDEC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2501.16398, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - "_65E7F678A98BB9AED57C6D474140DDEC" - { - "Name" = "8:Novell.CASA.Common.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Novell.CASA.Common.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15" - "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:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6F5143A35711D14A06EDE31F04D74B53" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.16397, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_6F5143A35711D14A06EDE31F04D74B53" - { - "Name" = "8:AppModule.InterProcessComm.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AppModule.InterProcessComm.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15" - "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:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B574E73CEF5460FB51F5A341F81EA9A" - { - "SourcePath" = "8:..\\..\\..\\..\\lib\\release\\micasa.lib" - "TargetName" = "8:micasa.lib" - "Tag" = "8:" - "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94" - "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:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8C67B5EDEB55DE3F71D20D5669166174" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.6.2501.16402, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - "_8C67B5EDEB55DE3F71D20D5669166174" - { - "Name" = "8:Novell.CASA.miCASAWrapper.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Novell.CASA.miCASAWrapper.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15" - "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:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9630BD80B06842BB9DE27916F038665C" { "SourcePath" = "8:..\\..\\..\\..\\include\\sscs_utf8.h" @@ -518,12 +302,23 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BFB5523F92C62717D5FFB02E609341F7" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C34F29E46C0F02D960C72638E2711F3B" { - "SourcePath" = "8:micasa.dll" - "TargetName" = "8:micasa.dll" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Novell.Casa.MiCasa, Version=1.7.0.0, Culture=neutral, PublicKeyToken=35accfbe728f56c2, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C34F29E46C0F02D960C72638E2711F3B" + { + "Name" = "8:Novell.Casa.MiCasa.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Novell.Casa.MiCasa.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_F3F9192858114846913E6271C812F8FA" + "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -713,7 +508,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_25A25AE17EF247C4AC5D3E5FFEA6730C" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0BB61D65C04F493AA015DFB2271EC2A5" { "SourcePath" = "8:" "TargetName" = "8:" @@ -743,7 +538,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_384A908A3DE54B359C611011C2A2AA97" { - "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Debug\\cSample.exe" + "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Release\\cSample.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F3F9192858114846913E6271C812F8FA" @@ -771,7 +566,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_718042C617DB414B91C69D1ACCD99A42" { - "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Debug\\CSharpSample.exe" + "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Release\\CSharpSample.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15" diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb index 85aa6cf6..ecd3bc78 100644 Binary files a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb and b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb differ diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo index 71b0d1ea..a54b4459 100644 Binary files a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo and b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo differ