Skip to content

Commit 6683b0a

Browse files
committed
[Tizen] Set IncludeTizenTargetFrameworks correctly
1 parent 5a0e923 commit 6683b0a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Directory.Build.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
<_MauiTargetPlatformIsTizen Condition="'$(_MauiTargetPlatformIdentifier)' == 'tizen'">True</_MauiTargetPlatformIsTizen>
1616

1717
<IncludeWindowsTargetFrameworks Condition="($([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full') or ('$(Packing)' == 'true')">true</IncludeWindowsTargetFrameworks>
18-
<IncludeTizenTargetFrameworks Condition="'$(CI)' == 'true'">true</IncludeTizenTargetFrameworks>
18+
<IncludeTizenTargetFrameworks Condition="'$(CI)' == 'true' or
19+
Exists('$(DOTNET_ROOT)\sdk-manifests\$(DotNetVersionBand)\samsung.net.sdk.tizen\WorkloadManifest.json') or
20+
Exists('$(ProgramFiles)\dotnet\sdk-manifests\$(DotNetVersionBand)\samsung.net.sdk.tizen\WorkloadManifest.json')">true</IncludeTizenTargetFrameworks>
1921
</PropertyGroup>
2022

2123
<PropertyGroup>

eng/pipelines/common/provision.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,11 @@ steps:
108108
condition: eq(variables['provisioningVS'], 'true')
109109
110110
- pwsh: |
111+
[xml] $fileXml = Get-Content "eng\Versions.props"
112+
$DotNetVersionBand = $fileXml.SelectSingleNode("Project/PropertyGroup/DotNetVersionBand").InnerText
113+
echo "Installing .NET $DotNetVersion"
111114
Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
112-
.\workload-install.ps1 -v 7.0.100-preview.13.6
115+
.\workload-install.ps1 -t $DotNetVersion
113116
displayName: 'Install Tizen'
114117
115118
# Prepare Both

0 commit comments

Comments
 (0)