Update prepare workload

Change-Id: I072f8e390bfd13aee1e6c9e481e43e4a3cd7c17e

diff --git a/build/prepare_additional_packs.sh b/build/prepare_additional_packs.sh
index 7d68af2e8adf8c5926954afa83123eae7b5cd0d6..1eccd3b0eff6f63cba1eeef84dd3b344c6a3782e 100755 (executable)
--- a/build/prepare_additional_packs.sh
+++ b/build/prepare_additional_packs.sh
@@ -30,13 +30,6 @@ for pack in "${ADDITIONAL_FRAMEWORK_PACKS[@]}"; do
 done
 
 # Tizen workload
-SDK_MANIFESTS_DIR="$ROOT_DIR/sdk-manifests/${DOTNET_SDK_VERSION_BAND}/samsung.net.sdk.tizen"
-TEMPLATE_PACKS_DIR="$ROOT_DIR/template-packs"
-RUNTIME_PACKS_DIR="$PACKS_DIR/Samsung.NETCore.App.Runtime.tizen/${TIZEN_WORKLOAD_VERSION}"
-REF_PACKS_DIR="$PACKS_DIR/Samsung.Tizen.Ref/${TIZEN_WORKLOAD_VERSION}"
-SDK_PACKS_DIR="$PACKS_DIR/Samsung.Tizen.Sdk/${TIZEN_WORKLOAD_VERSION}"
-MEATADATA_DIR="$ROOT_DIR/metadata/workloads/$DOTNET_SDK_VERSION_BAND/InstalledWorkloads"
-
 rm -rf $TEMPLATE_PACKS_DIR
 rm -rf $ROOT_DIR/sdk-manifests
 rm -rf $PACKS_DIR/Samsung.NETCore.App.Runtime.tizen
@@ -44,46 +37,62 @@ rm -rf $PACKS_DIR/Samsung.Tizen.Ref
 rm -rf $PACKS_DIR/Samsung.Tizen.Sdk
 rm -rf $ROOT_DIR/metadata
 
