Skip to content

Commit e0e2839

Browse files
yadavbdevyadavbdev
committed
Updating the wxi file to include RemoteApp binaries
1 parent 4e0309b commit e0e2839

File tree

4 files changed

+131
-5
lines changed

4 files changed

+131
-5
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,9 @@
423423
<Component Id="cmp13A9EC661F7AC7FA9D243ADFFC00A3A2" Guid="*">
424424
<File Id="fil9C49954FC1D7A0F8B58EBE2243987470" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.RedisCache.format.ps1xml" />
425425
</Component>
426+
<Component Id="cmpE26272EE838769BD2FFEA9C0C34D98A1" Guid="*">
427+
<File Id="filCC6184C17424259A3F35CE11A1AFE043" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.RemoteApp.dll" />
428+
</Component>
426429
<Component Id="cmp73768AE8C93638B2530E9F74B6FA5470" Guid="*">
427430
<File Id="fil2112A41C953308499BCC1D706AA6FC6F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.Resources.dll" />
428431
</Component>
@@ -489,6 +492,9 @@
489492
<Component Id="cmp7513A156C71ECD5FD6BE7BEBC3DB024B" Guid="*">
490493
<File Id="fil8EA604CD246FD926A5EB987107705884" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.Redis.dll" />
491494
</Component>
495+
<Component Id="cmp03437FBF8AA7C12F8B06FC71B5806FD0" Guid="*">
496+
<File Id="filFD84316FF13DB5AB769F0D77F9B3D596" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.RemoteApp.dll" />
497+
</Component>
492498
<Component Id="cmp1E110B3A62CD167B9B41556BD0F2CD6F" Guid="*">
493499
<File Id="fil4653A5682BB54F2C6DCEA81F1A9E76A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.Sql.dll" />
494500
</Component>
@@ -543,9 +549,15 @@
543549
<Component Id="cmp324B90D4B088D87E4F11B86F299C1C4A" Guid="*">
544550
<File Id="fil4258BBFD2F3134F91EC449D577FADD4F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Commands.StorSimple.dll-help.xml" />
545551
</Component>
552+
<Component Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" Guid="*">
553+
<File Id="filBA8A6C454E13EDED5C76A72DF055C141" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.Compute.dll" />
554+
</Component>
546555
<Component Id="cmp820458093C358621EA214A7362ACCE1D" Guid="*">
547556
<File Id="filA2B55531433CC808B17C5D3B97AC4AFB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.dll" />
548557
</Component>
558+
<Component Id="cmpE231A51CC41F80C051BC0663E08339BC" Guid="*">
559+
<File Id="fil954A0A3A5F9CFF0071F19B1555B09940" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.Network.dll" />
560+
</Component>
549561
<Component Id="cmp0308F0BCCC45D37858315B38CEC3127D" Guid="*">
550562
<File Id="filA9785D55AE0D9EBF6D9D248D28925024" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.Scheduler.dll" />
551563
</Component>
@@ -1715,6 +1727,86 @@
17151727
</Component>
17161728
</Directory>
17171729
</Directory>
1730+
<Directory Id="dirDF012C486C7A9897E2E985413D188EFB" Name="RemoteApp">
1731+
<Component Id="cmp876FCC4B6F7590AC9D51ABDD32229647" Guid="*">
1732+
<File Id="fil3C4F434DCE5410C69A1E3487C1326C5A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Hyak.Common.dll" />
1733+
</Component>
1734+
<Component Id="cmp26DF79CFA25FFCFADB0FB5DC14B25DD5" Guid="*">
1735+
<File Id="filC03C4AD0124468FF36AAAF3A7F9EDA93" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Commands.RemoteApp.dll" />
1736+
</Component>
1737+
<Component Id="cmp913600C952F3D3D27C7E14B7E72AA774" Guid="*">
1738+
<File Id="fil431D73D2EE9C4FFDA0CCEE983EC4D52A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.Authentication.dll" />
1739+
</Component>
1740+
<Component Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" Guid="*">
1741+
<File Id="fil27EBA2AC9E474ACC5A87F07B809B6DA4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.dll" />
1742+
</Component>
1743+
<Component Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" Guid="*">
1744+
<File Id="fil83B7914462FDE1E5AF770AB859D8B842" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.NetFramework.dll" />
1745+
</Component>
1746+
<Component Id="cmpD4EA1A1B4CB82D7218992CA903665EF5" Guid="*">
1747+
<File Id="fil583A385C77721311A91E9BC1ACB56102" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Management.RemoteApp.dll" />
1748+
</Component>
1749+
<Component Id="cmpB67E98F8DD3717DE55704662D73EB3DC" Guid="*">
1750+
<File Id="fil6DAFF57FDE88ADA1BECDE46CCD1B61A1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.Edm.dll" />
1751+
</Component>
1752+
<Component Id="cmp645D8B7138F96F1053AB259E37D61D3D" Guid="*">
1753+
<File Id="filEAD8D5453E4DF1A6D104EDD2BEEE997D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.OData.dll" />
1754+
</Component>
1755+
<Component Id="cmpF304B1EDB19805B49E0015BE90824B00" Guid="*">
1756+
<File Id="filB41F2071EEABDF866C99DD9978174991" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Data.Services.Client.dll" />
1757+
</Component>
1758+
<Component Id="cmp77D952CC555ECC8D893704C409770064" Guid="*">
1759+
<File Id="fil740874B2C7BABACB68258773DEF81026" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1760+
</Component>
1761+
<Component Id="cmp36C4A4A2FC1D0869C13C8C1B787310CC" Guid="*">
1762+
<File Id="fil8A7F8D2E49DE26EB3A6A45D325845EC5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1763+
</Component>
1764+
<Component Id="cmpF6A31E71E73261E256FB53289879CAC6" Guid="*">
1765+
<File Id="filB43C04EDB705D1968040C62BE7385426" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.dll" />
1766+
</Component>
1767+
<Component Id="cmp24E45E80EDFF6AFB35BDC3BDF5B8CDD8" Guid="*">
1768+
<File Id="filBD3B9725212B207BA71ACFEFCE499952" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
1769+
</Component>
1770+
<Component Id="cmpC6E9F874597250F8F9018EE96BD563C1" Guid="*">
1771+
<File Id="filD702F499B490185A0B37C88201372218" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Threading.Tasks.Extensions.dll" />
1772+
</Component>
1773+
<Component Id="cmp834EB592C6925B045C8B0510B26AF6B9" Guid="*">
1774+
<File Id="filEE9E830711213A45933A4822FB584B57" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Commands.Common.dll" />
1775+
</Component>
1776+
<Component Id="cmpBB19F2E6C4AB801608598C3381EFDE26" Guid="*">
1777+
<File Id="fil94F1AEF955F8197CE07F2B1A34D114E3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Configuration.dll" />
1778+
</Component>
1779+
<Component Id="cmpA85120F9A61D215485073CD1776A50EC" Guid="*">
1780+
<File Id="fil7361F1D3E3E7266D5E6F74C4AC8C68AC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Compute.dll" />
1781+
</Component>
1782+
<Component Id="cmpB365045D7785EED68D215DE18F8B6827" Guid="*">
1783+
<File Id="fil0A337D8FFA8479187FFB2DB28F87C707" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.dll" />
1784+
</Component>
1785+
<Component Id="cmp2D25DF3739FFB7B0517C3C2E55067DDC" Guid="*">
1786+
<File Id="fil0D8F856AC786EC316BB1409033666BD6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Network.dll" />
1787+
</Component>
1788+
<Component Id="cmp7EAAE4F8EE7484006AD094D162AD68D4" Guid="*">
1789+
<File Id="filDDEDC4CFD49C82F88AF85EF9873BCD18" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Management.Storage.dll" />
1790+
</Component>
1791+
<Component Id="cmp93364B74891D090E8B79AAD7B2D74521" Guid="*">
1792+
<File Id="fil43F3698E2CAA6C4A28A571893D7DD2CB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.WindowsAzure.Storage.dll" />
1793+
</Component>
1794+
<Component Id="cmp0DDAC0F6E13422C982E3A7BE75016837" Guid="*">
1795+
<File Id="fil7BCDAAE0F3CA862FB78DC09EE3C10309" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Newtonsoft.Json.dll" />
1796+
</Component>
1797+
<Component Id="cmpC75F982B777810AB4731D6E62AE087ED" Guid="*">
1798+
<File Id="fil01509C768D43E7413DD076BD89C72939" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Extensions.dll" />
1799+
</Component>
1800+
<Component Id="cmp61404C8CABE874A3DCC4AAA743606C62" Guid="*">
1801+
<File Id="filA811F36C97683F1FA68FBB7AE6E908DD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Formatting.dll" />
1802+
</Component>
1803+
<Component Id="cmp0B4140C0041F650FB202F15FD4F86721" Guid="*">
1804+
<File Id="fil59BC8F7918C21B61C9217189CE3A3B27" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Net.Http.Primitives.dll" />
1805+
</Component>
1806+
<Component Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" Guid="*">
1807+
<File Id="filF416020F6AC78654E2B61B571FBE32B9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\System.Spatial.dll" />
1808+
</Component>
1809+
</Directory>
17181810
<Directory Id="dir5A14F7172D6373ACE47493BAD054EEF3" Name="Services">
17191811
<Component Id="cmp5F55270F607737A772BFBE2D8F6B76E4" Guid="*">
17201812
<File Id="filF7E717D6789D9D4D072D3BA81461FCB3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.dll" />
@@ -2768,6 +2860,7 @@
27682860
<ComponentRef Id="cmp519FA93A87044E1F6B5096B295370488" />
27692861
<ComponentRef Id="cmp676F99A118173C700AFBDC73848BD83B" />
27702862
<ComponentRef Id="cmp13A9EC661F7AC7FA9D243ADFFC00A3A2" />
2863+
<ComponentRef Id="cmpE26272EE838769BD2FFEA9C0C34D98A1" />
27712864
<ComponentRef Id="cmp73768AE8C93638B2530E9F74B6FA5470" />
27722865
<ComponentRef Id="cmp43B198DD7ECA39F95FF5CD09BD732D67" />
27732866
<ComponentRef Id="cmpF723A612E44FEF81A6FD35D6F83156E4" />
@@ -2790,6 +2883,7 @@
27902883
<ComponentRef Id="cmp8FEE3315C970FDADD6195DE7DEC9F62C" />
27912884
<ComponentRef Id="cmp42A50186F4AFE110F82ED0DBF18A271E" />
27922885
<ComponentRef Id="cmp7513A156C71ECD5FD6BE7BEBC3DB024B" />
2886+
<ComponentRef Id="cmp03437FBF8AA7C12F8B06FC71B5806FD0" />
27932887
<ComponentRef Id="cmp1E110B3A62CD167B9B41556BD0F2CD6F" />
27942888
<ComponentRef Id="cmpE1BF6EAEEB822D9D73DBCFAB13791982" />
27952889
<ComponentRef Id="cmpB571FD86C3A85FE12327FC783A65BC2E" />
@@ -2808,7 +2902,9 @@
28082902
<ComponentRef Id="cmpFC3EB6ABEC249B231E7692A65B39E121" />
28092903
<ComponentRef Id="cmp41DD99937FCAACD05C1E4E7BE3A04532" />
28102904
<ComponentRef Id="cmp324B90D4B088D87E4F11B86F299C1C4A" />
2905+
<ComponentRef Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" />
28112906
<ComponentRef Id="cmp820458093C358621EA214A7362ACCE1D" />
2907+
<ComponentRef Id="cmpE231A51CC41F80C051BC0663E08339BC" />
28122908
<ComponentRef Id="cmp0308F0BCCC45D37858315B38CEC3127D" />
28132909
<ComponentRef Id="cmpF750706356EAB58C8C81ED96B57288C8" />
28142910
<ComponentRef Id="cmp32A0C53BFC04028B9D6A48690191D6B3" />
@@ -3189,6 +3285,32 @@
31893285
<ComponentRef Id="cmp4ED39EDE761ED68263635882802FB1B5" />
31903286
<ComponentRef Id="cmp2A0B3E88742D800F88F70A714BAC94B5" />
31913287
<ComponentRef Id="cmpE3495C0DD75A31199E40EAA7E5128E6C" />
3288+
<ComponentRef Id="cmp876FCC4B6F7590AC9D51ABDD32229647" />
3289+
<ComponentRef Id="cmp26DF79CFA25FFCFADB0FB5DC14B25DD5" />
3290+
<ComponentRef Id="cmp913600C952F3D3D27C7E14B7E72AA774" />
3291+
<ComponentRef Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" />
3292+
<ComponentRef Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" />
3293+
<ComponentRef Id="cmpD4EA1A1B4CB82D7218992CA903665EF5" />
3294+
<ComponentRef Id="cmpB67E98F8DD3717DE55704662D73EB3DC" />
3295+
<ComponentRef Id="cmp645D8B7138F96F1053AB259E37D61D3D" />
3296+
<ComponentRef Id="cmpF304B1EDB19805B49E0015BE90824B00" />
3297+
<ComponentRef Id="cmp77D952CC555ECC8D893704C409770064" />
3298+
<ComponentRef Id="cmp36C4A4A2FC1D0869C13C8C1B787310CC" />
3299+
<ComponentRef Id="cmpF6A31E71E73261E256FB53289879CAC6" />
3300+
<ComponentRef Id="cmp24E45E80EDFF6AFB35BDC3BDF5B8CDD8" />
3301+
<ComponentRef Id="cmpC6E9F874597250F8F9018EE96BD563C1" />
3302+
<ComponentRef Id="cmp834EB592C6925B045C8B0510B26AF6B9" />
3303+
<ComponentRef Id="cmpBB19F2E6C4AB801608598C3381EFDE26" />
3304+
<ComponentRef Id="cmpA85120F9A61D215485073CD1776A50EC" />
3305+
<ComponentRef Id="cmpB365045D7785EED68D215DE18F8B6827" />
3306+
<ComponentRef Id="cmp2D25DF3739FFB7B0517C3C2E55067DDC" />
3307+
<ComponentRef Id="cmp7EAAE4F8EE7484006AD094D162AD68D4" />
3308+
<ComponentRef Id="cmp93364B74891D090E8B79AAD7B2D74521" />
3309+
<ComponentRef Id="cmp0DDAC0F6E13422C982E3A7BE75016837" />
3310+
<ComponentRef Id="cmpC75F982B777810AB4731D6E62AE087ED" />
3311+
<ComponentRef Id="cmp61404C8CABE874A3DCC4AAA743606C62" />
3312+
<ComponentRef Id="cmp0B4140C0041F650FB202F15FD4F86721" />
3313+
<ComponentRef Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" />
31923314
<ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
31933315
<ComponentRef Id="cmp9EF03D7C53CEE400751AD1905625B82B" />
31943316
<ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageDetails.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public class GetAzureRemoteAppCollectionUsageDetails : RdsCmdlet
3838
[Parameter(Mandatory = false,
3939
Position = 1,
4040
HelpMessage = "Number of the month (MM) to report usage")]
41-
[ValidatePattern("^(0[1-9]|1[0-2])$")]
41+
[ValidatePattern(TwoDigitMonthPattern)]
4242
public string UsageMonth { get; set; }
4343

