Skip to content

Commit f07dd07

Browse files
huangpfhuangpf
committed
Merge pull request #378 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents 6c3386c + 457d10d commit f07dd07

File tree

62 files changed

+537
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+537
-132
lines changed

‎setup/azurecmdfiles.wxi‎

Lines changed: 168 additions & 68 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
<SpecificVersion>False</SpecificVersion>
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
111111
</Reference>
112-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113113
<SpecificVersion>False</SpecificVersion>
114-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
114+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
115115
</Reference>
116116
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117117
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.5.0" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="xunit" version="1.9.2" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
<SpecificVersion>False</SpecificVersion>
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
111111
</Reference>
112-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113113
<SpecificVersion>False</SpecificVersion>
114-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.3.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
114+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.5.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
115115
</Reference>
116116
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117117
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
22-
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
22+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.5.0" targetFramework="net45" />
2323
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2424
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2525
<package id="xunit" version="1.9.2" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public static class DiagnosticsHelper
3636
private static string XmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration";
3737
private static string EncodedXmlCfg = "xmlCfg";
3838
private static string WadCfg = "WadCfg";
39+
private static string WadCfgBlob = "WadCfgBlob";
3940
private static string StorageAccount = "storageAccount";
4041
private static string Path = "path";
4142
private static string ExpandResourceDirectory = "expandResourceDirectory";
@@ -163,6 +164,7 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
163164
var publicConfig = GetPublicConfigJObjectFromJsonFile(configurationPath);
164165
var properties = publicConfig.Properties().Select(p => p.Name);
165166
var wadCfgProperty = properties.FirstOrDefault(p => p.Equals(WadCfg, StringComparison.OrdinalIgnoreCase));
167+
var wadCfgBlobProperty = properties.FirstOrDefault(p => p.Equals(WadCfgBlob, StringComparison.OrdinalIgnoreCase));
166168
var xmlCfgProperty = properties.FirstOrDefault(p => p.Equals(EncodedXmlCfg, StringComparison.OrdinalIgnoreCase));
167169

168170
var hashTable = new Hashtable();
@@ -172,13 +174,17 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
172174
{
173175
hashTable.Add(wadCfgProperty, publicConfig[wadCfgProperty]);
174176
}
177+
else if (wadCfgBlobProperty != null)
178+
{
179+
hashTable.Add(wadCfgBlobProperty, publicConfig[wadCfgBlobProperty]);
180+
}
175181
else if (xmlCfgProperty != null)
176182
{
177183
hashTable.Add(xmlCfgProperty, publicConfig[xmlCfgProperty]);
178184
}
179185
else
180186
{
181-
throw new ArgumentException(Properties.Resources.DiagnosticsExtensionConfigNoWadCfgOrXmlCfg);
187+
throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefined);
182188
}
183189

184190
return hashTable;

‎src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip)
482482
<data name="DiagnosticsExtensionNullStorageAccountEndpoint" xml:space="preserve">
483483
<value>Storage account endpoint is not defined or can not be retrieved automatically..</value>
484484
</data>
485-
<data name="DiagnosticsExtensionConfigNoWadCfgOrXmlCfg" xml:space="preserve">
486-
<value>WadCfg or xmlCfg is not defined in configuration file.</value>
485+
<data name="DiagnosticsExtensionIaaSConfigElementNotDefined" xml:space="preserve">
486+
<value>No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file.</value>
487487
</data>
488488
<data name="DiagnosticsExtensionInvalidConfigFileFormat" xml:space="preserve">
489489
<value>Invalid diagnostics configuration file. It should be in Invalid diagnostics configuration file. It should be in either xml or json format.either xml or json format.</value>

‎src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@
113113
<Reference Include="Microsoft.Azure.Common.NetFramework">
114114
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
115115
</Reference>
116+
<Reference Include="Microsoft.Data.Edm">
117+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
118+
</Reference>
119+
<Reference Include="Microsoft.Data.OData">
120+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
121+
</Reference>
122+
<Reference Include="Microsoft.Data.Services.Client">
123+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
124+
</Reference>
116125
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117126
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
118127
<Private>True</Private>
@@ -155,6 +164,9 @@
155164
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
156165
</Reference>
157166
<Reference Include="System.Net.Http.WebRequest" />
167+
<Reference Include="System.Spatial">
168+
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
169+
</Reference>
158170
<Reference Include="System.XML" />
159171
<Reference Include="System.Xml.Linq" />
160172
</ItemGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
13+
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
14+
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
15+
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1316
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1417
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1518
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1619
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
1720
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
21+
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
1822
</packages>

0 commit comments

Comments
 (0)