Skip to content

Commit 0186aa7

Browse files
cormacpaynecormacpayne
committed
Fix build failure due to Key Vault mismatch
1 parent 792fa7c commit 0186aa7

File tree

5 files changed

+43
-38
lines changed

5 files changed

+43
-38
lines changed

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,28 @@
6161
<Reference Include="Hyak.Common">
6262
<HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
6363
</Reference>
64+
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.1.0-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
66+
<Private>True</Private>
67+
</Reference>
68+
<Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.4\lib\net45\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
70+
<Private>True</Private>
71+
</Reference>
6472
<Reference Include="Microsoft.Azure.Management.Authorization">
6573
<SpecificVersion>False</SpecificVersion>
6674
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6775
</Reference>
6876
<Reference Include="Microsoft.Azure.Management.Compute">
6977
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.14.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
7078
</Reference>
71-
<Reference Include="Microsoft.Azure.Management.KeyVault">
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.0.1-preview\lib\net45\Microsoft.Azure.Management.KeyVault.dll</HintPath>
73-
<Private>True</Private>
74-
</Reference>
7579
<Reference Include="Microsoft.Azure.Graph.RBAC">
7680
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.2.0-preview\lib\net45\Microsoft.Azure.Graph.RBAC.dll</HintPath>
7781
</Reference>
82+
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.2.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
84+
<Private>True</Private>
85+
</Reference>
7886
<Reference Include="Microsoft.Azure.Management.Network">
7987
<SpecificVersion>False</SpecificVersion>
8088
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.8.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
@@ -98,6 +106,14 @@
98106
<Reference Include="Microsoft.Data.Services.Client">
99107
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
100108
</Reference>
109+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
111+
<Private>True</Private>
112+
</Reference>
113+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
115+
<Private>True</Private>
116+
</Reference>
101117
<Reference Include="Microsoft.Threading.Tasks.Extensions">
102118
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
103119
</Reference>
@@ -140,14 +156,6 @@
140156
<Reference Include="Microsoft.Azure.Graph.RBAC">
141157
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.2.0-preview\lib\net45\Microsoft.Azure.Graph.RBAC.dll</HintPath>
142158
</Reference>
143-
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
144-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.0.2-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
145-
<Private>True</Private>
146-
</Reference>
147-
<Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
148-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.0-preview\lib\net45\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
149-
<Private>True</Private>
150-
</Reference>
151159
<Reference Include="Microsoft.Azure.Management.Authorization">
152160
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
153161
<Private>True</Private>
@@ -175,13 +183,6 @@
175183
<SpecificVersion>False</SpecificVersion>
176184
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
177185
</Reference>
178-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
179-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
180-
<Private>True</Private>
181-
</Reference>
182-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
183-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.4\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
184-
</Reference>
185186
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
186187
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
187188
<Private>True</Private>

‎src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/ScenarioTests/TestController.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public void RunPsTestWorkflow(
108108
d.Add("Microsoft.Resources", null);
109109
d.Add("Microsoft.Features", null);
110110
d.Add("Microsoft.Authorization", null);
111+
d.Add("Microsoft.KeyVault", null);
111112
var providersToIgnore = new Dictionary<string, string>();
112113
providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
113114
HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);

‎src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
7-
<package id="Microsoft.Azure.KeyVault" version="2.0.2-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.KeyVault" version="2.1.0-preview" targetFramework="net452" />
8+
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.4" targetFramework="net452" />
99
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.KeyVault" version="2.0.1-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.KeyVault" version="2.2.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.ServiceFabric" version="1.0.0-preview" targetFramework="net45" />
13-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1413
<package id="Microsoft.Azure.Management.Storage" version="6.3.0-preview" targetFramework="net45" />
14+
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1515
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1616
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
1717
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1818
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1919
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
2020
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
21-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.4" targetFramework="net45" />
22-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.4" targetFramework="net45" />
21+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.6" targetFramework="net452" />
22+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net452" />
2323
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
2424
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />

‎src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.csproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,12 @@
153153
<HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
154154
</Reference>
155155
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
156-
<SpecificVersion>False</SpecificVersion>
157-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.0.2-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
156+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.1.0-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
157+
<Private>True</Private>
158158
</Reference>
159-
<Reference Include="Microsoft.Azure.KeyVault.WebKey">
160-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.0-preview\lib\net45\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
159+
<Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
160+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.4\lib\net45\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
161+
<Private>True</Private>
161162
</Reference>
162163
<Reference Include="Microsoft.Azure.Management.Authorization">
163164
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -168,8 +169,9 @@
168169
<Reference Include="Microsoft.Azure.Management.Compute">
169170
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.14.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
170171
</Reference>
171-
<Reference Include="Microsoft.Azure.Management.KeyVault">
172-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.0.1-preview\lib\net45\Microsoft.Azure.Management.KeyVault.dll</HintPath>
172+
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
173+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.2.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
174+
<Private>True</Private>
173175
</Reference>
174176
<Reference Include="Microsoft.Azure.Management.Network">
175177
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.8.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
@@ -203,8 +205,9 @@
203205
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
204206
<Private>True</Private>
205207
</Reference>
206-
<Reference Include="Microsoft.Rest.ClientRuntime">
207-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
208+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
209+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
210+
<Private>True</Private>
208211
</Reference>
209212
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
210213
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>

‎src/ResourceManager/ServiceFabric/Commands.ServiceFabric/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.2.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.KeyVault" version="2.0.2-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.KeyVault" version="2.1.0-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.4" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="14.0.0-prerelease" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.KeyVault" version="2.0.1-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.KeyVault" version="2.2.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Network" version="8.1.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Management.ResourceManager" version="1.2.0-preview" targetFramework="net45" />
15-
<package id="Microsoft.Azure.Management.ServiceFabric" version="1.0.0-preview" targetFramework="net45" />
1615
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
16+
<package id="Microsoft.Azure.Management.ServiceFabric" version="1.0.0-preview" targetFramework="net45" />
1717
<package id="Microsoft.Azure.Management.Storage" version="6.3.0-preview" targetFramework="net452" />
1818
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
1919
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
@@ -23,7 +23,7 @@
2323
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
2424
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
2525
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
26-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
26+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.6" targetFramework="net452" />
2727
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
2828
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
2929
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />

0 commit comments

Comments
 (0)