Merge pull request #37 from adjust/v4130

Version 4.13.0
adjust · Apr 27, 2018 · c722277 · c722277
2 parents 9f29c4f + 66598e8
commit c722277
Show file tree

Hide file tree

Showing 85 changed files with 3,163 additions and 160 deletions.
diff --git a/Adjust/Adjust.sln b/Adjust/Adjust.sln
@@ -31,6 +31,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdjustUAP10", "..\WindowsUA
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdjustUAP10Example", "AdjustUAP10Example\AdjustUAP10Example.csproj", "{3C664762-0DC1-4F65-8A2C-EB209F58B9B3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTesting", "IntegrationTesting", "{19F87C0B-0059-4A1D-9415-BE8D14E8FAB7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLibrary", "..\IntegrationTesting\TestLibrary\TestLibrary.csproj", "{955E95E0-78BA-4FE7-81B9-90933B5F96BD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "..\IntegrationTesting\TestApp\TestApp.csproj", "{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -217,8 +223,58 @@ Global
 		{3C664762-0DC1-4F65-8A2C-EB209F58B9B3}.Release|x86.ActiveCfg = Release|x86
 		{3C664762-0DC1-4F65-8A2C-EB209F58B9B3}.Release|x86.Build.0 = Release|x86
 		{3C664762-0DC1-4F65-8A2C-EB209F58B9B3}.Release|x86.Deploy.0 = Release|x86
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|ARM.Build.0 = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|x64.Build.0 = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|ARM.Build.0 = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|x64.ActiveCfg = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|x64.Build.0 = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD}.Release|x86.Build.0 = Release|Any CPU
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|ARM.Build.0 = Debug|ARM
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|ARM.Deploy.0 = Debug|ARM
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|x64.ActiveCfg = Debug|x64
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|x64.Build.0 = Debug|x64
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|x64.Deploy.0 = Debug|x64
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|x86.ActiveCfg = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|x86.Build.0 = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Debug|x86.Deploy.0 = Debug|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|Any CPU.ActiveCfg = Release|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|ARM.ActiveCfg = Release|ARM
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|ARM.Build.0 = Release|ARM
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|ARM.Deploy.0 = Release|ARM
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|Mixed Platforms.Build.0 = Release|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|Mixed Platforms.Deploy.0 = Release|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|x64.ActiveCfg = Release|x64
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|x64.Build.0 = Release|x64
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|x64.Deploy.0 = Release|x64
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|x86.ActiveCfg = Release|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|x86.Build.0 = Release|x86
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{955E95E0-78BA-4FE7-81B9-90933B5F96BD} = {19F87C0B-0059-4A1D-9415-BE8D14E8FAB7}
+		{BDE22597-BD99-4F0F-A2C9-1DBE3B8F96E9} = {19F87C0B-0059-4A1D-9415-BE8D14E8FAB7}
+	EndGlobalSection
 EndGlobal
diff --git a/Adjust/AdjustUAP10Example/AdjustUAP10Example.nuget.targets b/Adjust/AdjustUAP10Example/AdjustUAP10Example.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.bcl.build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.bcl.build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
   </ImportGroup>
 </Project>
diff --git a/Adjust/AdjustUAP10Example/App.xaml.cs b/Adjust/AdjustUAP10Example/App.xaml.cs
@@ -40,7 +40,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             //var config = new AdjustConfig("{yourAppToken}", AdjustConfig.EnvironmentSandbox);
 
             // configure Adjust - with logging (Sandox env & Verbose log level)
-            string appToken = "{yourAppToken}";
+            string appToken = "2fm9gkqubvpc";
             string environment = AdjustConfig.EnvironmentSandbox;
             var config = new AdjustConfig(appToken, environment, 
                 msg => Debug.WriteLine(msg), LogLevel.Verbose);

diff --git a/Adjust/AdjustUAP10Example/MainPage.xaml.cs b/Adjust/AdjustUAP10Example/MainPage.xaml.cs
@@ -20,27 +20,27 @@ public MainPage()
 
         private void btnSimpleEvent_Click(object sender, RoutedEventArgs e)
         {
-            var simpleEvent = new AdjustEvent("{yourSimpleEventToken}");
+            var simpleEvent = new AdjustEvent("g3mfiw");
             Adjust.TrackEvent(simpleEvent);
         }
 
         private void btnRevenueEvent_Click(object sender, RoutedEventArgs e)
         {
-            var revenueEvent = new AdjustEvent("{yourRevenueEventToken}");
+            var revenueEvent = new AdjustEvent("a4fd35");
             revenueEvent.SetRevenue(0.01, "EUR");
             Adjust.TrackEvent(revenueEvent);
         }
 
         private void btnCallbakEvent_Click(object sender, RoutedEventArgs e)
         {
-            var callbackEvent = new AdjustEvent("{yourCallbackEventToken}");
+            var callbackEvent = new AdjustEvent("34vgg9");
             callbackEvent.AddPartnerParameter("key", "value");
             Adjust.TrackEvent(callbackEvent);
         }
 
         private void btnPartnerEvent_Click(object sender, RoutedEventArgs e)
         {
-            var partnerEvent = new AdjustEvent("{yourPartnerEventToken}");
+            var partnerEvent = new AdjustEvent("w788qs");
             partnerEvent.AddPartnerParameter("foo", "bar");
             Adjust.TrackEvent(partnerEvent);
         }

diff --git a/Adjust/AdjustWP81Example/App.xaml.cs b/Adjust/AdjustWP81Example/App.xaml.cs
@@ -46,7 +46,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             //var config = new AdjustConfig("{yourAppToken}", AdjustConfig.EnvironmentSandbox);
 
             // configure Adjust - with logging (Sandox env & Verbose log level)
-            string appToken = "{yourAppToken}";
+            string appToken = "2fm9gkqubvpc";
             string environment = AdjustConfig.EnvironmentSandbox;
             var config = new AdjustConfig(appToken, environment,
                 msg => Debug.WriteLine(msg), LogLevel.Verbose);

diff --git a/Adjust/AdjustWP81Example/MainPage.xaml.cs b/Adjust/AdjustWP81Example/MainPage.xaml.cs
@@ -37,27 +37,27 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
         private void btnSimpleEvent_Click(object sender, RoutedEventArgs e)
         {
-            var simpleEvent = new AdjustEvent("{yourSimpleEventToken}");
+            var simpleEvent = new AdjustEvent("g3mfiw");
             Adjust.TrackEvent(simpleEvent);
         }
 
         private void btnRevenueEvent_Click(object sender, RoutedEventArgs e)
         {
-            var revenueEvent = new AdjustEvent("{yourRevenueEventToken}");
+            var revenueEvent = new AdjustEvent("a4fd35");
             revenueEvent.SetRevenue(0.01, "EUR");
             Adjust.TrackEvent(revenueEvent);
         }
 
         private void btnCallbakEvent_Click(object sender, RoutedEventArgs e)
         {
-            var callbackEvent = new AdjustEvent("{yourCallbackEventToken}");
+            var callbackEvent = new AdjustEvent("34vgg9");
             callbackEvent.AddPartnerParameter("key", "value");
             Adjust.TrackEvent(callbackEvent);
         }
 
         private void btnPartnerEvent_Click(object sender, RoutedEventArgs e)
         {
-            var partnerEvent = new AdjustEvent("{yourPartnerEventToken}");
+            var partnerEvent = new AdjustEvent("w788qs");
             partnerEvent.AddPartnerParameter("foo", "bar");
             Adjust.TrackEvent(partnerEvent);
         }

diff --git a/Adjust/AdjustWSExample/App.xaml.cs b/Adjust/AdjustWSExample/App.xaml.cs
@@ -42,7 +42,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             //var config = new AdjustConfig("{yourAppToken}", AdjustConfig.EnvironmentSandbox);
 
             // configure Adjust - with logging (Sandox env & Verbose log level)
-            string appToken = "{yourAppToken}";
+            string appToken = "2fm9gkqubvpc";
             string environment = AdjustConfig.EnvironmentSandbox;
             var config = new AdjustConfig(appToken, environment,
                 msg => Debug.WriteLine(msg), LogLevel.Verbose);

diff --git a/Adjust/AdjustWSExample/MainPage.xaml.cs b/Adjust/AdjustWSExample/MainPage.xaml.cs
@@ -18,27 +18,27 @@ public MainPage()
 
         private void btnSimpleEvent_Click(object sender, RoutedEventArgs e)
         {
-            var simpleEvent = new AdjustEvent("{yourSimpleEventToken}");
+            var simpleEvent = new AdjustEvent("g3mfiw");
             Adjust.TrackEvent(simpleEvent);
         }
 
         private void btnRevenueEvent_Click(object sender, RoutedEventArgs e)
         {
-            var revenueEvent = new AdjustEvent("{yourRevenueEventToken}");
+            var revenueEvent = new AdjustEvent("a4fd35");
             revenueEvent.SetRevenue(0.01, "EUR");
             Adjust.TrackEvent(revenueEvent);
         }
 
         private void btnCallbakEvent_Click(object sender, RoutedEventArgs e)
         {
-            var callbackEvent = new AdjustEvent("{yourCallbackEventToken}");
+            var callbackEvent = new AdjustEvent("34vgg9");
             callbackEvent.AddPartnerParameter("key", "value");
             Adjust.TrackEvent(callbackEvent);
         }
 
         private void btnPartnerEvent_Click(object sender, RoutedEventArgs e)
         {
-            var partnerEvent = new AdjustEvent("{yourPartnerEventToken}");
+            var partnerEvent = new AdjustEvent("w788qs");
             partnerEvent.AddPartnerParameter("foo", "bar");
             Adjust.TrackEvent(partnerEvent);
         }

diff --git a/Adjust/Adjust_nuget4.nuspec b/Adjust/Adjust_nuget4.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>	
         <id>Adjust</id>
-        <version>4.12.0</version>
+        <version>4.13.0</version>
         <title>Adjust</title>
         <authors>Adjust</authors>
         <owners>Adjust</owners>
@@ -70,4 +70,4 @@
         <file src="..\WindowsUAP10\Properties\AdjustUAP10.rd.xml" target="lib\uap10.0\AdjustUAP10.rd.xml" />
 		<file src="..\WindowsPcl\bin\Release\WindowsPcl.dll" target="lib\uap10.0\WindowsPcl.dll" />
     </files>
-</package>
+</package>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### Version 4.13.0 (27th April 2018)
+#### Added
+- Added `Adjust.GdprForgetMe()` method to enable possibility for user to be forgotten in accordance with GDPR law.
+
+---
+
+### Version 4.12.1 (19th April 2018)
+#### Added
+- Added integration tests support to the repository.
+- Added `initiated_by` flag indicating whether SDK or backend initiated attribution request.
+
+---
+
 ### Version 4.12.0 (13th December 2017)
 #### Added
 - Added new `click label` parameter in attribution.

diff --git a/...ionTesting/3rdParty/system.collections.concurrent4.10.0/System.Collections.Concurrent.dll b/...ionTesting/3rdParty/system.collections.concurrent4.10.0/System.Collections.Concurrent.dll