Skip to content

Commit 733b4fd

Browse files
crummelcrummel
authored
Merge pull request #1383 from crummel/merge3.0-20191121
Merge 3.0 => 3.1
2 parents 41e3f40 + dc9a11c commit 733b4fd

22 files changed

+489
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
- script: |
117117
set -ex
118118
df -h
119-
args="--skip-build --minimize-disk-usage"
119+
args="--skip-build --minimize-disk-usage --skip-prebuilt-check"
120120
if [ "$(reportPrebuiltLeaks)" = "true" ]; then
121121
args="$args --enable-leak-detection"
122122
fi

‎build-source-tarball.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ shift
1818
SKIP_BUILD=0
1919
INCLUDE_LEAK_DETECTION=0
2020
MINIMIZE_DISK_USAGE=0
21+
SKIP_PREBUILT_ENFORCEMENT=0
2122
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
2223

2324
while :; do
@@ -36,6 +37,9 @@ while :; do
3637
--minimize-disk-usage)
3738
MINIMIZE_DISK_USAGE=1
3839
;;
40+
--skip-prebuilt-check)
41+
SKIP_PREBUILT_ENFORCEMENT=1
42+
;;
3943
--)
4044
shift
4145
echo "Detected '--': passing remaining parameters '$@' as build.sh arguments."
@@ -169,6 +173,14 @@ find $TARBALL_ROOT/src \( -type f \( \
169173
-iname *.zip -o \
170174
-iname *.nupkg \) \) -exec rm {} \;
171175

176+
if [ $MINIMIZE_DISK_USAGE -eq 1 ]; then
177+
pushd "$TARBALL_ROOT/src"
178+
echo 'Removing unneeded files to trim tarball...'
179+
# we don't build CoreCLR tests right now and they have a lot of them - ~380MB
180+
rm -rf coreclr.*/tests
181+
popd
182+
fi
183+
172184
echo 'Copying sourcelink metadata to tarball...'
173185
pushd $SCRIPT_ROOT
174186
for srcDir in `find bin/src -name '.git' -type d`; do
@@ -286,6 +298,33 @@ do
286298
fi
287299
done
288300

301+
echo 'Removing known extra packages from tarball prebuilts...'
302+
while IFS= read -r packagePattern
303+
do
304+
if [[ "$packagePattern" =~ ^# ]]; then
305+
continue
306+
fi
307+
rm -f $TARBALL_ROOT/packages/prebuilt/$packagePattern
308+
done < $SCRIPT_ROOT/support/additional-prebuilts-to-delete.txt
309+
310+
if [ $SKIP_PREBUILT_ENFORCEMENT -ne 1 ]; then
311+
echo 'Checking for extra prebuilts...'
312+
error_encountered=false
313+
for package in `ls -A $TARBALL_ROOT/packages/prebuilt`
314+
do
315+
if grep -q "$package" $SCRIPT_ROOT/support/allowed-prebuilts.txt; then
316+
echo "Allowing prebuilt $package"
317+
else
318+
echo "ERROR: $package is not in the allowed prebuilts list ($SCRIPT_ROOT/support/allowed-prebuilts.txt)"
319+
error_encountered=true
320+
fi
321+
done
322+
if [ "$error_encountered" = "true" ]; then
323+
echo "Either remove this prebuilt, add it to the known extras list ($SCRIPT_ROOT/support/additional-prebuilts-to-delete.txt) or add it to the allowed prebuilts list."
324+
exit 1
325+
fi
326+
fi
327+
289328
echo 'Removing source-built, previously source-built packages and reference packages from il pkg src...'
290329
OLDIFS=$IFS
291330

‎dir.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<SourceBuiltPackagesPath>$(SourceBuiltBlobFeedDir)packages/</SourceBuiltPackagesPath>
8080
<SourceBuiltAssetsDir>$(SourceBuiltBlobFeedDir)assets/</SourceBuiltAssetsDir>
8181
<PrebuiltPackagesPath>$(ProjectDir)packages/prebuilt/</PrebuiltPackagesPath>
82+
<PreviouslyRestoredPackagesPath>$(ProjectDir)packages/previouslyRestored/</PreviouslyRestoredPackagesPath>
8283
<PrebuiltSourceBuiltPackagesPath>$(ProjectDir)packages/source-built/</PrebuiltSourceBuiltPackagesPath>
8384
<SourceBuiltTarBallPath>$(OutputPath)</SourceBuiltTarBallPath>
8485
<SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Toolset/</SourceBuiltToolsetDir>

‎patches/aspnetcore/0011-Add-FreeBSD.patch

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 457e4bcc40228d64bb98c4e35937d31b4cc76599 Mon Sep 17 00:00:00 2001
2+
From: Tomas Weinfurt <[email protected]>
3+
Date: Wed, 13 Nov 2019 22:32:02 -0800
4+
Subject: [PATCH] Add FreeBSD
5+
6+
---
7+
Directory.Build.props | 2 ++
8+
1 file changed, 2 insertions(+)
9+
10+
diff --git a/Directory.Build.props b/Directory.Build.props
11+
index 80e6bb14f0..76b1b4451b 100644
12+
--- a/Directory.Build.props
13+
+++ b/Directory.Build.props
14+
@@ -115,6 +115,7 @@
15+
<PropertyGroup>
16+
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
17+
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
18+
+ <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))">freebsd</TargetOsName>
19+
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
20+
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
21+
<TargetRuntimeIdentifier>$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
22+
@@ -125,6 +126,7 @@
23+
win-x86;
24+
win-arm;
25+
osx-x64;
26+
+ freebsd-x64;
27+
linux-musl-x64;
28+
linux-musl-arm64;
29+
linux-x64;
30+
--
31+
2.23.0
32+

