From: j-h.choi Date: Fri, 9 Dec 2022 05:59:27 +0000 (+0900) Subject: Add Tizen workload X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fref%2Ffor%2Ftizen;p=platform%2Fcore%2Fdotnet%2Fbuild-tools.git Add Tizen workload Change-Id: I2b98f3c2083148a88a814eacfdae7b422a526a93 --- diff --git a/build/prepare_additional_packs.sh b/build/prepare_additional_packs.sh old mode 100755 new mode 100644 index 4e6dcf51..7d68af2e --- a/build/prepare_additional_packs.sh +++ b/build/prepare_additional_packs.sh @@ -23,9 +23,67 @@ for pack in "${ADDITIONAL_FRAMEWORK_PACKS[@]}"; do # extract pack mkdir -p $PACKS_DIR/$packname/$packversion unzip -q $TEMP_DIR/$packname.$packversion.nupkg -d $PACKS_DIR/$packname/$packversion + chmod 775 $PACKS_DIR/$packname/$packversion/* -R # cleanup rm -fr $PACKS_DIR/$packname/$packversion/{package,_rels,'[Content_Types].xml',*.nuspec} 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 +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 +done + +mkdir -p $MEATADATA_DIR +touch $MEATADATA_DIR/tizen + rm -fr $TEMP_DIR diff --git a/build/versions.inc b/build/versions.inc index f422d28c..b27cf057 100644 --- a/build/versions.inc +++ b/build/versions.inc @@ -4,8 +4,22 @@ ADDITIONAL_FRAMEWORK_PACKS=( "NETStandard.Library.Ref 2.1.0" "Microsoft.NETCore.App.Ref 3.0.0" "Microsoft.NETCore.App.Ref 3.1.0" + "Microsoft.NETCore.App.Ref 6.0.9" "Microsoft.AspNetCore.App.Ref 3.0.1" - "Microsoft.AspNetCore.App.Ref 3.1.10" + "Microsoft.AspNetCore.App.Ref 3.1.10" + "Microsoft.AspNetCore.App.Ref 6.0.9" "Microsoft.NETCore.App.Host.linux-x64 3.0.3" "Microsoft.NETCore.App.Host.linux-x64 3.1.22" + "Microsoft.NETCore.App.Host.linux-x64 6.0.9" +) + +DOTNET_SDK_VERSION_BAND=6.0.100 +TIZEN_WORKLOAD_VERSION=7.0.101 + +TIZEN_WORKLOAD_NUPKGS=( + "Samsung.NET.Sdk.Tizen.Manifest-${DOTNET_SDK_VERSION_BAND}" + "Samsung.NETCore.App.Runtime.tizen" + "Samsung.Tizen.Ref" + "Samsung.Tizen.Sdk" + "Samsung.Tizen.Templates" ) \ No newline at end of file diff --git a/metadata/workloads/6.0.100/InstalledWorkloads/tizen b/metadata/workloads/6.0.100/InstalledWorkloads/tizen new file mode 100644 index 00000000..e69de29b diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec index 111388db..ed4bb424 100644 --- a/packaging/dotnet-build-tools.spec +++ b/packaging/dotnet-build-tools.spec @@ -86,6 +86,11 @@ cp -fr ./dotnet/* %{buildroot}%{SDK_PATH} # .NETCore Additional Packs cp -fr ./packs/* %{buildroot}%{SDK_PATH}/packs +# Tizen Workload +cp -rf ./sdk-manifests %{buildroot}%{SDK_PATH} +cp -rf ./template-packs %{buildroot}%{SDK_PATH} +cp -rf ./metadata %{buildroot}%{SDK_PATH} + # BuildTools cp -fr ./tools/* %{buildroot}%{TOOLS_PATH} ln -s %{TOOLS_PATH}/dotnet-build.sh %{buildroot}%{_bindir}/dotnet-build @@ -101,3 +106,7 @@ install -p -m 644 ./targets/Tizen.Pre.AOT.Reference.targets %{buildroot}%{SDK_PA %config(noreplace) %{_sysconfdir}/rpm/macros.dotnet-build-tools %{_bindir}/* %{TOOLS_PATH}/* + +%post +dotnet --version +dotnet workload list diff --git a/sdk-manifests/6.0.100/samsung.net.sdk.tizen/WorkloadManifest.json b/sdk-manifests/6.0.100/samsung.net.sdk.tizen/WorkloadManifest.json new file mode 100644 index 00000000..2e6ead77 --- /dev/null +++ b/sdk-manifests/6.0.100/samsung.net.sdk.tizen/WorkloadManifest.json @@ -0,0 +1,32 @@ +{ + "version": "7.0.101", + "workloads": { + "tizen": { + "description": ".NET SDK Workload for building Tizen applications.", + "packs": [ + "Samsung.Tizen.Sdk", + "Samsung.Tizen.Ref", + "Samsung.Tizen.Templates", + "Samsung.NETCore.App.Runtime.tizen" + ] + } + }, + "packs": { + "Samsung.Tizen.Sdk": { + "kind": "sdk", + "version": "7.0.101" + }, + "Samsung.Tizen.Ref": { + "kind": "framework", + "version": "7.0.101" + }, + "Samsung.Tizen.Templates": { + "kind": "template", + "version": "7.0.101" + }, + "Samsung.NETCore.App.Runtime.tizen": { + "kind": "framework", + "version": "7.0.101" + } + } +} diff --git a/sdk-manifests/6.0.100/samsung.net.sdk.tizen/WorkloadManifest.targets b/sdk-manifests/6.0.100/samsung.net.sdk.tizen/WorkloadManifest.targets new file mode 100644 index 00000000..e40625b9 --- /dev/null +++ b/sdk-manifests/6.0.100/samsung.net.sdk.tizen/WorkloadManifest.targets @@ -0,0 +1,7 @@ + + + + + + + diff --git a/template-packs/Samsung.Tizen.Templates.7.0.101.nupkg b/template-packs/Samsung.Tizen.Templates.7.0.101.nupkg new file mode 100644 index 00000000..fb70c629 Binary files /dev/null and b/template-packs/Samsung.Tizen.Templates.7.0.101.nupkg differ