Fix KnownFrameworkReference

Samsung · Jun 13, 2023 · a4e22eb · a4e22eb
1 parent fafcc4e
commit a4e22eb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/workload/build/Versions.props b/workload/build/Versions.props
@@ -15,7 +15,7 @@
        example: -preview.3.100+sha12345
   -->
   <PropertyGroup>
-    <TizenWorkloadVersion>7.0.118</TizenWorkloadVersion>
+    <TizenWorkloadVersion>7.0.121</TizenWorkloadVersion>
   </PropertyGroup>
 
   <!-- 

diff --git a/workload/scripts/workload-install.ps1 b/workload/scripts/workload-install.ps1
@@ -32,20 +32,20 @@ $LatestVersionMap = @{
     "$ManifestBaseName-6.0.100" = "7.0.101";
     "$ManifestBaseName-6.0.200" = "7.0.100-preview.13.6";
     "$ManifestBaseName-6.0.300" = "7.0.304";
-    "$ManifestBaseName-6.0.400" = "7.0.116";
+    "$ManifestBaseName-6.0.400" = "7.0.119";
     "$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.117";
+    "$ManifestBaseName-7.0.300" = "7.0.120";
     "$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";
     "$ManifestBaseName-8.0.100-preview.4" = "7.0.108";
     "$ManifestBaseName-8.0.100-preview.5" = "7.0.110";
-    "$ManifestBaseName-8.0.100-preview.6" = "7.0.118";
+    "$ManifestBaseName-8.0.100-preview.6" = "7.0.121";
 }
 
 function New-TemporaryDirectory {

diff --git a/workload/scripts/workload-install.sh b/workload/scripts/workload-install.sh
@@ -17,20 +17,20 @@ 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=7.0.304"
-    "$MANIFEST_BASE_NAME-6.0.400=7.0.116"
+    "$MANIFEST_BASE_NAME-6.0.400=7.0.119"
     "$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.117"
+    "$MANIFEST_BASE_NAME-7.0.300=7.0.120"
     "$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"
     "$MANIFEST_BASE_NAME-8.0.100-preview.4=7.0.108"
     "$MANIFEST_BASE_NAME-8.0.100-preview.5=7.0.110"
-    "$MANIFEST_BASE_NAME-8.0.100-preview.6=7.0.118"
+    "$MANIFEST_BASE_NAME-8.0.100-preview.6=7.0.121"
     )
 
 while [ $# -ne 0 ]; do

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
@@ -19,7 +19,8 @@ Copyright (c) Samsung All rights reserved.
   <PropertyGroup>
     <TargetPlatformSupported>true</TargetPlatformSupported>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(_DefaultTargetPlatformVersion)</TargetPlatformVersion>
-    <TargetFramework Condition="$(TargetFramework.EndsWith('tizen'))">$(TargetFramework)$(_DefaultTargetPlatformVersion)</TargetFramework>
+    <_TargetFramework Condition="$(TargetFramework.EndsWith('tizen'))">$(TargetFramework)$(_DefaultTargetPlatformVersion)</_TargetFramework>
+    <_TargetFramework Condition="!$(TargetFramework.EndsWith('tizen'))">$(TargetFramework)</_TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -50,7 +51,7 @@ Copyright (c) Samsung All rights reserved.
   <ItemGroup>
     <KnownFrameworkReference
       Include="Samsung.Tizen"
-      TargetFramework="$(TargetFramework)"
+      TargetFramework="$(_TargetFramework)"
       TargetingPackName="Samsung.Tizen.Ref"
       TargetingPackVersion="**FromWorkload**"
       Profile="Tizen"