‎patches/core-setup/0005-Add-FreeBSD-support.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 9847f667b05b577cf98f92cb32f38beff95ea504 Mon Sep 17 00:00:00 2001
2+
From: Tomas Weinfurt <[email protected]>
3+
Date: Wed, 13 Nov 2019 00:53:31 -0800
4+
Subject: [PATCH] add freebsd support
5+
6+
---
7+
src/Directory.Build.props | 4 ++--
8+
src/pkg/projects/netcoreappRIDs.props | 1 +
9+
3 files changed, 4 insertions(+), 5 deletions(-)
10+
11+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
12+
index c22e11fa..1fc24b41 100644
13+
--- a/src/Directory.Build.props
14+
+++ b/src/Directory.Build.props
15+
@@ -12,7 +12,7 @@
16+
<CrossGenSymbolExtension>.map</CrossGenSymbolExtension>
17+
<CrossGenSymbolExtension Condition="'$(OSGroup)' == 'Windows_NT'">.ni.pdb</CrossGenSymbolExtension>
18+
<!-- OSX doesn't have crossgen symbols, yet -->
19+
- <CrossGenSymbolExtension Condition="'$(OSGroup)' == 'OSX'"></CrossGenSymbolExtension>
20+
+ <CrossGenSymbolExtension Condition="'$(OSGroup)' == 'OSX' OR '$(OSGroup)' == 'FreeBSD'"></CrossGenSymbolExtension>
21+
</PropertyGroup>
22+
23+
-</Project>
24+
\ No newline at end of file
25+
+</Project>
26+
diff --git a/src/pkg/projects/netcoreappRIDs.props b/src/pkg/projects/netcoreappRIDs.props
27+
index 7483d182..5561842f 100644
28+
--- a/src/pkg/projects/netcoreappRIDs.props
29+
+++ b/src/pkg/projects/netcoreappRIDs.props
30+
@@ -35,6 +35,7 @@
31+
<!-- The following RIDs are not officically supported and are not
32+
built during official builds, however we wish to include them
33+
in our runtime.json to enable others to provide them. -->
34+
+ <UnofficialBuildRID Include="freebsd-x64" />
35+
<UnofficialBuildRID Include="tizen.4.0.0-armel">
36+
<Platform>armel</Platform>
37+
</UnofficialBuildRID>
38+
--
39+
2.23.0
40+

