Skip to content

Commit c4d82c2

Browse files
dagooddagood
authored
Merge pull request #843 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2
[automated] Merge branch 'release/2.1' => 'release/2.2'
2 parents 6fd1076 + 72c4ddf commit c4d82c2

22 files changed

+301
-197
lines changed

‎.vsts.pipelines/builds/ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
matrix:
1414
Production: {}
1515
Online: { type: Online }
16-
Online Portable: { type: Online Portable }
1716
Offline: { type: Offline }
1817
Offline Portable: { type: Offline Portable }
1918

@@ -24,7 +23,16 @@ jobs:
2423
matrix:
2524
Production: {}
2625
Online: { type: Online }
26+
27+
- template: ../jobs/ci-linux.yml
28+
parameters:
29+
job: fedora29
30+
imageName: microsoft/dotnet-buildtools-prereqs:fedora-29-2f0798a-20181105183801
31+
matrix:
32+
Production: {}
33+
Online: { type: Online }
2734
Offline: { type: Offline }
35+
Offline Portable: { type: Offline Portable }
2836

2937
- template: ../jobs/ci-linux.yml
3038
parameters:

‎.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeoutInMinutes: 270
1515
variables:
1616
# Prefix to distinguish artifacts from different legs.
17-
artifactName: ${{ format('$(type) {0}', parameters.job) }}
17+
artifactName: ${{ format('{0} $(type)', parameters.job) }}
1818
# Use ":z" to set selinux flag for sharing in build-owned root dir. https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label
1919
docker.agentSrc.map: -v $(Build.SourcesDirectory):/agentSrc:z
2020
docker.agentSrc.work: -w /agentSrc

‎DotnetCLIVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.402
1+
2.1.403

