diff --git a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj index ba20f58..adf0d93 100644 --- a/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj +++ b/IntelliTect.IntelliWait.Tests/IntelliTect.IntelliWait.Tests.csproj @@ -7,7 +7,7 @@ - + all diff --git a/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj b/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj index 0d7a017..a694afa 100644 --- a/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj +++ b/IntelliTect.IntelliWait/IntelliTect.IntelliWait.csproj @@ -7,23 +7,37 @@ 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) - Copyright © IntelliTect 2018 + Copyright © IntelliTect 2019 https://github.com/IntelliTect/IntelliTect https://github.com/IntelliTect/IntelliTect Git ui test, automated test, testing, api test, web test, integration test, await, async Obsoleting in favor of Polly IntelliTect.IntelliWait - 1.2.0 + 1.2.1 MIT + en - + all runtime; build; native; contentfiles; analyzers + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + diff --git a/IntelliTect.IntelliWait/Poll.cs b/IntelliTect.IntelliWait/Poll.cs index b92ec38..a4ad565 100644 --- a/IntelliTect.IntelliWait/Poll.cs +++ b/IntelliTect.IntelliWait/Poll.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Linq; using System.Threading.Tasks; +using IntelliTect.IntelliWait.Properties; namespace IntelliTect.IntelliWait { @@ -240,7 +241,7 @@ private static void VerifyAllExceptionTypes(params Type[] exes) { if (!exes.All(e => e.IsSubclassOf(typeof(Exception)) || e == typeof(Exception))) { - throw new ArgumentException("Invalid type passed into exceptionsToIgnore parameter. Must be of type Exception."); + throw new ArgumentException(Resources.VerifyAllExceptionTypes_ArgumentException); } } } diff --git a/IntelliTect.IntelliWait/Properties/Resources.Designer.cs b/IntelliTect.IntelliWait/Properties/Resources.Designer.cs new file mode 100644 index 0000000..658d69a --- /dev/null +++ b/IntelliTect.IntelliWait/Properties/Resources.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace IntelliTect.IntelliWait.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IntelliTect.IntelliWait.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Invalid type passed into exceptionsToIgnore parameter. Must be of type Exception.. + /// + internal static string VerifyAllExceptionTypes_ArgumentException { + get { + return ResourceManager.GetString("VerifyAllExceptionTypes_ArgumentException", resourceCulture); + } + } + } +} diff --git a/IntelliTect.IntelliWait/Properties/Resources.resx b/IntelliTect.IntelliWait/Properties/Resources.resx new file mode 100644 index 0000000..66c78df --- /dev/null +++ b/IntelliTect.IntelliWait/Properties/Resources.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Invalid type passed into exceptionsToIgnore parameter. Must be of type Exception. + + \ No newline at end of file diff --git a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj b/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj index cdad6a6..63fd1be 100644 --- a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj +++ b/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj @@ -7,10 +7,10 @@ - + - + all diff --git a/IntelliTect.Utilities/IntelliTect.Utilities.csproj b/IntelliTect.Utilities/IntelliTect.Utilities.csproj index c4afeed..a2acb74 100644 --- a/IntelliTect.Utilities/IntelliTect.Utilities.csproj +++ b/IntelliTect.Utilities/IntelliTect.Utilities.csproj @@ -7,19 +7,21 @@ IntelliTect A utility library for IntelliTect https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE - Copyright © IntelliTect 2018 + Copyright © IntelliTect 2019 https://github.com/IntelliTect/IntelliTect https://github.com/IntelliTect/IntelliTect Git IntelliTect Utilities - Upgraded to netstandard 2.0 + Update deps and fix CA warnings-as-errors. true + en + 1.0.1 - + all runtime; build; native; contentfiles; analyzers