" + _title + "

From 6b494be1c7b4543237352ee703372225768b309a Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:17 -0800 Subject: [PATCH 01/81] Update TestService --- test/tools/TestService/Program.cs | 2 +- test/tools/TestService/Service1.Designer.cs | 3 ++- test/tools/TestService/Service1.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/tools/TestService/Program.cs b/test/tools/TestService/Program.cs index f3a5c5d53b4..6be04aac653 100644 --- a/test/tools/TestService/Program.cs +++ b/test/tools/TestService/Program.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using System.ServiceProcess; diff --git a/test/tools/TestService/Service1.Designer.cs b/test/tools/TestService/Service1.Designer.cs index b8210d468c9..8ec66d05df5 100644 --- a/test/tools/TestService/Service1.Designer.cs +++ b/test/tools/TestService/Service1.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. namespace TestService { @@ -12,6 +12,7 @@ protected override void Dispose(bool disposing) { components.Dispose(); } + base.Dispose(disposing); } diff --git a/test/tools/TestService/Service1.cs b/test/tools/TestService/Service1.cs index 36f680fa5f9..2a5e5c18f6b 100644 --- a/test/tools/TestService/Service1.cs +++ b/test/tools/TestService/Service1.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using System.ServiceProcess; From f3f173eaf6bf304b4b5dbd37a407055ba90d2332 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:17 -0800 Subject: [PATCH 02/81] Update WebListener --- test/tools/WebListener/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs index 74135b2f2ce..a5535500fc2 100644 --- a/test/tools/WebListener/Program.cs +++ b/test/tools/WebListener/Program.cs @@ -25,6 +25,7 @@ public static void Main(string[] args) System.Console.WriteLine("Required: "); Environment.Exit(1); } + BuildWebHost(args).Run(); } From 088dfd2c6ad405236ecc04fbb14b68842feca202 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:18 -0800 Subject: [PATCH 03/81] Update Controllers --- test/tools/WebListener/Controllers/CertController.cs | 1 + test/tools/WebListener/Controllers/DelayController.cs | 1 + test/tools/WebListener/Controllers/GetController.cs | 4 ++++ test/tools/WebListener/Controllers/HomeController.cs | 1 + test/tools/WebListener/Controllers/LinkController.cs | 2 ++ test/tools/WebListener/Controllers/MultipartController.cs | 5 +++++ test/tools/WebListener/Controllers/RedirectController.cs | 1 + test/tools/WebListener/Controllers/ResponseController.cs | 1 + .../WebListener/Controllers/ResponseHeadersController.cs | 1 + test/tools/WebListener/Controllers/ResumeController.cs | 2 ++ 10 files changed, 19 insertions(+) diff --git a/test/tools/WebListener/Controllers/CertController.cs b/test/tools/WebListener/Controllers/CertController.cs index 0e7eda84992..e2bca31cd32 100644 --- a/test/tools/WebListener/Controllers/CertController.cs +++ b/test/tools/WebListener/Controllers/CertController.cs @@ -34,6 +34,7 @@ public JsonResult Index() {"NotBefore" , HttpContext.Connection.ClientCertificate.NotBefore} }; } + return Json(output); } diff --git a/test/tools/WebListener/Controllers/DelayController.cs b/test/tools/WebListener/Controllers/DelayController.cs index 2298c892540..c64fb2490b9 100644 --- a/test/tools/WebListener/Controllers/DelayController.cs +++ b/test/tools/WebListener/Controllers/DelayController.cs @@ -21,6 +21,7 @@ public JsonResult Index(int seconds) int milliseconds = seconds * 1000; Thread.Sleep(milliseconds); } + var getController = new GetController(); getController.ControllerContext = this.ControllerContext; return getController.Index(); diff --git a/test/tools/WebListener/Controllers/GetController.cs b/test/tools/WebListener/Controllers/GetController.cs index 24a3edb3bfe..0cf6cb9a8c1 100644 --- a/test/tools/WebListener/Controllers/GetController.cs +++ b/test/tools/WebListener/Controllers/GetController.cs @@ -22,11 +22,13 @@ public JsonResult Index() { args.Add(key, String.Join(Constants.HeaderSeparator, Request.Query[key])); } + Hashtable headers = new Hashtable(); foreach (var key in Request.Headers.Keys) { headers.Add(key, String.Join(Constants.HeaderSeparator, Request.Headers[key])); } + Hashtable output = new Hashtable { {"args" , args}, @@ -43,6 +45,7 @@ public JsonResult Index() { form.Add(key,Request.Form[key]); } + output["form"] = form; } @@ -54,6 +57,7 @@ public JsonResult Index() return Json(output); } + public IActionResult Error() { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); diff --git a/test/tools/WebListener/Controllers/HomeController.cs b/test/tools/WebListener/Controllers/HomeController.cs index 88c12d7ebd4..3341ff11f6a 100644 --- a/test/tools/WebListener/Controllers/HomeController.cs +++ b/test/tools/WebListener/Controllers/HomeController.cs @@ -16,6 +16,7 @@ public IActionResult Index() { return View(); } + public IActionResult Error() { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); diff --git a/test/tools/WebListener/Controllers/LinkController.cs b/test/tools/WebListener/Controllers/LinkController.cs index e699dd325ca..e70a75f66be 100644 --- a/test/tools/WebListener/Controllers/LinkController.cs +++ b/test/tools/WebListener/Controllers/LinkController.cs @@ -46,6 +46,7 @@ public JsonResult Index() { linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: linkNumber - 1, type: type, whitespace: whitespace, rel: "prev")); } + linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: maxLinks, type: type, whitespace: whitespace, rel: "last")); linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: 1, type: type, whitespace: whitespace, rel: "first")); linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: linkNumber, type: type, whitespace: whitespace, rel: "self")); @@ -87,6 +88,7 @@ public JsonResult Index() { linkHeader = String.Join(",", linkList); } + Response.Headers.Add("Link", linkHeader); // Generate /Get/ result and append linknumber, maxlinks, and type diff --git a/test/tools/WebListener/Controllers/MultipartController.cs b/test/tools/WebListener/Controllers/MultipartController.cs index f94e539893e..959c081d66d 100644 --- a/test/tools/WebListener/Controllers/MultipartController.cs +++ b/test/tools/WebListener/Controllers/MultipartController.cs @@ -23,6 +23,7 @@ public MultipartController(IHostingEnvironment environment) { _environment = environment; } + public ActionResult Index() { return View(); @@ -49,6 +50,7 @@ public JsonResult Index(IFormCollection collection) result = reader.ReadToEnd(); } } + Hashtable fileHash = new Hashtable { {"ContentDisposition" , file.ContentDisposition}, @@ -61,17 +63,20 @@ public JsonResult Index(IFormCollection collection) }; fileList.Add(fileHash); } + Hashtable itemsHash = new Hashtable(); foreach (var key in collection.Keys) { itemsHash.Add(key,collection[key]); } + MediaTypeHeaderValue mediaContentType = MediaTypeHeaderValue.Parse(Request.ContentType); Hashtable headers = new Hashtable(); foreach (var key in Request.Headers.Keys) { headers.Add(key, String.Join(Constants.HeaderSeparator, Request.Headers[key])); } + Hashtable output = new Hashtable { {"Files" , fileList}, diff --git a/test/tools/WebListener/Controllers/RedirectController.cs b/test/tools/WebListener/Controllers/RedirectController.cs index b32722b3822..3e9a14f9806 100644 --- a/test/tools/WebListener/Controllers/RedirectController.cs +++ b/test/tools/WebListener/Controllers/RedirectController.cs @@ -52,6 +52,7 @@ public IActionResult Index(int count) return View(); } + public IActionResult Error() { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); diff --git a/test/tools/WebListener/Controllers/ResponseController.cs b/test/tools/WebListener/Controllers/ResponseController.cs index 23c0a461ff9..339b60bdb25 100644 --- a/test/tools/WebListener/Controllers/ResponseController.cs +++ b/test/tools/WebListener/Controllers/ResponseController.cs @@ -65,6 +65,7 @@ public String Index() { continue; } + foreach (string entry in GetSingleOrArray(property.Value)) { Response.Headers.Append(property.Name,entry); diff --git a/test/tools/WebListener/Controllers/ResponseHeadersController.cs b/test/tools/WebListener/Controllers/ResponseHeadersController.cs index e53f10f6271..5eab3c82640 100644 --- a/test/tools/WebListener/Controllers/ResponseHeadersController.cs +++ b/test/tools/WebListener/Controllers/ResponseHeadersController.cs @@ -40,6 +40,7 @@ public string Index() Response.Headers.TryAdd(key, Request.Query[key]); } } + return JsonConvert.SerializeObject(headers); } diff --git a/test/tools/WebListener/Controllers/ResumeController.cs b/test/tools/WebListener/Controllers/ResumeController.cs index d3f8944a45c..aaaf962a8b0 100644 --- a/test/tools/WebListener/Controllers/ResumeController.cs +++ b/test/tools/WebListener/Controllers/ResumeController.cs @@ -34,6 +34,7 @@ public async void Index() { from = (int)range.From; } + if(range.To != null) { to = (int)range.To; @@ -79,6 +80,7 @@ public async void Bytes(int NumberBytes) { NumberBytes = FileBytes.Length; } + Response.ContentType = MediaTypeNames.Application.Octet; Response.ContentLength = NumberBytes; await Response.Body.WriteAsync(FileBytes, 0, NumberBytes); From 86eb91692b14622d21536444eb94cd66e746d016 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:24 -0800 Subject: [PATCH 04/81] Update ExpTest --- .../engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs b/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs index a73b649f48c..3d38dd57145 100644 --- a/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs +++ b/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs @@ -62,8 +62,10 @@ protected override void EndProcessing() if (ExperimentalFeature.IsEnabled("ExpTest.FeatureOne")) { if (SwitchOne.IsPresent) { message += "-SwitchOne is on."; } + if (SwitchTwo.IsPresent) { message += "-SwitchTwo is on."; } } + WriteObject(message); } } From b111f3a657c64ea25ae6ec5f71bf759895c2d2b8 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:25 -0800 Subject: [PATCH 05/81] Update MyApp --- .../sample-dotnet2.0-powershell-crossplatform/MyApp/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/host-powershell/sample-dotnet2.0-powershell-crossplatform/MyApp/Program.cs b/docs/host-powershell/sample-dotnet2.0-powershell-crossplatform/MyApp/Program.cs index 74676efba24..6553363d94f 100644 --- a/docs/host-powershell/sample-dotnet2.0-powershell-crossplatform/MyApp/Program.cs +++ b/docs/host-powershell/sample-dotnet2.0-powershell-crossplatform/MyApp/Program.cs @@ -19,6 +19,7 @@ public static int Main(string[] args) var results = ps.AddScript("Get-Command Write-Output").Invoke(); Console.WriteLine(results[0].ToString()); } + return 0; } } From 74dbb95319e7c6780e9d7b67189256a2e4792c6c Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:25 -0800 Subject: [PATCH 06/81] Update Logic --- .../sample-dotnet2.0-powershell.beta.1/Logic/UseRunspace.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/host-powershell/sample-dotnet2.0-powershell.beta.1/Logic/UseRunspace.cs b/docs/host-powershell/sample-dotnet2.0-powershell.beta.1/Logic/UseRunspace.cs index e126fd28a3a..8d91e9cc252 100644 --- a/docs/host-powershell/sample-dotnet2.0-powershell.beta.1/Logic/UseRunspace.cs +++ b/docs/host-powershell/sample-dotnet2.0-powershell.beta.1/Logic/UseRunspace.cs @@ -29,6 +29,7 @@ public static int Start(string[] args) Console.WriteLine(result.ToString()); } } + return 0; } } From 59125f25ed350c45dcb9787b3fb6ecae27502db0 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:25 -0800 Subject: [PATCH 07/81] Update Logic --- docs/host-powershell/sample-dotnet1.1/Logic/UseRunspace.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/host-powershell/sample-dotnet1.1/Logic/UseRunspace.cs b/docs/host-powershell/sample-dotnet1.1/Logic/UseRunspace.cs index e126fd28a3a..8d91e9cc252 100644 --- a/docs/host-powershell/sample-dotnet1.1/Logic/UseRunspace.cs +++ b/docs/host-powershell/sample-dotnet1.1/Logic/UseRunspace.cs @@ -29,6 +29,7 @@ public static int Start(string[] args) Console.WriteLine(result.ToString()); } } + return 0; } } From 4b8c59cb2cee629cc069ac58e56c486eb61c21fb Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:26 -0800 Subject: [PATCH 08/81] Update MyApp --- .../sample-dotnet2.0-powershell.beta.3/MyApp/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/host-powershell/sample-dotnet2.0-powershell.beta.3/MyApp/Program.cs b/docs/host-powershell/sample-dotnet2.0-powershell.beta.3/MyApp/Program.cs index ec88a87b6e4..0413e5d8ab4 100644 --- a/docs/host-powershell/sample-dotnet2.0-powershell.beta.3/MyApp/Program.cs +++ b/docs/host-powershell/sample-dotnet2.0-powershell.beta.3/MyApp/Program.cs @@ -28,6 +28,7 @@ public static int Main(string[] args) Console.WriteLine(result.ToString()); } } + return 0; } } From 21b00338b6447156f00a2a651058153e430fd3b7 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 23 Dec 2018 09:45:28 -0800 Subject: [PATCH 09/81] Update Microsoft.Management.Infrastructure.CimCmdlets --- .../CimAsyncOperation.cs | 12 ++++ .../CimBaseAction.cs | 2 + .../CimCmdletModuleInitialize.cs | 4 ++ .../CimCommandBase.cs | 31 ++++++++++ .../CimGetAssociatedInstance.cs | 4 ++ .../CimGetCimClass.cs | 7 +++ .../CimGetInstance.cs | 25 ++++++++ .../CimIndicationWatcher.cs | 6 ++ .../CimInvokeCimMethod.cs | 18 ++++++ .../CimNewCimInstance.cs | 10 ++++ .../CimPromptUser.cs | 4 ++ .../CimRegisterCimIndication.cs | 8 +++ .../CimRemoveCimInstance.cs | 6 ++ .../CimResultObserver.cs | 4 ++ .../CimSessionOperations.cs | 37 ++++++++++++ .../CimSessionProxy.cs | 43 ++++++++++++++ .../CimSetCimInstance.cs | 14 +++++ .../CimWriteError.cs | 4 ++ .../CimWriteProgress.cs | 1 + .../CimWriteResultObject.cs | 1 + .../CmdletOperation.cs | 15 +++++ .../GetCimAssociatedInstanceCommand.cs | 19 ++++++ .../GetCimClassCommand.cs | 17 ++++++ .../GetCimInstanceCommand.cs | 27 +++++++++ .../GetCimSessionCommand.cs | 8 +++ .../InvokeCimMethodCommand.cs | 25 ++++++++ .../NewCimInstanceCommand.cs | 22 +++++++ .../NewCimSessionCommand.cs | 28 +++++++++ .../NewCimSessionOptionCommand.cs | 59 +++++++++++++++++++ .../RegisterCimIndicationCommand.cs | 21 +++++++ .../RemoveCimInstanceCommand.cs | 17 ++++++ .../RemoveCimSessionCommand.cs | 10 ++++ .../SetCimInstanceCommand.cs | 21 +++++++ .../Utils.cs | 9 +++ 34 files changed, 539 insertions(+) diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs index 8e575e235a9..a12ec7c90d5 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs @@ -62,6 +62,7 @@ protected void NewCmdletActionHandler(object cimSession, CmdletActionEventArgs a // unblock the thread waiting for response (actionArgs.Action as CimSyncAction).OnComplete(); } + return; } @@ -164,6 +165,7 @@ public void ProcessRemainActions(CmdletOperationBase cmdletOperation) DebugHelper.WriteLogEx("Either disposed or all operations completed.", 2); break; } + try { this.moreActionEvent.Wait(); @@ -177,6 +179,7 @@ public void ProcessRemainActions(CmdletOperationBase cmdletOperation) break; } } + ProcessActions(cmdletOperation); } @@ -209,6 +212,7 @@ protected void AddCimSessionProxy(CimSessionProxy sessionproxy) { this.cimSessionProxyCache = new List(); } + if (!this.cimSessionProxyCache.Contains(sessionproxy)) { this.cimSessionProxyCache.Add(sessionproxy); @@ -366,6 +370,7 @@ protected object GetBaseObject(object value) { arraybaseObject[i] = GetBaseObject(arrayObject[i]); } + return arraybaseObject; } } @@ -390,6 +395,7 @@ protected object GetReferenceOrReferenceArrayObject(object value, ref CimType re { return null; } + referenceType = CimType.Reference; return cimInstance; } @@ -404,6 +410,7 @@ protected object GetReferenceOrReferenceArrayObject(object value, ref CimType re { return null; } + CimInstance[] cimInstanceArray = new CimInstance[cimReferenceArray.Length]; for (int i = 0; i < cimReferenceArray.Length; i++) { @@ -412,6 +419,7 @@ protected object GetReferenceOrReferenceArrayObject(object value, ref CimType re { return null; } + object baseObject = GetBaseObject(tempCimReference.Value); cimInstanceArray[i] = baseObject as CimInstance; if (cimInstanceArray[i] == null) @@ -419,6 +427,7 @@ protected object GetReferenceOrReferenceArrayObject(object value, ref CimType re return null; } } + referenceType = CimType.ReferenceArray; return cimInstanceArray; } @@ -439,6 +448,7 @@ protected bool Disposed return (Interlocked.Read(ref this._disposed) == 1); } } + private long _disposed; ///

