Skip to content

Commit 36b14ff

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#219 from markcowl/fixapi
Fix issues with ApiManagement library
2 parents 2bfe357 + a209e59 commit 36b14ff

File tree

5 files changed

+142
-5
lines changed

5 files changed

+142
-5
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,95 @@
77
<Component Id="cmp96F13C307DA6E4AAC35F3D147F21553F" Guid="*">
88
<File Id="fil96C82365E5F5A2F2747805236B563DF0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureResourceManager.psd1" />
99
</Component>
10+
<Directory Id="dir838549562B6DA27CC3A67DA6EBDE4786" Name="ApiManagement">
11+
<Component Id="cmp53976CD68EB95B394DA506B39428339E" Guid="*">
12+
<File Id="fil540FB86D847BB7ADE837FAFDE045F1E8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\AutoMapper.dll" />
13+
</Component>
14+
<Component Id="cmp3A19AB52120FEF083E8B5C9847509286" Guid="*">
15+
<File Id="fil74A39AD899E37E9FFE25D402C315A42A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\AutoMapper.Net4.dll" />
16+
</Component>
17+
<Component Id="cmp0A225313105F55FD24E961F72B00EB14" Guid="*">
18+
<File Id="fil52ECAF62E96EC46F03804DC9A3B7CACF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Hyak.Common.dll" />
19+
</Component>
20+
<Component Id="cmp4E7CF05E1B9E496E36CCC1BFDA0D03D3" Guid="*">
21+
<File Id="fil199E1454E350576E6D0F8BE48503E381" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll" />
22+
</Component>
23+
<Component Id="cmp44E441142C5E8C50D41EA35E08A3461B" Guid="*">
24+
<File Id="fil586AB671A9FF15B891718D29E64076E5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll-help.xml" />
25+
</Component>
26+
<Component Id="cmp7B266EF20853E623E6FC2605B12C6DB8" Guid="*">
27+
<File Id="filF9B5379C5A04B9423B3EB5E96F1F1E67" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Common.Authentication.dll" />
28+
</Component>
29+
<Component Id="cmp4755EF4B900B92994240186B50990B3C" Guid="*">
30+
<File Id="fil36A0FC10D6DB6C3A0E24DDDF989B62E4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Common.dll" />
31+
</Component>
32+
<Component Id="cmp11B9541353C95E7985FD4BF420C3AA40" Guid="*">
33+
<File Id="filCC427F20E773B4CD8ED7BB35B7404AEB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Common.NetFramework.dll" />
34+
</Component>
35+
<Component Id="cmp97213488A35117F44C5B33A158B992F3" Guid="*">
36+
<File Id="fil1CEDDEFE6A512DCC93BDBFE5CE29D31B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Management.ApiManagement.dll" />
37+
</Component>
38+
<Component Id="cmpDC433AC0D6833219D86CA13947A3934D" Guid="*">
39+
<File Id="filA95ABA71ABB678931802000F97D03EDA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.ResourceManager.dll" />
40+
</Component>
41+
<Component Id="cmp1A6CF5E9ED315E384B7AB1184EC3175B" Guid="*">
42+
<File Id="fil186A2DF1B91F21443E64C42A9201B6A9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Data.Edm.dll" />
43+
</Component>
44+
<Component Id="cmp826C930AA51318C68E651B63DCFAAAC8" Guid="*">
45+
<File Id="fil124189B8174117C765D0E0BD92CE4EE5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Data.OData.dll" />
46+
</Component>
47+
<Component Id="cmpCECF2D62D817B489CF15D4E525BB6044" Guid="*">
48+
<File Id="fil921D3DC14FDC2B11767C321FF220217C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Data.Services.Client.dll" />
49+
</Component>
50+
<Component Id="cmp105BBDA2A4C46386DB0E97F0D207D78D" Guid="*">
51+
<File Id="fil1573114A5C8A34317522258BD54D5402" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
52+
</Component>
53+
<Component Id="cmpDCFB91A76C2C049F0861E2304D9BD823" Guid="*">
54+
<File Id="fil6213C1225E486986A097563BCDE697E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
55+
</Component>
56+
<Component Id="cmp3D543906A64292076E47ACFB9AC074AD" Guid="*">
57+
<File Id="fil42C110F83DACA4B779AA76A1DB2DBF7B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Threading.Tasks.dll" />
58+
</Component>
59+
<Component Id="cmpA5685821514CBFE3CACE6914F5BFF22D" Guid="*">
60+
<File Id="filEC9003345AC74C45669379FC64849B92" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
61+
</Component>
62+
<Component Id="cmpC5727D6E3441B3153A67EAE825A552D5" Guid="*">
63+
<File Id="fil59C0E188B7C0123742E7B3EB21629BA4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Threading.Tasks.Extensions.dll" />
64+
</Component>
65+
<Component Id="cmp538692E7B8402791D7BDA3349D6BDCA6" Guid="*">
66+
<File Id="filBA5FFE101A68B9DC5230255C0B321CBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.WindowsAzure.Commands.Common.dll" />
67+
</Component>
68+
<Component Id="cmp3C836B05BDD4B15607770B0C6E504B7A" Guid="*">
69+
<File Id="fil7CF93D91DA1DE8317E09D9EEEA8140B4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.WindowsAzure.Commands.Common.Storage.dll" />
70+
</Component>
71+
<Component Id="cmp5899E2938989647CCF89DDDC1D28D26D" Guid="*">
72+
<File Id="fil2BE22D76B4F94D976FAAADF4003C50AC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.WindowsAzure.Configuration.dll" />
73+
</Component>
74+
<Component Id="cmp1A471DC3317F995F408280FDDB2E4254" Guid="*">
75+
<File Id="fil4D012A77EB249F0417B28DDCF5A5E8B8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.WindowsAzure.Management.dll" />
76+
</Component>
77+
<Component Id="cmp6F72EEDA687B648C7FF04D30F2E9CF23" Guid="*">
78+
<File Id="filB648A09EB1C9CF0EAE91AFC381BA2C7D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.WindowsAzure.Management.Storage.dll" />
79+
</Component>
80+
<Component Id="cmp652B58A0B172473170C746AAFE9ED9C8" Guid="*">
81+
<File Id="fil49D6D5399E99A4A825BA48DD1434968F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.WindowsAzure.Storage.dll" />
82+
</Component>
83+
<Component Id="cmp7518EE9A5D44548F4350D2F2634F6F29" Guid="*">
84+
<File Id="filB9C7BCAADC11AB4CE48FCE7ABF9AB2BF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\Newtonsoft.Json.dll" />
85+
</Component>
86+
<Component Id="cmp2B1585E76571709BB2FDEEB42C829349" Guid="*">
87+
<File Id="fil7BB473627DB779BB3C6B6CFAAFF279D0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\System.Net.Http.Extensions.dll" />
88+
</Component>
89+
<Component Id="cmp432B3732B0CB403DDC30C0FCE7AF84DD" Guid="*">
90+
<File Id="fil328A4769B7CFA36162E5CD0C3ADF913F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\System.Net.Http.Formatting.dll" />
91+
</Component>
92+
<Component Id="cmpB85EDFECAEA3B63D2BA6EE78D1FEC526" Guid="*">
93+
<File Id="fil43AE27BFBA96106EC3A1611282C4928A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\System.Net.Http.Primitives.dll" />
94+
</Component>
95+
<Component Id="cmp937DD6E62ABC2DDB428C384F9570440B" Guid="*">
96+
<File Id="filB689ADD9D95A8636A10EF7A26BECAA90" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ApiManagement\System.Spatial.dll" />
97+
</Component>
98+
</Directory>
1099
<Directory Id="dir7FBB567B67962EF87B803F2D40A1C91D" Name="Automation">
11100
<Component Id="cmpCBE516C3EB8B0C94FD1B235D0806CC33" Guid="*">
12101
<File Id="fil0DD0F16890E95B85B2B03CBB03E6CF07" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Hyak.Common.dll" />
@@ -3608,6 +3697,35 @@
36083697
<Fragment>
36093698
<ComponentGroup Id="azurecmdfiles">
36103699
<ComponentRef Id="cmp96F13C307DA6E4AAC35F3D147F21553F" />
3700+
<ComponentRef Id="cmp53976CD68EB95B394DA506B39428339E" />
3701+
<ComponentRef Id="cmp3A19AB52120FEF083E8B5C9847509286" />
3702+
<ComponentRef Id="cmp0A225313105F55FD24E961F72B00EB14" />
3703+
<ComponentRef Id="cmp4E7CF05E1B9E496E36CCC1BFDA0D03D3" />
3704+
<ComponentRef Id="cmp44E441142C5E8C50D41EA35E08A3461B" />
3705+
<ComponentRef Id="cmp7B266EF20853E623E6FC2605B12C6DB8" />
3706+
<ComponentRef Id="cmp4755EF4B900B92994240186B50990B3C" />
3707+
<ComponentRef Id="cmp11B9541353C95E7985FD4BF420C3AA40" />
3708+
<ComponentRef Id="cmp97213488A35117F44C5B33A158B992F3" />
3709+
<ComponentRef Id="cmpDC433AC0D6833219D86CA13947A3934D" />
3710+
<ComponentRef Id="cmp1A6CF5E9ED315E384B7AB1184EC3175B" />
3711+
<ComponentRef Id="cmp826C930AA51318C68E651B63DCFAAAC8" />
3712+
<ComponentRef Id="cmpCECF2D62D817B489CF15D4E525BB6044" />
3713+
<ComponentRef Id="cmp105BBDA2A4C46386DB0E97F0D207D78D" />
3714+
<ComponentRef Id="cmpDCFB91A76C2C049F0861E2304D9BD823" />
3715+
<ComponentRef Id="cmp3D543906A64292076E47ACFB9AC074AD" />
3716+
<ComponentRef Id="cmpA5685821514CBFE3CACE6914F5BFF22D" />
3717+
<ComponentRef Id="cmpC5727D6E3441B3153A67EAE825A552D5" />
3718+
<ComponentRef Id="cmp538692E7B8402791D7BDA3349D6BDCA6" />
3719+
<ComponentRef Id="cmp3C836B05BDD4B15607770B0C6E504B7A" />
3720+
<ComponentRef Id="cmp5899E2938989647CCF89DDDC1D28D26D" />
3721+
<ComponentRef Id="cmp1A471DC3317F995F408280FDDB2E4254" />
3722+
<ComponentRef Id="cmp6F72EEDA687B648C7FF04D30F2E9CF23" />
3723+
<ComponentRef Id="cmp652B58A0B172473170C746AAFE9ED9C8" />
3724+
<ComponentRef Id="cmp7518EE9A5D44548F4350D2F2634F6F29" />
3725+
<ComponentRef Id="cmp2B1585E76571709BB2FDEEB42C829349" />
3726+
<ComponentRef Id="cmp432B3732B0CB403DDC30C0FCE7AF84DD" />
3727+
<ComponentRef Id="cmpB85EDFECAEA3B63D2BA6EE78D1FEC526" />
3728+
<ComponentRef Id="cmp937DD6E62ABC2DDB428C384F9570440B" />
36113729
<ComponentRef Id="cmpCBE516C3EB8B0C94FD1B235D0806CC33" />
36123730
<ComponentRef Id="cmp9C538B9F96F953FD1A81796FC970EE9B" />
36133731
<ComponentRef Id="cmpA201F61684A51530DEF685F87ECB42A3" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,29 @@
2222
<DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<RunCodeAnalysis>true</RunCodeAnalysis>
26+
<UseVSHostingProcess>true</UseVSHostingProcess>
2527
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
<Prefer32Bit>false</Prefer32Bit>
2629
</PropertyGroup>
2730
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2831
<DebugType>pdbonly</DebugType>
2932
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
33+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\ApiManagement\</OutputPath>
34+
<DefineConstants>TRACE;SIGN</DefineConstants>
35+
<PlatformTarget>AnyCPU</PlatformTarget>
36+
<CodeAnalysisLogFile>bin\Release\Management.Automation.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
37+
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
38+
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
3239
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
40+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
41+
<CodeAnalysisRuleSetDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\Rule Sets</CodeAnalysisRuleSetDirectories>
42+
<CodeAnalysisRuleDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\FxCop\Rules</CodeAnalysisRuleDirectories>
43+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
44+
<SignAssembly>true</SignAssembly>
45+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
46+
<DelaySign>true</DelaySign>
47+
<Prefer32Bit>false</Prefer32Bit>
3448
</PropertyGroup>
3549
<ItemGroup>
3650
<Reference Include="AutoMapper">
@@ -188,6 +202,7 @@
188202
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
189203
</Content>
190204
<None Include="packages.config" />
205+
<None Include="MSSharedLibKey.snk" />
191206
</ItemGroup>
192207
<ItemGroup>
193208
<WCFMetadata Include="Service References\" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/MSSharedLibKey.snk

