Skip to content

Commit 913f895

Browse files
committed
Merge pull request #80 from huangpf/clu
Clu
2 parents ad17769 + 08cfe16 commit 913f895

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

src/CLU/Microsoft.Azure.Commands.Compute/Common/DiagnosticsHelper.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ public static Hashtable GetPublicDiagnosticsConfiguration(string config, string
7979
XmlNamespaceManager ns = new XmlNamespaceManager(doc.NameTable);
8080
ns.AddNamespace("ns", XmlNamespace);
8181
doc.LoadXml(config);
82-
XmlNode node = null;
83-
//node = doc.SelectSingleNode("//ns:LocalResourceDirectory", ns);
82+
XmlNode node = doc.SelectSingleNode("//ns:LocalResourceDirectory", ns);
8483
string localDirectory = (node != null && node.Attributes != null) ? node.Attributes[Path].Value : null;
8584
string localDirectoryExpand = (node != null && node.Attributes != null)
8685
? node.Attributes["expandEnvironment"].Value

src/CLU/Microsoft.Azure.Commands.Compute/Properties/launchSettings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/CLU/Microsoft.Azure.Commands.Compute/project.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
}
1616
},
1717
"dependencies": {
18-
"System.Linq": "4.0.1-beta-23516",
19-
"Microsoft.CLU": "1.0.0",
18+
"AutoMapper": "4.1.1",
2019
"Commands.Common": "",
2120
"Commands.Common.Authentication": "",
2221
"Commands.Common.Storage": "",
2322
"Commands.ResourceManager.Common": "",
2423
"Microsoft.Azure.Management.Compute": "11.0.0-prerelease",
2524
"Microsoft.Azure.Management.Network": "3.0.3-preview",
26-
"AutoMapper": "4.1.1",
25+
"Microsoft.Azure.Management.Storage": "4.0.0-preview",
26+
"Microsoft.CLU": "1.0.0",
2727
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
2828
"Microsoft.Rest.ClientRuntime": "1.5.0",
2929
"Newtonsoft.Json": "7.0.1",
@@ -33,6 +33,7 @@
3333
"System.Diagnostics.Tracing": "4.0.21-beta-23516",
3434
"System.IO": "4.0.11-beta-23516",
3535
"System.IO.FileSystem": "4.0.1-beta-23516",
36+
"System.Linq": "4.0.1-beta-23516",
3637
"System.Net.Http": "4.0.1-beta-23516",
3738
"System.Net.WebHeaderCollection": "4.0.1-beta-23516",
3839
"System.Reflection": "4.1.0-beta-23516",
@@ -50,9 +51,9 @@
5051
"System.Threading": "4.0.11-beta-23516",
5152
"System.Threading.Tasks": "4.0.11-beta-23516",
5253
"System.Threading.Thread": "4.0.0-beta-23516",
53-
"WindowsAzure.Storage": "6.1.1-preview",
54-
"Microsoft.Azure.Management.Storage": "4.0.0-preview",
55-
"System.Xml.XmlDocument": "4.0.1-beta-23516"
54+
"System.Xml.XmlDocument": "4.0.1-beta-23516",
55+
"System.Xml.XPath.XmlDocument": "4.0.1-beta-23516",
56+
"WindowsAzure.Storage": "6.1.1-preview"
5657
},
5758
"compilationOptions": {"emitEntryPoint": true}
5859
}

0 commit comments

Comments
 (0)