Skip to content

Commit af7d3da

Browse files
rkmandarkmanda
committed
Fixing build issues
1 parent f4ac364 commit af7d3da

File tree

8 files changed

+152
-35
lines changed

8 files changed

+152
-35
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 92 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,71 @@
44
<DirectoryRef Id="PowerShellFolder">
55
<Directory Id="dirB60B5B1F56FA5598EFFC960CA393FDCE" Name="ResourceManager">
66
<Directory Id="dir9E409EB63EF03736275B51044C819FD8" Name="AzureResourceManager">
7+
<Directory Id="dir887149D384FA060718922AB0DA37F700" Name="AzureRM.AnalysisServices">
8+
<Component Id="cmpE1934F4197E90691F3F4FD7D0D17559F" Guid="*">
9+
<File Id="filDF0DDEF57A08314CBF3061F3513F605F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\AzureRM.AnalysisServices.psd1" />
10+
</Component>
11+
<Component Id="cmpF0D8E7A18EC397D4F297FB010BB719FF" Guid="*">
12+
<File Id="fil3AF8A401B156C1E1081CD77287EB9456" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Hyak.Common.dll" />
13+
</Component>
14+
<Component Id="cmpB5FFAB492F5FC283B45A8B0FC8B85B23" Guid="*">
15+
<File Id="fil662A002742D1A6B36540F70969B80A9D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.ApplicationInsights.dll" />
16+
</Component>
17+
<Component Id="cmp6108BA66E02AF03106520F7A2C289BC7" Guid="*">
18+
<File Id="fil5BB6CCFE42A464236D5EB72623754357" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.AnalysisServices.dll" />
19+
</Component>
20+
<Component Id="cmp0E077802E445D50411F71866C69A9EB9" Guid="*">
21+
<File Id="fil2768C0B9EE4DDA305A933359E4482119" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.AnalysisServices.dll-help.xml" />
22+
</Component>
23+
<Component Id="cmp1CEE4E00D234A8D8B553DA9595E61904" Guid="*">
24+
<File Id="filDB780EC7C19CC2ABD7AE02C2BB50698E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
25+
</Component>
26+
<Component Id="cmpD58ABE4F9591F4B6AFCC66F94E0A0019" Guid="*">
27+
<File Id="fil21BAE98F98FB33C24D19E258775D830D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
28+
</Component>
29+
<Component Id="cmp83A0E14BED2814B44ABE7DA08D9D8D03" Guid="*">
30+
<File Id="fil6A53E52E63A0103107AAB4DDC0113301" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Common.dll" />
31+
</Component>
32+
<Component Id="cmp1041C83734412321A7D6AE4994BEB5D1" Guid="*">
33+
<File Id="fil5F68E9687448D85E34658D2CCFA6B3D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Common.NetFramework.dll" />
34+
</Component>
35+
<Component Id="cmp02DC06DD48BBD3A3DAE9CB44578BE071" Guid="*">
36+
<File Id="filB561591EA69B4F9ED1F79B8DE0F438D5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Management.Analysis.dll" />
37+
</Component>
38+
<Component Id="cmp53145B1D571CA066487C18EB39268757" Guid="*">
39+
<File Id="fil05FED58236E9C23886043061A364DC63" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
40+
</Component>
41+
<Component Id="cmpA68ABDF0F5DDC292BBFB3380B5DC9B11" Guid="*">
42+
<File Id="filFF93E920A77E2DBE925204E1292FC816" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
43+
</Component>
44+
<Component Id="cmpBCC309023CB3A878BF9256DA1943855A" Guid="*">
45+
<File Id="fil7449557BBE757B6694383B966FD9E8A5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Rest.ClientRuntime.Azure.dll" />
46+
</Component>
47+
<Component Id="cmp3DD869B6824B2913D04B0A4FB6D4B04E" Guid="*">
48+
<File Id="filDA4403B36D01D8E05530303A368B6106" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Rest.ClientRuntime.dll" />
49+
</Component>
50+
<Component Id="cmp2E459760623158FCAF9D0A4B519E0637" Guid="*">
51+
<File Id="filFD5E4D8E5ACE34B410ACAFE3604155F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Threading.Tasks.dll" />
52+
</Component>
53+
<Component Id="cmp6E9F75BCAD634F076A3F4B2B95FE007D" Guid="*">
54+
<File Id="filA15DF9C91644E496F46CE7712A1FE348" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
55+
</Component>
56+
<Component Id="cmp3A50F1319D78804190DB48C294EEEE59" Guid="*">
57+
<File Id="filA479EC2E4BA138DA16A3F3A86F9BA6B0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Threading.Tasks.Extensions.dll" />
58+
</Component>
59+
<Component Id="cmpB36CF33BC2D97DD90831B716158B7955" Guid="*">
60+
<File Id="filE71754779898CE9B86BA1342BE78051B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.WindowsAzure.Commands.Common.dll" />
61+
</Component>
62+
<Component Id="cmp15DB7B41839B518C871AB1C7F1008B91" Guid="*">
63+
<File Id="fil63BCF3AE45360F4F78693DDB1E7C1054" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Newtonsoft.Json.dll" />
64+
</Component>
65+
<Component Id="cmp4239E298007039D73447BCF1C811AFFF" Guid="*">
66+
<File Id="filA127AA37F0523B9D65F02F72D2B56911" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\System.Net.Http.Extensions.dll" />
67+
</Component>
68+
<Component Id="cmp52FA0519C93110702BAA6D4D39EED5A4" Guid="*">
69+
<File Id="fil33A3239A1DA665175FD7641EE92AA253" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\System.Net.Http.Primitives.dll" />
70+
</Component>
71+
</Directory>
772
<Directory Id="dir353A23738AB980F60790BE53E5213715" Name="AzureRM.ApiManagement">
873
<Component Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" Guid="*">
974
<File Id="fil7E95F218EFC39408F9F2DB3FD01A124C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AutoMapper.dll" />
@@ -1266,9 +1331,6 @@
12661331
<Component Id="cmpAB0BE651457D19885EE5BD5615E283A9" Guid="*">
12671332
<File Id="fil7C8081F59D42A001771050D89E11D7CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.KeyVault.Core.dll" />
12681333
</Component>
1269-
<Component Id="cmpFB65291F937077CCA80689CFC3727B1A" Guid="*">
1270-
<File Id="fil87446160E4B0238E50AB62B792E935C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.ResourceManager.dll" />
1271-
</Component>
12721334
<Component Id="cmpBE9F3609F315D89DE19004AC7E629A12" Guid="*">
12731335
<File Id="filFED788047F438C9397D43C0F1F5AA7A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.Edm.dll" />
12741336
</Component>
@@ -1281,12 +1343,14 @@
12811343
<Component Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" Guid="*">
12821344
<File Id="fil923B64CC593E3BC837C3F9B6227E8342" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
12831345
</Component>
1284-
<Component Id="cmp734CB1D0853F1EC3CC1EA7E5A0C5D408" Guid="*">
1285-
<File Id="filD8501C838DFEE91793C98002F926B62D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1286-
</Component>
12871346
<Component Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" Guid="*">
12881347
<File Id="fil0BC58752DC9792178625EA842D496953" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
12891348
</Component>
1349+
<Component Id="cmpE389288C5CA88334DBFAA1A298DFDC57" Guid="*">
1350+
1351+
<File Id="fil3D9EA2F20E6C186138C8614E1378739F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.Azure.dll" />
1352+
1353+
</Component>
12901354
<Component Id="cmpE0A4360ECC0B00A74E3D29F280B2FD2E" Guid="*">
12911355
<File Id="fil1FB9B7667782F24EAC7BB0B862A44410" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.dll" />
12921356
</Component>
@@ -5525,6 +5589,27 @@
55255589
</Fragment>
55265590
<Fragment>
55275591
<ComponentGroup Id="azurecmdfiles">
5592+
<ComponentRef Id="cmpE1934F4197E90691F3F4FD7D0D17559F" />
5593+
<ComponentRef Id="cmpF0D8E7A18EC397D4F297FB010BB719FF" />
5594+
<ComponentRef Id="cmpB5FFAB492F5FC283B45A8B0FC8B85B23" />
5595+
<ComponentRef Id="cmp6108BA66E02AF03106520F7A2C289BC7" />
5596+
<ComponentRef Id="cmp0E077802E445D50411F71866C69A9EB9" />
5597+
<ComponentRef Id="cmp1CEE4E00D234A8D8B553DA9595E61904" />
5598+
<ComponentRef Id="cmpD58ABE4F9591F4B6AFCC66F94E0A0019" />
5599+
<ComponentRef Id="cmp83A0E14BED2814B44ABE7DA08D9D8D03" />
5600+
<ComponentRef Id="cmp1041C83734412321A7D6AE4994BEB5D1" />
5601+
<ComponentRef Id="cmp02DC06DD48BBD3A3DAE9CB44578BE071" />
5602+
<ComponentRef Id="cmp53145B1D571CA066487C18EB39268757" />
5603+
<ComponentRef Id="cmpA68ABDF0F5DDC292BBFB3380B5DC9B11" />
5604+
<ComponentRef Id="cmpBCC309023CB3A878BF9256DA1943855A" />
5605+
<ComponentRef Id="cmp3DD869B6824B2913D04B0A4FB6D4B04E" />
5606+
<ComponentRef Id="cmp2E459760623158FCAF9D0A4B519E0637" />
5607+
<ComponentRef Id="cmp6E9F75BCAD634F076A3F4B2B95FE007D" />
5608+
<ComponentRef Id="cmp3A50F1319D78804190DB48C294EEEE59" />
5609+
<ComponentRef Id="cmpB36CF33BC2D97DD90831B716158B7955" />
5610+
<ComponentRef Id="cmp15DB7B41839B518C871AB1C7F1008B91" />
5611+
<ComponentRef Id="cmp4239E298007039D73447BCF1C811AFFF" />
5612+
<ComponentRef Id="cmp52FA0519C93110702BAA6D4D39EED5A4" />
55285613
<ComponentRef Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" />
55295614
<ComponentRef Id="cmp957D146263F021CE3EF1CBADBF06D2C4" />
55305615
<ComponentRef Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" />
@@ -5936,13 +6021,12 @@
59366021
<ComponentRef Id="cmp652574B007D36760A8F3951C8BBCBA73" />
59376022
<ComponentRef Id="cmp19A1422310791548B2EE9CC01D0E80AB" />
59386023
<ComponentRef Id="cmpAB0BE651457D19885EE5BD5615E283A9" />
5939-
<ComponentRef Id="cmpFB65291F937077CCA80689CFC3727B1A" />
59406024
<ComponentRef Id="cmpBE9F3609F315D89DE19004AC7E629A12" />
59416025
<ComponentRef Id="cmp45E9D11A1E7E15837ADBF6220B8DFD7E" />
59426026
<ComponentRef Id="cmp95FB8932F45A41F4AF974FB6F565B75C" />
59436027
<ComponentRef Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" />
5944-
<ComponentRef Id="cmp734CB1D0853F1EC3CC1EA7E5A0C5D408" />
59456028
<ComponentRef Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" />
6029+
<ComponentRef Id="cmpE389288C5CA88334DBFAA1A298DFDC57" />
59466030
<ComponentRef Id="cmpE0A4360ECC0B00A74E3D29F280B2FD2E" />
59476031
<ComponentRef Id="cmpE2B4EA9CCA75508B10345C79226A99BF" />
59486032
<ComponentRef Id="cmp545597FAE11FE5F91F4BDCD56D1DFE83" />

‎src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@
6363
<Private>True</Private>
6464
</Reference>
6565
<Reference Include="Microsoft.CSharp" />
66-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.1.741, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.1\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
68-
<Private>True</Private>
66+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<SpecificVersion>False</SpecificVersion>
68+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.1.741, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.1\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
72-
<Private>True</Private>
70+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7575
<HintPath>..\packages\Microsoft.Rest.ClientRuntime.2.3.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<HintPath>..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.8-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
79+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">

‎src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.1.741, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.1\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
41+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.1.741, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.1\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
45+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -55,7 +55,7 @@
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.8-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
58+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -172,6 +172,7 @@
172172
<Generator>ResXFileCodeGenerator</Generator>
173173
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
174174
<CustomToolNamespace>Microsoft.Azure.Commands.Management.IotHub.Properties</CustomToolNamespace>
175+
<SubType>Designer</SubType>
175176
</EmbeddedResource>
176177
</ItemGroup>
177178
<ItemGroup>

0 commit comments

Comments
 (0)