Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20228.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20228.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20255.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
<Sha>981e1a0b0149281a5994ecddfeb5cfcf002f9f1e</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
21 changes: 10 additions & 11 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,16 @@
</ItemGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20228.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20228.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkSdk>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksTargetFrameworkSdk>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20228.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20228.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20228.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20228.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20228.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20228.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20228.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20228.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20255.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20255.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20255.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20255.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20255.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20255.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20255.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20255.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20255.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20255.6</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/CIBuild.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2 changes: 1 addition & 1 deletion eng/common/PSScriptAnalyzerSettings.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
'PSStandardDSCFunctionsInResource',
'PSUseIdenticalMandatoryParametersForDSC',
'PSUseIdenticalParametersForDSC')
}
}
2 changes: 1 addition & 1 deletion eng/common/cibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ while [[ -h $source ]]; do
done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"

. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.trusty
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.trusty
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
4 changes: 2 additions & 2 deletions eng/common/darc-init.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
param (
$darcVersion = $null,
$darcVersion = "1.1.0-beta.20255.1",
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
$verbosity = 'minimal',
$toolpath = $null
Expand Down Expand Up @@ -44,4 +44,4 @@ catch {
Write-Host $_.ScriptStackTrace
Write-PipelineTelemetryError -Category 'Darc' -Message $_
ExitWithExitCode 1
}
}
2 changes: 1 addition & 1 deletion eng/common/darc-init.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

source="${BASH_SOURCE[0]}"
darcVersion=''
darcVersion='1.1.0-beta.20255.1'
versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
verbosity='minimal'

Expand Down
2 changes: 1 addition & 1 deletion eng/common/dotnet-install.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"
2 changes: 1 addition & 1 deletion eng/common/generate-graph-files.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ catch {
ExitWithExitCode 1
} finally {
Pop-Location
}
}
2 changes: 1 addition & 1 deletion eng/common/init-tools-native.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*"
exit /b %ErrorLevel%
exit /b %ErrorLevel%
1 change: 1 addition & 0 deletions eng/common/internal/Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
</PropertyGroup>
<ItemGroup>
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/msbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ catch {
ExitWithExitCode 1
}

ExitWithExitCode 0
ExitWithExitCode 0
2 changes: 1 addition & 1 deletion eng/common/native/install-cmake-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ if [[ $? != 0 ]]; then
exit 1
fi

exit 0
exit 0
2 changes: 1 addition & 1 deletion eng/common/native/install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ if [[ $? != 0 ]]; then
exit 1
fi

exit 0
exit 0
2 changes: 1 addition & 1 deletion eng/common/performance/perfhelixpublish.proj
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
</HelixWorkItem>
</ItemGroup>
</Project>
</Project>
7 changes: 4 additions & 3 deletions eng/common/performance/performance-setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Param(
[string] $CoreRootDirectory,
[string] $BaselineCoreRootDirectory,
[string] $Architecture="x64",
[string] $Framework="netcoreapp5.0",
[string] $Framework="net5.0",
[string] $CompilationMode="Tiered",
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
[string] $Branch=$env:BUILD_SOURCEBRANCH,
Expand Down Expand Up @@ -31,7 +31,8 @@ $HelixSourcePrefix = "pr"

$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"

if ($Framework.StartsWith("netcoreapp")) {
# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
$Queue = "Windows.10.Amd64.ClientRS5.Open"
}

Expand Down Expand Up @@ -111,4 +112,4 @@ Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $fal
Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false
Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false

exit 0
exit 0
2 changes: 1 addition & 1 deletion eng/common/performance/performance-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory=
baseline_core_root_directory=
architecture=x64
framework=netcoreapp5.0
framework=net5.0
compilation_mode=tiered
repository=$BUILD_REPOSITORY_NAME
branch=$BUILD_SOURCEBRANCH
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipeline-logging-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,4 @@ function Write-PipelinePrependPath {
if [[ "$ci" == true ]]; then
echo "##vso[task.prependpath]$prepend_path"
fi
}
}
9 changes: 5 additions & 4 deletions eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ try {

if( $msbuildEngine -eq "vs") {
# Ensure desktop MSBuild is available for sdk tasks.
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty
if( -not ($GlobalJson.tools.PSObject.Properties.Name -contains "vs" )) {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty
}

InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
$global:_MSBuildExe = "$($xcopyMSBuildToolsFolder)\MSBuild\Current\Bin\MSBuild.exe"
}

$taskProject = GetSdkTaskProject $task
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ jobs:
Creator: $(Creator)
WorkItemTimeout: 4:00 # 4 hours
WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy
CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions
CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions
2 changes: 1 addition & 1 deletion eng/common/templates/steps/run-script-ifequalelse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ steps:
name: ${{ parameters.name }}
displayName: ${{ parameters.displayName }}
env: ${{ parameters.env }}
condition: ${{ parameters.condition }}
condition: ${{ parameters.condition }}
19 changes: 15 additions & 4 deletions eng/pipelines/installer/jobs/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ jobs:
eq(parameters.isOfficialBuild, true),
ne(parameters.crossrootfsDir, '')) }}

- name: BuildAction
value: -test

- ${{ if eq(variables.SkipTests, true) }}:
- name: BuildAction
value: ''

- name: SignType
value: test

Expand Down Expand Up @@ -108,7 +115,8 @@ jobs:

- name: BaseJobBuildCommand
value: >-
build.cmd -subset installer -test -ci
build.cmd -subset installer -ci
$(BuildAction)
-configuration $(_BuildConfig)
$(LiveOverridePathArgs)
$(CommonMSBuildArgs)
Expand All @@ -124,7 +132,8 @@ jobs:

- name: BaseJobBuildCommand
value: >-
$(Build.SourcesDirectory)/build.sh -subset installer -test -ci
$(Build.SourcesDirectory)/build.sh -subset installer -ci
$(BuildAction)
-configuration $(_BuildConfig)
$(LiveOverridePathArgs)
$(CommonMSBuildArgs)
Expand All @@ -139,7 +148,8 @@ jobs:

- name: BaseJobBuildCommand
value: >-
$(Build.SourcesDirectory)/build.sh -subset installer --ci --test
$(Build.SourcesDirectory)/build.sh -subset installer -ci
$(BuildAction)
-configuration $(_BuildConfig)
-os ${{ parameters.osGroup }}
-arch ${{ parameters.archType }}
Expand Down Expand Up @@ -199,7 +209,8 @@ jobs:

- name: BuildArguments
value: >-
-subset installer -test -ci
-subset installer -ci
$(BuildAction)
/p:CrossBuild=${{ ne(parameters.crossrootfsDir, '') }}
/p:PortableBuild=$(_PortableBuild)
/p:SkipTests=$(SkipTests)
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20228.4",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20228.4",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20228.4",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20228.4",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20255.6",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20255.6",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20255.6",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20255.6",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18",
"Microsoft.Build.NoTargets": "1.0.53",
Expand Down