@@ -506,6 +516,7 @@ private void Cleanup() (action as CimSyncAction).OnComplete(); } } + if (this.cimSessionProxyCache != null) { List temporaryProxy; @@ -527,6 +538,7 @@ private void Cleanup() { this.ackedEvent.Dispose(); } + DebugHelper.WriteLog("Cleanup complete.", 2); } diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs index fad68f72b47..0f0d21d639e 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs @@ -50,11 +50,13 @@ protected XOperationContextBase Context { return this.context; } + set { this.context = value; } } + private XOperationContextBase context; }//End Class diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCmdletModuleInitialize.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCmdletModuleInitialize.cs index b496a963d93..9dfd6aa1036 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCmdletModuleInitialize.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCmdletModuleInitialize.cs @@ -46,6 +46,7 @@ public void OnImport() invoker.AddScript(string.Format(CultureInfo.CurrentUICulture, "Set-Alias -Name {0} -Value {1} -Option {2} -ErrorAction SilentlyContinue", alias.Name, alias.Value, alias.Options)); DebugHelper.WriteLog(@"Add commands {0} of {1} with option {2} to current runspace.", 1, alias.Name, alias.Value, alias.Options); } + System.Collections.ObjectModel.Collection psObjects = invoker.Invoke(); DebugHelper.WriteLog(@"Invoke results {0}.", 1, psObjects.Count); } @@ -77,18 +78,21 @@ internal CimCmdletAliasEntry(string name, string value) /// The string defining the name of this alias ///

