Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Tizen workload; use the Tizen SDK package directly instead #17550

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ jobs:
script: |
dotnet workload install android macos wasm-tools

- task: CmdLine@2
displayName: 'Install Tizen Workload'
inputs:
targetType: 'inline'
script: |
curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.sh | sudo bash -s -- -d "/opt/hostedtoolcache/dotnet"

- task: CmdLine@2
displayName: 'Run Build'
inputs:
Expand Down Expand Up @@ -88,13 +81,6 @@ jobs:
inputs:
script: |
dotnet workload install android ios macos wasm-tools

- task: CmdLine@2
displayName: 'Install Tizen Workload'
inputs:
targetType: 'inline'
script: |
curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.sh | sudo bash

- task: CmdLine@2
displayName: 'Generate avalonia-native'
Expand Down Expand Up @@ -170,13 +156,6 @@ jobs:
script: |
dotnet workload install android ios tvos wasm-tools

- task: PowerShell@2
displayName: 'Install Tizen Workload'
inputs:
targetType: 'inline'
script: |
(New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1') | Invoke-Expression

- task: CmdLine@2
displayName: 'Install Nuke'
inputs:
Expand Down
1 change: 1 addition & 0 deletions build/TargetFrameworks.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<AvsCurrentTvOSTargetFramework>$(AvsCurrentTargetFramework)-tvos17.0</AvsCurrentTvOSTargetFramework>
<AvsCurrentBrowserTargetFramework>$(AvsCurrentTargetFramework)-browser</AvsCurrentBrowserTargetFramework>
<AvsCurrentTizenTargetFramework>$(AvsCurrentTargetFramework)-tizen</AvsCurrentTizenTargetFramework>
<AvsCurrentTizenTargetSdk>8.0.155</AvsCurrentTizenTargetSdk>
</PropertyGroup>
<PropertyGroup Condition="'$(AvsSkipBuildingLegacyTargetFrameworks)' != 'True'">
<AvsLegacyTargetFrameworks>net6.0</AvsLegacyTargetFrameworks>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.204",
"version": "8.0.404",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
Expand Down
9 changes: 7 additions & 2 deletions samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(AvsCurrentTizenTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

<Import Project="AutoImport.props" Sdk="Samsung.Tizen.Sdk" Version="$(AvsCurrentTizenTargetSdk)" />

<ItemGroup>
<TizenSharedResource Remove="shared\res\Avalonia.png" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Tizen\Avalonia.Tizen\Avalonia.Tizen.csproj" />
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Samsung.Tizen.Sdk" Version="$(AvsCurrentTizenTargetSdk)" />

<ItemGroup>
<Folder Include="lib\" />
<Folder Include="res\" />
<KnownFrameworkReference Update="Samsung.Tizen" TargetingPackVersion="$(AvsCurrentTizenTargetSdk)" />
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<Import Project="AutoImport.props" Sdk="Samsung.Tizen.Sdk" Version="$(AvsCurrentTizenTargetSdk)" />

<ItemGroup>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
<ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
Expand All @@ -14,4 +16,11 @@
<Import Project="..\..\..\build\DevAnalyzers.props" />
<Import Project="..\..\..\build\TrimmingEnable.props" />
<Import Project="..\..\..\build\NullableEnable.props" />

<Import Project="Sdk.targets" Sdk="Samsung.Tizen.Sdk" Version="$(AvsCurrentTizenTargetSdk)" />

<ItemGroup>
<KnownFrameworkReference Update="Samsung.Tizen" TargetingPackVersion="$(AvsCurrentTizenTargetSdk)" />
</ItemGroup>

</Project>