diff --git a/workload/build/Samsung.NET.Sdk.Tizen.proj b/workload/build/Samsung.NET.Sdk.Tizen.proj index b9b68a9d..76025369 100644 --- a/workload/build/Samsung.NET.Sdk.Tizen.proj +++ b/workload/build/Samsung.NET.Sdk.Tizen.proj @@ -13,6 +13,16 @@ workload manifest pack containing information about the Tizen .NET workload. $([System.Text.RegularExpressions.Regex]::Replace($(MicrosoftDotnetSdkInternalPackageVersion), `[-+].*$`, "")) + + + True + True + True + $(MicrosoftDotnetSdkInternalPackageVersion.Replace(`-`, `.`).Split(`.`)[3]) + $(MicrosoftDotnetSdkInternalPackageVersion.Replace(`-`, `.`).Split(`.`)[4]) + $(DotNetPreviewVersionBand)-$(PreviewTag).$(PreviewTagVersion) + + Samsung.NET.Sdk.Tizen.Manifest-$(DotNetPreviewVersionBand) Tizen .NET workload manifest. Please do not reference directly. diff --git a/workload/scripts/workload-install.ps1 b/workload/scripts/workload-install.ps1 index 0ba5be45..027ed97c 100644 --- a/workload/scripts/workload-install.ps1 +++ b/workload/scripts/workload-install.ps1 @@ -72,29 +72,29 @@ function Ensure-Directory([string]$TestDir) { } function Get-LatestVersion([string]$Id) { + $attempts=3 + $sleepInSeconds=3 + do + { + try + { + $Response = Invoke-WebRequest -Uri https://api.nuget.org/v3-flatcontainer/$Id/index.json -UseBasicParsing | ConvertFrom-Json + return $Response.versions | Select-Object -Last 1 + } + catch { + Write-Host "Id: $Id" + Write-Host "An exception was caught: $($_.Exception.Message)" + } + + $attempts-- + if ($attempts -gt 0) { Start-Sleep $sleepInSeconds } + } while ($attempts -gt 0) + if ($LatestVersionMap.ContainsKey($Id)) { Write-Host "Return cached latest version." return $LatestVersionMap.$Id } else { - $attempts=3 - $sleepInSeconds=3 - do - { - try - { - $Response = Invoke-WebRequest -Uri https://api.nuget.org/v3-flatcontainer/$Id/index.json -UseBasicParsing | ConvertFrom-Json - return $Response.versions | Select-Object -Last 1 - } - catch { - Write-Host "Id: $Id" - Write-Host "An exception was caught: $($_.Exception.Message)" - } - - $attempts-- - if ($attempts -gt 0) { Start-Sleep $sleepInSeconds } - } while ($attempts -gt 0) - Write-Error "Wrong Id: $Id" } } diff --git a/workload/scripts/workload-install.sh b/workload/scripts/workload-install.sh index 68b2b294..cffc976c 100755 --- a/workload/scripts/workload-install.sh +++ b/workload/scripts/workload-install.sh @@ -168,9 +168,9 @@ function install_tizenworkload() { # Check latest version of manifest. if [[ "$MANIFEST_VERSION" == "" ]]; then - MANIFEST_VERSION=$(getLatestVersion "$MANIFEST_NAME") + MANIFEST_VERSION=$(curl -s https://api.nuget.org/v3-flatcontainer/$MANIFEST_NAME/index.json | grep \" | tail -n 1 | tr -d '\r' | xargs) if [ ! "$MANIFEST_VERSION" ]; then - MANIFEST_VERSION=$(curl -s https://api.nuget.org/v3-flatcontainer/$MANIFEST_NAME/index.json | grep \" | tail -n 1 | tr -d '\r' | xargs) + MANIFEST_VERSION=$(getLatestVersion "$MANIFEST_NAME") if [[ -n $MANIFEST_VERSION ]]; then echo "Return cached latest version: $MANIFEST_VERSION" else