@@ -4,5 +4,6 @@
<AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)\src\tools\Avalonia.Designer.HostApp\bin\$(Configuration)\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
<!-- https://github.com/dotnet/msbuild/issues/2661 -->
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
+ <MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
</PropertyGroup>
</Project>
@@ -29,8 +29,6 @@ jobs:
- job: Linux
pool:
vmImage: 'ubuntu-20.04'
- variables:
- MSBuildEnableWorkloadResolver: 'false'
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.414'
@@ -60,7 +58,6 @@ jobs:
- job: macOS
variables:
SolutionDir: '$(Build.SourcesDirectory)'
vmImage: 'macOS-10.15'
@@ -8,6 +8,7 @@
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<AndroidPackageFormat>apk</AndroidPackageFormat>
+ <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
<ItemGroup>
<None Remove="Assets\AboutAssets.txt" />
@@ -3,6 +3,7 @@
<TargetFramework>net6.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">