‎README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,26 @@
66
<!-- Generated table start -->
77
| OS | *Jenkins*<br/>Release | <br/>Debug | *Azure DevOps*<br/>Release |
88
| -- | :-- | :-- | :-- |
9-
| CentOS7.1 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
10-
| CentOS7.1 (Online) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
11-
| CentOS7.1 (Online Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Debug_Portable/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Online%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
12-
| CentOS7.1 (Offline) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
13-
| CentOS7.1 (Offline Portable) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
14-
| Debian8.2 | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=debian82&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
15-
| Debian8.2 (Online) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=debian82&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
16-
| Debian8.2 (Offline) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=debian82&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
9+
| CentOS7.1 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
10+
| CentOS7.1 (Online) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
11+
| CentOS7.1 (Online Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/CentOS7.1_Tarball_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/CentOS7.1_Tarball_Debug_Portable/) |
12+
| CentOS7.1 (Offline) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
13+
| CentOS7.1 (Offline Portable) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=centos71&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
14+
| Debian8.2 | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=debian82&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
15+
| Debian8.2 (Online) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=debian82&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
1716
| Debian8.4 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Debian8.4_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Debian8.4_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Debian8.4_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Debian8.4_Debug/) |
1817
| Fedora24 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Fedora24_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Fedora24_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Fedora24_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Fedora24_Debug/) |
19-
| OSX10.12 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/OSX10.12_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/OSX10.12_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/OSX10.12_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/OSX10.12_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=OSX&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
18+
| Fedora29 | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=fedora29&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
19+
| Fedora29 (Online) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=fedora29&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
20+
| Fedora29 (Offline) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=fedora29&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
21+
| Fedora29 (Offline Portable) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=fedora29&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
22+
| OSX10.12 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/OSX10.12_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/OSX10.12_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/OSX10.12_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/OSX10.12_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=OSX&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
2023
| RHEL7.2 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Debug/) |
2124
| RHEL7.2 (Online) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Tarball_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Tarball_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Tarball_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Tarball_Debug/) |
2225
| RHEL7.2 (Online Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Tarball_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Tarball_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Tarball_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Tarball_Debug_Portable/) |
2326
| RHEL7.2 (Offline) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Unshared_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Unshared_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Unshared_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Unshared_Debug/) |
2427
| RHEL7.2 (Offline Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Unshared_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Unshared_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/RHEL7.2_Unshared_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/RHEL7.2_Unshared_Debug_Portable/) |
25-
| Ubuntu16.04 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Ubuntu16.04_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Ubuntu16.04_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Ubuntu16.04_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Ubuntu16.04_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=ubuntu1604&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114) |
28+
| Ubuntu16.04 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Ubuntu16.04_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Ubuntu16.04_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Ubuntu16.04_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Ubuntu16.04_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=release/2.2&jobname=ubuntu1604&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=release/2.2) |
2629
| Windows | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Windows_NT_Release)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Windows_NT_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/release_2.2/Windows_NT_Debug)](https://ci.dot.net/job/dotnet_source-build/job/release_2.2/job/Windows_NT_Debug/) |
2730
<!-- Generated table end -->
2831

‎patches/corefx/0001-Skip-CoreFx.Private.TestUtilities-in-source-build.patch

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 3c58c35b188d80799948917e1e09721ff8316ad2 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 31 Oct 2018 22:33:26 -0500
4+
Subject: [PATCH] Skip CoreFx.Private.TestUtilities in source-build
5+
6+
This project referenced the XUnit.Runtime dependency project, causing test-only prebuilt dependencies.
7+
8+
Even though we always pass BuildTests=false, include a condition to handle "true" to make intent clear.
9+
10+
Patch PR: https://github.com/dotnet/corefx/pull/33217
11+
---
12+
dir.props | 8 ++++++++
13+
src/ref.builds | 2 +-
14+
2 files changed, 9 insertions(+), 1 deletion(-)
15+
16+
diff --git a/dir.props b/dir.props
17+
index b75c58047b..530c63c821 100644
18+
--- a/dir.props
19+
+++ b/dir.props
20+
@@ -306,6 +306,14 @@
21+
<SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)'==''">$(PackageOutputPath)symbols/</SymbolPackageOutputPath>
22+
</PropertyGroup>
23+
24+
+ <!--
25+
+ Remove test-only dependencies during source-build: disable project that brings in XUnit.Runtime
26+
+ dependencies through 'ReferenceFromRuntime' property.
27+
+ -->
28+
+ <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true' and '$(BuildTests)' != 'true'">
29+
+ <ProjectExclusions Include="$(SourceDir)CoreFx.Private.TestUtilities/**/*.csproj" />
30+
+ </ItemGroup>
31+
+
32+
<!-- Properties related to multi-file mode for ILC tests -->
33+
<PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
34+
<!-- Only enable multi-file for Release-x64 and Debug-x86 for now -->
35+
diff --git a/src/ref.builds b/src/ref.builds
36+
index c7542be16a..79ee0d40a8 100644
37+
--- a/src/ref.builds
38+
+++ b/src/ref.builds
39+
@@ -7,7 +7,7 @@
40+
</PropertyGroup>
41+
42+
<ItemGroup>
43+
- <Project Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" />
44+
+ <Project Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
45+
</ItemGroup>
46+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
47+
</Project>
48+
\ No newline at end of file
49+
--
50+
2.17.1.windows.2
51+

‎patches/sdk/0001-Exclude-unit-test-projects-from-source-build.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 06d3c0dbd226c3f7cd7aafd89ccf2e42f15dfce8 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 31 Oct 2018 23:04:45 -0500
4+
Subject: [PATCH] Exclude unit test projects from source-build
5+
6+
Patch PR: https://github.com/dotnet/sdk/pull/2642
7+
---
8+
src/Directory.Build.props | 1 +
9+
1 file changed, 1 insertion(+)
10+
11+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
12+
index ca3ebe94..396d7b21 100644
13+
--- a/src/Directory.Build.props
14+
+++ b/src/Directory.Build.props
15+
@@ -29,6 +29,7 @@
16+
</PropertyGroup>
17+
18+
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
19+
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
20+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
21+
<GenerateProgramFile>false</GenerateProgramFile>
22+
<XUnitRunnerAdditionalArguments>-parallel none</XUnitRunnerAdditionalArguments>
23+
--
24+
2.17.1.windows.2
25+

0 commit comments

Comments
 (0)