Merge branch 'net7.0' of https://github.com/Samsung/Tizen.NET into release/7.0.400

JoonghyunCho · JoonghyunCho · commit 6d832f16efa1 · 2025-10-20T11:27:29.000+09:00
diff --git a/.github/workflows/build-workload.yml b/.github/workflows/build-workload.yml
@@ -23,9 +23,9 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/release-workload.yml b/.github/workflows/release-workload.yml
@@ -14,9 +14,9 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -27,7 +27,7 @@ jobs:
       env:
         PRERELEASE_TAG: ${{ github.event.inputs.prerelease }}
         IS_STABLE_RELEASE_TAG: ${{ fromJson(github.event.inputs.isStableRelease) }}
-      run: make msi
+      run: make install
       working-directory: ./workload
 
     - name: Push packages to NuGet.org
diff --git a/workload/build/Versions.props b/workload/build/Versions.props
@@ -15,7 +15,7 @@
        example: -preview.3.100+sha12345
   -->
   <PropertyGroup>
-    <TizenWorkloadVersion>10.0.102</TizenWorkloadVersion>
+    <TizenWorkloadVersion>10.0.116</TizenWorkloadVersion>
   </PropertyGroup>
 
   <!-- 
@@ -26,7 +26,7 @@
     This version is used to generate Samsung.Tizen.Ref package.
   -->
   <PropertyGroup>
-    <TizenFXVersion>13.0.0.18659</TizenFXVersion>
+    <TizenFXVersion>13.0.0.19191</TizenFXVersion>
   </PropertyGroup>
 
   <!--
diff --git a/workload/scripts/workload-install.ps1 b/workload/scripts/workload-install.ps1
@@ -32,15 +32,15 @@ $LatestVersionMap = @{
     "$ManifestBaseName-6.0.100" = "7.0.101";
     "$ManifestBaseName-6.0.200" = "7.0.100-preview.13.6";
     "$ManifestBaseName-6.0.300" = "8.0.133";
-    "$ManifestBaseName-6.0.400" = "8.0.154";
+    "$ManifestBaseName-6.0.400" = "9.0.103";
     "$ManifestBaseName-7.0.100-preview.6" = "7.0.100-preview.6.14";
     "$ManifestBaseName-7.0.100-preview.7" = "7.0.100-preview.7.20";
     "$ManifestBaseName-7.0.100-rc.1" = "7.0.100-rc.1.22";
     "$ManifestBaseName-7.0.100-rc.2" = "7.0.100-rc.2.24";
     "$ManifestBaseName-7.0.100" = "7.0.103";
     "$ManifestBaseName-7.0.200" = "7.0.105";
     "$ManifestBaseName-7.0.300" = "7.0.120";
-    "$ManifestBaseName-7.0.400" = "10.0.102";
+    "$ManifestBaseName-7.0.400" = "10.0.116";
     "$ManifestBaseName-8.0.100-alpha.1" = "7.0.104";
     "$ManifestBaseName-8.0.100-preview.2" = "7.0.106";
     "$ManifestBaseName-8.0.100-preview.3" = "7.0.107";
diff --git a/workload/scripts/workload-install.sh b/workload/scripts/workload-install.sh
@@ -17,15 +17,15 @@ LatestVersionMap=(
     "$MANIFEST_BASE_NAME-6.0.100=7.0.101"
     "$MANIFEST_BASE_NAME-6.0.200=7.0.100-preview.13.6"
     "$MANIFEST_BASE_NAME-6.0.300=8.0.133"
-    "$MANIFEST_BASE_NAME-6.0.400=8.0.154"
+    "$MANIFEST_BASE_NAME-6.0.400=9.0.103"
     "$MANIFEST_BASE_NAME-7.0.100-preview.6=7.0.100-preview.6.14"
     "$MANIFEST_BASE_NAME-7.0.100-preview.7=7.0.100-preview.7.20"
     "$MANIFEST_BASE_NAME-7.0.100-rc.1=7.0.100-rc.1.22"
     "$MANIFEST_BASE_NAME-7.0.100-rc.2=7.0.100-rc.2.24"
     "$MANIFEST_BASE_NAME-7.0.100=7.0.103"
     "$MANIFEST_BASE_NAME-7.0.200=7.0.105"
     "$MANIFEST_BASE_NAME-7.0.300=7.0.120"
-    "$MANIFEST_BASE_NAME-7.0.400=10.0.102"
+    "$MANIFEST_BASE_NAME-7.0.400=10.0.116"
     "$MANIFEST_BASE_NAME-8.0.100-alpha.1=7.0.104"
     "$MANIFEST_BASE_NAME-8.0.100-preview.2=7.0.106"
     "$MANIFEST_BASE_NAME-8.0.100-preview.3=7.0.107"
diff --git a/workload/src/Samsung.NET.Sdk.Tizen/WorkloadManifest.in.json b/workload/src/Samsung.NET.Sdk.Tizen/WorkloadManifest.in.json
@@ -20,7 +20,7 @@
     },
     "Samsung.Tizen.Sdk.net6": {
       "kind": "sdk",
-      "version": "9.0.101",
+      "version": "9.0.103",
       "alias-to": {
         "any": "Samsung.Tizen.Sdk"
       }
diff --git a/workload/src/Samsung.Tizen.Build.Tasks/MergeManifest.cs b/workload/src/Samsung.Tizen.Build.Tasks/MergeManifest.cs
@@ -38,12 +38,13 @@ public override bool Execute()
             Log.LogMessage(MessageImportance.High, "Base manifest file : {0}", MainManifestFile);
 
             foreach (var subManifest in subManifestFileList)
-                Log.LogMessage(MessageImportance.High, "Sub manifest file : {0}", subManifest.ItemSpec);
+                Log.LogMessage(MessageImportance.High, "Sub manifest file new : {0}", subManifest.ItemSpec);
 
-            Log.LogMessage(MessageImportance.High, "Result manifest file : {0}", ResultManifestFile);
+            Log.LogMessage(MessageImportance.High, "Result manifest file new : {0}", ResultManifestFile);
 
             var mainDoc = XDocument.Load(MainManifestFile);
             var ns = mainDoc.Root.GetDefaultNamespace();
+            var processedManifests = new List<string>();
 
             //Merge sub manifest to base manifest
             foreach (var subManifest in subManifestFileList)
@@ -54,9 +55,17 @@ public override bool Execute()
                     return !Log.HasLoggedErrors;
                 }
 
+
+                if (processedManifests.Contains(subManifest.ItemSpec))
+                {
+                    Log.LogMessage(MessageImportance.High, "Skipping duplicate sub manifest file : {0}", subManifest.ItemSpec);
+                    continue;
+                }
+
                 var subDoc = XDocument.Load(subManifest.ItemSpec);
 
                 var subElemList = subDoc.Root.Elements();
+
                 foreach (var subapp in subElemList)
                 {
                     if (subapp.Name.LocalName == "ui-application" ||
@@ -95,6 +104,7 @@ public override bool Execute()
                         mainDoc.Root.Add(subapp);
                     }
                 }
+                processedManifests.Add(subManifest.ItemSpec);
             }
 
             // Remove duplicate privilege
