Change .Result to .GetAwaiter().GetResult() (#3040)

icsharpcode · Jul 24, 2023 · f56881d · f56881d
1 parent b482ae9
commit f56881d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/ICSharpCode.ILSpyX/LoadedAssembly.cs b/ICSharpCode.ILSpyX/LoadedAssembly.cs
@@ -268,7 +268,7 @@ public string Text {
 						if (metadata.IsAssembly)
 						{
 							versionOrInfo = metadata.GetAssemblyDefinition().Version?.ToString();
-							var tfId = GetTargetFrameworkIdAsync().Result;
+							string tfId = GetTargetFrameworkIdAsync().GetAwaiter().GetResult();
 							if (!string.IsNullOrEmpty(tfId))
 								versionOrInfo += ", " + tfId.Replace("Version=", " ");
 						}
@@ -638,8 +638,8 @@ internal IAssemblyResolver GetAssemblyResolver(AssemblyListSnapshot snapshot,
 		private UniversalAssemblyResolver GetUniversalResolver(bool applyWinRTProjections)
 		{
 			return LazyInitializer.EnsureInitialized(ref this.universalResolver, () => {
-				var targetFramework = this.GetTargetFrameworkIdAsync().Result;
-				var runtimePack = this.GetRuntimePackAsync().Result;
+				var targetFramework = this.GetTargetFrameworkIdAsync().GetAwaiter().GetResult();
+				var runtimePack = this.GetRuntimePackAsync().GetAwaiter().GetResult();
 
 				var readerOptions = applyWinRTProjections
 					? MetadataReaderOptions.ApplyWindowsRuntimeProjections

diff --git a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs
@@ -56,8 +56,10 @@ protected override void LoadChildren()
 
 		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.WriteCommentLine(output, $"Detected TargetFramework-Id: {parentAssembly.LoadedAssembly.GetTargetFrameworkIdAsync().Result}");
-			language.WriteCommentLine(output, $"Detected RuntimePack: {parentAssembly.LoadedAssembly.GetRuntimePackAsync().Result}");
+			string targetFramework = parentAssembly.LoadedAssembly.GetTargetFrameworkIdAsync().GetAwaiter().GetResult();
+			string runtimePack = parentAssembly.LoadedAssembly.GetRuntimePackAsync().GetAwaiter().GetResult();
+			language.WriteCommentLine(output, $"Detected TargetFramework-Id: {targetFramework}");
+			language.WriteCommentLine(output, $"Detected RuntimePack: {runtimePack}");
 
 			App.Current.Dispatcher.Invoke(DispatcherPriority.Normal, new Action(EnsureLazyChildren));
 			output.WriteLine();