IntelliTect · adamskt · Dec 10, 2018 · Nov 28, 2018 · Nov 28, 2018 · Nov 28, 2018
diff --git a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -7,9 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

diff --git a/IntelliTect.IntelliWait/CustomDictionary.xml b/IntelliTect.IntelliWait/CustomDictionary.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<Dictionary>
+  <Words>
+    <Recognized>
+      <Word>Intelli</Word>
+      <Word>Tect</Word>
+    </Recognized>
+  </Words>
+</Dictionary>
diff --git a/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj b/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj
@@ -1,21 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsAsErrors />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Authors>Mike Curn</Authors>
+    <Authors>IntelliTect-Nuget; Mike Curn</Authors>
     <Company>IntelliTect</Company>
     <Description>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)</Description>
     <PackageLicenseUrl>https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE</PackageLicenseUrl>
-    <Copyright>2018</Copyright>
+    <Copyright>Copyright © IntelliTect 2018</Copyright>
     <PackageProjectUrl>https://github.com/IntelliTect/IntelliTect</PackageProjectUrl>
     <RepositoryUrl>https://github.com/IntelliTect/IntelliTect</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>ui test, automated test, testing, api test, web test, integration test, await, async</PackageTags>
     <PackageReleaseNotes>Initial release for long-term home, independant from Selenium dependency</PackageReleaseNotes>
-    <AssemblyName>IntelliTect.IntelliWait</AssemblyName>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
-
+  <ItemGroup>
+    <CodeAnalysisDictionary Include="CustomDictionary.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/IntelliTect.IntelliWait/Wait.cs b/IntelliTect.IntelliWait/Wait.cs
@@ -182,7 +182,7 @@ private static async Task<TResult> ExecuteWait<TResult>(Func<TResult> 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);
         }

diff --git a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj b/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj
@@ -1,18 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Moq" Version="4.7.99" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Moq" Version="4.10.0" />
+
+
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IntelliTect.Utilities/IntelliTect.Utilities.csproj b/IntelliTect.Utilities/IntelliTect.Utilities.csproj
@@ -1,22 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RootNamespace>IntelliTect.Utilities</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
-    <Description>A utility library for IntelliTect</Description>
-    <Company>IntelliTect</Company>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Company>IntelliTect-Nuget</Company>
     <Authors>IntelliTect</Authors>
-    <Copyright>Copyright © IntelliTect 2017</Copyright>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <CodeAnalysisRuleSet>..\SolutionRuleset.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
+    <Description>A utility library for IntelliTect</Description>
+    <PackageLicenseUrl>https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE</PackageLicenseUrl>
+    <Copyright>Copyright © IntelliTect 2018</Copyright>
+    <PackageProjectUrl>https://github.com/IntelliTect/IntelliTect</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/IntelliTect/IntelliTect</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+    <PackageTags>IntelliTect Utilities</PackageTags>
+    <PackageReleaseNotes>Upgraded to netstandard 2.0</PackageReleaseNotes>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="IntelliTect.Utilities.nuspec" />
+    <CodeAnalysisDictionary Include="CustomDictionary.xml" />
   </ItemGroup>
   <ItemGroup>
-    <CodeAnalysisDictionary Include="CustomDictionary.xml" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/IntelliTect.Utilities/IntelliTect.Utilities.nuspec b/IntelliTect.Utilities/IntelliTect.Utilities.nuspec
diff --git 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/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
 ============

diff --git a/SolutionRuleset.ruleset b/SolutionRuleset.ruleset
diff --git a/appveyor.yml 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