From c75c9412a4c148be05be21fcf15c558e35e1f64b Mon Sep 17 00:00:00 2001 From: Kelly Adams Date: Wed, 28 Nov 2018 13:55:44 -0800 Subject: [PATCH 1/5] Fix FxCop issue --- IntelliTect.IntelliWait/Wait.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IntelliTect.IntelliWait/Wait.cs b/IntelliTect.IntelliWait/Wait.cs index 6f9d549..6c7aa50 100644 --- a/IntelliTect.IntelliWait/Wait.cs +++ b/IntelliTect.IntelliWait/Wait.cs @@ -182,7 +182,7 @@ private static async Task ExecuteWait(Func actionToWa { exceptions.Add(ex); } - await Task.Delay(250); + await Task.Delay(250).ConfigureAwait(false); } while (sw.Elapsed < timeToWait); throw new AggregateException(exceptions); } @@ -203,7 +203,7 @@ private static async Task ExecuteWait(Action actionToWaitForComplete, TimeSpan t { exceptions.Add(ex); } - await Task.Delay(250); + await Task.Delay(250).ConfigureAwait(false); } while (sw.Elapsed < timeToWait); throw new AggregateException(exceptions); } From 903b3a577a488f5a51559f9acc86699facee5e6a Mon Sep 17 00:00:00 2001 From: Kelly Adams Date: Wed, 28 Nov 2018 13:56:34 -0800 Subject: [PATCH 2/5] Remove funky unicode flotsam --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09ea8ab..661e78c 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Libraries * IntelliTect.IntelliWait - Wait: Set of methods to facilitate waiting a certain amount of time for a delegate to evaluate, while ignoring certain exceptions while attempting to evaluate, and throwing after a specified time limit - (or throwing immediately if an unexpected exception is encountered). + (or throwing immediately if an unexpected exception is encountered). Contributing ============ From 6fd2201f19f2ff8155fcc60b0464fd70fa87d544 Mon Sep 17 00:00:00 2001 From: Kelly Adams Date: Wed, 28 Nov 2018 14:02:48 -0800 Subject: [PATCH 3/5] Deprecate CodeAnalysis for FxCop Analyzers, and target netstandard2.0 --- .../IntelliTect.IntelliWait.Tests.csproj | 10 ++++-- IntelliTect.IntelliWait/CustomDictionary.xml | 9 ++++++ .../IntelliTect.IntelliWait.csproj | 18 +++++++---- .../IntelliTect.Utilities.Tests.csproj | 20 +++++++----- .../IntelliTect.Utilities.csproj | 31 +++++++++++-------- .../IntelliTect.Utilities.nuspec | 17 ---------- SolutionRuleset.ruleset | 14 --------- 7 files changed, 58 insertions(+), 61 deletions(-) create mode 100644 IntelliTect.IntelliWait/CustomDictionary.xml delete mode 100644 IntelliTect.Utilities/IntelliTect.Utilities.nuspec delete mode 100644 SolutionRuleset.ruleset diff --git a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj index 5393533..d1106f1 100644 --- a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj +++ b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj @@ -7,9 +7,13 @@ - - - + + + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/IntelliTect.IntelliWait/CustomDictionary.xml b/IntelliTect.IntelliWait/CustomDictionary.xml new file mode 100644 index 0000000..e611429 --- /dev/null +++ b/IntelliTect.IntelliWait/CustomDictionary.xml @@ -0,0 +1,9 @@ + + + + + Intelli + Tect + + + \ No newline at end of file diff --git a/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj b/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj index 5558d58..25fd59f 100644 --- a/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj +++ b/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj @@ -1,21 +1,27 @@  - netstandard2.0 true - true - Mike Curn + IntelliTect-Nuget; Mike Curn IntelliTect Set of methods to facilitate waiting a certain amount of time for a delegate to evaluate, while ignoring certain exceptions while attempting to evaluate, and throwing after a specified time limit (or throwing immediately if an unexpected exception is encountered) https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE - 2018 + Copyright © IntelliTect 2018 https://github.com/IntelliTect/IntelliTect https://github.com/IntelliTect/IntelliTect Git ui test, automated test, testing, api test, web test, integration test, await, async Initial release for long-term home, independant from Selenium dependency - IntelliTect.IntelliWait + true - + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj b/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj index dc20886..cdad6a6 100644 --- a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj +++ b/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj @@ -1,18 +1,22 @@ - + - net462 + netcoreapp2.0 false - - - - - - + + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/IntelliTect.Utilities/IntelliTect.Utilities.csproj b/IntelliTect.Utilities/IntelliTect.Utilities.csproj index 9834486..c4afeed 100644 --- a/IntelliTect.Utilities/IntelliTect.Utilities.csproj +++ b/IntelliTect.Utilities/IntelliTect.Utilities.csproj @@ -1,22 +1,27 @@  - IntelliTect.Utilities - net462 - A utility library for IntelliTect - IntelliTect + netstandard2.0 + true + true + IntelliTect-Nuget IntelliTect - Copyright © IntelliTect 2017 - - - ..\SolutionRuleset.ruleset - true - full - true + A utility library for IntelliTect + https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE + Copyright © IntelliTect 2018 + https://github.com/IntelliTect/IntelliTect + https://github.com/IntelliTect/IntelliTect + Git + IntelliTect Utilities + Upgraded to netstandard 2.0 + true - + - + + all + runtime; build; native; contentfiles; analyzers + \ No newline at end of file diff --git a/IntelliTect.Utilities/IntelliTect.Utilities.nuspec b/IntelliTect.Utilities/IntelliTect.Utilities.nuspec deleted file mode 100644 index 3d8374d..0000000 --- a/IntelliTect.Utilities/IntelliTect.Utilities.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE - https://github.com/IntelliTect/IntelliTect - true - $description$ - Added ClaimsPrincipal extensions. - Copyright 2017 - IntelliTect - - \ No newline at end of file diff --git a/SolutionRuleset.ruleset b/SolutionRuleset.ruleset deleted file mode 100644 index a5f2eac..0000000 --- a/SolutionRuleset.ruleset +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From 466552169a8052cc75c36e7e56cf169acb89bf9f Mon Sep 17 00:00:00 2001 From: Kelly Adams Date: Wed, 28 Nov 2018 14:36:18 -0800 Subject: [PATCH 4/5] Add appveyor config --- IntelliTect.sln | 6 ++++++ appveyor.yml | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 appveyor.yml diff --git a/IntelliTect.sln b/IntelliTect.sln index 006ce3f..0229ece 100644 --- a/IntelliTect.sln +++ b/IntelliTect.sln @@ -11,6 +11,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.IntelliWait", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.IntelliWait.Tests", "IntelliTect.IntelliWait.Tests\IntelliTect.IntelliWait.Tests.csproj", "{174B4C67-DEFA-4387-A947-52395E4C79A5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7FB66610-EB11-460E-8CC8-F49044F452D0}" + ProjectSection(SolutionItems) = preProject + appveyor.yml = appveyor.yml + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..94925a9 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,37 @@ +version: 1.0.{build} +pull_requests: + do_not_increment_build_number: true +branches: + only: + - release + - master +skip_branch_with_pr: true +image: Visual Studio 2017 +assembly_info: + patch: true + file: '**\AssemblyInfo.*' + assembly_version: '{version}' + assembly_file_version: '{version}' + assembly_informational_version: '{version}' +dotnet_csproj: + patch: true + file: '**\*.csproj' + version: '{version}' + package_version: '{version}' + assembly_version: '{version}' + file_version: '{version}' + informational_version: '{version}' +before_build: +- cmd: dotnet restore +build: + publish_nuget: true + publish_nuget_symbols: true + include_nuget_references: true + verbosity: minimal +deploy: +- provider: NuGet + api_key: + secure: ViQUgBR04fO//b45zYHRvlnQI/PRjxmhC7ur0opzxuQCDO/ejXnN6ZiSri1hbgoU + skip_symbols: true + on: + branch: release \ No newline at end of file From b7b62f613dd40b1567750000d0083e6e47755a97 Mon Sep 17 00:00:00 2001 From: Kelly Adams Date: Wed, 28 Nov 2018 14:44:20 -0800 Subject: [PATCH 5/5] Remove spurious library from IntelliWait --- .../IntelliTect.IntelliWait.Tests.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj index d1106f1..ba20f58 100644 --- a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj +++ b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0 @@ -8,7 +8,6 @@ - all