mirror of
				https://github.com/actions/setup-dotnet.git
				synced 2025-10-31 15:33:44 +00:00 
			
		
		
		
	Update external install scripts
This commit is contained in:
		
							parent
							
								
									d9c317d9d5
								
							
						
					
					
						commit
						d6b77de15f
					
				
							
								
								
									
										14
									
								
								externals/install-dotnet.ps1
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								externals/install-dotnet.ps1
									
									
									
									
										vendored
									
									
								
							| @ -46,6 +46,7 @@ | ||||
|     Possible values: | ||||
|         - dotnet     - the Microsoft.NETCore.App shared runtime | ||||
|         - aspnetcore - the Microsoft.AspNetCore.App shared runtime | ||||
|         - windowsdesktop - the Microsoft.WindowsDesktop.App shared runtime | ||||
| .PARAMETER DryRun | ||||
|     If set it will not perform installation but instead display what command line to use to consistently install | ||||
|     currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link | ||||
| @ -83,7 +84,7 @@ param( | ||||
|    [string]$Version="Latest", | ||||
|    [string]$InstallDir="<auto>", | ||||
|    [string]$Architecture="<auto>", | ||||
|    [ValidateSet("dotnet", "aspnetcore", IgnoreCase = $false)] | ||||
|    [ValidateSet("dotnet", "aspnetcore", "windowsdesktop", IgnoreCase = $false)] | ||||
|    [string]$Runtime, | ||||
|    [Obsolete("This parameter may be removed in a future version of this script. The recommended alternative is '-Runtime dotnet'.")] | ||||
|    [switch]$SharedRuntime, | ||||
| @ -268,6 +269,10 @@ function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Co | ||||
|     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" | ||||
|     } | ||||
|     elseif (-not $Runtime) { | ||||
|         if ($Coherent) { | ||||
|             $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.coherent.version" | ||||
| @ -325,6 +330,9 @@ function Get-Download-Link([string]$AzureFeed, [string]$SpecificVersion, [string | ||||
|     elseif ($Runtime -eq "aspnetcore") { | ||||
|         $PayloadURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/aspnetcore-runtime-$SpecificVersion-win-$CLIArchitecture.zip" | ||||
|     } | ||||
|     elseif ($Runtime -eq "windowsdesktop") { | ||||
|         $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/windowsdesktop-runtime-$SpecificVersion-win-$CLIArchitecture.zip" | ||||
|     } | ||||
|     elseif (-not $Runtime) { | ||||
|         $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificVersion-win-$CLIArchitecture.zip" | ||||
|     } | ||||
| @ -564,6 +572,10 @@ elseif ($Runtime -eq "aspnetcore") { | ||||
|     $assetName = "ASP.NET Core Runtime" | ||||
|     $dotnetPackageRelativePath = "shared\Microsoft.AspNetCore.App" | ||||
| } | ||||
| elseif ($Runtime -eq "windowsdesktop") { | ||||
|     $assetName = ".NET Core Windows Desktop Runtime" | ||||
|     $dotnetPackageRelativePath = "shared\Microsoft.WindowsDesktop.App" | ||||
| } | ||||
| elseif (-not $Runtime) { | ||||
|     $assetName = ".NET Core SDK" | ||||
|     $dotnetPackageRelativePath = "sdk" | ||||
|  | ||||
							
								
								
									
										8
									
								
								externals/install-dotnet.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								externals/install-dotnet.sh
									
									
									
									
										vendored
									
									
								
							| @ -148,7 +148,7 @@ get_linux_platform_name() { | ||||
|             return 0 | ||||
|         elif [ -e /etc/redhat-release ]; then | ||||
|             local redhatRelease=$(</etc/redhat-release) | ||||
|             if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then | ||||
|             if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux "*" release 6."* ]]; then | ||||
|                 echo "rhel.6" | ||||
|                 return 0 | ||||
|             fi | ||||
| @ -612,6 +612,9 @@ copy_files_or_dirs_from_list() { | ||||
|         local target="$out_path/$path" | ||||
|         if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then | ||||
|             mkdir -p "$out_path/$(dirname "$path")" | ||||
|             if [ -d "$target" ]; then | ||||
|                 rm -rf "$target" | ||||
|             fi | ||||
|             cp -R $override_switch "$root_path/$path" "$target" | ||||
|         fi | ||||
|     done | ||||
| @ -868,6 +871,9 @@ do | ||||
|             runtime="$1" | ||||
|             if [[ "$runtime" != "dotnet" ]] && [[ "$runtime" != "aspnetcore" ]]; then | ||||
|                 say_err "Unsupported value for --runtime: '$1'. Valid values are 'dotnet' and 'aspnetcore'." | ||||
|                 if [[ "$runtime" == "windowsdesktop" ]]; then | ||||
|                     say_err "WindowsDesktop archives are manufactured for Windows platforms only." | ||||
|                 fi | ||||
|                 exit 1 | ||||
|             fi | ||||
|             ;; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user