Try build with dotnet root
This commit is contained in:
Родитель
8062ecc2d1
Коммит
eb299afb6b
|
@ -106,7 +106,7 @@ stages:
|
|||
- pwsh: dotnet tool restore
|
||||
displayName: install dotnet tools
|
||||
|
||||
- pwsh: ./build.ps1 --target=dotnet --configuration="${{ BuildConfiguration.name }}" --verbosity=diagnostic --DotNetDirectory "$env:DOTNET_ROOT"
|
||||
- pwsh: ./build.ps1 --target=dotnet --configuration="${{ BuildConfiguration.name }}" --verbosity=diagnostic
|
||||
displayName: 'Install .NET'
|
||||
retryCountOnTaskFailure: 3
|
||||
env:
|
||||
|
|
|
@ -42,6 +42,8 @@ string envProgramFiles = EnvironmentVariable("ProgramFiles(x86)");
|
|||
var configuration = GetBuildVariable("BUILD_CONFIGURATION", GetBuildVariable("configuration", "DEBUG"));
|
||||
bool isHostedAgent = agentName.StartsWith("Azure Pipelines") || agentName.StartsWith("Hosted Agent");
|
||||
|
||||
var dotnetInstallDirectory = EnvironmentVariable("DOTNET_ROOT");
|
||||
|
||||
var localDotnet = GetBuildVariable("workloads", (target == "VS-WINUI") ? "global" : "local") == "local";
|
||||
var vsVersion = GetBuildVariable("VS", "");
|
||||
|
||||
|
|
|
@ -14,9 +14,19 @@ Task("dotnet")
|
|||
|
||||
DotNetCoreBuild("./build/DotNet/DotNet.csproj", new DotNetCoreBuildSettings
|
||||
{
|
||||
MSBuildSettings = new DotNetCoreMSBuildSettings()
|
||||
// MSBuildSettings = new DotNetCoreMSBuildSettings()
|
||||
// .EnableBinaryLogger($"{logDirectory}/dotnet-{configuration}.binlog")
|
||||
// .WithProperty("InstallWorkloadPacks", "false")
|
||||
// .SetConfiguration(configuration),
|
||||
|
||||
// if(!string.IsNullOrEmpty(dotnetInstallDirectory))
|
||||
// {
|
||||
MSBuildSettings= new DotNetCoreMSBuildSettings()
|
||||
.EnableBinaryLogger($"{logDirectory}/dotnet-{configuration}.binlog")
|
||||
.WithProperty("InstallWorkloadPacks", "false")
|
||||
.WithProperty("DotNetDirectory", dotnetInstallDirectory)
|
||||
.SetConfiguration(configuration),
|
||||
//}
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче