Skip to content

Commit

Permalink
Merge pull request #89 from BranchMetrics/SDK-1122/release-prep
Browse files Browse the repository at this point in the history
[SDK-1122] release prep
  • Loading branch information
jdee authored Mar 16, 2021
2 parents 3c7e396 + 9e1c7a9 commit ab1274e
Show file tree
Hide file tree
Showing 45 changed files with 865 additions and 227 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ Testing
Thumbs.db

docs
obj
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,26 @@
Advertise="yes"
Icon="branch.exe" />
</File>
<File Id="TestBedPdb" Source="$(var.ProjectDir)..\Debug\TestBed-Basic.pdb" />
</Component>
<Component Id="ExamplePage" Guid="fc9d0d52-7c4e-4402-b189-db6711b3d154">
<File Id="example.html" Source="$(var.ProjectDir)..\example.html" KeyPath="yes">
<Shortcut Id="ExamplePageShortcut"
Name="Example Page"
<Component Id="WelcomePage" Guid="fc9d0d52-7c4e-4402-b189-db6711b3d154">
<File Id="Welcome.html" Source="$(var.ProjectDir)..\Welcome.html" KeyPath="yes">
<Shortcut Id="WelcomePageShortcut"
Name="Welcome Page"
Directory="ApplicationProgramsFolder"
Description="Example Page for Branch TestBed (Basic)"
Advertise="yes" />
Description="Welcome Page for Branch TestBed (Basic)"
Advertise="yes"
Icon="branch.exe" />
</File>
<File Id="WelcomePageBackground" Source="$(var.ProjectDir)..\branch-badge-dark.png" />
<File Id="WelcomePageFavicon" Source="$(var.ProjectDir)..\small.ico" />
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" Directory="ApplicationProgramsFolder"/>
</Component>
<Component Id="TestBedURIScheme" Guid="502eb451-4bb1-4f67-8016-ba0009fb8d6a">
<!-- Add Registry entries for URI redirection -->
<!-- testbedbasic is the URI scheme from the Branch Dashboard -->
<RegistryKey Root="HKCU" Key="SOFTWARE\Classes\testbedbasic" >
<RegistryValue Value="URL:testbedbasic" Type="string" />
<RegistryValue Value="Branch TestBed (Basic)" Type="string" />
<RegistryValue Name="URL Protocol" Value="" Type="string" />
<RegistryKey Key="DefaultIcon">
<RegistryValue Value="[INSTALLFOLDER]TestBed-Basic.exe,1" Type="string"/>
Expand All @@ -64,7 +68,7 @@
<Feature Id="ProductFeature" Title="TestBed (Basic) Application" Level="1" AllowAdvertise="yes" TypicalDefault="advertise">
<ComponentRef Id="TestBedBinary" />
<ComponentRef Id="TestBedURIScheme"/>
<ComponentRef Id="ExamplePage"/>
<ComponentRef Id="WelcomePage"/>
</Feature>
</Product>
</Wix>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>TestBed-Basic</OutputName>
<OutputType>Package</OutputType>
<SignOutput>true</SignOutput>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
Expand Down Expand Up @@ -43,6 +44,13 @@
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
<!-- https://wixtoolset.org/documentation/manual/v3/overview/insignia.html for these targets and the SignOutput property -->
<Target Name="SignCabs">
<Exec Command="&quot;C:\Program Files (x86)\Windows Kits\10\App Certification Kit\Signtool.exe&quot; sign /a &quot;%(SignCabs.FullPath)&quot;" />
</Target>
<Target Name="SignMsi">
<Exec Command="&quot;C:\Program Files (x86)\Windows Kits\10\App Certification Kit\Signtool.exe&quot; sign /a &quot;%(SignMsi.FullPath)&quot;" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
Expand All @@ -51,4 +59,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
8 changes: 4 additions & 4 deletions BranchSDK-Samples/Windows/TestBed-Basic/TestBed-Basic.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Program Files (x86)\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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)</AdditionalDependencies>
<AdditionalDependencies>BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -113,7 +113,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Program Files (x86)\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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)</AdditionalDependencies>
<AdditionalDependencies>BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -128,7 +128,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Program Files (x86)\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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)</AdditionalDependencies>
<AdditionalDependencies>BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -147,7 +147,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Program Files (x86)\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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)</AdditionalDependencies>
<AdditionalDependencies>BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
72 changes: 72 additions & 0 deletions BranchSDK-Samples/Windows/TestBed-Basic/Welcome.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<!DOCTYPE html>
<html>
<head>
<link href="small.ico" rel="shortcut icon" type="image/vnd.microsoft.icon"/>
<style>
* {
font-size: 36pt;
font-family: Verdana, 'Trebuchet MS', Arial, sans-serif;
}
body {
background-image: url("branch-badge-dark.png");
background-color: #363636;
background-repeat: no-repeat;
}
h1, h2 {
color: white;
}
h2 {
font-size: 24pt;
}
a {
text-decoration: none;
}
a:link, a:visited {
color: #88aaff;
}
a:hover {
color: #ccccff;
}
span.link {
border-radius: 5px;
background-color: rgb(0.4, 0.4, 0.4, 0.4);
padding: 8px;
margin: 4px;
display: inline-block;
width: 100%;
align-content: flex-start;
}
</style>
</head>
<body>
<h1>Welcome to the Branch Metrics C++/Win32 SDK</h1>
<h2>Release 1.2.1</h2>
<table>
<tr>
<td>
<a href="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview" target="_blank"><span class="link">SDK Documentation</span></a>
</td>
</tr>
<tr>
<td>
<a href="https://0vzx2.app.link/opSPRMKeFdb" target="_blank"><span class="link">Open Demo App from a Branch Link</span></a>
</td>
</tr>
<tr>
<td>
<a href="https://dashboard.branch.io" target="_blank"><span class="link">Branch Dashboard</span></a>
</td>
</tr>
<tr>
<td>
<a href="https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution" target="_blank"><span class="link">Source Code (GitHub)</span></a>
</td>
</tr>
<tr>
<td>
<a href="https://help.branch.io/using-branch/page/submit-a-ticket" target="_blank"><span class="link">Branch Support</span></a>
</td>
</tr>
</table>
</body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions BranchSDK-Samples/Windows/TestBed-Conan/Resource.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by TestBed-Conan.rc

