Merge branch 'master' into feature/conflict-alleviation-changes

# Conflicts: # README.md # shortid/ShortId.cs # shortid/Utils/Constants.cs # shortid/shortid.csproj
bolorundurowb · Aug 26, 2020 · 6ab3c6a · 6ab3c6a
2 parents b387e74 + c3c8717
commit 6ab3c6a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ using shortid.Configuration;
 
 This gives your code access the classes and methods of the `shortid` namespace.
 
-To generate a unique id of any length between 8 and 14, you call the `Generate` method without parameters.
+To generate a unique id of any length between 8 and 15, you call the `Generate` method without parameters.
 
 ```csharp
 string id = ShortId.Generate();
@@ -85,7 +85,7 @@ string id = ShortId.Generate(options);
 To change the character set in use, run the following:
 
 ```csharp
-string characters = //whatever you want;
+string characters = "ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ①②③④⑤⑥⑦⑧⑨⑩⑪⑫"; //whatever you want;
 ShortId.SetCharacters(characters);
 ```
 
@@ -104,4 +104,4 @@ Finally, `ShortId` allows for all customizations to be reset using the following
 
 ```csharp
 ShortId.Reset();
-```
+```
diff --git a/shortid.Test/Configuration/GenerationOptions.Tests.cs b/shortid.Test/Configuration/GenerationOptions.Tests.cs
@@ -33,7 +33,7 @@ public void ShouldAssignRandomLengthOnInstantiation()
             options
                 .Length
                 .Should()
-                .BeGreaterThan(7);
+                .BeGreaterThan(6);
             options
                 .Length
                 .Should()

diff --git a/shortid/shortid.csproj b/shortid/shortid.csproj
@@ -8,17 +8,17 @@
     <PackageIconUrl>https://members.orcid.org/sites/default/files/vector_iD_icon.svg</PackageIconUrl>
     <RepositoryUrl>https://github.com/bolorundurowb/shortid/</RepositoryUrl>
     <PackageTags>shortid short id databse identifier key primarykey mongodb sql</PackageTags>
-    <PackageReleaseNotes>- fix thread safety issues
+    <PackageReleaseNotes>-
 - add in further restrictions to maintain uniqueness</PackageReleaseNotes>
     <Authors>Bolorunduro Winner-Timothy</Authors>
     <Description>A library that generates random identifiers from 7 to 14 characters. Identifiers generated can be used as primary keys for databases or unique identifiers.</Description>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Title>shortid</Title>
     <RepositoryType>git</RepositoryType>
-    <PackageVersion>3.0.0</PackageVersion>
-    <AssemblyVersion>3.0.0</AssemblyVersion>
-    <FileVersion>3.0.0</FileVersion>
+    <PackageVersion>3.0.0.0</PackageVersion>
+    <AssemblyVersion>3.0.0.0</AssemblyVersion>
+    <FileVersion>3.0.0.0</FileVersion>
     <NeutralLanguage>en-NG</NeutralLanguage>
   </PropertyGroup>
 </Project>