internal string Name { get { return this._name; } } + private string _name; ///

/// The string defining real cmdlet name ///

internal string Value { get { return this._value; } } + private string _value = String.Empty; ///

/// The string defining real cmdlet name ///

internal ScopedItemOptions Options { get { return this._options; } } + private ScopedItemOptions _options = ScopedItemOptions.AllScope | ScopedItemOptions.ReadOnly; } diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs index b3fb43ba926..0b970304ece 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs @@ -45,6 +45,7 @@ internal string ParameterSetName return this.parameterSetName; } } + private readonly string parameterSetName = null; ///

@@ -57,6 +58,7 @@ internal bool IsMandatory return this.mandatory; } } + private readonly bool mandatory = false; } @@ -120,6 +122,7 @@ internal bool IsDefaultParameterSet return this.isDefaultParameterSet; } } + private readonly bool isDefaultParameterSet = false; ///

@@ -132,6 +135,7 @@ internal UInt32 MandatoryParameterCount return this.mandatoryParameterCount; } } + private readonly UInt32 mandatoryParameterCount = 0; ///

@@ -143,11 +147,13 @@ internal bool IsValueSet { return this.isValueSet; } + set { this.isValueSet = value; } } + private bool isValueSet = false; ///

@@ -159,11 +165,13 @@ internal bool IsValueSetAtBeginProcess { return this.isValueSetAtBeginProcess; } + set { this.isValueSetAtBeginProcess = value; } } + private bool isValueSetAtBeginProcess = false; ///