4444
[Parameter(Mandatory = false,
4545
Position = 2,
4646
HelpMessage = "Year (YYYY) to report usage")]
47-
[ValidatePattern(@"^(19|20)\d\d$")]
47+
[ValidatePattern(FullYearPattern)]
4848
public string UsageYear { get; set; }
4949

5050
public override void ExecuteCmdlet()

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageSummary.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ public class GetAzureRemoteAppCollectionUsageSummary : RdsCmdlet
3434
[Parameter(Mandatory = false,
3535
Position = 1,
3636
HelpMessage = "Number of the month (MM) to report usage")]
37-
[ValidatePattern("^(0[1-9]|1[0-2])$")]
37+
[ValidatePattern(TwoDigitMonthPattern)]
3838
public string UsageMonth { get; set; }
3939

4040
[Parameter(Mandatory = false,
4141
Position = 2,
4242
HelpMessage = "Year (YYYY) to report usage")]
43-
[ValidatePattern(@"^(19|20)\d\d$")]
43+
[ValidatePattern(FullYearPattern)]
4444
public string UsageYear { get; set; }
4545

4646
public override void ExecuteCmdlet()

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public abstract partial class RdsCmdlet
2525

2626
protected const string VNetNameValidatorString = @"^[A-Za-z][-A-Za-z0-9]{3,49}(?<!-)$";
2727

28-
protected const string DomainNameValidatorString = @"^[a-zA-Z\u007F-\uFFFF]+[\w\-\.]+$";
28+
protected const string DomainNameValidatorString = @"[^,~:@#$%\^&'.(){}_\s]+([.][^,~:@#$%\^&'.(){}_\s]+)+";
2929

3030
protected const string UserNameValidatorString = @"[^@\""/\[\]:;|=,+*?<>\s]+";
3131

@@ -140,5 +140,9 @@ public abstract partial class RdsCmdlet
140140
* )*$
141141
*
142142
*/
143+
144+
protected const string FullYearPattern = @"^(19|20)\d\d$";
145+
146+
protected const string TwoDigitMonthPattern = @"^(0[1-9]|1[0-2])$";
143147
}
144148
}

0 commit comments

Comments
 (0)