Skip to content

Commit 5c08105

Browse files
author
Hovsep
committed
Merge pull request Azure#1699 from zaevans/zaevansDev
Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
2 parents 308678f + 56ab638 commit 5c08105

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## 2016.02.02 version 1.1.1
2-
2+
* Azure RemoteApp: Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
33
## 2016.01.12 version 1.1.0
44
* Azure SQL Database: Threat Detection policies:
55
* Using new Threat Detection Types

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Common/RemoteAppRegEx.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,14 @@ public abstract partial class RdsCmdlet
5757
// ASCII code in hex, e.g. #ff
5858
protected const string asciiCodeRegexPattern = @"#([0-9A-Fa-f]{2})+";
5959

60+
// Unicode grapheme
61+
protected const string unicodeRegexPattern = @"(?>\P{M}\p{M}*)";
62+
6063
// used to separate entities, , or + followed by 0 or more spaces
6164
protected const string delimiterRegexPattern = @"[\+,]\s*";
6265

6366
// an entity value, consists of normal chars, escape codes and hex codes
64-
protected const string entityRegexPattern = @"(" + normalCharRegexPattern + @"|" + escapedCharRegexPattern + @"|" + asciiCodeRegexPattern + @")+";
67+
protected const string entityRegexPattern = @"(" + normalCharRegexPattern + @"|" + escapedCharRegexPattern + @"|" + asciiCodeRegexPattern + @"|" + unicodeRegexPattern + @")+";
6568

6669
// a key/entity pair, e.g DC=foo-bar.com
6770
protected const string keyEntityRegexPattern = @"(" + keyRegexPattern + @"=" + entityRegexPattern + @")";
@@ -92,6 +95,10 @@ public abstract partial class RdsCmdlet
9295
* |
9396
* Or a # followed by a sequence of 8 bit ASCII codes in hex
9497
* (#([0-9A-Fa-f]{2})+)
98+
*
99+
* Or a Unicode grapheme
100+
* (?>\P{M}\p{M}*)
101+
*
95102
* There will be 1 or more characters matching this pattern
96103
* )+
97104
* )

0 commit comments

Comments
 (0)