@@ -175,11 +183,13 @@ internal UInt32 SetMandatoryParameterCount { return this.setMandatoryParameterCount; } + set { this.setMandatoryParameterCount = value; } } + private UInt32 setMandatoryParameterCount = 0; ///

@@ -191,11 +201,13 @@ internal UInt32 SetMandatoryParameterCountAtBeginProcess { return this.setMandatoryParameterCountAtBeginProcess; } + set { this.setMandatoryParameterCountAtBeginProcess = value; } } + private UInt32 setMandatoryParameterCountAtBeginProcess = 0; } @@ -334,8 +346,10 @@ internal void SetParameter(string parameterName, bool isBeginProcess) { psEntry.SetMandatoryParameterCountAtBeginProcess++; } + DebugHelper.WriteLogEx("parameterset name = '{0}'; SetMandatoryParameterCount = '{1}'", 1, parameterDefinitionEntry.ParameterSetName, psEntry.SetMandatoryParameterCount); } + if (!psEntry.IsValueSet) { psEntry.IsValueSet = true; @@ -344,8 +358,10 @@ internal void SetParameter(string parameterName, bool isBeginProcess) psEntry.IsValueSetAtBeginProcess = true; } } + nameset.Add(parameterDefinitionEntry.ParameterSetName); } + this.parametersetNamesList = nameset; if (isBeginProcess) { @@ -368,6 +384,7 @@ internal void SetParameter(string parameterName, bool isBeginProcess) { psEntry.SetMandatoryParameterCountAtBeginProcess++; } + DebugHelper.WriteLogEx("parameterset name = '{0}'; SetMandatoryParameterCount = '{1}'", 1, entry.ParameterSetName, @@ -375,6 +392,7 @@ internal void SetParameter(string parameterName, bool isBeginProcess) } } } + if (nameset.Count == 0) { throw new PSArgumentException(Strings.UnableToResolveParameterSetName); @@ -420,12 +438,15 @@ internal string GetParameterSet() { defaultParameterSetName = parameterSetName; } + if (entry.IsValueSet) { noMandatoryParameterSet.Add(parameterSetName); } + continue; } + if ((entry.SetMandatoryParameterCount == entry.MandatoryParameterCount) && this.parametersetNamesList.Contains(parameterSetName)) { @@ -433,6 +454,7 @@ internal string GetParameterSet() { throw new PSArgumentException(Strings.UnableToResolveParameterSetName); } + boundParameterSetName = parameterSetName; } } @@ -462,6 +484,7 @@ internal string GetParameterSet() { throw new PSArgumentException(Strings.UnableToResolveParameterSetName); } + return boundParameterSetName; } @@ -516,6 +539,7 @@ internal void CheckParameterSet() this.parameterBinder.reset(); } } + DebugHelper.WriteLog("current parameterset is: " + this.parameterSetName, 4); } @@ -533,6 +557,7 @@ internal void SetParameter(object value, string parameterName) { return; } + if (this.parameterBinder != null) { this.parameterBinder.SetParameter(parameterName, this.AtBeginProcess); @@ -684,6 +709,7 @@ internal bool AtBeginProcess { return this.atBeginProcess; } + set { this.atBeginProcess = value; @@ -709,6 +735,7 @@ internal CimAsyncOperation AsyncOperation this.operation = value; } } + get { return this.operation; @@ -924,8 +951,10 @@ internal void ThrowInvalidProperty( { propList.Append(","); } + propList.Append(property); } + string message = String.Format(CultureInfo.CurrentUICulture, Strings.CouldNotFindPropertyFromGivenClass, className, propList); PSArgumentOutOfRangeException exception = new PSArgumentOutOfRangeException( @@ -975,8 +1004,10 @@ internal CimCredential CreateCimCredentials(PSCredential psCredentials, ThrowInvalidAuthenticationTypeError(operationName, parameterName, passwordAuthentication); return null; } + credentials = new CimCredential(impersonatedAuthentication); } + DebugHelper.WriteLogEx("return credential {0}", 1, credentials); return credentials; } diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs index 524f1c928ad..64c2e3b31e8 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs @@ -44,6 +44,7 @@ public void GetCimAssociatedInstance(GetCimAssociatedInstanceCommand cmdlet) // try to use namespace of ciminstance, then fall back to default namespace nameSpace = ConstValue.GetNamespace(cmdlet.CimInstance.CimSystemProperties.Namespace); } + List proxys = new List(); switch (cmdlet.ParameterSetName) { @@ -53,6 +54,7 @@ public void GetCimAssociatedInstance(GetCimAssociatedInstanceCommand cmdlet) CimSessionProxy proxy = CreateSessionProxy(computerName, cmdlet.CimInstance, cmdlet); proxys.Add(proxy); } + break; case CimBaseCommand.SessionSetName: foreach (CimSession session in cmdlet.CimSession) @@ -60,10 +62,12 @@ public void GetCimAssociatedInstance(GetCimAssociatedInstanceCommand cmdlet) CimSessionProxy proxy = CreateSessionProxy(session, cmdlet); proxys.Add(proxy); } + break; default: return; } + foreach (CimSessionProxy proxy in proxys) { proxy.EnumerateAssociatedInstancesAsync( diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs index 61a1fbcdd02..2965cac5ba6 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs @@ -50,8 +50,10 @@ internal CimGetCimClassContext( public String ClassName { get { return className; } + set { className = value; } } + private String className; ///