‎patches/core-setup/0006-Fix-OSGroup-on-FreeBSD.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 63218afeff61a044c6482c5cd119a17bdb59de09 Mon Sep 17 00:00:00 2001
2+
From: Tomas Weinfurt <[email protected]>
3+
Date: Wed, 13 Nov 2019 14:07:57 -0800
4+
Subject: [PATCH] Fix OSGroup on FreeBSD
5+
6+
---
7+
Directory.Build.props | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/Directory.Build.props b/Directory.Build.props
11+
index 890012bf..a2539d51 100644
12+
--- a/Directory.Build.props
13+
+++ b/Directory.Build.props
14+
@@ -111,6 +111,7 @@
15+
-->
16+
<PropertyGroup>
17+
<OSGroup Condition="'$(OS)'=='Unix' AND Exists('/Applications')">OSX</OSGroup>
18+
+ <OSGroup Condition="'$(OS)'=='Unix' and $([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD</OSGroup>
19+
<OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
20+
</PropertyGroup>
21+
22+
--
23+
2.23.0
24+

‎patches/corefx/0005-Add-FreeBSD-RIDs.patch

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
From 32d103eecf9d1e9648e6b1ed063860fed00bcc8f Mon Sep 17 00:00:00 2001
2+
From: Tomas Weinfurt <[email protected]>
3+
Date: Thu, 24 Oct 2019 10:19:39 -0700
4+
Subject: [PATCH] add entries for new FreeBSD releases (#41794)
5+
6+
---
7+
.../runtime.compatibility.json | 81 +++----------------
8+
pkg/Microsoft.NETCore.Platforms/runtime.json | 38 ++-------
9+
.../runtimeGroups.props | 2 +-
10+
3 files changed, 22 insertions(+), 99 deletions(-)
11+
12+
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
13+
index 1e5c380a7a6a..2a196ecc9fc7 100644
14+
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
15+
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
16+
@@ -984,17 +984,17 @@
17+
"any",
18+
"base"
19+
],
20+
- "freebsd.11.0": [
21+
- "freebsd.11.0",
22+
+ "freebsd.12": [
23+
+ "freebsd.12",
24+
"freebsd.11",
25+
"freebsd",
26+
"unix",
27+
"any",
28+
"base"
29+
],
30+
- "freebsd.11.0-x64": [
31+
- "freebsd.11.0-x64",
32+
- "freebsd.11.0",
33+
+ "freebsd.12-x64": [
34+
+ "freebsd.12-x64",
35+
+ "freebsd.12",
36+
"freebsd.11-x64",
37+
"freebsd.11",
38+
"freebsd-x64",
39+
@@ -1004,75 +1004,20 @@
40+
"any",
41+
"base"
42+
],
43+
- "freebsd.11.1": [
44+
- "freebsd.11.1",
45+
- "freebsd.11.0",
46+
+ "freebsd.13": [
47+
+ "freebsd.13",
48+
+ "freebsd.12",
49+
"freebsd.11",
50+
"freebsd",
51+
"unix",
52+
"any",
53+
"base"
54+
],
55+
- "freebsd.11.1-x64": [
56+
- "freebsd.11.1-x64",
57+
- "freebsd.11.1",
58+
- "freebsd.11.0-x64",
59+
- "freebsd.11.0",
60+
- "freebsd.11-x64",
61+
- "freebsd.11",
62+
- "freebsd-x64",
63+
- "freebsd",
64+
- "unix-x64",
65+
- "unix",
66+
- "any",
67+
- "base"
68+
- ],
69+
- "freebsd.11.2": [
70+
- "freebsd.11.2",
71+
- "freebsd.11.1",
72+
- "freebsd.11.0",
73+
- "freebsd.11",
74+
- "freebsd",
75+
- "unix",
76+
- "any",
77+
- "base"
78+
- ],
79+
- "freebsd.11.2-x64": [
80+
- "freebsd.11.2-x64",
81+
- "freebsd.11.2",
82+
- "freebsd.11.1-x64",
83+
- "freebsd.11.1",
84+
- "freebsd.11.0-x64",
85+
- "freebsd.11.0",
86+
- "freebsd.11-x64",
87+
- "freebsd.11",
88+
- "freebsd-x64",
89+
- "freebsd",
90+
- "unix-x64",
91+
- "unix",
92+
- "any",
93+
- "base"
94+
- ],
95+
- "freebsd.11.3": [
96+
- "freebsd.11.3",
97+
- "freebsd.11.2",
98+
- "freebsd.11.1",
99+
- "freebsd.11.0",
100+
- "freebsd.11",
101+
- "freebsd",
102+
- "unix",
103+
- "any",
104+
- "base"
105+
- ],
106+
- "freebsd.11.3-x64": [
107+
- "freebsd.11.3-x64",
108+
- "freebsd.11.3",
109+
- "freebsd.11.2-x64",
110+
- "freebsd.11.2",
111+
- "freebsd.11.1-x64",
112+
- "freebsd.11.1",
113+
- "freebsd.11.0-x64",
114+
- "freebsd.11.0",
115+
+ "freebsd.13-x64": [
116+
+ "freebsd.13-x64",
117+
+ "freebsd.13",
118+
+ "freebsd.12-x64",
119+
+ "freebsd.12",
120+
"freebsd.11-x64",
121+
"freebsd.11",
122+
"freebsd-x64",
123+
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
124+
index b2f286ea2479..e70f2da7e668 100644
125+
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
126+
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
127+
@@ -510,48 +510,26 @@
128+
"freebsd-x64"
129+
]
130+
},
131+
- "freebsd.11.0": {
132+
+ "freebsd.12": {
133+
"#import": [
134+
"freebsd.11"
135+
]
136+
},
137+
- "freebsd.11.0-x64": {
138+
+ "freebsd.12-x64": {
139+
"#import": [
140+
- "freebsd.11.0",
141+
+ "freebsd.12",
142+
"freebsd.11-x64"
143+
]
144+
},
145+
- "freebsd.11.1": {
146+
+ "freebsd.13": {
147+
"#import": [
148+
- "freebsd.11.0"
149+
+ "freebsd.12"
150+
]
151+
},
152+
- "freebsd.11.1-x64": {
153+
+ "freebsd.13-x64": {
154+
"#import": [
155+
- "freebsd.11.1",
156+
- "freebsd.11.0-x64"
157+
- ]
158+
- },
159+
- "freebsd.11.2": {
160+
- "#import": [
161+
- "freebsd.11.1"
162+
- ]
163+
- },
164+
- "freebsd.11.2-x64": {
165+
- "#import": [
166+
- "freebsd.11.2",
167+
- "freebsd.11.1-x64"
168+
- ]
169+
- },
170+
- "freebsd.11.3": {
171+
- "#import": [
172+
- "freebsd.11.2"
173+
- ]
174+
- },
175+
- "freebsd.11.3-x64": {
176+
- "#import": [
177+
- "freebsd.11.3",
178+
- "freebsd.11.2-x64"
179+
+ "freebsd.13",
180+
+ "freebsd.12-x64"
181+
]
182+
},
183+
"gentoo": {
184+
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
185+
index eeb8130b54fb..6c95b67819be 100644
186+
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
187+
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
188+
@@ -99,7 +99,7 @@
189+
<RuntimeGroup Include="freebsd">
190+
<Parent>unix</Parent>
191+
<Architectures>x64</Architectures>
192+
- <Versions>11;11.0;11.1;11.2;11.3</Versions>
193+
+ <Versions>11;12;13</Versions>
194+
</RuntimeGroup>
195+
196+
<!-- rhel 6 is independent -->

0 commit comments

Comments
 (0)