Remove ReleaseVersion from interface definition and ProjectRetargetHandler to avoid premature image load of assembly (#9779)

We will only use this internally in DotNetReleasesProvider

Author: phenning

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Retargeting/DotNetReleasesProvider.cs

@@ -115,8 +115,8 @@ private Task CreateDefaultFileIfNotExistAsync(string path, string resource, bool
         return await _product.GetValueAsync(cancellationToken);
     }
 
-    public async Task<ReleaseVersion?> GetSupportedOrLatestSdkVersionAsync(
-        ReleaseVersion? sdkVersion,
+    public async Task<string?> GetSupportedOrLatestSdkVersionAsync(
+        string? sdkVersion,
         bool includePreview = false,
         CancellationToken cancellationToken = default)
     {
@@ -129,27 +129,30 @@ private Task CreateDefaultFileIfNotExistAsync(string path, string resource, bool
 
         if (sdkVersion is not null)
         {
-            // Find the product that matches the major/minor version of the SDK
-            Product matchingProduct = products.FirstOrDefault( p => p.LatestSdkVersion.Major == sdkVersion.Major &&
-                p.LatestSdkVersion.Minor == sdkVersion.Minor && p.LatestSdkVersion.IsLaterThan(sdkVersion));
-
-            if (matchingProduct is not null)
+            if (ReleaseVersion.TryParse(sdkVersion, out ReleaseVersion parsedSdkVersion))
             {
-                try
-                {
-                    return await GetLatestSupportedSdkVersionAsync(sdkVersion, includePreview, matchingProduct);
-                }
-                catch
+                // Find the product that matches the major/minor version of the SDK
+                Product matchingProduct = products.FirstOrDefault(p => p.LatestSdkVersion.Major == parsedSdkVersion.Major &&
+                    p.LatestSdkVersion.Minor == parsedSdkVersion.Minor && p.LatestSdkVersion.IsLaterThan(sdkVersion));
+
+                if (matchingProduct is not null)
                 {
-                    // we can just fall through and return null here
+                    try
+                    {
+                        return await GetLatestSupportedSdkVersionAsync(parsedSdkVersion, includePreview, matchingProduct);
+                    }
+                    catch
+                    {
+                        // we can just fall through and return null here
+                    }
                 }
             }
         }
 
         return null;
     }
 
-    private async Task<ReleaseVersion?> GetLatestSupportedSdkVersionAsync(ReleaseVersion? currentVersion, bool includePreview, Product matchingProduct)
+    private async Task<string?> GetLatestSupportedSdkVersionAsync(ReleaseVersion? currentVersion, bool includePreview, Product matchingProduct)
     {
         string resourceFileName = Path.Combine(AppDataPath, RetargetingAppDataFolder, $"{matchingProduct.ProductVersion}{ReleasesFileName}");
 
@@ -197,15 +200,15 @@ private Task CreateDefaultFileIfNotExistAsync(string path, string resource, bool
             if (currentVersion is not null
                 && string.Equals(currentVersion.ToString(), latestSdk.Version.ToString(), StringComparison.OrdinalIgnoreCase))
             {
-                return currentVersion;
+                return currentVersion.ToString();
             }
 
-            return ReleaseVersion.Parse(latestSdk.DisplayVersion.ToString());
+            return latestSdk.DisplayVersion.ToString();
         }
 
         return null;
     }
-    
+
     private async Task<IReadOnlyCollection<ProductRelease>?> GetReleasesAsync(Product product, string resourceFileName, string version, bool forceLocalFile = false, CancellationToken cancellationToken = default)
     {
         try

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Retargeting/IDotNetReleasesProvider.cs

@@ -1,7 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
-using Microsoft.Deployment.DotNet.Releases;
-
 namespace Microsoft.VisualStudio.ProjectSystem.VS.Retargeting;
 
 /// <summary>
@@ -18,8 +16,8 @@ internal interface IDotNetReleasesProvider
     /// <returns>
     /// A task that represents the asynchronous operation. The task result contains the supported or latest SDK version as a string, or null if no suitable version is found.
     /// </returns>
-    Task<ReleaseVersion?> GetSupportedOrLatestSdkVersionAsync(
-        ReleaseVersion? sdkVersion,
+    Task<string?> GetSupportedOrLatestSdkVersionAsync(
+        string? sdkVersion,
         bool includePreview = false,
         CancellationToken cancellationToken = default);
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Retargeting/ProjectRetargetHandler.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System.Text.Json;
-using Microsoft.Deployment.DotNet.Releases;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
@@ -76,14 +75,14 @@ public Task RetargetAsync(TextWriter outputLogger, RetargetOptions options, IPro
 
     private async Task<TargetChange?> GetTargetChangeAsync(IVsTrackProjectRetargeting2 retargetingService)
     {
-        ReleaseVersion? sdkVersion = await GetSdkVersionForProjectAsync();
+        string? sdkVersion = await GetSdkVersionForProjectAsync();
 
         if (sdkVersion is null)
         {
             return null;
         }
 
-        ReleaseVersion? retargetVersion = await _releasesProvider.Value.GetSupportedOrLatestSdkVersionAsync(sdkVersion, includePreview: true);
+        string? retargetVersion = await _releasesProvider.Value.GetSupportedOrLatestSdkVersionAsync(sdkVersion, includePreview: true);
 
         if (retargetVersion is null || sdkVersion == retargetVersion)
         {
@@ -132,7 +131,7 @@ public Task RetargetAsync(TextWriter outputLogger, RetargetOptions options, IPro
         return null;
     }
 
-    private async Task<ReleaseVersion?> GetSdkVersionForProjectAsync()
+    private async Task<string?> GetSdkVersionForProjectAsync()
     {
         string projectDirectory = _unconfiguredProject.GetProjectDirectory();
 
@@ -148,12 +147,7 @@ public Task RetargetAsync(TextWriter outputLogger, RetargetOptions options, IPro
                     if (doc.RootElement.TryGetProperty("sdk", out JsonElement sdkProp) &&
                         sdkProp.TryGetProperty("version", out JsonElement versionProp))
                     {
-                        if (ReleaseVersion.TryParse(versionProp.GetString(), out ReleaseVersion parsedVersions))
-                        {
-                            return parsedVersions;
-                        }
-
-                        return null;
+                        return versionProp.GetString();
                     }
                 }
                 catch /* ignore errors */