@@ -65,6 +67,7 @@ internal String MethodName { get { return methodName; } } + private String methodName; ///

@@ -78,6 +81,7 @@ internal String PropertyName { get { return propertyName; } } + private String propertyName; ///

@@ -91,6 +95,7 @@ internal String QualifierName { get { return qualifierName; } } + private String qualifierName; } @@ -140,6 +145,7 @@ public void GetCimClass(GetCimClassCommand cmdlet) proxys.Add(proxy); } } + break; case CimBaseCommand.SessionSetName: { @@ -150,6 +156,7 @@ public void GetCimClass(GetCimClassCommand cmdlet) proxys.Add(proxy); } } + break; default: return; diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs index 41b6434ad0f..e0fecd62101 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs @@ -40,6 +40,7 @@ public object Process(object resultObject) obj.TypeNames.Insert(0, PartialPSTypeName); return obj; } + return resultObject; } } @@ -96,8 +97,10 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) { this.SetPreProcess(proxy, cmdlet as GetCimInstanceCommand); } + proxys.Add(proxy); } + break; case CimBaseCommand.ClassNameComputerSet: case CimBaseCommand.QueryComputerSet: @@ -109,8 +112,10 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) { this.SetPreProcess(proxy, cmdlet as GetCimInstanceCommand); } + proxys.Add(proxy); } + break; case CimBaseCommand.ClassNameSessionSet: case CimBaseCommand.CimInstanceSessionSet: @@ -123,12 +128,15 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) { this.SetPreProcess(proxy, cmdlet as GetCimInstanceCommand); } + proxys.Add(proxy); } + break; default: break; } + switch (cmdlet.ParameterSetName) { case CimBaseCommand.ClassNameComputerSet: @@ -152,6 +160,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) proxy.EnumerateInstancesAsync(nameSpace, GetClassName(cmdlet)); } } + break; case CimBaseCommand.CimInstanceComputerSet: case CimBaseCommand.CimInstanceSessionSet: @@ -163,6 +172,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) proxy.GetInstanceAsync(nameSpace, instance); } } + break; case CimBaseCommand.QueryComputerSet: case CimBaseCommand.QuerySessionSet: @@ -173,6 +183,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) ConstValue.GetQueryDialectWithDefault(GetQueryDialect(cmdlet)), GetQuery(cmdlet)); } + break; case CimBaseCommand.ResourceUriSessionSet: case CimBaseCommand.ResourceUriComputerSet: @@ -180,6 +191,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet) { proxy.EnumerateInstancesAsync(GetNamespace(cmdlet), GetClassName(cmdlet)); } + break; default: break; @@ -202,6 +214,7 @@ protected static String[] GetComputerName(CimBaseCommand cmdlet) { return (cmdlet as SetCimInstanceCommand).ComputerName; } + return null; } @@ -219,6 +232,7 @@ protected static String GetNamespace(CimBaseCommand cmdlet) { return (cmdlet as SetCimInstanceCommand).Namespace; } + return null; } @@ -236,6 +250,7 @@ protected static CimSession[] GetCimSession(CimBaseCommand cmdlet) { return (cmdlet as SetCimInstanceCommand).CimSession; } + return null; } @@ -245,6 +260,7 @@ protected static String GetClassName(CimBaseCommand cmdlet) { return (cmdlet as GetCimInstanceCommand).ClassName; } + return null; } @@ -262,6 +278,7 @@ protected static String GetQuery(CimBaseCommand cmdlet) { return (cmdlet as SetCimInstanceCommand).Query; } + return null; } @@ -276,6 +293,7 @@ internal static bool IsClassNameQuerySet(CimBaseCommand cmdlet) return true; } } + return false; } @@ -298,13 +316,16 @@ protected static String CreateQuery(CimBaseCommand cmdlet) { propertyList.Append(","); } + propertyList.Append(property); } } + return (cmd.Filter == null) ? String.Format(CultureInfo.CurrentUICulture, queryWithoutWhere, propertyList, cmd.ClassName) : String.Format(CultureInfo.CurrentUICulture, queryWithWhere, propertyList, cmd.ClassName, cmd.Filter); } + return null; } @@ -322,6 +343,7 @@ protected static String GetQueryDialect(CimBaseCommand cmdlet) { return (cmdlet as SetCimInstanceCommand).QueryDialect; } + return null; } @@ -339,6 +361,7 @@ protected static CimInstance GetCimInstanceParameter(CimBaseCommand cmdlet) { return (cmdlet as SetCimInstanceCommand).CimInstance; } + return null; } #endregion @@ -375,6 +398,7 @@ private void SetSessionProxyProperties( { proxy.ResourceUri = removeCimInstance.ResourceUri; } + CimRemoveCimInstanceContext context = new CimRemoveCimInstanceContext( ConstValue.GetNamespace(removeCimInstance.Namespace), proxy); @@ -388,6 +412,7 @@ private void SetSessionProxyProperties( { proxy.ResourceUri = setCimInstance.ResourceUri; } + CimSetCimInstanceContext context = new CimSetCimInstanceContext( ConstValue.GetNamespace(setCimInstance.Namespace), setCimInstance.Property, diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs index c32c1f3a7b5..888a1efff4a 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs @@ -31,6 +31,7 @@ public Object Context return context; } } + internal Object context; } @@ -51,6 +52,7 @@ public Exception Exception return exception; } } + private Exception exception; ///

