Browse Source

Solve workload installation

pull/6922/head
Max Katz 4 years ago
parent
commit
a568c175f3
  1. 10
      azure-pipelines.yml
  2. 2
      samples/ControlCatalog.Android/ControlCatalog.Android.csproj
  3. 1
      samples/ControlCatalog.Web/ControlCatalog.Web.csproj
  4. 2
      src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
  5. 1
      src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj

10
azure-pipelines.yml

@ -1,6 +1,3 @@
variables:
MSBuildEnableWorkloadResolver: 'false'
jobs:
- job: GetPRNumber
@ -32,6 +29,8 @@ jobs:
- job: Linux
pool:
vmImage: 'ubuntu-20.04'
variables:
MSBuildEnableWorkloadResolver: 'false'
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.414'
@ -61,6 +60,7 @@ jobs:
- job: macOS
variables:
SolutionDir: '$(Build.SourcesDirectory)'
MSBuildEnableWorkloadResolver: 'false'
pool:
vmImage: 'macOS-10.15'
steps:
@ -147,10 +147,10 @@ jobs:
version: 6.0.100
- task: CmdLine@2
displayName: 'Install Androi Workload'
displayName: 'Install Workloads'
inputs:
script: |
dotnet workload install --no-cache --disable-parallel ios android --skip-manifest-update --source "https://pkgs.dev.azure.com/xamarin/public/_packaging/maui-main/nuget/v3/index.json" --source "https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" --source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" --source "https://api.nuget.org/v3/index.json"
dotnet workload install android
- task: CmdLine@2
displayName: 'Install Nuke'

2
samples/ControlCatalog.Android/ControlCatalog.Android.csproj

@ -18,7 +18,7 @@
</AndroidResource>
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
<DebugSymbols>True</DebugSymbols>
<RunAOTCompilation>True</RunAOTCompilation>
<EnableLLVM>True</EnableLLVM>

1
samples/ControlCatalog.Web/ControlCatalog.Web.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
<Nullable>enable</Nullable>
<WasmBuildNative>True</WasmBuildNative>
</PropertyGroup>

2
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj

@ -10,7 +10,7 @@
<AndroidPackageFormat>apk</AndroidPackageFormat>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
<DebugSymbols>True</DebugSymbols>
<RunAOTCompilation>True</RunAOTCompilation>
<EnableLLVM>True</EnableLLVM>

1
src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj

@ -5,6 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>Avalonia.Web.Blazor</PackageId>
<LangVersion>preview</LangVersion>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
<StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>
</PropertyGroup>

Loading…
Cancel
Save