@@ -159,4 +169,4 @@ public int Compare(XElement x, XElement y)
             return x_order - y_order;
         }
     }
-}
+}
diff --git a/workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets b/workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets
@@ -26,7 +26,7 @@ Copyright (c) Samsung All rights reserved.
     <_TargetingPackVersion>**FromWorkload**</_TargetingPackVersion>
     <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('7.0'))">7.0.123</_TargetingPackVersion>
     <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('8.0'))">8.0.154</_TargetingPackVersion>
-    <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('9.0'))">9.0.101</_TargetingPackVersion>
+    <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('9.0'))">9.0.103</_TargetingPackVersion>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`},`
`21`	`21`	`"Samsung.Tizen.Sdk.net6": {`
`22`	`22`	`"kind": "sdk",`
`23`		`- "version": "9.0.101",`
	`23`	`+ "version": "9.0.103",`
`24`	`24`	`"alias-to": {`
`25`	`25`	`"any": "Samsung.Tizen.Sdk"`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ public override bool Execute()`
`38`	`38`	`Log.LogMessage(MessageImportance.High, "Base manifest file : {0}", MainManifestFile);`
`39`	`39`
`40`	`40`	`foreach (var subManifest in subManifestFileList)`
`41`		`- Log.LogMessage(MessageImportance.High, "Sub manifest file : {0}", subManifest.ItemSpec);`
	`41`	`+ Log.LogMessage(MessageImportance.High, "Sub manifest file new : {0}", subManifest.ItemSpec);`
`42`	`42`
`43`		`- Log.LogMessage(MessageImportance.High, "Result manifest file : {0}", ResultManifestFile);`
	`43`	`+ Log.LogMessage(MessageImportance.High, "Result manifest file new : {0}", ResultManifestFile);`
`44`	`44`
`45`	`45`	`var mainDoc = XDocument.Load(MainManifestFile);`
`46`	`46`	`var ns = mainDoc.Root.GetDefaultNamespace();`
	`47`	`+ var processedManifests = new List<string>();`
`47`	`48`
`48`	`49`	`//Merge sub manifest to base manifest`
`49`	`50`	`foreach (var subManifest in subManifestFileList)`
`@@ -54,9 +55,17 @@ public override bool Execute()`
`54`	`55`	`return !Log.HasLoggedErrors;`
`55`	`56`	`}`
`56`	`57`
	`58`	`+`
	`59`	`+ if (processedManifests.Contains(subManifest.ItemSpec))`
	`60`	`+ {`
	`61`	`+ Log.LogMessage(MessageImportance.High, "Skipping duplicate sub manifest file : {0}", subManifest.ItemSpec);`
	`62`	`+ continue;`
	`63`	`+ }`
	`64`	`+`
`57`	`65`	`var subDoc = XDocument.Load(subManifest.ItemSpec);`
`58`	`66`
`59`	`67`	`var subElemList = subDoc.Root.Elements();`
	`68`	`+`
`60`	`69`	`foreach (var subapp in subElemList)`
`61`	`70`	`{`
`62`	`71`	`if (subapp.Name.LocalName == "ui-application" \|\|`
`@@ -95,6 +104,7 @@ public override bool Execute()`
`95`	`104`	`mainDoc.Root.Add(subapp);`
`96`	`105`	`}`
`97`	`106`	`}`
	`107`	`+ processedManifests.Add(subManifest.ItemSpec);`
`98`	`108`	`}`
`99`	`109`
`100`	`110`	`// Remove duplicate privilege`
`@@ -159,4 +169,4 @@ public int Compare(XElement x, XElement y)`
`159`	`169`	`return x_order - y_order;`
`160`	`170`	`}`
`161`	`171`	`}`
`162`		`-}`
	`172`	`+}`