@@ -263,6 +265,7 @@ public bool EnableRaisingEvents { return enableRaisingEvents; } + set { DebugHelper.WriteLogEx(); @@ -273,6 +276,7 @@ public bool EnableRaisingEvents } } } + private bool enableRaisingEvents; ///

@@ -306,6 +310,7 @@ public void Start() this.queryExpression, this.operationTimeout); } + status = Status.Started; } } @@ -329,6 +334,7 @@ public void Stop() DebugHelper.WriteLog("Dispose CimRegisterCimIndication object", 4); this.cimRegisterCimIndication.Dispose(); } + status = Status.Stopped; } } diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs index 33e7e1e9fc0..2c59d1d32cf 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs @@ -56,6 +56,7 @@ internal string MethodName return this.methodName; } } + private string methodName; ///

@@ -68,6 +69,7 @@ internal CimMethodParametersCollection ParametersCollection return this.collection; } } + private CimMethodParametersCollection collection; } @@ -101,6 +103,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) { proxys.Add(CreateSessionProxy(computerName, cmdlet.CimInstance, cmdlet)); } + break; case CimBaseCommand.ClassNameComputerSet: case CimBaseCommand.CimClassComputerSet: @@ -110,6 +113,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) { proxys.Add(CreateSessionProxy(computerName, cmdlet)); } + break; case CimBaseCommand.ClassNameSessionSet: case CimBaseCommand.CimClassSessionSet: @@ -121,10 +125,12 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) CimSessionProxy proxy = CreateSessionProxy(session, cmdlet); proxys.Add(proxy); } + break; default: break; } + CimMethodParametersCollection paramsCollection = CreateParametersCollection(cmdlet.Arguments, cmdlet.CimClass, cmdlet.CimInstance, cmdlet.MethodName); @@ -145,12 +151,14 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) { nameSpace = ConstValue.GetNamespace(cmdlet.Namespace); } + foreach (CimSessionProxy proxy in proxys) { if (!cmdlet.ShouldProcess(target, action)) { return; } + proxy.InvokeMethodAsync( nameSpace, cmdlet.ClassName, @@ -158,6 +166,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) paramsCollection); } } + break; case CimBaseCommand.CimClassComputerSet: case CimBaseCommand.CimClassSessionSet: @@ -170,6 +179,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) { return; } + proxy.InvokeMethodAsync( nameSpace, cmdlet.CimClass.CimSystemProperties.ClassName, @@ -177,6 +187,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) paramsCollection); } } + break; case CimBaseCommand.QueryComputerSet: case CimBaseCommand.QuerySessionSet: @@ -193,6 +204,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) // firstly query instance and then invoke method upon returned instances proxy.QueryInstancesAsync(nameSpace, ConstValue.GetQueryDialectWithDefault(cmdlet.QueryDialect), cmdlet.Query); } + break; case CimBaseCommand.CimInstanceComputerSet: case CimBaseCommand.CimInstanceSessionSet: @@ -206,12 +218,14 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) { nameSpace = ConstValue.GetNamespace(cmdlet.CimInstance.CimSystemProperties.Namespace); } + foreach (CimSessionProxy proxy in proxys) { if (!cmdlet.ShouldProcess(target, action)) { return; } + proxy.InvokeMethodAsync( nameSpace, cmdlet.CimInstance, @@ -219,6 +233,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet) paramsCollection); } } + break; default: break; @@ -394,6 +409,7 @@ private CimMethodParametersCollection CreateParametersCollection( throw new ArgumentException(String.Format( CultureInfo.CurrentUICulture, Strings.InvalidMethodParameter, parameterName, methodName, className)); } + parameter = CimMethodParameter.Create( parameterName, parameterValue, @@ -434,9 +450,11 @@ private CimMethodParametersCollection CreateParametersCollection( } } } + if (parameter != null) collection.Add(parameter); } + return collection; } #endregion diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs index 7543e21a184..2babc5e2484 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs @@ -81,6 +81,7 @@ public void NewCimInstance(NewCimInstanceCommand cmdlet) cmdlet); } + break; case CimBaseCommand.ResourceUriSessionSet: case CimBaseCommand.ResourceUriComputerSet: @@ -93,6 +94,7 @@ public void NewCimInstance(NewCimInstanceCommand cmdlet) cmdlet); } + break; case CimBaseCommand.CimClassComputerSet: case CimBaseCommand.CimClassSessionSet: @@ -103,6 +105,7 @@ public void NewCimInstance(NewCimInstanceCommand cmdlet) cmdlet); } + break; default: return; @@ -148,6 +151,7 @@ public void NewCimInstance(NewCimInstanceCommand cmdlet) proxys.Add(CreateSessionProxy(computerName, cmdlet)); } } + break; case CimBaseCommand.CimClassSessionSet: case CimBaseCommand.ClassNameSessionSet: @@ -156,6 +160,7 @@ public void NewCimInstance(NewCimInstanceCommand cmdlet) { proxys.Add(CreateSessionProxy(session, cmdlet)); } + break; } @@ -289,6 +294,7 @@ private CimInstance CreateCimInstance( { flag = CimFlags.Key; } + object propertyValue = GetBaseObject(enumerator.Value); DebugHelper.WriteLog("Create and add new property to ciminstance: name = {0}; value = {1}; flags = {2}", 5, propertyName, propertyValue, flag); @@ -309,6 +315,7 @@ private CimInstance CreateCimInstance( } } + return cimInstance; } @@ -333,6 +340,7 @@ private CimInstance CreateCimInstance( { return cimInstance; } + List notfoundProperties = new List(); foreach (string property in properties.Keys) { @@ -342,9 +350,11 @@ private CimInstance CreateCimInstance( cmdlet.ThrowInvalidProperty(notfoundProperties, cmdlet.CimClass.CimSystemProperties.ClassName, @"Property", action, properties); return null; } + object propertyValue = GetBaseObject(properties[property]); cimInstance.CimInstanceProperties[property].Value = propertyValue; } + return cimInstance; } diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs index d8a49bd9857..6f5e5e07369 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs @@ -82,6 +82,7 @@ public override void Execute(CmdletOperationBase cmdlet) // unblocking the waiting thread this.OnComplete(); } + break; case CimPromptType.Normal: try @@ -106,10 +107,12 @@ public override void Execute(CmdletOperationBase cmdlet) // unblocking the waiting thread this.OnComplete(); } + break; default: break; } + this.OnComplete(); } @@ -125,6 +128,7 @@ public string Message return message; } } + private string message; ///

diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs index 909f994a445..127489f66f9 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs @@ -32,6 +32,7 @@ public Object Context return context; } } + protected Object context; } @@ -54,6 +55,7 @@ public CimSubscriptionResult Result return result; } } + private CimSubscriptionResult result; ///

@@ -87,6 +89,7 @@ public Exception Exception return exception; } } + private Exception exception; ///

@@ -169,6 +172,7 @@ public void RegisterCimIndication( { throw new ArgumentNullException(String.Format(CultureInfo.CurrentUICulture, Strings.NullArgument, @"cimSession")); } + this.TargetComputerName = cimSession.ComputerName; CimSessionProxy proxy = CreateSessionProxy(cimSession, operationTimeout); proxy.SubscribeAsync(nameSpace, queryDialect, queryExpression); @@ -224,6 +228,7 @@ private void CimIndicationHandler(object cimSession, CmdletActionEventArgs actio this.ackedEvent.Set(); return; } + EventHandler temp = this.OnNewSubscriptionResult; if (temp != null) { @@ -231,6 +236,7 @@ private void CimIndicationHandler(object cimSession, CmdletActionEventArgs actio temp(this, new CimSubscriptionExceptionEventArgs(this.exception)); } + DebugHelper.WriteLog("Got an exception: {0}", 2, exception); } @@ -290,6 +296,7 @@ private void WaitForAckMessage() throw this.exception; } } + DebugHelper.WriteLogEx("ACK happened", 0); } #endregion @@ -364,6 +371,7 @@ internal Exception Exception return exception; } } + private Exception exception; #endregion diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs index c9454f8e6c8..9c6d5687667 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs @@ -70,16 +70,19 @@ public void RemoveCimInstance(RemoveCimInstanceCommand cmdlet) { proxys.Add(CreateSessionProxy(computerName, cmdlet.CimInstance, cmdlet)); } + break; case CimBaseCommand.CimInstanceSessionSet: foreach (CimSession session in GetCimSession(cmdlet)) { proxys.Add(CreateSessionProxy(session, cmdlet)); } + break; default: break; } + switch (cmdlet.ParameterSetName) { case CimBaseCommand.CimInstanceComputerSet: @@ -93,6 +96,7 @@ public void RemoveCimInstance(RemoveCimInstanceCommand cmdlet) { nameSpace = ConstValue.GetNamespace(GetCimInstanceParameter(cmdlet).CimSystemProperties.Namespace); } + string target = cmdlet.CimInstance.ToString(); foreach (CimSessionProxy proxy in proxys) { @@ -100,8 +104,10 @@ public void RemoveCimInstance(RemoveCimInstanceCommand cmdlet) { return; } + proxy.DeleteInstanceAsync(nameSpace, cmdlet.CimInstance); } + break; case CimBaseCommand.QueryComputerSet: case CimBaseCommand.QuerySessionSet: diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs index 8939e6d64e0..cc7ee1f35d8 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs @@ -50,6 +50,7 @@ internal object ErrorSource return this.errorSource; } } + private object errorSource; } #endregion @@ -334,6 +335,7 @@ public virtual void OnNext(T value) { return; } + this.OnNextCore(value); } @@ -349,6 +351,7 @@ protected CimSession CurrentSession return session; } } + private CimSession session; ///

@@ -466,6 +469,7 @@ public override void OnNext(CimMethodResultBase value) resultObject.Properties.Add(new PSNoteProperty(@"ItemValue", methodStreamedResult.ItemValue)); } } + if (resultObject != null) { resultObject.Properties.Add(new PSNoteProperty(@"PSComputerName", this.CurrentSession.ComputerName)); diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs index c020ab6d5b8..deecc99f951 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs @@ -31,6 +31,7 @@ public uint SessionId return this.sessionId; } } + private uint sessionId; ///

@@ -43,6 +44,7 @@ public Guid InstanceId return this.instanceId; } } + private Guid instanceId; ///

@@ -55,6 +57,7 @@ public string Name return this.name; } } + private string name; ///

@@ -67,6 +70,7 @@ public string ComputerName return this.computerName; } } + private string computerName; ///

@@ -79,6 +83,7 @@ public CimSession CimSession return this.cimSession; } } + private CimSession cimSession; ///

@@ -99,10 +104,12 @@ public string Protocol } } } + internal ProtocolType GetProtocolType() { return protocol; } + private ProtocolType protocol; ///

