Powershell: changed the location of windows desktop runtime starting 5.0 (#120)

* Powershell: changed the location of windows desktop runtime starting 5.0

* removed semicolons

* added comments, simplified the code

* tests

Author: vlada-shubina

src/dotnet-install.ps1

@@ -340,9 +340,8 @@ function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel) {
     elseif ($Runtime -eq "aspnetcore") {
         $VersionFileUrl = "$UncachedFeed/aspnetcore/Runtime/$Channel/latest.version"
     }
-    # Currently, the WindowsDesktop runtime is manufactured with the .Net core runtime
     elseif ($Runtime -eq "windowsdesktop") {
-        $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version"
+        $VersionFileUrl = "$UncachedFeed/WindowsDesktop/$Channel/latest.version"
     }
     elseif (-not $Runtime) {
         $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.version"
@@ -438,7 +437,16 @@ function Get-Download-Link([string]$AzureFeed, [string]$SpecificVersion, [string
         $PayloadURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/aspnetcore-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
     }
     elseif ($Runtime -eq "windowsdesktop") {
+        # The windows desktop runtime is part of the core runtime layout prior to 5.0
         $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/windowsdesktop-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
+        if ($SpecificVersion -match '^(\d+)\.(.*)$')
+        {
+            $majorVersion = [int]$Matches[1]
+            if ($majorVersion -ge 5)
+            {
+                $PayloadURL = "$AzureFeed/WindowsDesktop/$SpecificVersion/windowsdesktop-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip"
+            }
+        }
     }
     elseif (-not $Runtime) {
         $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificProductVersion-win-$CLIArchitecture.zip"
@@ -480,7 +488,16 @@ function Get-Product-Version([string]$AzureFeed, [string]$SpecificVersion) {
         $ProductVersionTxtURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/productVersion.txt"
     }
     elseif ($Runtime -eq "windowsdesktop") {
+        # The windows desktop runtime is part of the core runtime layout prior to 5.0
         $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/productVersion.txt"
+        if ($SpecificVersion -match '^(\d+)\.(.*)')
+        {
+            $majorVersion = [int]$Matches[1]
+            if ($majorVersion -ge 5)
+            {
+                $ProductVersionTxtURL = "$AzureFeed/WindowsDesktop/$SpecificVersion/productVersion.txt"
+            }
+        }
     }
     elseif (-not $Runtime) {
         $ProductVersionTxtURL = "$AzureFeed/Sdk/$SpecificVersion/productVersion.txt"

tests/Install-Scripts.Test/GivenThatIWantToInstallTheSdkFromAScript.cs

@@ -109,18 +109,36 @@ public void WhenRuntimeParametersArePassedToInstallScripts(string runtime, strin
         // [InlineData("release/5.0", "dotnet")] - Broken
         [InlineData("Current", "aspnetcore")]
         [InlineData("LTS", "aspnetcore")]
+        //[InlineData("1.0", "aspnetcore")] - Broken
+        //[InlineData("1.1", "aspnetcore")] - Broken
+        //[InlineData("2.0", "aspnetcore")] - Broken
+        [InlineData("2.2", "aspnetcore")]
+        [InlineData("3.0", "aspnetcore")]
+        [InlineData("3.1", "aspnetcore")]
+        [InlineData("5.0", "aspnetcore")]
         [InlineData("master", "aspnetcore")]
         [InlineData("2.2", "aspnetcore")]
         [InlineData("3.0", "aspnetcore")]
         [InlineData("3.1", "aspnetcore")]
         [InlineData("5.0", "aspnetcore")]
         [InlineData("release/2.1", "aspnetcore")]
         [InlineData("release/2.2", "aspnetcore")]
-        // [InlineData("release/3.0", "aspnetcore")] - Broken
-        // [InlineData("release/3.1", "aspnetcore")] - Broken
-        // [InlineData("release/5.0", "aspnetcore")] - Broken
+        //[InlineData("release/3.0", "aspnetcore")] - Broken
+        //[InlineData("release/3.1", "aspnetcore")] - Broken
+        //[InlineData("release/5.0", "aspnetcore")] - Broken 
+        [InlineData("Current", "windowsdesktop")]
+        [InlineData("LTS", "windowsdesktop")]
+        [InlineData("3.0", "windowsdesktop")]
+        [InlineData("3.1", "windowsdesktop")]
+        [InlineData("5.0", "windowsdesktop")]
+        [InlineData("master", "windowsdesktop")]
         public void WhenChannelResolvesToASpecificRuntimeVersion(string channel, string runtimeType)
         {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && runtimeType == "windowsdesktop")
+            {
+                //do not run windowsdesktop test on Linux environment
+                return;
+            }
             var args = new string[] { "-dryrun", "-channel", channel, "-runtime", runtimeType };
 
             var commandResult = CreateInstallCommand(args)
@@ -193,6 +211,26 @@ public void WhenChannelResolvesToASpecificSDKVersion(string channel)
             commandResult.Should().HaveStdOutContainingIgnoreCase("-version");
         }
 
+        [Theory]
+        [InlineData("5.0.1", "WindowsDesktop")]
+        [InlineData("3.1.10", "Runtime")]
+        public void CanResolveCorrectLocationBasedOnVersion(string version, string location)
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                //do not run windowsdesktop test on Linux environment
+                return;
+            }
+            string expectedLinkLog = $"Constructed primary named payload URL: {Environment.NewLine}https://dotnetcli.azureedge.net/dotnet/{location}/{version}";
+            var args = new string[] { "-version", version, "-runtime", "windowsdesktop", "-verbose", "-dryrun"};
+            var commandResult = CreateInstallCommand(args)
+                            .CaptureStdOut()
+                            .CaptureStdErr()
+                            .Execute();
+
+            commandResult.Should().Pass().And.HaveStdOutContaining(expectedLinkLog);
+        } 
+
         private static Command CreateInstallCommand(IEnumerable<string> args)
         {
             string path;