Browse Source

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

pull/17559/head
Julien Lebosquain 1 year ago
committed by GitHub
parent
commit
0774007a4c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 21
      azure-pipelines.yml
  2. 1
      build/TargetFrameworks.props
  3. 2
      global.json
  4. 9
      samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj
  5. 9
      src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj

21
azure-pipelines.yml

@ -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:
@ -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'
@ -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:

1
build/TargetFrameworks.props

@ -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>

2
global.json

@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.204",
"version": "8.0.404",
"rollForward": "latestFeature"
},
"msbuild-sdks": {

9
samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj

@ -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
src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj

@ -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" />
@ -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>

Loading…
Cancel
Save