@@ -148,6 +155,7 @@ internal PSObject GetPSObject() psObject.Properties[CimSessionState.computernamePropName].Value = this.ComputerName; psObject.Properties[CimSessionState.protocolPropName].Value = this.Protocol; } + return psObject; } } @@ -358,6 +366,7 @@ public void Cleanup() { session.Dispose(); } + curCimSessionWrapper.Clear(); curCimSessionsByName.Clear(); curCimSessionsByComputerName.Clear(); @@ -397,6 +406,7 @@ internal PSObject AddObjectToCache( objects = new HashSet(); this.curCimSessionsByComputerName.Add(computerName, objects); } + objects.Add(wrapper); if (!this.curCimSessionsByName.TryGetValue(name, out objects)) @@ -404,6 +414,7 @@ internal PSObject AddObjectToCache( objects = new HashSet(); this.curCimSessionsByName.Add(name, objects); } + objects.Add(wrapper); this.curCimSessionsByInstanceId.Add(instanceId, wrapper); @@ -431,20 +442,25 @@ internal string GetRemoveSessionObjectTarget(PSObject psObject) { id = Convert.ToUInt32(psObject.Properties[idPropName].Value, null); } + if (psObject.Properties[instanceidPropName].Value is Guid) { instanceId = (Guid)psObject.Properties[instanceidPropName].Value; } + if (psObject.Properties[namePropName].Value is String) { name = (String)psObject.Properties[namePropName].Value; } + if (psObject.Properties[computernamePropName].Value is String) { computerName = (String)psObject.Properties[computernamePropName].Value; } + message = String.Format(CultureInfo.CurrentUICulture, SessionObjectPath, id, instanceId, name, computerName); } + return message; } @@ -478,6 +494,7 @@ internal void RemoveOneSessionObjectFromCache(CimSession session) { return; } + CimSessionWrapper wrapper = this.curCimSessionWrapper[session]; String name = wrapper.Name; String computerName = wrapper.ComputerName; @@ -489,10 +506,12 @@ internal void RemoveOneSessionObjectFromCache(CimSession session) { objects.Remove(wrapper); } + if (this.curCimSessionsByName.TryGetValue(name, out objects)) { objects.Remove(wrapper); } + RemoveSessionInternal(session, wrapper); } @@ -566,6 +585,7 @@ internal IEnumerable QuerySession(IEnumerable ids, AddErrorRecord(ref errRecords, idPropName, id); } } + return sessions; } @@ -597,6 +617,7 @@ internal IEnumerable QuerySession(IEnumerable instanceIds, AddErrorRecord(ref errRecords, instanceidPropName, instanceid); } } + return sessions; } @@ -632,11 +653,13 @@ internal IEnumerable QuerySession(IEnumerable nameArray, } } } + if (!foundSession && !WildcardPattern.ContainsWildcardCharacters(name)) { AddErrorRecord(ref errRecords, namePropName, name); } } + return sessions; } @@ -669,11 +692,13 @@ internal IEnumerable QuerySessionByComputerName( } } } + if (!foundSession) { AddErrorRecord(ref errRecords, computernamePropName, computername); } } + return sessions; } @@ -705,6 +730,7 @@ internal IEnumerable QuerySession(IEnumerable cimsessions, AddErrorRecord(ref errRecords, CimSessionClassName, CimSessionObject); } } + return sessions; } @@ -732,6 +758,7 @@ internal CimSession QuerySession(Guid cimSessionInstanceId) CimSessionWrapper wrapper = this.curCimSessionsByInstanceId[cimSessionInstanceId]; return wrapper.CimSession; } + return null; } #endregion @@ -766,6 +793,7 @@ public CimSessionBase() { Runspace.DefaultRunspace.StateChanged += DefaultRunspace_StateChanged; } + return new CimSessionState(); }); } @@ -845,6 +873,7 @@ private static void DefaultRunspace_StateChanged(object sender, RunspaceStateEve DebugHelper.WriteLog(String.Format(CultureInfo.CurrentUICulture, DebugHelper.runspaceStateChanged, runspace.InstanceId, e.RunspaceStateInfo.State)); state.Dispose(); } + runspace.StateChanged -= DefaultRunspace_StateChanged; break; default: @@ -900,6 +929,7 @@ internal CimSessionWrapper CimSessionWrapper return this.cimSessionWrapper; } } + private CimSessionWrapper cimSessionWrapper; } @@ -937,6 +967,7 @@ internal void NewCimSession(NewCimSessionCommand cmdlet, sessionOptions = CimSessionProxy.CreateCimSessionOption(computerName, cmdlet.OperationTimeoutSec, credential); } + proxy = new CimSessionProxyTestConnection(computerName, sessionOptions); string computerNameValue = (computerName == ConstValue.NullComputerName) ? ConstValue.LocalhostComputerName : computerName; CimSessionWrapper wrapper = new CimSessionWrapper(0, Guid.Empty, cmdlet.Name, computerNameValue, proxy.CimSession, proxy.Protocol); @@ -1034,6 +1065,7 @@ protected bool Disposed return _disposed; } } + private bool _disposed; ///

@@ -1122,6 +1154,7 @@ public void GetCimSession(GetCimSessionCommand cmdlet) { sessionToGet = this.sessionState.QuerySessionByComputerName(cmdlet.ComputerName, out errorRecords); } + break; case CimBaseCommand.SessionIdSet: sessionToGet = this.sessionState.QuerySession(cmdlet.Id, out errorRecords); @@ -1135,6 +1168,7 @@ public void GetCimSession(GetCimSessionCommand cmdlet) default: break; } + if (sessionToGet != null) { foreach(PSObject psobject in sessionToGet) @@ -1142,6 +1176,7 @@ public void GetCimSession(GetCimSessionCommand cmdlet) cmdlet.WriteObject(psobject); } } + if (errorRecords != null) { foreach (ErrorRecord errRecord in errorRecords) @@ -1210,6 +1245,7 @@ public void RemoveCimSession(RemoveCimSessionCommand cmdlet) default: break; } + if (sessionToRemove != null) { foreach (PSObject psobject in sessionToRemove) @@ -1220,6 +1256,7 @@ public void RemoveCimSession(RemoveCimSessionCommand cmdlet) } } } + if (errorRecords != null) { foreach (ErrorRecord errRecord in errorRecords) diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs index b084c3408ca..aba1e469cd7 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs @@ -39,6 +39,7 @@ internal string Namespace return this.nameSpace; } } + protected string nameSpace; ///

@@ -53,6 +54,7 @@ internal CimSessionProxy Proxy return this.proxy; } } + protected CimSessionProxy proxy; } @@ -148,6 +150,7 @@ public CmdletActionEventArgs(CimBaseAction action) { this.Action = action; } + public readonly CimBaseAction Action; } @@ -169,6 +172,7 @@ public OperationEventArgs(IDisposable operationCancellation, this.operation = operation; this.success = theSuccess; } + public readonly IDisposable operationCancellation; public readonly IObservable