Fixed windows build conflict issues.
This commit is contained in:
@@ -13,6 +13,36 @@
|
||||
"SccProvider" = "8:"
|
||||
"Hierarchy"
|
||||
{
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_2EBD1126703136415C570EC63F66C49A"
|
||||
"OwnerKey" = "8:_75519C9025D94CC496F276E698CE3AF8"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_2EBD1126703136415C570EC63F66C49A"
|
||||
"OwnerKey" = "8:_C1C37E2154994C29B02FDD9C90635B26"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_2EBD1126703136415C570EC63F66C49A"
|
||||
"OwnerKey" = "8:_8E623C85FD4143F3B09460457E8ED6CA"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_3001B2F06DD188752812041C3D273EEF"
|
||||
"OwnerKey" = "8:_75519C9025D94CC496F276E698CE3AF8"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_3001B2F06DD188752812041C3D273EEF"
|
||||
"OwnerKey" = "8:_C1C37E2154994C29B02FDD9C90635B26"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_4744A4EB6B904673B8897294AB8C6162"
|
||||
@@ -144,6 +174,46 @@
|
||||
}
|
||||
"File"
|
||||
{
|
||||
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2EBD1126703136415C570EC63F66C49A"
|
||||
{
|
||||
"SourcePath" = "8:micasa.dll"
|
||||
"TargetName" = "8:micasa.dll"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
|
||||
"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}:_3001B2F06DD188752812041C3D273EEF"
|
||||
{
|
||||
"SourcePath" = "8:WINHTTP.dll"
|
||||
"TargetName" = "8:WINHTTP.dll"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
|
||||
"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}:_4E73B42DD7BB4E5C8B309F197D94C7F2"
|
||||
{
|
||||
"SourcePath" = "8:..\\..\\..\\library\\client.conf"
|
||||
@@ -403,7 +473,7 @@
|
||||
{
|
||||
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4744A4EB6B904673B8897294AB8C6162"
|
||||
{
|
||||
"SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
|
||||
"SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
|
||||
"TargetName" = "8:"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
|
||||
@@ -431,7 +501,7 @@
|
||||
}
|
||||
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_50C15B4896B94AAD8CF7A676F541BD89"
|
||||
{
|
||||
"SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
|
||||
"SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\x64\\Release\\krb5mech.dll"
|
||||
"TargetName" = "8:"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_01897726E7804A3B875B67A1C2692147"
|
||||
@@ -459,7 +529,7 @@
|
||||
}
|
||||
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_75519C9025D94CC496F276E698CE3AF8"
|
||||
{
|
||||
"SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
|
||||
"SourcePath" = "8:..\\..\\..\\library\\windows\\x64\\Release\\casa_authtoken.dll"
|
||||
"TargetName" = "8:"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
|
||||
@@ -487,7 +557,7 @@
|
||||
}
|
||||
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E623C85FD4143F3B09460457E8ED6CA"
|
||||
{
|
||||
"SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
|
||||
"SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\x64\\Release\\pwmech.dll"
|
||||
"TargetName" = "8:"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_01897726E7804A3B875B67A1C2692147"
|
||||
@@ -515,7 +585,7 @@
|
||||
}
|
||||
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1C37E2154994C29B02FDD9C90635B26"
|
||||
{
|
||||
"SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
|
||||
"SourcePath" = "8:..\\..\\..\\library\\windows\\x64\\Release\\casa_authtoken.dll"
|
||||
"TargetName" = "8:"
|
||||
"Tag" = "8:"
|
||||
"Folder" = "8:_01897726E7804A3B875B67A1C2692147"
|
||||
|
||||
Reference in New Issue
Block a user