(#672) Added better ID detection (#674)

* (#672) Added better ID detection
Azure · May 11, 2023 · 8f3d441 · 8f3d441
1 parent 11e82b2
commit 8f3d441
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/sdk/dotnet/build.ps1 b/sdk/dotnet/build.ps1
@@ -8,8 +8,12 @@
 # Restore Workloads
 dotnet workload restore --project .\src\Microsoft.Datasync.Client\Microsoft.Datasync.Client.csproj
 
+# Restore NuGet Packages
+dotnet restore .\Datasync.Framework.sln
+
 # Build
 msbuild -property:Configuration=Release ./Datasync.Framework.sln
+
 # Test
 vstest.console --collect:"Code Coverage" .\test\**\bin\Release\**\Microsoft.*.Test.dll
 
diff --git a/sdk/dotnet/src/Microsoft.Datasync.Client/Utils/Arguments.cs b/sdk/dotnet/src/Microsoft.Datasync.Client/Utils/Arguments.cs
@@ -32,7 +32,7 @@ public static class Arguments
         /// as a path segment according to RFC 2396.  It must also be suitable for storing
         /// a GUID, and for storing in a database string.
         /// </remarks>
-        private static readonly Regex validIdRegex = new("^[a-zA-Z0-9][a-zA-Z0-9-_.]{0,126}$");
+        private static readonly Regex validIdRegex = new("^[a-zA-Z0-9][a-zA-Z0-9_.|:-]{0,126}$");
 
         /// <summary>
         /// Returns if the parameter is not null.

diff --git a/sdk/dotnet/test/Microsoft.Datasync.Client.Test/Utils/Arguments.Test.cs b/sdk/dotnet/test/Microsoft.Datasync.Client.Test/Utils/Arguments.Test.cs
@@ -121,11 +121,11 @@ public void IsValidId_Null_Throws()
     [InlineData(" ")]
     [InlineData("\t")]
     [InlineData("abcdef gh")]
-    [InlineData("!!!")]
     [InlineData("?")]
     [InlineData(";")]
     [InlineData("{EA235ADF-9F38-44EA-8DA4-EF3D24755767}")]
     [InlineData("###")]
+    [InlineData("!!!")]
     [Trait("Method", "IsValidId")]
     public void IsValidId_InvalidId_Throws(string sut)
     {
@@ -136,6 +136,7 @@ public void IsValidId_InvalidId_Throws(string sut)
     [InlineData("db0ec08d-46a9-465d-9f5e-0066a3ee5b5f")]
     [InlineData("0123456789")]
     [InlineData("abcdefgh")]
+    [InlineData("2023|05|01_120000")]
     [InlineData("db0ec08d_46a9_465d_9f5e_0066a3ee5b5f")]
     [InlineData("db0ec08d.46a9.465d.9f5e.0066a3ee5b5f")]
     [Trait("Method", "IsValidId")]