diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 87d001db67..7f4e3be3b3 100644 --- a/azure-pipelines.yml +++ b/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: diff --git a/build/TargetFrameworks.props b/build/TargetFrameworks.props index 8c88b4cf4b..0b04810436 100644 --- a/build/TargetFrameworks.props +++ b/build/TargetFrameworks.props @@ -8,6 +8,7 @@ $(AvsCurrentTargetFramework)-tvos17.0 $(AvsCurrentTargetFramework)-browser $(AvsCurrentTargetFramework)-tizen + 8.0.155 net6.0 diff --git a/global.json b/global.json index b423edba49..28c43eff46 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.204", + "version": "8.0.404", "rollForward": "latestFeature" }, "msbuild-sdks": { diff --git a/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj b/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj index 6b14083842..4b12a096d4 100644 --- a/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj +++ b/samples/ControlCatalog.Tizen/ControlCatalog.Tizen.csproj @@ -1,20 +1,25 @@  + $(AvsCurrentTizenTargetFramework) Exe + + + + - - + + diff --git a/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj b/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj index bf83050d3c..76654fc64a 100644 --- a/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj +++ b/src/Tizen/Avalonia.Tizen/Avalonia.Tizen.csproj @@ -6,6 +6,8 @@ enable + + @@ -14,4 +16,11 @@ + + + + + + +