Browse Source

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

pull/3042/head
Christoph Wille 2 years ago committed by GitHub
parent
commit
f56881de32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      ICSharpCode.ILSpyX/LoadedAssembly.cs
  2. 6
      ILSpy/TreeNodes/ReferenceFolderTreeNode.cs

6
ICSharpCode.ILSpyX/LoadedAssembly.cs

@ -268,7 +268,7 @@ namespace ICSharpCode.ILSpyX @@ -268,7 +268,7 @@ namespace ICSharpCode.ILSpyX
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 @@ namespace ICSharpCode.ILSpyX @@ -638,8 +638,8 @@ namespace ICSharpCode.ILSpyX
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

6
ILSpy/TreeNodes/ReferenceFolderTreeNode.cs

@ -56,8 +56,10 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -56,8 +56,10 @@ namespace ICSharpCode.ILSpy.TreeNodes
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();

Loading…
Cancel
Save