Skip to content

Commit 4382700

Browse files
committed
FW: Remove the wxi changes and add again all references
1 parent e180462 commit 4382700

File tree

3 files changed

+121
-0
lines changed

3 files changed

+121
-0
lines changed

setup/azurecmdfiles.wxi

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,9 +1288,27 @@
12881288
<Component Id="cmp19A1422310791548B2EE9CC01D0E80AB" Guid="*">
12891289
<File Id="fil775FC63E54E73F93CF6A7DD79AA7766F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Insights.dll" />
12901290
</Component>
1291+
<Component Id="cmpAB0BE651457D19885EE5BD5615E283A9" Guid="*">
1292+
<File Id="fil7C8081F59D42A001771050D89E11D7CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.KeyVault.Core.dll" />
1293+
</Component>
1294+
<Component Id="cmpFB65291F937077CCA80689CFC3727B1A" Guid="*">
1295+
<File Id="fil87446160E4B0238E50AB62B792E935C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.ResourceManager.dll" />
1296+
</Component>
1297+
<Component Id="cmpBE9F3609F315D89DE19004AC7E629A12" Guid="*">
1298+
<File Id="filFED788047F438C9397D43C0F1F5AA7A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.Edm.dll" />
1299+
</Component>
1300+
<Component Id="cmp45E9D11A1E7E15837ADBF6220B8DFD7E" Guid="*">
1301+
<File Id="fil68988BF4794EF93E735022A7BFF20997" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.OData.dll" />
1302+
</Component>
1303+
<Component Id="cmp95FB8932F45A41F4AF974FB6F565B75C" Guid="*">
1304+
<File Id="filFA94C707722DFF90E974DB5BC3D375E1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.Services.Client.dll" />
1305+
</Component>
12911306
<Component Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" Guid="*">
12921307
<File Id="fil923B64CC593E3BC837C3F9B6227E8342" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
12931308
</Component>
1309+
<Component Id="cmp734CB1D0853F1EC3CC1EA7E5A0C5D408" Guid="*">
1310+
<File Id="filD8501C838DFEE91793C98002F926B62D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1311+
</Component>
12941312
<Component Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" Guid="*">
12951313
<File Id="fil0BC58752DC9792178625EA842D496953" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
12961314
</Component>
@@ -1303,9 +1321,15 @@
13031321
<Component Id="cmp545597FAE11FE5F91F4BDCD56D1DFE83" Guid="*">
13041322
<File Id="fil928770DD46031339492018E2CD7D9BCC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.WindowsAzure.Commands.Common.dll" />
13051323
</Component>
1324+
<Component Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" Guid="*">
1325+
<File Id="filF4A2BE56AA42EB88C96B3F8DF53F8F6C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.WindowsAzure.Storage.dll" />
1326+
</Component>
13061327
<Component Id="cmp7781002FCC3D1B3F0519A286C3E916E9" Guid="*">
13071328
<File Id="fil7A9F66CF061583CA28B0DA562E249A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Newtonsoft.Json.dll" />
13081329
</Component>
1330+
<Component Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" Guid="*">
1331+
<File Id="filF161B346D39B2AA99CBA7434BC7AD7C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\System.Spatial.dll" />
1332+
</Component>
13091333
</Directory>
13101334
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
13111335
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
@@ -5404,12 +5428,20 @@
54045428
<ComponentRef Id="cmpA848C04563692D93B90821EE8960E3B4" />
54055429
<ComponentRef Id="cmp652574B007D36760A8F3951C8BBCBA73" />
54065430
<ComponentRef Id="cmp19A1422310791548B2EE9CC01D0E80AB" />
5431+
<ComponentRef Id="cmpAB0BE651457D19885EE5BD5615E283A9" />
5432+
<ComponentRef Id="cmpFB65291F937077CCA80689CFC3727B1A" />
5433+
<ComponentRef Id="cmpBE9F3609F315D89DE19004AC7E629A12" />
5434+
<ComponentRef Id="cmp45E9D11A1E7E15837ADBF6220B8DFD7E" />
5435+
<ComponentRef Id="cmp95FB8932F45A41F4AF974FB6F565B75C" />
54075436
<ComponentRef Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" />
5437+
<ComponentRef Id="cmp734CB1D0853F1EC3CC1EA7E5A0C5D408" />
54085438
<ComponentRef Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" />
54095439
<ComponentRef Id="cmpE0A4360ECC0B00A74E3D29F280B2FD2E" />
54105440
<ComponentRef Id="cmpE2B4EA9CCA75508B10345C79226A99BF" />
54115441
<ComponentRef Id="cmp545597FAE11FE5F91F4BDCD56D1DFE83" />
5442+
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
54125443
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
5444+
<ComponentRef Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" />
54135445
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
54145446
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
54155447
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />

src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,16 @@
5151
<Reference Include="Microsoft.Azure.Common">
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5353
</Reference>
54+
<Reference Include="Microsoft.Azure.Common.NetFramework">
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
56+
</Reference>
5457
<Reference Include="Microsoft.Azure.Insights">
5558
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.10.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
5659
</Reference>
60+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
63+
</Reference>
5764
<Reference Include="Microsoft.Azure.Test.Framework">
5865
<SpecificVersion>False</SpecificVersion>
5966
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
@@ -83,17 +90,53 @@
8390
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
8491
<Private>True</Private>
8592
</Reference>
93+
<Reference Include="Microsoft.Threading.Tasks">
94+
<SpecificVersion>False</SpecificVersion>
95+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
96+
</Reference>
97+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98+
<SpecificVersion>False</SpecificVersion>
99+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
100+
</Reference>
101+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102+
<SpecificVersion>False</SpecificVersion>
103+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
104+
</Reference>
105+
<Reference Include="Microsoft.WindowsAzure.Configuration">
106+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
107+
</Reference>
108+
<Reference Include="Microsoft.WindowsAzure.Storage">
109+
<SpecificVersion>False</SpecificVersion>
110+
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
111+
</Reference>
112+
<Reference Include="Microsoft.Azure.KeyVault.Core">
113+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
114+
<Private>True</Private>
115+
</Reference>
86116
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
87117
<SpecificVersion>False</SpecificVersion>
88118
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
89119
</Reference>
120+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
121+
<SpecificVersion>False</SpecificVersion>
122+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
123+
</Reference>
90124
<Reference Include="System" />
91125
<Reference Include="System.Core" />
126+
<Reference Include="System.Data" />
92127
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93128
<SpecificVersion>False</SpecificVersion>
94129
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
95130
</Reference>
96131
<Reference Include="System.Net" />
132+
<Reference Include="System.Net.Http" />
133+
<Reference Include="System.Net.Http.WebRequest" />
134+
<Reference Include="System.Spatial">
135+
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
136+
</Reference>
137+
<Reference Include="System.Xml" /> <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
138+
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath> <Private>True</Private>
139+
</Reference>
97140
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
98141
<HintPath>..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
99142
<Private>True</Private>

src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,37 @@
4949
<Reference Include="Microsoft.Azure.Common">
5050
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5151
</Reference>
52+
<Reference Include="Microsoft.Azure.Common.NetFramework">
53+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
54+
</Reference>
5255
<Reference Include="Microsoft.Azure.Insights">
5356
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.10.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
5457
</Reference>
58+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<SpecificVersion>False</SpecificVersion>
60+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
61+
</Reference>
62+
<Reference Include="Microsoft.CSharp" />
63+
<Reference Include="Microsoft.Data.Edm">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Microsoft.Data.OData">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Microsoft.Data.Services.Client">
72+
<SpecificVersion>False</SpecificVersion>
73+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
74+
</Reference>
75+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
77+
<Private>True</Private>
78+
</Reference>
79+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
81+
<Private>True</Private>
82+
</Reference>
5583
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5684
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.0.1\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
5785
<Private>True</Private>
@@ -60,11 +88,29 @@
6088
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
6189
<Private>True</Private>
6290
</Reference>
91+
<Reference Include="Microsoft.WindowsAzure.Storage">
92+
<SpecificVersion>False</SpecificVersion>
93+
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
94+
</Reference>
95+
<Reference Include="Microsoft.Azure.KeyVault.Core">
96+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
97+
<Private>True</Private>
98+
</Reference>
99+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
100+
<SpecificVersion>False</SpecificVersion>
101+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
102+
</Reference>
63103
<Reference Include="System" />
64104
<Reference Include="System.Core" />
105+
<Reference Include="System.Data" />
65106
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
66107
<Reference Include="System.Net" />
67108
<Reference Include="System.Net.Http" />
109+
<Reference Include="System.Net.Http.WebRequest" />
110+
<Reference Include="System.Spatial">
111+
<SpecificVersion>False</SpecificVersion>
112+
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
113+
</Reference>
68114
<Reference Include="System.Xml" />
69115
</ItemGroup>
70116
<ItemGroup>

0 commit comments

Comments
 (0)