瀏覽代碼

Move MSBuildEnableWorkloadResolver to directory build props

Max Katz 3 年之前
父節點
當前提交
dcc7d02e18

+ 1 - 0
Directory.Build.props

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

+ 0 - 3
azure-pipelines.yml

@@ -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)'
-    MSBuildEnableWorkloadResolver: 'false'
   pool:
     vmImage: 'macOS-10.15'
   steps:

+ 1 - 0
samples/ControlCatalog.Android/ControlCatalog.Android.csproj

@@ -8,6 +8,7 @@
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\AboutAssets.txt" />

+ 1 - 0
src/Android/Avalonia.Android/Avalonia.Android.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>net6.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />

+ 1 - 0
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj

@@ -8,6 +8,7 @@
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">