Skip to content

Commit 2c631cd

Browse files
committed
Use **FromWorkload** for targeting version
Context: dotnet/sdk#19596
1 parent dab29ff commit 2c631cd

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

workload/build/Samsung.Tizen.Sdk.proj

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,15 @@ core workload sdk pack imported by the Samsung.NET.Sdk.Tizen.
2222
</PropertyGroup>
2323

2424
<Target Name="_GenerateSdkContent" DependsOnTargets="_GetBuildTasksAssets;_GetLicense">
25-
2625
<PropertyGroup>
2726
<_SDKSourceDirectory>$(_ProjectSourceDirectory)Samsung.Tizen.Sdk\</_SDKSourceDirectory>
28-
<_SDKReplacedTargetDirectory>$(OutputPath)sdk-targets\</_SDKReplacedTargetDirectory>
2927
</PropertyGroup>
3028

31-
<ItemGroup>
32-
<_TargetInputFiles Include="$(_SDKSourceDirectory)targets\*.in.targets" />
33-
</ItemGroup>
34-
35-
<RemoveDir Directories="$(_SDKReplacedTargetDirectory)" />
36-
<MakeDir Directories="$(_SDKReplacedTargetDirectory)" />
37-
<ReplaceFileContents
38-
SourceFile="%(_TargetInputFiles.FullPath)"
39-
DestinationFile="$(_SDKReplacedTargetDirectory)$([System.String]::Copy('%(Filename)%(Extension)').Replace('.in.targets','.targets'))"
40-
Replacements="@TIZEN_PACK_VERSION@=$(TizenPackVersion);">
41-
</ReplaceFileContents>
42-
4329
<ItemGroup>
4430
<_PackageFiles Include="$(_SDKSourceDirectory)certificate\*" PackagePath="certificate" />
4531
<_PackageFiles Include="$(_SDKSourceDirectory)Sdk\*" PackagePath="Sdk" />
4632
<_PackageFiles Include="$(_SDKSourceDirectory)tools\*" PackagePath="tools" />
47-
<_PackageFiles Include="$(_SDKReplacedTargetDirectory)\*.targets" PackagePath="targets" />
48-
<_PackageFiles
49-
Include="$(_SDKSourceDirectory)targets\*.props"
50-
Exclude="$(_SDKSourceDirectory)targets\*.in.props"
51-
PackagePath="targets" />
52-
<_PackageFiles
53-
Include="$(_SDKSourceDirectory)targets\*.targets"
54-
Exclude="$(_SDKSourceDirectory)targets\*.in.targets"
55-
PackagePath="targets" />
33+
<_PackageFiles Include="$(_SDKSourceDirectory)targets\*" PackagePath="targets" />
5634
</ItemGroup>
5735
</Target>
5836

workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.in.targets renamed to workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ Copyright (c) Samsung All rights reserved.
1414

1515
<PropertyGroup>
1616
<_DefaultTargetPlatformVersion>6.5</_DefaultTargetPlatformVersion>
17-
<_TizenFrameworkReferenceVersion>@TIZEN_PACK_VERSION@</_TizenFrameworkReferenceVersion>
1817
</PropertyGroup>
1918

2019
<ItemGroup>
2120
<KnownFrameworkReference
2221
Include="Samsung.Tizen"
2322
TargetFramework="net6.0-tizen$(_DefaultTargetPlatformVersion)"
2423
TargetingPackName="Samsung.Tizen.Ref"
25-
TargetingPackVersion="$(_TizenFrameworkReferenceVersion)"
24+
TargetingPackVersion="**FromWorkload**"
2625
Profile="Tizen"
2726
/>
2827
</ItemGroup>

0 commit comments

Comments
 (0)