-for pack in "${TIZEN_WORKLOAD_NUPKGS[@]}"; do
-    packname=($pack)
-    packversion=$TIZEN_WORKLOAD_VERSION
-
-    echo "Downloading $packname $packversion ..."
-    NUPKG=$TEMP_DIR/$packname.$packversion.nupkg
-    curl -s -o $NUPKG -L https://www.nuget.org/api/v2/package/$packname/$packversion
-
-    if [[ "$packname" == *"Template"* ]]; then
-        mkdir -p $TEMPLATE_PACKS_DIR
-        cp -rf $NUPKG $TEMPLATE_PACKS_DIR
-
-    elif [[ "$packname" == *"Manifest"* ]]; then
-        mkdir -p $SDK_MANIFESTS_DIR
-        mkdir -p $TEMP_DIR/manifest
-        unzip -q $NUPKG -d $TEMP_DIR/manifest
-        chmod 744 $TEMP_DIR/manifest/data/*
-        cp -rf $TEMP_DIR/manifest/data/* $SDK_MANIFESTS_DIR
-
-    elif [[ "$packname" == *"Runtime"* ]]; then
-        mkdir -p $RUNTIME_PACKS_DIR
-        unzip $NUPKG -d $RUNTIME_PACKS_DIR
-        chmod 764 $RUNTIME_PACKS_DIR/* -R
-        rm -fr $RUNTIME_PACKS_DIR/{package,_rels,'[Content_Types].xml'}
-
-    elif [[ "$packname" == *"Ref"* ]]; then
-        mkdir -p $REF_PACKS_DIR
-        unzip $NUPKG -d $REF_PACKS_DIR
-        chmod 764 $REF_PACKS_DIR/* -R
-        rm -fr $REF_PACKS_DIR/{package,_rels,'[Content_Types].xml'}
-
-    else
-        mkdir -p $SDK_PACKS_DIR
-        unzip $NUPKG -d $SDK_PACKS_DIR
-        chmod 764 $SDK_PACKS_DIR/* -R
-        rm -fr $SDK_PACKS_DIR/{package,_rels,'[Content_Types].xml'}
-    fi
+for workload in "${WORKLOAD_PACKS[@]}"; do
+    workloadinfo=($workload)
+    DOTNET_SDK_VERSION_BAND=${workloadinfo[0]}
+    TIZEN_WORKLOAD_VERSION=${workloadinfo[1]}
+
+    SDK_MANIFESTS_DIR="$ROOT_DIR/sdk-manifests/${DOTNET_SDK_VERSION_BAND}/samsung.net.sdk.tizen"
+    TEMPLATE_PACKS_DIR="$ROOT_DIR/template-packs"
+    RUNTIME_PACKS_DIR="$PACKS_DIR/Samsung.NETCore.App.Runtime.tizen/${TIZEN_WORKLOAD_VERSION}"
+    REF_PACKS_DIR="$PACKS_DIR/Samsung.Tizen.Ref/${TIZEN_WORKLOAD_VERSION}"
+    SDK_PACKS_DIR="$PACKS_DIR/Samsung.Tizen.Sdk/${TIZEN_WORKLOAD_VERSION}"
+    MEATADATA_DIR="$ROOT_DIR/metadata/workloads/$DOTNET_SDK_VERSION_BAND/InstalledWorkloads"
+
+    packname="Samsung.NET.Sdk.Tizen.Manifest-"${DOTNET_SDK_VERSION_BAND}
+    NUPKG=$TEMP_DIR/$packname.$TIZEN_WORKLOAD_VERSION.nupkg
+    curl -s -o $NUPKG -L https://www.nuget.org/api/v2/package/$packname/$TIZEN_WORKLOAD_VERSION
+
+    mkdir -p $SDK_MANIFESTS_DIR
+    mkdir -p $TEMP_DIR/manifest
+    unzip -q $NUPKG -d $TEMP_DIR/manifest
+    chmod 744 $TEMP_DIR/manifest/data/*
+    cp -rf $TEMP_DIR/manifest/data/* $SDK_MANIFESTS_DIR
+
+    for pack in "${SAMSUNG_NUPKGS[@]}"; do
+        packname=($pack)
+        packversion=$TIZEN_WORKLOAD_VERSION
+
+        echo "Downloading $packname $packversion ..."
+        NUPKG=$TEMP_DIR/$packname.$packversion.nupkg
+        curl -s -o $NUPKG -L https://www.nuget.org/api/v2/package/$packname/$packversion
+
+        if [[ "$packname" == *"Template"* ]]; then
+            mkdir -p $TEMPLATE_PACKS_DIR
+            cp -rf $NUPKG $TEMPLATE_PACKS_DIR
+
+        elif [[ "$packname" == *"Runtime"* ]]; then
+            mkdir -p $RUNTIME_PACKS_DIR
+            unzip $NUPKG -d $RUNTIME_PACKS_DIR
+            chmod 764 $RUNTIME_PACKS_DIR/* -R
+            rm -fr $RUNTIME_PACKS_DIR/{package,_rels,'[Content_Types].xml'}
+
+        elif [[ "$packname" == *"Ref"* ]]; then
+            mkdir -p $REF_PACKS_DIR
+            unzip $NUPKG -d $REF_PACKS_DIR
+            chmod 764 $REF_PACKS_DIR/* -R
+            rm -fr $REF_PACKS_DIR/{package,_rels,'[Content_Types].xml'}
+
+        else
+            mkdir -p $SDK_PACKS_DIR
+            unzip $NUPKG -d $SDK_PACKS_DIR
+            chmod 764 $SDK_PACKS_DIR/* -R
+            rm -fr $SDK_PACKS_DIR/{package,_rels,'[Content_Types].xml'}
+        fi
+    done
+
+    mkdir -p $MEATADATA_DIR
+    touch $MEATADATA_DIR/tizen
 done
 
-mkdir -p $MEATADATA_DIR
-touch $MEATADATA_DIR/tizen
-
 rm -fr $TEMP_DIR

diff --git a/build/versions.inc b/build/versions.inc
index c2cf3fdf9a121e8861fbee5c125280451f0bf288..f0a7e4069ed5cadd4a372c68ae96a6c47f372324 100644 (file)
--- a/build/versions.inc
+++ b/build/versions.inc
@@ -20,11 +20,13 @@ ADDITIONAL_FRAMEWORK_PACKS=(
     "Microsoft.NETCore.App.Host.linux-x64 8.0.11"
 )
 
-DOTNET_SDK_VERSION_BAND=8.0.400
-TIZEN_WORKLOAD_VERSION=10.0.103
+WORKLOAD_PACKS=(
+    "8.0.400 10.0.103"
+    "6.0.400 9.0.101"
+    "6.0.400 8.0.154"
+)
 
-TIZEN_WORKLOAD_NUPKGS=(
-    "Samsung.NET.Sdk.Tizen.Manifest-${DOTNET_SDK_VERSION_BAND}"
+SAMSUNG_NUPKGS=(
     "Samsung.NETCore.App.Runtime.tizen"
     "Samsung.Tizen.Ref"
     "Samsung.Tizen.Sdk"