Skip to content

Commit 660a9b8

Browse files
dseefelddseefeld
authored
Re enable bootstrap build job in 5.0 CI (#1949)
1 parent 9e3dc14 commit 660a9b8

File tree

7 files changed

+88
-52
lines changed

7 files changed

+88
-52
lines changed

‎.vsts.pipelines/builds/matrix.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,15 @@ stages:
2525
Offline: { type: Offline }
2626
Offline Portable: { type: Offline Portable }
2727

28-
# Temporarily disable bootstrap build until entire product builds.
29-
# See https://github.com/dotnet/source-build/issues/1550
30-
# - template: ../stages/stage-jobs-matrix.yml
31-
# parameters:
32-
# jobTemplateName: ../jobs/ci-linux_bootstrap.yml
33-
# name: centos71_BootStrap
34-
# dependsOn: centos71_Offline
35-
# jobParameters:
36-
# imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-359e48e-20200313130914
37-
# matrix:
38-
# Offline: { type: Offline }
28+
- template: ../stages/stage-jobs-matrix.yml
29+
parameters:
30+
jobTemplateName: ../jobs/ci-linux_bootstrap.yml
31+
name: centos71_BootStrap
32+
dependsOn: centos71_Offline
33+
jobParameters:
34+
imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-359e48e-20200313130914
35+
matrix:
36+
Offline: { type: Offline }
3937

4038
- template: ../stages/stage-jobs-matrix.yml
4139
parameters:

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "5.0.100-rc.1.20452.10"
3+
"dotnet": "5.0.100"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/roslyn-analyzers/0010-Build-roslyn-analyzer-tools-with-net5.0-TFM.patch

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
From f1ffa381244fa08d4ba38fd6815a3dead7c3a954 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Fri, 11 Dec 2020 20:13:28 +0000
4+
Subject: [PATCH] Build roslyn-analyzer tools with net5.0 TFM
5+
6+
---
7+
eng/GenerateAnalyzerNuspec.targets | 2 +-
8+
src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj | 1 +
9+
.../GenerateDocumentationAndConfigFiles.csproj | 1 +
10+
.../GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj | 1 +
11+
4 files changed, 4 insertions(+), 1 deletion(-)
12+
13+
diff --git a/eng/GenerateAnalyzerNuspec.targets b/eng/GenerateAnalyzerNuspec.targets
14+
index 91c6a26..f683eab 100644
15+
--- a/eng/GenerateAnalyzerNuspec.targets
16+
+++ b/eng/GenerateAnalyzerNuspec.targets
17+
@@ -109,7 +109,7 @@
18+
19+
<PropertyGroup>
20+
<!-- Ideally, we would extract this from the MSBuild task, but we need this as the Target Output before that task is executed -->
21+
- <_GenerateAnalyzerNuspecPath>$(ArtifactsBinDir)GenerateAnalyzerNuspec\$(Configuration)\netcoreapp3.1\GenerateAnalyzerNuspec.dll</_GenerateAnalyzerNuspecPath>
22+
+ <_GenerateAnalyzerNuspecPath>$(ArtifactsBinDir)GenerateAnalyzerNuspec\$(Configuration)\net5.0\GenerateAnalyzerNuspec.dll</_GenerateAnalyzerNuspecPath>
23+
</PropertyGroup>
24+
25+
<Target Name="BuildGenerateAnalyzerNuspecFile"
26+
diff --git a/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj b/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
27+
index ba0a961..3a16ac4 100644
28+
--- a/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
29+
+++ b/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
30+
@@ -2,6 +2,7 @@
31+
<PropertyGroup>
32+
<OutputType>Exe</OutputType>
33+
<TargetFramework>netcoreapp3.1</TargetFramework>
34+
+ <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</TargetFramework>
35+
<NonShipping>true</NonShipping>
36+
<UseAppHost>false</UseAppHost>
37+
</PropertyGroup>
38+
diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
39+
index 0056792..181473c 100644
40+
--- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
41+
+++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
42+
@@ -2,6 +2,7 @@
43+
<PropertyGroup>
44+
<OutputType>Exe</OutputType>
45+
<TargetFramework>netcoreapp3.1</TargetFramework>
46+
+ <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</TargetFramework>
47+
<NonShipping>true</NonShipping>
48+
<UseAppHost>false</UseAppHost>
49+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
50+
diff --git a/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj b/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj
51+
index c76df9d..4367d01 100644
52+
--- a/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj
53+
+++ b/src/Tools/GenerateGlobalAnalyzerConfigs/GenerateGlobalAnalyzerConfigs.csproj
54+
@@ -2,6 +2,7 @@
55+
<PropertyGroup>
56+
<OutputType>Exe</OutputType>
57+
<TargetFramework>netcoreapp3.1</TargetFramework>
58+
+ <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</TargetFramework>
59+
<NonShipping>true</NonShipping>
60+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
61+
<UseAppHost>false</UseAppHost>
62+
--
63+
1.8.3.1
64+

‎patches/sdk/0010-PlatformAbstractions-is-not-produced-in-source-build.patch

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@ Date: Wed, 12 Aug 2020 14:26:52 -0500
44
Subject: [PATCH 10/10] PlatformAbstractions is not produced in source-build
55

66
---
7-
src/Layout/redist/redist.csproj | 2 +-
87
.../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +-
9-
2 files changed, 2 insertions(+), 2 deletions(-)
8+
1 files changed, 1 insertions(+), 1 deletions(-)
109

11-
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
12-
index c3940776b..e46938bae 100644
13-
--- a/src/Layout/redist/redist.csproj
14-
+++ b/src/Layout/redist/redist.csproj
15-
@@ -20,7 +20,7 @@
16-
17-
<ItemGroup>
18-
<PackageReference Include="NuGet.Build.Tasks" Version="$(NuGetBuildTasksPackageVersion)" />
19-
- <PackageReference Include="NuGet.Build.Tasks.Console" Version="$(NuGetBuildTasksConsolePackageVersion)" />
20-
+ <!-- <PackageReference Include="NuGet.Build.Tasks.Console" Version="$(NuGetBuildTasksConsolePackageVersion)" />-->
21-
<PackageReference Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
22-
<PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" ExcludeAssets="All" />
23-
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
2410
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
2511
index ecf56d956..59545bb39 100644
2612
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj

‎repos/runtime.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Additional Targets -->
1616
<Target Name="InstallJustBuiltRuntime" AfterTargets="RemoveBuiltPackagesFromCache">
1717
<!-- Install the runtime that was just built to be used by downstream repos, namely, aspnetcore -->
18-
<Exec Command="tar -xvf $(SourceBuiltAssetsDir)dotnet-runtime-$(runtimeOutputPackageVersion)-$(TargetRid).tar.gz -C $(DotNetRoot)" />
18+
<Exec Command="tar -xvf $(SourceBuiltAssetsDir)dotnet-runtime-$(runtimeOutputPackageVersion)-$(TargetRid).tar.gz -C $(DotNetCliToolDir)" />
1919
</Target>
2020

2121

‎support/tarball/tool-bootstrapping/bootstrap.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function LogMessage {
2929
}
3030

3131
function BuildStage1Sdk {
32-
LogMessage "Starting Step1 - Build stage1 sdk"
32+
LogMessage "Starting Step1 - Build stage1 sdk"
3333

3434
if [ -d "$stage1Dir" ]; then
3535
echo "$stage1Dir already exists"
@@ -53,11 +53,11 @@ function BuildStage1Sdk {
5353
./build.sh
5454
popd
5555

56-
LogMessage "Completing Step1 - Build stage1 sdk"
56+
LogMessage "Completing Step1 - Build stage1 sdk"
5757
}
5858

5959
function BuildRefPkgs {
60-
LogMessage "Starting Step2 - Build Reference Packages"
60+
LogMessage "Starting Step2 - Build Reference Packages"
6161

6262
if [ ! -d "$refPkgSourceDir" ]; then
6363
echo "$refPkgSourceDir doesn't exist"
@@ -85,14 +85,14 @@ function BuildRefPkgs {
8585
rm -rf $stage1SdkInstallDir
8686
fi
8787
mkdir $stage1SdkInstallDir
88-
tar -xzf $stage1Dir/artifacts/x64/Release/dotnet-sdk-3*.tar.gz --directory $stage1SdkInstallDir
88+
tar -xzf $stage1Dir/artifacts/x64/Release/dotnet-sdk-5*.tar.gz --directory $stage1SdkInstallDir
8989

9090
LogMessage "Build stage1 ref-pkgs"
9191
pushd $refPkgsDir
9292
./build.sh --with-packages $stage1Dir/artifacts/x64/Release/Private.SourceBuilt.Artifacts.*.tar.gz --with-sdk $stage1SdkInstallDir
9393
popd
9494

95-
LogMessage "Completing Step2 - Build Reference Packages"
95+
LogMessage "Completing Step2 - Build Reference Packages"
9696
}
9797

9898
function buildFinalSdk {

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<Dir>artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/</Dir>
1212
<Dir>artifacts/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/</Dir>
1313
<Dir>artifacts/src/fsharp.da6be68280c89131cdba2045525b80890401defd/</Dir>
14+
<Dir>artifacts/src/Humanizer.b30550eed103a6970d8465fe7c5c16300b70be81/</Dir>
1415
<Dir>artifacts/src/installer.5044b938294b7b920a5a4393a5f0f8b7b1750548/</Dir>
1516
<Dir>artifacts/src/known-good-tests./</Dir>
1617
<Dir>artifacts/src/known-good./</Dir>
@@ -48,8 +49,7 @@
4849
<Usage Id="MicroBuild.Core" Version="0.3.0" IsDirectDependency="true" />
4950
<Usage Id="MicroBuild.Core.Sentinel" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
5051
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="3.0.1" />
51-
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="3.1.2" />
52-
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20451.17" />
52+
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="3.1.8" />
5353
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
5454
<Usage Id="Microsoft.AspNetCore.Components.WebAssembly.Templates" Version="3.2.1" />
5555
<Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
@@ -71,18 +71,13 @@
7171
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
7272
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.9.6" />
7373
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0" />
74-
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" IsDirectDependency="true" />
7574
<Usage Id="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
7675
<Usage Id="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
7776
<Usage Id="Microsoft.CodeAnalysis.Common" Version="3.4.0" />
7877
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" IsDirectDependency="true" />
7978
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" IsDirectDependency="true" />
8079
<Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-2.20414.4" IsDirectDependency="true" />
81-
<Usage Id="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" IsDirectDependency="true" />
82-
<Usage Id="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
83-
<Usage Id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0" />
8480
<Usage Id="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="3.8.0-2.20414.4" IsDirectDependency="true" />
85-
<Usage Id="Microsoft.CodeQuality.Analyzers" Version="3.3.0" />
8681
<Usage Id="Microsoft.CSharp" Version="4.0.1" IsDirectDependency="true" />
8782
<Usage Id="Microsoft.CSharp" Version="4.3.0" IsDirectDependency="true" />
8883
<Usage Id="Microsoft.Docker.Sdk" Version="1.1.0" />
@@ -108,10 +103,8 @@
108103
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
109104
<Usage Id="Microsoft.Extensions.DependencyModel" Version="3.1.6" IsDirectDependency="true" />
110105
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
111-
<Usage Id="Microsoft.NetCore.Analyzers" Version="3.3.0" />
112106
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
113107
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
114-
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.3" />
115108
<Usage Id="Microsoft.NETCore.App.Ref" Version="3.0.0" />
116109
<Usage Id="Microsoft.NETCore.App.Ref" Version="3.1.0" />
117110
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
@@ -125,14 +118,13 @@
125118
<Usage Id="Microsoft.NETCore.Platforms" Version="1.1.0" />
126119
<Usage Id="Microsoft.NETCore.Platforms" Version="1.1.1" />
127120
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
128-
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
121+
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" IsDirectDependency="true" />
129122
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.2" />
130123
<Usage Id="Microsoft.NETCore.Platforms" Version="3.1.0" />
131124
<Usage Id="Microsoft.NETCore.Targets" Version="1.0.1" />
132125
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.0" />
133126
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.3" />
134127
<Usage Id="Microsoft.NETCore.Targets" Version="2.1.0" />
135-
<Usage Id="Microsoft.NetFramework.Analyzers" Version="3.3.0" />
136128
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" IsDirectDependency="true" IsAutoReferenced="true" />
137129
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
138130
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.0-preview.2" />
@@ -185,7 +177,6 @@
185177
<Usage Id="NUnit3.DotNetNew.Template" Version="1.6.5" />
186178
<Usage Id="NUnit3.DotNetNew.Template" Version="1.7.2" />
187179
<Usage Id="NUnit3.DotNetNew.Template" Version="1.8.1" />
188-
<Usage Id="Roslyn.Diagnostics.Analyzers" Version="3.3.0" IsDirectDependency="true" />
189180
<Usage Id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="debian.8-x64" />
190181
<Usage Id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="debian.8-x64" />
191182
<Usage Id="runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="fedora.23-x64" />
@@ -268,7 +259,7 @@
268259
<Usage Id="System.Diagnostics.FileVersionInfo" Version="4.0.0" IsDirectDependency="true" />
269260
<Usage Id="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
270261
<Usage Id="System.Diagnostics.Process" Version="4.1.0" />
271-
<Usage Id="System.Diagnostics.Process" Version="4.3.0" IsDirectDependency="true" />
262+
<Usage Id="System.Diagnostics.Process" Version="4.3.0" />
272263
<Usage Id="System.Diagnostics.StackTrace" Version="4.3.0" IsDirectDependency="true" />
273264
<Usage Id="System.Diagnostics.Tools" Version="4.0.1" />
274265
<Usage Id="System.Diagnostics.Tools" Version="4.3.0" />
@@ -387,19 +378,16 @@
387378
<Usage Id="System.Security.Cryptography.Cng" Version="4.2.0" />
388379
<Usage Id="System.Security.Cryptography.Cng" Version="4.3.0" />
389380
<Usage Id="System.Security.Cryptography.Cng" Version="4.7.0" />
390-
<Usage Id="System.Security.Cryptography.Cng" Version="5.0.0-preview.3.20214.6" />
391381
<Usage Id="System.Security.Cryptography.Csp" Version="4.0.0" />
392382
<Usage Id="System.Security.Cryptography.Csp" Version="4.3.0" />
393383
<Usage Id="System.Security.Cryptography.Encoding" Version="4.0.0" />
394384
<Usage Id="System.Security.Cryptography.Encoding" Version="4.3.0" />
395385
<Usage Id="System.Security.Cryptography.OpenSsl" Version="4.0.0" />
396386
<Usage Id="System.Security.Cryptography.OpenSsl" Version="4.3.0" />
397387
<Usage Id="System.Security.Cryptography.Pkcs" Version="4.7.0" />
398-
<Usage Id="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.3.20214.6" />
399388
<Usage Id="System.Security.Cryptography.Primitives" Version="4.0.0" />
400389
<Usage Id="System.Security.Cryptography.Primitives" Version="4.3.0" />
401390
<Usage Id="System.Security.Cryptography.ProtectedData" Version="4.3.0" />
402-
<Usage Id="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
403391
<Usage Id="System.Security.Cryptography.X509Certificates" Version="4.1.0" />
404392
<Usage Id="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
405393
<Usage Id="System.Security.Cryptography.Xml" Version="4.7.0" />
@@ -442,12 +430,12 @@
442430
<Usage Id="System.Threading.Thread" Version="4.0.0" />
443431
<Usage Id="System.Threading.Thread" Version="4.3.0" />
444432
<Usage Id="System.Threading.ThreadPool" Version="4.0.10" />
445-
<Usage Id="System.Threading.ThreadPool" Version="4.3.0" IsDirectDependency="true" />
433+
<Usage Id="System.Threading.ThreadPool" Version="4.3.0" />
446434
<Usage Id="System.Threading.Timer" Version="4.0.1" />
447435
<Usage Id="System.Threading.Timer" Version="4.3.0" />
448436
<Usage Id="System.ValueTuple" Version="4.3.0" />
449437
<Usage Id="System.ValueTuple" Version="4.4.0" />
450-
<Usage Id="System.ValueTuple" Version="4.5.0" IsDirectDependency="true" />
438+
<Usage Id="System.ValueTuple" Version="4.5.0" />
451439
<Usage Id="System.Windows.Extensions" Version="4.7.0" />
452440
<Usage Id="System.Xml.ReaderWriter" Version="4.0.11" IsDirectDependency="true" />
453441
<Usage Id="System.Xml.ReaderWriter" Version="4.3.0" />
@@ -463,4 +451,4 @@
463451
<Usage Id="vswhere" Version="2.6.7" IsDirectDependency="true" IsAutoReferenced="true" />
464452
<Usage Id="XliffTasks" Version="1.0.0-beta.20420.1" IsDirectDependency="true" IsAutoReferenced="true" />
465453
</Usages>
466-
</UsageData>
454+
</UsageData>

0 commit comments

Comments
 (0)