Merge pull request #14954 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
This commit is contained in:
commit
6b880c7f86
2 changed files with 8 additions and 10 deletions
|
@ -84,22 +84,19 @@ jobs:
|
||||||
${{ else }}:
|
${{ else }}:
|
||||||
${{ parameters.poolInternalAmd64 }}
|
${{ parameters.poolInternalAmd64 }}
|
||||||
|
|
||||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
||||||
parameters:
|
parameters:
|
||||||
architecture: arm64
|
architecture: arm64
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
|
||||||
excludeSdkContentTests: true
|
|
||||||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||||
matrix:
|
matrix:
|
||||||
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
Debian9-Offline:
|
||||||
Debian9-Offline:
|
_BootstrapPrep: true
|
||||||
_BootstrapPrep: true
|
_Container: ${{ parameters.debian9Arm64Container }}
|
||||||
_Container: ${{ parameters.debian9Arm64Container }}
|
_EnablePoison: false
|
||||||
_EnablePoison: false
|
_ExcludeOmniSharpTests: false
|
||||||
_ExcludeOmniSharpTests: false
|
_RunOnline: false
|
||||||
_RunOnline: false
|
|
||||||
name: Build_Tarball_arm64
|
name: Build_Tarball_arm64
|
||||||
pool: ${{ parameters.poolInternalArm64 }}
|
pool: ${{ parameters.poolInternalArm64 }}
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
|
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
|
||||||
|
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
|
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
|
||||||
|
|
Loading…
Reference in a new issue