Merge remote-tracking branch 'origin/develop'

GregsStack · Sep 3, 2019 · b33eecb · b33eecb
2 parents 2626fb9 + d331b1f
commit b33eecb
Show file tree

Hide file tree

Showing 49 changed files with 572 additions and 313 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
-# PushCrew.Net
-.Net implementation of [PushCrew API](https://api.pushcrew.com)  
-[![codecov](https://codecov.io/gh/GregsStack/PushCrew.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/GregsStack/PushCrew.Net)
+# VwoEngage.Net
+.Net implementation of [VWO Engage](https://vwo.com/engage/) (former [PushCrew API](https://api.pushcrew.com))  
+
+[![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/GregsStack.VwoEngage.Net.Api)](https://www.nuget.org/packages/GregsStack.VwoEngage.Net.Api)
+[![Build Status](https://dev.azure.com/GregsStack/GitHub/_apis/build/status/GregsStack.VwoEngage.Net?branchName=master)](https://dev.azure.com/GregsStack/GitHub/_build/latest?definitionId=4&branchName=master)
+[![codecov](https://codecov.io/gh/GregsStack/VwoEngage.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/GregsStack/VwoEngage.Net)
diff --git a/PushCrew.Net.sln → VwoEngage.Net.sln b/PushCrew.Net.sln → VwoEngage.Net.sln
@@ -5,22 +5,25 @@ VisualStudioVersion = 16.0.29123.89
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2384891B-7AE9-408A-9DB0-AB41ED0F41C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GregsStack.PushCrew.Net.Api", "src\GregsStack.PushCrew.Net.Api\GregsStack.PushCrew.Net.Api.csproj", "{CABE94FF-0D04-4C74-B62B-02785FBADEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GregsStack.VwoEngage.Net.Api", "src\GregsStack.VwoEngage.Net.Api\GregsStack.VwoEngage.Net.Api.csproj", "{CABE94FF-0D04-4C74-B62B-02785FBADEFD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BB3C3681-2D2A-4F08-B7CE-68461C0643B6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GregsStack.PushCrew.Net.Api.Tests", "tests\GregsStack.PushCrew.Net.Api.Tests\GregsStack.PushCrew.Net.Api.Tests.csproj", "{8EDEE3E3-7899-49AC-9271-F685890D83F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GregsStack.VwoEngage.Net.Api.Tests", "tests\GregsStack.VwoEngage.Net.Api.Tests\GregsStack.VwoEngage.Net.Api.Tests.csproj", "{8EDEE3E3-7899-49AC-9271-F685890D83F0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{45050F49-6359-48E6-B1D1-CBF29026D8D8}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
+		azure-pipelines.yml = azure-pipelines.yml
+		GitVersion.yml = GitVersion.yml
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{130AB2DF-DA26-436C-AEE2-B644473D3AD4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GregsStack.NuGet.Tools", "tools\GregsStack.NuGet.Tools\GregsStack.NuGet.Tools.csproj", "{1597AD92-5743-46A3-9E09-7F91BA6FDC89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GregsStack.NuGet.Tools", "tools\GregsStack.NuGet.Tools\GregsStack.NuGet.Tools.csproj", "{1597AD92-5743-46A3-9E09-7F91BA6FDC89}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -65,12 +65,13 @@ steps:
 - powershell: |
     $testsDirectory = Join-Path -Path '$(Build.SourcesDirectory)' -ChildPath 'tests'
     $coverageFile = Get-ChildItem -Path "$testsDirectory" -Recurse -File -Filter 'coverage.xml' | Select-Object -First 1
-    & "$ENV:USERPROFILE\.nuget\packages\codecov\1.7.1\tools\codecov.exe" -f "$($coverageFile.FullName)" -t '$(CODECOV_TOKEN)'
+    $codecovExecutable = Get-ChildItem -Path "$ENV:USERPROFILE\.nuget\packages\codecov" -Recurse -File -Filter "codecov.exe" | Sort-Object -Descending -Property FullName | Select-Object -First 1
+    & "$($codecovExecutable.FullName)" -f "$($coverageFile.FullName)" -t '$(CODECOV_TOKEN)'
   displayName: 'Upload coverage to codecov.io'
 
 - task: DotNetCoreCLI@2
   displayName: 'Pack projects'
-  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
+  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
   inputs:
     command: 'pack'
     packagesToPack: '$(Solution)'
@@ -80,14 +81,14 @@ steps:
     versionEnvVar: 'GITVERSION_NUGETVERSIONV2'
 
 - task: NuGetToolInstaller@1
-  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
+  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
   inputs:
     versionSpec: '5.1.0'
     checkLatest: true
 
 - task: NuGetCommand@2
   displayName: 'Push *.nupkg and *.snupkg to nuget.org'
-  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
+  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
   inputs:
     command: 'push'
     packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
@@ -103,8 +104,8 @@ steps:
     action: 'create'
     target: '$(Build.SourceVersion)'
     tagSource: 'manual'
-    tag: '$(Build.BuildNumber)'
-    title: '$(Build.BuildNumber)'
+    tag: 'v$(Build.BuildNumber)'
+    title: 'v$(Build.BuildNumber)'
 
 - task: GitHubRelease@0
   condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
@@ -114,6 +115,6 @@ steps:
     action: 'create'
     target: '$(Build.SourceVersion)'
     tagSource: 'manual'
-    tag: '$(Build.BuildNumber)'
-    title: '$(Build.BuildNumber)'
+    tag: 'v$(Build.BuildNumber)'
+    title: 'v$(Build.BuildNumber)'
     isPreRelease: true
diff --git a/src/GregsStack.PushCrew.Net.Api/Client.cs b/src/GregsStack.PushCrew.Net.Api/Client.cs
diff --git a/src/GregsStack.PushCrew.Net.Api/Exceptions/BadRequestException.cs b/src/GregsStack.PushCrew.Net.Api/Exceptions/BadRequestException.cs
diff --git a/src/GregsStack.PushCrew.Net.Api/Exceptions/InternalServerErrorException.cs b/src/GregsStack.PushCrew.Net.Api/Exceptions/InternalServerErrorException.cs
diff --git a/src/GregsStack.PushCrew.Net.Api/Exceptions/PushCrewException.cs b/src/GregsStack.PushCrew.Net.Api/Exceptions/PushCrewException.cs
diff --git a/src/GregsStack.PushCrew.Net.Api/Exceptions/UnauthorizedException.cs b/src/GregsStack.PushCrew.Net.Api/Exceptions/UnauthorizedException.cs
diff --git a/src/GregsStack.PushCrew.Net.Api/GregsStack.PushCrew.Net.Api.csproj b/src/GregsStack.PushCrew.Net.Api/GregsStack.PushCrew.Net.Api.csproj
diff --git a/...i/Attributes/ValidatedNotNullAttribute.cs → ...i/Attributes/ValidatedNotNullAttribute.cs b/...i/Attributes/ValidatedNotNullAttribute.cs → ...i/Attributes/ValidatedNotNullAttribute.cs
@@ -1,4 +1,4 @@
-namespace GregsStack.PushCrew.Net.Api.Attributes
+namespace GregsStack.VwoEngage.Net.Api.Attributes
 {
     using System;
 

diff --git a/...ew.Net.Api/Converters/BooleanConverter.cs → ...ge.Net.Api/Converters/BooleanConverter.cs b/...ew.Net.Api/Converters/BooleanConverter.cs → ...ge.Net.Api/Converters/BooleanConverter.cs
@@ -1,4 +1,4 @@
-namespace GregsStack.PushCrew.Net.Api.Converters
+namespace GregsStack.VwoEngage.Net.Api.Converters
 {
     using System;
 

diff --git a/...verters/FormUrlEncodedContentConverter.cs → ...verters/FormUrlEncodedContentConverter.cs b/...verters/FormUrlEncodedContentConverter.cs → ...verters/FormUrlEncodedContentConverter.cs
@@ -1,4 +1,4 @@
-namespace GregsStack.PushCrew.Net.Api.Converters
+namespace GregsStack.VwoEngage.Net.Api.Converters
 {
     using System;
     using System.Collections.Generic;

diff --git a/...w.Net.Api/Converters/TimeSpanConverter.cs → ...e.Net.Api/Converters/TimeSpanConverter.cs b/...w.Net.Api/Converters/TimeSpanConverter.cs → ...e.Net.Api/Converters/TimeSpanConverter.cs
@@ -1,4 +1,4 @@
-namespace GregsStack.PushCrew.Net.Api.Converters
+namespace GregsStack.VwoEngage.Net.Api.Converters
 {
     using System;