summaryrefslogtreecommitdiff
path: root/Ivy
diff options
context:
space:
mode:
Diffstat (limited to 'Ivy')
-rw-r--r--Ivy/InstIvyDev/InstIvyDev.vdproj58
-rw-r--r--Ivy/Ivy.vcproj1
-rw-r--r--Ivy/IvyLib/IvyLib.vdproj6
3 files changed, 33 insertions, 32 deletions
diff --git a/Ivy/InstIvyDev/InstIvyDev.vdproj b/Ivy/InstIvyDev/InstIvyDev.vdproj
index 930587c..7d9a8e5 100644
--- a/Ivy/InstIvyDev/InstIvyDev.vdproj
+++ b/Ivy/InstIvyDev/InstIvyDev.vdproj
@@ -15,14 +15,14 @@
{
"Entry"
{
- "MsmKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_1AF7586332934A1D8068AF6C422CC2DD"
+ "OwnerKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_34B995BB34324AD4A1FFA79365EDDA41"
- "OwnerKey" = "8:_C943180E14D2401283428900C39E38A6"
+ "MsmKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -33,14 +33,14 @@
}
"Entry"
{
- "MsmKey" = "8:_46277ABBD7FF4829BC70CD9150B7547C"
- "OwnerKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_587183B52DD64752997FFA522BC57D0A"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_587183B52DD64752997FFA522BC57D0A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6ACC064FA1FC418FAB2B122A5F09BAB0"
+ "OwnerKey" = "8:_A83C290CFE914EFBBD8EBED57EFBE505"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -51,34 +51,34 @@
}
"Entry"
{
+ "MsmKey" = "8:_A83C290CFE914EFBBD8EBED57EFBE505"
+ "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B656C8E7B4C5444BB7CAA2BB82B22DEB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"OwnerKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"OwnerKey" = "8:_3B5C053C16CE42B2810E6471B5EBFDBD"
"MsmSig" = "8:_UNDEFINED"
}
- "Entry"
- {
- "MsmKey" = "8:_C943180E14D2401283428900C39E38A6"
- "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"
- "MsmSig" = "8:_UNDEFINED"
- }
}
"Configurations"
{
@@ -285,15 +285,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:InstIvyDev"
- "ProductCode" = "8:{D651E6A4-ED73-447B-A2D9-4081D13E27DC}"
- "PackageCode" = "8:{81856041-B01B-4760-982C-9B1B8626ED92}"
+ "ProductCode" = "8:{3534F30C-6A33-4023-9256-1A889832F9A5}"
+ "PackageCode" = "8:{7205FDA9-231D-4053-9135-0FCA66792070}"
"UpgradeCode" = "8:{B61AA283-78E2-443D-A093-4D5D6C0B779A}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.0.1"
- "Manufacturer" = "8:SDER PII"
+ "ProductVersion" = "8:1.3.1"
+ "Manufacturer" = "8:DTI/R&D"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.tls.cena.fr/products/ivy"
"Title" = "8:InstIvyDev"
@@ -801,11 +801,11 @@
}
"MergeModule"
{
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_34B995BB34324AD4A1FFA79365EDDA41"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1AF7586332934A1D8068AF6C422CC2DD"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:microsoft_vc90_mfc_x86.msm"
+ "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm"
"Properties"
{
}
@@ -815,11 +815,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_46277ABBD7FF4829BC70CD9150B7547C"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ACC064FA1FC418FAB2B122A5F09BAB0"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
+ "SourcePath" = "8:microsoft_vc90_mfc_x86_x64.msm"
"Properties"
{
}
@@ -829,11 +829,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A83C290CFE914EFBBD8EBED57EFBE505"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
+ "SourcePath" = "8:policy_9_0_Microsoft_VC90_MFC_x86_x64.msm"
"Properties"
{
}
@@ -843,11 +843,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C943180E14D2401283428900C39E38A6"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E8DA4E6514774E88A3E16EC00C9A093D"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_9_0_Microsoft_VC90_MFC_x86.msm"
+ "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"
"Properties"
{
}
diff --git a/Ivy/Ivy.vcproj b/Ivy/Ivy.vcproj
index 9c765fb..a0c9f94 100644
--- a/Ivy/Ivy.vcproj
+++ b/Ivy/Ivy.vcproj
@@ -8,6 +8,7 @@
SccProjectName=""$/Bus/Ivy", QPEAAAAA"
SccLocalPath="."
SccProvider="MSSCCI:Microsoft Visual SourceSafe"
+ AssemblyReferenceSearchPaths=""..\..\..\pcre";"C:\Users\fcolin\Documents\Projects Visual Studio\pcre""
TargetFrameworkVersion="131072"
>
<Platforms>
diff --git a/Ivy/IvyLib/IvyLib.vdproj b/Ivy/IvyLib/IvyLib.vdproj
index 7729f40..7058349 100644
--- a/Ivy/IvyLib/IvyLib.vdproj
+++ b/Ivy/IvyLib/IvyLib.vdproj
@@ -152,7 +152,7 @@
"Module"
{
"ModuleSignature" = "8:MergeModule.B704211C29924E868D1D16832CA83D91"
- "Version" = "8:1.0.0.0"
+ "Version" = "8:1.3.1.0"
"Title" = "8:IvyLib"
"Subject" = "8:"
"Author" = "8:DTI/R&D"
@@ -169,7 +169,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_800E481F824E4563B3647395936B79A9"
{
- "SourcePath" = "8:..\\..\\release\\Ivy.dll"
+ "SourcePath" = "8:..\\..\\x64\\release\\Ivy.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E128D81775304F09A5707F244264031A"
@@ -197,7 +197,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EF9BC5D6F4274E54867D4FB7F7A33653"
{
- "SourcePath" = "8:..\\..\\release\\pcre.dll"
+ "SourcePath" = "8:..\\..\\x64\\release\\pcre.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E128D81775304F09A5707F244264031A"