#define IDS_APP_TITLE 103

#define IDR_MAINFRAME 128
#define IDD_TESTBEDCONAN_DIALOG 102
#define IDD_ABOUTBOX 103
#define IDM_ABOUT 104
#define IDM_EXIT 105
#define IDI_TESTBEDCONAN 107
#define IDI_SMALL 108
#define IDC_TESTBEDCONAN 109
#define IDC_MYICON 2
#ifndef IDC_STATIC
#define IDC_STATIC -1
#endif
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS

#define _APS_NO_MFC 130
#define _APS_NEXT_RESOURCE_VALUE 129
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 110
#endif
#endif
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>

<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap rescap">

<Identity
Name="7dad590b-3b99-43f8-a027-fe84615ff35c"
Publisher="CN=Branch Metrics, C=US"
Version="1.0.0.0" />

<Properties>
<DisplayName>Branch TestBed (Conan)</DisplayName>
<PublisherDisplayName>Branch Metrics</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>

<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
</Dependencies>

<Resources>
<Resource Language="x-generate"/>
</Resources>

<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$">
<uap:VisualElements
DisplayName="Branch TestBed (Conan)"
Description="TestBed QA application built using the Conan Visual Studio extension."
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
<uap:SplashScreen Image="Images\SplashScreen.png" />
</uap:VisualElements>
<Extensions>
<uap:Extension Category="windows.protocol">
<uap:Protocol Name="testbedconan"/>
</uap:Extension>
</Extensions>
</Application>
</Applications>

<Capabilities>
<Capability Name="internetClient" />
<rescap:Capability Name="runFullTrust" />
</Capabilities>
</Package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x86">
<Configuration>Debug</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<Configuration>Release</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|AnyCPU">
<Configuration>Debug</Configuration>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|AnyCPU">
<Configuration>Release</Configuration>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
</PropertyGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
<PropertyGroup>
<ProjectGuid>b20ad100-c9b2-4804-a7b6-945022ec50f2</ProjectGuid>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<PackageCertificateThumbprint>8132C1C16AAB24EB2CA9CC95BBA6ADA1C2C0A930</PackageCertificateThumbprint>
<PackageCertificateKeyFile>Branch.pfx</PackageCertificateKeyFile>
<EntryPointProjectUniqueName>..\TestBed-Conan.vcxproj</EntryPointProjectUniqueName>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<None Include="Branch.pfx" />
<Content Include="Images\SplashScreen.scale-200.png" />
<Content Include="Images\LockScreenLogo.scale-200.png" />
<Content Include="Images\Square150x150Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.scale-200.png" />
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\StoreLogo.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.19041.8" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TestBed-Conan.vcxproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
3 changes: 3 additions & 0 deletions BranchSDK-Samples/Windows/TestBed-Conan/TestBed-Conan.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#pragma once

#include "resource.h"
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit ab1274e

Please sign in to comment.