diff --git a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic-Package/Product.wxs b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic-Package/Product.wxs
index 04fc33ab..710f3e12 100644
--- a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic-Package/Product.wxs
+++ b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic-Package/Product.wxs
@@ -1,52 +1,70 @@
-
-
+
+
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
diff --git a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.rc b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.rc
index 9e114e78..1ef1d0ef 100644
Binary files a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.rc and b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.rc differ
diff --git a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.sln b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.sln
index c5315abe..e0f996ac 100644
--- a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.sln
+++ b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30907.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestBed-Basic", "TestBed-Basic.vcxproj", "{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BranchIO-Static", "..\..\..\BranchSDK\Windows\BranchIO-Static\BranchIO-Static.vcxproj", "{4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}"
-EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "TestBed-Basic-Package", "TestBed-Basic-Package\TestBed-Basic-Package.wixproj", "{AC67AA34-E2DE-470D-BD7D-B87218DA186D}"
EndProject
Global
@@ -25,14 +23,6 @@ Global
{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.Build.0 = Release|x64
{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.ActiveCfg = Release|Win32
{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.Build.0 = Release|Win32
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.ActiveCfg = Debug|x64
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.Build.0 = Debug|x64
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.ActiveCfg = Debug|Win32
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.Build.0 = Debug|Win32
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.ActiveCfg = Release|x64
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.Build.0 = Release|x64
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.ActiveCfg = Release|Win32
- {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.Build.0 = Release|Win32
{AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x64.ActiveCfg = Debug|x86
{AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x86.ActiveCfg = Debug|x86
{AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x86.Build.0 = Debug|x86
diff --git a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.vcxproj b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.vcxproj
index 08c69014..1e5d7771 100644
--- a/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.vcxproj
+++ b/BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.vcxproj
@@ -88,13 +88,13 @@
true
BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
+ C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
Windows
true
C:\Program Files (x86)\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories)
- BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;libcryptod.lib;libssld.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -105,7 +105,7 @@
true
BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
+ C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
Windows
@@ -113,7 +113,7 @@
true
true
C:\Program Files (x86)\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories)
- BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;libcrypto.lib;libssl.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -122,13 +122,13 @@
true
BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";WIN32;DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
+ C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
Windows
true
C:\Program Files (x86)\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories)
- BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;libcryptod.lib;libssld.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -139,7 +139,7 @@
true
BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";WIN32;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
+ C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories)
Windows
@@ -147,7 +147,7 @@
true
true
C:\Program Files (x86)\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories)
- BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;libcrypto.lib;libssl.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -177,11 +177,6 @@
-
-
- {4f51dc46-1a0e-467d-8ca4-af37e134c0a4}
-
-
diff --git a/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.rc b/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.rc
index e9b127a9..8b507602 100644
Binary files a/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.rc and b/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.rc differ
diff --git a/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.vcxproj b/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.vcxproj
index bd215e75..1e7597ac 100644
--- a/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.vcxproj
+++ b/BranchSDK-Samples/Windows/TestBed-Local/TestBed-Local.vcxproj
@@ -94,7 +94,7 @@
Windows
true
C:\Program Files (x86)\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories)
- advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;libcryptod.lib;libssld.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -113,7 +113,7 @@
true
true
C:\Program Files (x86)\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories)
- advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;libcrypto.lib;libssl.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -128,7 +128,7 @@
Windows
true
C:\Program Files (x86)\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories)
- advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;libcryptod.lib;libssld.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -147,7 +147,7 @@
true
true
C:\Program Files (x86)\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories)
- advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;libcrypto.lib;libssl.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
diff --git a/BranchSDK-Samples/Windows/TestBed-Local/TestBedLocalPackage/Package.appxmanifest b/BranchSDK-Samples/Windows/TestBed-Local/TestBedLocalPackage/Package.appxmanifest
index 413e7616..26a37ddc 100644
--- a/BranchSDK-Samples/Windows/TestBed-Local/TestBedLocalPackage/Package.appxmanifest
+++ b/BranchSDK-Samples/Windows/TestBed-Local/TestBedLocalPackage/Package.appxmanifest
@@ -9,7 +9,7 @@
+ Version="1.2.1.0" />
Branch TestBed (Local)
diff --git a/BranchSDK-Samples/Windows/TestBed/TestBed.rc b/BranchSDK-Samples/Windows/TestBed/TestBed.rc
index d414eadd..2fd4924e 100644
Binary files a/BranchSDK-Samples/Windows/TestBed/TestBed.rc and b/BranchSDK-Samples/Windows/TestBed/TestBed.rc differ
diff --git a/BranchSDK-Samples/Windows/TestBed/TestBed.vcxproj b/BranchSDK-Samples/Windows/TestBed/TestBed.vcxproj
index b59ccf99..15d0e34c 100644
--- a/BranchSDK-Samples/Windows/TestBed/TestBed.vcxproj
+++ b/BranchSDK-Samples/Windows/TestBed/TestBed.vcxproj
@@ -94,7 +94,7 @@
Windows
true
C:\Program Files %28x86%29\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories)
- BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;libcryptod.lib;libssld.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -113,7 +113,7 @@
true
true
C:\Program Files %28x86%29\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories)
- BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;libcrypto.lib;libssl.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -128,7 +128,7 @@
Windows
true
C:\Program Files %28x86%29\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories)
- BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmdd.lib;advapi32.lib;PocoNetmdd.lib;PocoNetSSLWinmdd.lib;PocoCryptomdd.lib;PocoDatamdd.lib;PocoZipmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;Crypt32.lib;libcryptod.lib;libssld.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
@@ -147,7 +147,7 @@
true
true
C:\Program Files %28x86%29\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories)
- BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;ssleay32.lib;libeay32.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
+ BranchIOmd.lib;advapi32.lib;PocoNetmd.lib;PocoNetSSLWinmd.lib;PocoCryptomd.lib;PocoDatamd.lib;PocoZipmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;Crypt32.lib;libcrypto.lib;libssl.lib;crypt32.lib;msi.lib;ws2_32.lib;zlib.lib;%(AdditionalDependencies)
diff --git a/BranchSDK-Samples/Windows/TestBed/TestBedPackage/Package.appxmanifest b/BranchSDK-Samples/Windows/TestBed/TestBedPackage/Package.appxmanifest
index 002a3484..c7c72684 100644
--- a/BranchSDK-Samples/Windows/TestBed/TestBedPackage/Package.appxmanifest
+++ b/BranchSDK-Samples/Windows/TestBed/TestBedPackage/Package.appxmanifest
@@ -9,7 +9,7 @@
+ Version="1.2.1.0" />
Branch TestBed
diff --git a/BranchSDK-Samples/Windows/TestBed/TestBedPackage/TestBedPackage.wapproj b/BranchSDK-Samples/Windows/TestBed/TestBedPackage/TestBedPackage.wapproj
index efe30a37..9686a3f9 100644
--- a/BranchSDK-Samples/Windows/TestBed/TestBedPackage/TestBedPackage.wapproj
+++ b/BranchSDK-Samples/Windows/TestBed/TestBedPackage/TestBedPackage.wapproj
@@ -51,7 +51,7 @@
2273973c-f44b-426a-bff6-f24ecbb353d8
- 10.0.19041.0
+ 10.0.18362.0
10.0.17763.0
en-US
True
diff --git a/BranchSDK/Windows/BranchInstaller/Components.wxs b/BranchSDK/Windows/BranchInstaller/Components.wxs
index 5542853b..432be269 100644
--- a/BranchSDK/Windows/BranchInstaller/Components.wxs
+++ b/BranchSDK/Windows/BranchInstaller/Components.wxs
@@ -10,18 +10,20 @@
+
+
+
-
@@ -117,6 +119,7 @@
+
@@ -142,6 +145,8 @@
+
+
@@ -155,7 +160,6 @@
-
@@ -165,7 +169,6 @@
-
@@ -195,7 +198,6 @@
-
@@ -234,7 +236,6 @@
-
@@ -258,12 +259,10 @@
-
-
@@ -281,9 +280,13 @@
+
+
+
+
+
-
@@ -307,7 +310,6 @@
-
@@ -333,11 +335,11 @@
+
-
@@ -558,6 +560,13 @@
+
+
+
+
+
+
+
@@ -570,6 +579,7 @@
+
@@ -588,6 +598,7 @@
+
@@ -629,11 +640,13 @@
+
+
@@ -666,6 +679,7 @@
+
@@ -681,6 +695,7 @@
+
@@ -689,25 +704,17 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -843,62 +850,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
@@ -906,28 +950,35 @@
-
+
+
+
+
-
+
+
+
+
+
-
-
-
+
+
+
@@ -946,7 +997,8 @@
-
+
+
@@ -958,21 +1010,17 @@
-
-
-
-
-
-
+
+
@@ -981,11 +1029,9 @@
-
-
@@ -1005,7 +1051,8 @@
-
+
+
@@ -1017,21 +1064,17 @@
-
-
-
-
-
-
+
+
@@ -1040,11 +1083,9 @@
-
-
diff --git a/BranchSDK/Windows/BranchInstaller/Product.wxs b/BranchSDK/Windows/BranchInstaller/Product.wxs
index b774ff44..dd582e07 100644
--- a/BranchSDK/Windows/BranchInstaller/Product.wxs
+++ b/BranchSDK/Windows/BranchInstaller/Product.wxs
@@ -1,6 +1,6 @@
-
+
diff --git a/BranchSDK/src/BranchIO/Version.h b/BranchSDK/src/BranchIO/Version.h
index 5df7fd24..aac1713a 100644
--- a/BranchSDK/src/BranchIO/Version.h
+++ b/BranchSDK/src/BranchIO/Version.h
@@ -5,6 +5,6 @@
#define BRANCHIO_VERSION_MAJOR 1
#define BRANCHIO_VERSION_MINOR 2
-#define BRANCHIO_VERSION_REVISION 0
+#define BRANCHIO_VERSION_REVISION 1
#endif // BRANCHIO_VERSION_H__
diff --git a/BranchSDK/tools/build_wix.py b/BranchSDK/tools/build_wix.py
index c85c308c..522e99a5 100755
--- a/BranchSDK/tools/build_wix.py
+++ b/BranchSDK/tools/build_wix.py
@@ -246,9 +246,9 @@ def wix_components(elem, paths, include_subdirs=True):
# zlib headers are directly in the include_root. Don't include subdirs.
wix_components(third_party_headers, include_root, False)
third_party_licenses = make_component_elem(third_party_headers, "ThirdPartyLicenses", "LICENSEFOLDER")
-make_file_elem(third_party_licenses, "PocoLicense", os.path.join(license_root, "LICENSE-Poco.txt"))
-make_file_elem(third_party_licenses, "OpenSSLLicense", os.path.join(license_root, "LICENSE-OpenSSL.txt"))
-make_file_elem(third_party_licenses, "ZlibLicense", os.path.join(license_root, "LICENSE-zlib.txt"))
+make_file_elem(third_party_licenses, "PocoLicense", "$(var.ProjectDir)\\..\\..\\..\\build\Releasex64\stage\licenses\LICENSE-Poco.txt")
+make_file_elem(third_party_licenses, "OpenSSLLicense", "$(var.ProjectDir)\\..\\..\\..\\build\Releasex64\stage\licenses\LICENSE-OpenSSL.txt")
+make_file_elem(third_party_licenses, "ZlibLicense", "$(var.ProjectDir)\\..\\..\\..\\build\Releasex64\stage\licenses\LICENSE-Zlib.txt")
# The BranchIO.lib sits in the same lib folder with the third-party libs. This
# is as it should be, to avoid making devs pass multiple library paths at
diff --git a/BranchSDK/tools/component-ids.json b/BranchSDK/tools/component-ids.json
index c816fb26..b32aaa2e 100644
--- a/BranchSDK/tools/component-ids.json
+++ b/BranchSDK/tools/component-ids.json
@@ -1 +1 @@
-{"Releasex64.stage.include.BranchIO": "e4c5d9ed-da88-450d-9142-42c8306246fb", "Releasex64.stage.include.BranchIO.Event": "7d04d0a2-a632-4c4f-b4c9-1863a10ca9eb", "Releasex64.stage.include.BranchIO.Util": "4741ca5d-d4f2-4009-8f2d-bb663b72e06a", "Releasex64.stage.include.Poco": "6787e14a-2ad3-4462-be59-640f621748ff", "Releasex64.stage.include.Poco.Crypto": "d5f84981-e34d-41bd-8eba-83564fbb6e32", "Releasex64.stage.include.Poco.Data": "efa47c70-0d89-48b3-b7e7-ab9aa990b27e", "Releasex64.stage.include.Poco.DOM": "b1e33b2f-3c57-4fdd-bd70-71b8857c5b08", "Releasex64.stage.include.Poco.Dynamic": "97c640b2-5a2b-4294-bb68-58b477760db2", "Releasex64.stage.include.Poco.JSON": "29e19a51-1d32-42fd-928b-1755d6c6919a", "Releasex64.stage.include.Poco.Net": "e8193dd6-42c5-4bbb-b82c-aca3f8446eea", "Releasex64.stage.include.Poco.Redis": "757f9443-d1ea-4ab7-8bc6-ffb8dc651df0", "Releasex64.stage.include.Poco.SAX": "f7b5c348-7fcc-4ded-8423-0c97d7664cae", "Releasex64.stage.include.Poco.Util": "f8422974-80d9-4007-9105-03246f2a46e0", "Releasex64.stage.include.Poco.XML": "969ac18a-7fe0-4a8d-8232-594c5fdefe7e", "Releasex64.stage.include.Poco.Zip": "c8ff9dbd-697e-4290-b14e-fe5d328a08ad", "Releasex64.stage.include.Poco.Data.MySQL": "800ed270-f1db-435d-9f37-ae56357fdd73", "Releasex64.stage.include.Poco.Data.ODBC": "c539e814-8be7-4d64-9b7a-072edb2e0818", "Releasex64.stage.include.openssl": "1b72cb36-73d9-4ccd-9a65-6f6939a40b8c", "Releasex64.stage.include": "ac1a8143-7c11-4dec-bf84-111b8b2b0093", "BranchLibrariesDebugX64": "6b538925-ded6-4bbf-8b59-64495e0e3b9c", "BranchLibrariesReleaseX64": "14030dd2-fad4-4d5a-baf2-20abdda3be0c", "BranchLibrariesDebugX86": "054b215a-7743-4fe3-b212-a4798cfc305d", "BranchLibrariesReleaseX86": "c8b9e075-e963-4283-993d-b1ed2e853ea7", "X64DEBUGLIBFOLDER": "5a94d40d-f719-40f4-86a1-8b897cfc4b70", "X64RELEASELIBFOLDER": "c9f2a7b9-560d-4ff7-bd7b-5535a60b1123", "X86DEBUGLIBFOLDER": "0db87ca1-c644-47df-a72e-85913578c98a", "X86RELEASELIBFOLDER": "db6ede4d-cc8f-4c26-918a-01de8c5ea904", "Releasex64.stage.licenses.LICENSE.txt": "ee137023-e23a-4290-b0a1-4b9effcc8a6b", "Releasex64.stage.licenses.LICENSE-Poco.txt": "1e2bbcce-7e37-4416-848d-704dbeb7c54b", "ThirdPartyLicenses": "37a92faa-7f32-4483-8a05-0ef404be8e5d", "BranchLicense": "c476d3e5-66fa-4689-9a03-1fee2b8403d7"}
\ No newline at end of file
+{"Releasex64.stage.include.BranchIO": "e4c5d9ed-da88-450d-9142-42c8306246fb", "Releasex64.stage.include.BranchIO.Event": "7d04d0a2-a632-4c4f-b4c9-1863a10ca9eb", "Releasex64.stage.include.BranchIO.Util": "4741ca5d-d4f2-4009-8f2d-bb663b72e06a", "Releasex64.stage.include.Poco": "6787e14a-2ad3-4462-be59-640f621748ff", "Releasex64.stage.include.Poco.Crypto": "d5f84981-e34d-41bd-8eba-83564fbb6e32", "Releasex64.stage.include.Poco.Data": "efa47c70-0d89-48b3-b7e7-ab9aa990b27e", "Releasex64.stage.include.Poco.DOM": "b1e33b2f-3c57-4fdd-bd70-71b8857c5b08", "Releasex64.stage.include.Poco.Dynamic": "97c640b2-5a2b-4294-bb68-58b477760db2", "Releasex64.stage.include.Poco.JSON": "29e19a51-1d32-42fd-928b-1755d6c6919a", "Releasex64.stage.include.Poco.Net": "e8193dd6-42c5-4bbb-b82c-aca3f8446eea", "Releasex64.stage.include.Poco.Redis": "757f9443-d1ea-4ab7-8bc6-ffb8dc651df0", "Releasex64.stage.include.Poco.SAX": "f7b5c348-7fcc-4ded-8423-0c97d7664cae", "Releasex64.stage.include.Poco.Util": "f8422974-80d9-4007-9105-03246f2a46e0", "Releasex64.stage.include.Poco.XML": "969ac18a-7fe0-4a8d-8232-594c5fdefe7e", "Releasex64.stage.include.Poco.Zip": "c8ff9dbd-697e-4290-b14e-fe5d328a08ad", "Releasex64.stage.include.Poco.Data.MySQL": "800ed270-f1db-435d-9f37-ae56357fdd73", "Releasex64.stage.include.Poco.Data.ODBC": "c539e814-8be7-4d64-9b7a-072edb2e0818", "Releasex64.stage.include.openssl": "1b72cb36-73d9-4ccd-9a65-6f6939a40b8c", "Releasex64.stage.include": "ac1a8143-7c11-4dec-bf84-111b8b2b0093", "BranchLibrariesDebugX64": "6b538925-ded6-4bbf-8b59-64495e0e3b9c", "BranchLibrariesReleaseX64": "14030dd2-fad4-4d5a-baf2-20abdda3be0c", "BranchLibrariesDebugX86": "054b215a-7743-4fe3-b212-a4798cfc305d", "BranchLibrariesReleaseX86": "c8b9e075-e963-4283-993d-b1ed2e853ea7", "X64DEBUGLIBFOLDER": "5a94d40d-f719-40f4-86a1-8b897cfc4b70", "X64RELEASELIBFOLDER": "c9f2a7b9-560d-4ff7-bd7b-5535a60b1123", "X86DEBUGLIBFOLDER": "0db87ca1-c644-47df-a72e-85913578c98a", "X86RELEASELIBFOLDER": "db6ede4d-cc8f-4c26-918a-01de8c5ea904", "Releasex64.stage.licenses.LICENSE.txt": "ee137023-e23a-4290-b0a1-4b9effcc8a6b", "Releasex64.stage.licenses.LICENSE-Poco.txt": "1e2bbcce-7e37-4416-848d-704dbeb7c54b", "ThirdPartyLicenses": "37a92faa-7f32-4483-8a05-0ef404be8e5d", "BranchLicense": "c476d3e5-66fa-4689-9a03-1fee2b8403d7", "Releasex64.stage.include.Poco.JWT": "5a58b864-75fb-4ed6-af99-b4edec018f8d", "Releasex64.stage.include.Poco.Data.PostgreSQL": "4b49ab29-a8e6-42f7-a0ba-a50655bb87ea"}
\ No newline at end of file
diff --git a/BranchSDK/tools/stage.py b/BranchSDK/tools/stage.py
index 452fd820..387e3eb4 100755
--- a/BranchSDK/tools/stage.py
+++ b/BranchSDK/tools/stage.py
@@ -28,19 +28,24 @@ def copyall(src, dst, excludes=[]):
# TODO: Collapse this and the above and/or rethink this whole idea, remove conan
# from build process. Makes a flat copy of all *.pdb files from a recursive search.
-def copy_pdbs(src, dst):
+def copy_pdbs(src, dst, excludes=[]):
if not os.path.exists(src):
return
+
+ ignores = shutil.ignore_patterns(*excludes)
all_files = os.listdir(src)
+ # rejects is a set of all files matching the excludes
+ rejected = ignores(src, all_files)
+ files = [f for f in all_files if f not in rejected]
# TODO: Use a re with os.path.splitext or something
- for f in [f for f in all_files if f.endswith(".pdb") or f.endswith(".PDB")]:
+ for f in [f for f in files if f.endswith(".pdb") or f.endswith(".PDB")]:
path = os.path.join(src, f)
shutil.copy(path, dst)
- for d in [f for f in all_files if os.path.isdir(os.path.join(src, f))]:
+ for d in [f for f in files if os.path.isdir(os.path.join(src, f))]:
path = os.path.join(src, d)
- copy_pdbs(path, dst)
+ copy_pdbs(path, dst, excludes=excludes)
# TODO: Collapse this and the above and/or rethink this whole idea, remove conan
# from build process. Makes a copy of all LICENSE files from the conan source cache.
@@ -76,7 +81,7 @@ def copy_licenses(src, dst):
# Skip Poco's MongoDB and SQLiteData modules, which we don't require.
# Also CppUnit, which one of our deps uses.
-excludes = ["CppUnit", "*gtest*", "*gmock*", "*MongoDB*", "*SQLite*"]
+excludes = ["CppUnit", "*gtest*", "*gmock*", "*MongoDB*", "*SQLite*", "*Redis*", "*unit_test*"]
for item in installed:
recipe = item["recipe"]
@@ -98,4 +103,4 @@ def copy_licenses(src, dst):
# pdbs are under build_path
build_path = os.path.join((os.path.dirname(os.path.dirname(rootpath))), "build", build_id)
- copy_pdbs(build_path, "stage/lib")
+ copy_pdbs(build_path, "stage/lib", excludes=excludes)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0fb0161..0783d73a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12)
# TODO(jdee): Set the version in one place and pass it around.
-project(root VERSION 1.2.0 LANGUAGES CXX)
+project(root VERSION 1.2.1 LANGUAGES CXX)
# Determines handling of RPATH and related variables when building dylibs on Mac.
# TODO(jdee): Review this. RPATH is an issue on Unix right now.
diff --git a/conanfile.py b/conanfile.py
index 8d46e123..2dcde8d2 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -11,7 +11,7 @@ class BranchioConan(ConanFile):
# ----- Package metadata -----
name = "BranchIO"
# TODO(jdee): Set the version in one place and propagate it
- version = "1.2.0"
+ version = "1.2.1"
license = "MIT"
description = "Branch Metrics deep linking and attribution analytics C++ SDK"
topics = (
@@ -40,7 +40,7 @@ class BranchioConan(ConanFile):
# ----- Package dependencies -----
# Allow patch updates to Poco
- requires = "Poco/[~=1.9.4]@pocoproject/stable"
+ requires = ("Poco/[~=1.10.1]@pocoproject/stable", ("OpenSSL/[>=1.1.1c <3.0]@conan/stable", "override"))
build_requires = "gtest/1.8.1@bincrafters/stable"
def build(self):
diff --git a/rmake.bat b/rmake.bat
index 05c5a7cd..70bb92d9 100644
--- a/rmake.bat
+++ b/rmake.bat
@@ -115,7 +115,12 @@ conan install ..\..\conanfile.py^
--settings compiler.runtime=%RUNTIME%^
--options *:shared=%BUILD_SHARED_LIBS%^
--options Poco:enable_mongodb=False^
+ --options Poco:enable_data_mysql=False^
+ --options Poco:enable_data_odbc=False^
+ --options Poco:enable_data_postgresql=False^
--options Poco:enable_data_sqlite=False^
+ --options Poco:enable_jwt=False^
+ --options Poco:enable_netssl=True^
--build outdated
if ERRORLEVEL 1 (
@@ -157,7 +162,12 @@ conan create ..\.. branch/testing^
--settings compiler.runtime=%RUNTIME%^
--options *:shared=%BUILD_SHARED_LIBS%^
--options Poco:enable_mongodb=False^
+ --options Poco:enable_data_mysql=False^
+ --options Poco:enable_data_odbc=False^
+ --options Poco:enable_data_postgresql=False^
--options Poco:enable_data_sqlite=False^
+ --options Poco:enable_jwt=False^
+ --options Poco:enable_netssl=True^
--build outdated
echo Building stage from conan cache