160 Bytes
Binary file not shown.

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/PSObjects.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,10 @@ public ASRProtectionContainer(ProtectionContainer pc)
435435
public string FabricType { get; set; }
436436

437437
/// <summary>
438-
/// Gets or sets the type e.g. VMM, HyperVSite etc.
438+
/// Gets or sets the type e.g. VMM, HyperVSite, etc.
439439
/// </summary>
440440
[DataMember]
441+
[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed.")]
441442
public string Type { get; set; }
442443

443444
/// <summary>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/Utilities.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using System;
16+
using System.Diagnostics.CodeAnalysis;
1617
using System.Globalization;
1718
using System.IO;
1819
using System.Runtime.Serialization;
@@ -28,11 +29,12 @@ namespace Microsoft.Azure.Commands.RecoveryServices
2829
public static class Utilities
2930
{
3031
/// <summary>
31-
/// Serialize the T as xml using DataContractSerializer
32+
/// Serialize the T as xml using DataContract Serializer
3233
/// </summary>
3334
/// <typeparam name="T">the type name</typeparam>
3435
/// <param name="value">the T object.</param>
3536
/// <returns>the serialized object.</returns>
37+
[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed.")]
3638
public static string Serialize<T>(T value)
3739
{
3840
if (value == null)
@@ -60,6 +62,7 @@ public static string Serialize<T>(T value)
6062
/// <typeparam name="T">the type name</typeparam>
6163
/// <param name="xml">the xml as string</param>
6264
/// <returns>the equivalent T</returns>
65+
[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed.")]
6366
public static T Deserialize<T>(string xml)
6467
{
6568
if (string.IsNullOrEmpty(xml))

0 commit comments

Comments
 (0)