feat: drop vs2019 support, add vs2022 support, fix aspnetcore/runtime…

… sources search Fixes: #13
vchirikov · Aug 22, 2021 · 5604590 · 5604590
1 parent e340760
commit 5604590
Show file tree

Hide file tree

Showing 11 changed files with 472 additions and 670 deletions.
diff --git a/package.json b/package.json
diff --git a/src/GoToDnSpy/EnvDteExtensions.cs b/src/GoToDnSpy/EnvDteExtensions.cs
@@ -11,7 +11,7 @@ internal static class EnvDteExtensions
         public static T FindByNameOrDefault<T>(this Properties properties, string name)
         {
             if (properties == null || string.IsNullOrEmpty(name))
-                return default;
+                return default!;
 
             ThreadHelper.ThrowIfNotOnUIThread();
 
@@ -22,10 +22,10 @@ public static T FindByNameOrDefault<T>(this Properties properties, string name)
 
                 return (T) property.Value;
             }
-            return default;
+            return default!;
         }
 
-        public static ProjectItem FindByNameOrDefault(this ProjectItems collection, string name, bool recursive = false)
+        public static ProjectItem? FindByNameOrDefault(this ProjectItems collection, string name, bool recursive = false)
         {
             if (collection == null)
                 return null;
@@ -49,11 +49,11 @@ public static ProjectItem FindByNameOrDefault(this ProjectItems collection, stri
             return null;
         }
 
-        public static EnvDTE.ProjectItem FindProjectItemByNameOrDefault(this Project project, string name, bool recursive) // directory tree recursive find of files
+        public static ProjectItem? FindProjectItemByNameOrDefault(this Project project, string name, bool recursive) // directory tree recursive find of files
         {
             ThreadHelper.ThrowIfNotOnUIThread();
             // if it's real project we can use find
-            if (project.Kind != EnvDTE.Constants.vsProjectKindSolutionItems)
+            if (project.Kind != Constants.vsProjectKindSolutionItems)
             {
                 if (project.ProjectItems?.Count > 0)
                     return project.ProjectItems.FindByNameOrDefault(name, recursive);
@@ -76,11 +76,17 @@ public static EnvDTE.ProjectItem FindProjectItemByNameOrDefault(this Project pro
         /// <summary>
         /// Workaround from https://github.com/dotnet/project-system/issues/669
         /// </summary>
-        private static string GetProjectPropertyNetCoreWorkaround(this Project project, string name)
+        private static string? GetProjectPropertyNetCoreWorkaround(this Project project, string name)
         {
             var unconfiguredProject = project.AsUnconfiguredProject();
+            if (unconfiguredProject == null)
+                return null;
             var configuredProject = unconfiguredProject.GetSuggestedConfiguredProjectAsync().ConfigureAwait(false).GetAwaiter().GetResult();
-            var properties = configuredProject.Services.ProjectPropertiesProvider.GetCommonProperties();
+            if (configuredProject == null)
+                return null;
+            var properties = configuredProject.Services.ProjectPropertiesProvider?.GetCommonProperties();
+            if (properties == null)
+                return null;
             return properties.GetEvaluatedPropertyValueAsync(name).ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
@@ -90,7 +96,7 @@ private static string GetProjectPropertyNetCoreWorkaround(this Project project,
         /// <param name="project">EnvDTE proj</param>
         /// <param name="name">The property name.</param>
         /// <returns>string or null</returns>
-        public static string GetPropertyOrDefault(this Project project, string name)
+        public static string? GetPropertyOrDefault(this Project project, string name)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
             return (project.Properties.FindByNameOrDefault<string>(name)
@@ -106,7 +112,7 @@ public static string GetPropertyOrDefault(this Project project, string name)
         /// </summary>
         /// <param name="project">The project.</param>
         /// <returns>output filepath</returns>
-        public static string GetOutputFilename(this Project project)
+        public static string? GetOutputFilename(this Project project)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
             return (project.Properties.FindByNameOrDefault<string>("OutputFileName") ?? project.GetProjectPropertyNetCoreWorkaround("TargetFileName"))?.Trim();

diff --git a/src/GoToDnSpy/GACHelper.cs b/src/GoToDnSpy/GACHelper.cs
@@ -38,7 +38,7 @@ private static Dictionary<string, string> ReadGacAssemblyNames(string gacRoot)
 
                 foreach (var assemblyFile in Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories))
                 {
-                    AssemblyName assemblyName = null;
+                    AssemblyName? assemblyName = null;
                     try
                     {
                         assemblyName = AssemblyName.GetAssemblyName(assemblyFile);
@@ -57,9 +57,9 @@ private static Dictionary<string, string> ReadGacAssemblyNames(string gacRoot)
         /// Search assemblyName in GAC folders.
         /// First search in net framework 4, when search in gac net framework 2
         /// </summary>
-        /// <param name="assemblyName">Assembly name for search</param>
+        /// <param name="assemblyFullName">Assembly name for search</param>
         /// <returns>path to assembly or <c>null</c></returns>
-        public static string FindAssemblyInGac(string assemblyFullName)
+        public static string? FindAssemblyInGac(string assemblyFullName)
         {
             if (_gacNetframework4.Value.TryGetValue(assemblyFullName, out var result))
                 return result;