diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml index b1551844..c5acb221 100644 --- a/GitVersionConfig.yaml +++ b/GitVersionConfig.yaml @@ -1,4 +1,4 @@ -next-version: 3.5.0 +next-version: 3.5.1 assembly-versioning-scheme: MajorMinorPatch mode: ContinuousDeployment build-metadata-padding: 0 diff --git a/release.bat b/release.bat deleted file mode 100644 index 8fd3df43..00000000 --- a/release.bat +++ /dev/null @@ -1,2 +0,0 @@ -cd C:\_gitPub\ZendeskApi_v2\ -GitReleaseNotes.exe . /O ReleaseNotes2.md /verbose /IssueTracker GitHub /allTags / \ No newline at end of file diff --git a/src/GitVersionConfig.yaml b/src/GitVersionConfig.yaml index b1551844..c5acb221 100644 --- a/src/GitVersionConfig.yaml +++ b/src/GitVersionConfig.yaml @@ -1,4 +1,4 @@ -next-version: 3.5.0 +next-version: 3.5.1 assembly-versioning-scheme: MajorMinorPatch mode: ContinuousDeployment build-metadata-padding: 0 diff --git a/src/Tests/HelpCenter/ArticleTests.cs b/src/Tests/HelpCenter/ArticleTests.cs index 12a1bb31..a7427b62 100644 --- a/src/Tests/HelpCenter/ArticleTests.cs +++ b/src/Tests/HelpCenter/ArticleTests.cs @@ -26,15 +26,15 @@ public class ArticleTests public void CanGetSingleArticle() { var res = api.HelpCenter.Articles.GetArticle(_articleIdWithComments); - Assert.IsNotNull(res.Arcticle); + Assert.IsNotNull(res.Article); } [Test] public void CanGetSingleArticleWithTranslations() { var res = api.HelpCenter.Articles.GetArticle(_articleIdWithComments, ArticleSideLoadOptionsEnum.Translations); - Assert.IsNotNull(res.Arcticle); - Assert.Greater(res.Arcticle.Translations.Count, 0); + Assert.IsNotNull(res.Article); + Assert.Greater(res.Article.Translations.Count, 0); } [Test] @@ -151,21 +151,21 @@ public void CanCreateUpdateAndDeleteArticles() Body = "The body of my article", Locale = "en-us" }); - Assert.Greater(res.Arcticle.Id, 0); + Assert.Greater(res.Article.Id, 0); - res.Arcticle.LabelNames = new string[] { "updated" }; - var update = api.HelpCenter.Articles.UpdateArticleAsync(res.Arcticle).Result; - Assert.That(update.Arcticle.LabelNames, Is.EqualTo(res.Arcticle.LabelNames)); + res.Article.LabelNames = new string[] { "updated" }; + var update = api.HelpCenter.Articles.UpdateArticleAsync(res.Article).Result; + Assert.That(update.Article.LabelNames, Is.EqualTo(res.Article.LabelNames)); - Assert.True(api.HelpCenter.Articles.DeleteArticle(res.Arcticle.Id.Value)); + Assert.True(api.HelpCenter.Articles.DeleteArticle(res.Article.Id.Value)); } [Test] public void CanGetSingleArticleWithTranslationsAsync() { var res = api.HelpCenter.Articles.GetArticleAsync(_articleIdWithComments, ArticleSideLoadOptionsEnum.Translations).Result; - Assert.IsNotNull(res.Arcticle); - Assert.Greater(res.Arcticle.Translations.Count, 0); + Assert.IsNotNull(res.Article); + Assert.Greater(res.Article.Translations.Count, 0); } [Test] @@ -190,13 +190,13 @@ public async Task CanCreateUpdateAndDeleteArticlesAsync() Locale = "en-us" }); - Assert.Greater(res.Arcticle.Id, 0); + Assert.Greater(res.Article.Id, 0); - res.Arcticle.LabelNames = new string[] { "photo", "tripod" }; - var update = await api.HelpCenter.Articles.UpdateArticleAsync(res.Arcticle); - Assert.AreEqual(update.Arcticle.LabelNames, res.Arcticle.LabelNames); + res.Article.LabelNames = new string[] { "photo", "tripod" }; + var update = await api.HelpCenter.Articles.UpdateArticleAsync(res.Article); + Assert.AreEqual(update.Article.LabelNames, res.Article.LabelNames); - Assert.True(await api.HelpCenter.Articles.DeleteArticleAsync(res.Arcticle.Id.Value)); + Assert.True(await api.HelpCenter.Articles.DeleteArticleAsync(res.Article.Id.Value)); } [Test] diff --git a/src/Tests/HelpCenter/TranslationTests.cs b/src/Tests/HelpCenter/TranslationTests.cs index 00bbcaf0..97c59056 100644 --- a/src/Tests/HelpCenter/TranslationTests.cs +++ b/src/Tests/HelpCenter/TranslationTests.cs @@ -54,7 +54,7 @@ public void CanListMissingCreateUpdateAndDeleteTranslationsForArticle() Body = "The body of my article", Locale = "en-us" }); - long article_id = new_article_res.Arcticle.Id.Value; + long article_id = new_article_res.Article.Id.Value; var missing_res = api.HelpCenter.Translations.ListMissingTranslationsForArticle(article_id); Assert.AreEqual(1, missing_res.Count); @@ -239,7 +239,7 @@ public async Task CanListMissingCreateUpdateAndDeleteTranslationsForArticleAsync Body = "The body of my article", Locale = "en-us" }); - long article_id = new_article_res.Arcticle.Id.Value; + long article_id = new_article_res.Article.Id.Value; var missing_res = await api.HelpCenter.Translations.ListMissingTranslationsForArticleAsync(article_id); Assert.That(missing_res.Count, Is.EqualTo(1)); diff --git a/src/ZendeskApi_v2/Models/Articles/IndividualArticleResponse.cs b/src/ZendeskApi_v2/Models/Articles/IndividualArticleResponse.cs index 3815d5a6..70b8ad8e 100644 --- a/src/ZendeskApi_v2/Models/Articles/IndividualArticleResponse.cs +++ b/src/ZendeskApi_v2/Models/Articles/IndividualArticleResponse.cs @@ -2,10 +2,10 @@ namespace ZendeskApi_v2.Models.Articles { - public class IndividualArticleResponse - { + public class IndividualArticleResponse + { - [JsonProperty("article")] - public Article Arcticle { get; set; } - } + [JsonProperty("article")] + public Article Article { get; set; } + } } \ No newline at end of file diff --git a/testing.ps1 b/testing.ps1 deleted file mode 100644 index e8c71eac..00000000 --- a/testing.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -$gitVersionExe = "C:\git_pub\ZendeskApi_v2\build\GitVersion\GitVersion.exe" -cd C:\git_pub\ZendeskApi_v2\src - -#& $path /l console /output buildserver /updateAssemblyInfo - - -$output = gitversion -$joined = $output -join "`n" -$versionInfo = $joined | ConvertFrom-Json - -$versionInfo | % { foreach ($property in $_.PSObject.Properties) { -Set-AppveyorBuildVariable -Name "GitVersion_$($property.Name)" -Value "$($_.PSObject.properties[$property.Name].Value)" -} -} - -Update-AppveyorBuild -Version "$versionInfo.NuGetVersionV2" + ".build.$env:APPVEYOR_BUILD_ID" -#Write-Host $versionInfo; \ No newline at end of file diff --git a/GitReleaseNotes.exe b/tools/GitReleaseNotes.exe similarity index 100% rename from GitReleaseNotes.exe rename to tools/GitReleaseNotes.exe diff --git a/NativeBinaries/amd64/git2-e0902fb.dll b/tools/NativeBinaries/amd64/git2-e0902fb.dll similarity index 100% rename from NativeBinaries/amd64/git2-e0902fb.dll rename to tools/NativeBinaries/amd64/git2-e0902fb.dll diff --git a/tools/ReleaseNotes.ps1 b/tools/ReleaseNotes.ps1 new file mode 100644 index 00000000..3c5c7d9c --- /dev/null +++ b/tools/ReleaseNotes.ps1 @@ -0,0 +1,9 @@ +Param( + [string]$Version = "3.5.1", + [string]$gitHubToken = "$env:GitHubToken" +) + +$gitReleaseNotesPath = "$PSScriptRoot\GitReleaseNotes.exe" +Push-Location "$PSScriptRoot\.." +& $gitReleaseNotesPath . /O ReleaseNotes.md /Vers $Version /RepoUrl https://github.com/mozts2005/ZendeskApi_v2 /RepoUsername mozts2005 /RepoT $gitHubToken /AllT /AllL /IssueTrackerUsername mozts /IssueTrackerToken $gitHubToken +Pop-Location \ No newline at end of file