Skip to content

Commit 6d30638

Browse files
mmitchemmitche
authored
Enable prebuilt detection (#47894)
* Enable prebuilt detection - Add some missing depenencies with source-build tags - Update baseline - Remove some unused NuGet properties - Remove old source build workaround - Remove explicit reference to Microbuild.Core - Pass DotNetBuildFromSource to the repo tasks inner build environment
1 parent d4430f0 commit 6d30638

8 files changed

+86
-21
lines changed

‎eng/SourceBuild.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<ItemGroup>
4444
<!-- We need to flow FullAssemblySigningSupported even when building repo tasks because they use full signing -->
4545
<InnerBuildEnv Condition="'$(FullAssemblySigningSupported)' != ''" Include="FullAssemblySigningSupported=$(FullAssemblySigningSupported)" />
46+
<InnerBuildEnv Include="DotNetBuildFromSource=true" />
4647
</ItemGroup>
4748

4849
<!-- Call the build.sh script to build the repo tasks. Set IgnoreStandardErrorWarningFormat

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
<UsageData>
22
<IgnorePatterns>
3-
<UsagePattern IdentityGlob="*/*" />
3+
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
4+
5+
<!-- These are used in-build for repo-tasks and should come from previously source built -->
6+
<UsagePattern IdentityGlob="NuGet.Common/*6.2.2*" />
7+
<UsagePattern IdentityGlob="NuGet.Configuration/*6.2.2*" />
8+
<UsagePattern IdentityGlob="NuGet.Frameworks/*6.2.2*" />
9+
<UsagePattern IdentityGlob="NuGet.Packaging/*6.2.2*" />
10+
<UsagePattern IdentityGlob="NuGet.Versioning/*6.2.2*" />
11+
12+
<!-- These are what the analyzers are built against. They are overridden in full source build.
13+
It may be possible to generate SBRPs -->
14+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*2.9.4*" />
15+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
16+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Common/*3.3.1*" />
17+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp/*3.3.1*" />
18+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Workspaces/*3.3.1*" />
19+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Workspaces.Common/*3.3.1*" />
20+
<UsagePattern IdentityGlob="System.Composition/*1.0.31*" />
21+
<UsagePattern IdentityGlob="System.Threading.Tasks.Extensions/*4.5.3*" />
22+
23+
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
24+
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*8.0.*" />
25+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
426
</IgnorePatterns>
527
</UsageData>

‎eng/Version.Details.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@
285285
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23227.1">
286286
<Uri>https://github.com/dotnet/runtime</Uri>
287287
<Sha>9ef03140e8e99f55f903e7caa48044c1a5885d85</Sha>
288+
<SourceBuild RepoName="runtime" ManagedOnly="false" />
288289
</Dependency>
289290
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="8.0.0-preview.5.23227.1">
290291
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -299,6 +300,29 @@
299300
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
300301
<SourceBuild RepoName="xdt" ManagedOnly="true" />
301302
</Dependency>
303+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23225.2">
304+
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
305+
<Sha>4bf273ec25cc3983d6a5991cf0a4aa082cb255a5</Sha>
306+
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
307+
</Dependency>
308+
<!-- Not updated automatically -->
309+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.4.0-4.22520.2">
310+
<Uri>https://github.com/dotnet/roslyn</Uri>
311+
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
312+
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
313+
</Dependency>
314+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.4.0-4.22520.2">
315+
<Uri>https://github.com/dotnet/roslyn</Uri>
316+
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
317+
</Dependency>
318+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-4.22520.2">
319+
<Uri>https://github.com/dotnet/roslyn</Uri>
320+
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
321+
</Dependency>
322+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0-4.22520.2">
323+
<Uri>https://github.com/dotnet/roslyn</Uri>
324+
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
325+
</Dependency>
302326
</ProductDependencies>
303327
<ToolsetDependencies>
304328
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
@@ -311,6 +335,11 @@
311335
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
312336
<SourceBuild RepoName="arcade" ManagedOnly="true" />
313337
</Dependency>
338+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
339+
<Uri>https://github.com/dotnet/sourcelink</Uri>
340+
<Sha>47c52dd2ebf9edfd40abdcff999c13eb461f6ce2</Sha>
341+
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
342+
</Dependency>
314343
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23224.1">
315344
<Uri>https://github.com/dotnet/arcade</Uri>
316345
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
@@ -327,5 +356,17 @@
327356
<Uri>https://github.com/dotnet/arcade</Uri>
328357
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
329358
</Dependency>
359+
<Dependency Name="NuGet.Frameworks" Version="6.2.2">
360+
<Uri>https://github.com/nuget/nuget.client</Uri>
361+
<Sha>027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d</Sha>
362+
</Dependency>
363+
<Dependency Name="NuGet.Packaging" Version="6.2.2">
364+
<Uri>https://github.com/nuget/nuget.client</Uri>
365+
<Sha>027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d</Sha>
366+
</Dependency>
367+
<Dependency Name="NuGet.Versioning" Version="6.2.2">
368+
<Uri>https://github.com/nuget/nuget.client</Uri>
369+
<Sha>027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d</Sha>
370+
</Dependency>
330371
</ToolsetDependencies>
331372
</Dependencies>

‎eng/Versions.props

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,25 @@
135135
<MicrosoftEntityFrameworkCoreToolsVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreToolsVersion>
136136
<MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreVersion>
137137
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreDesignVersion>
138+
<!-- Packages from dotnet/roslyn -->
139+
<MicrosoftCodeAnalysisCommonVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCommonVersion>
140+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
141+
<MicrosoftCodeAnalysisCSharpVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpVersion>
142+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
143+
<!-- Packages from NuGet/Nuget.client -->
144+
<NuGetPackagingVersion>6.2.2</NuGetPackagingVersion>
145+
<NuGetVersioningVersion>6.2.2</NuGetVersioningVersion>
146+
<NuGetFrameworksVersion>6.2.2</NuGetFrameworksVersion>
138147
<!-- Packages from dotnet/arcade -->
139148
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23224.1</MicrosoftDotNetBuildTasksInstallersVersion>
140149
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23224.1</MicrosoftDotNetBuildTasksTemplatingVersion>
141150
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23224.1</MicrosoftDotNetRemoteExecutorVersion>
151+
<!-- Packages from dotnet/source-link -->
152+
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23218.3</MicrosoftSourceLinkGitHubVersion>
142153
<!-- Packages from dotnet/source-build-externals -->
143154
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23221.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
155+
<!-- Packages from dotnet/source-build-reference-packages -->
156+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23225.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
144157
<!-- Packages from dotnet/xdt -->
145158
<MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
146159
</PropertyGroup>
@@ -166,6 +179,8 @@
166179
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion>
167180
<!-- Build tool dependencies -->
168181
<MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
182+
<!-- Manually updated version from 6.0.0 to address CVE-2021-43877 -->
183+
<RepoTasksSystemSecurityCryptographyXmlVersion>6.0.1</RepoTasksSystemSecurityCryptographyXmlVersion>
169184
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
170185
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
171186
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
@@ -212,10 +227,10 @@
212227
-->
213228
<Analyzer_MicrosoftCodeAnalysisCSharpVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpVersion>
214229
<Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>
215-
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.4.0-3.22472.13</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
216-
<MicrosoftCodeAnalysisCommonVersion>4.4.0-3.22472.13</MicrosoftCodeAnalysisCommonVersion>
217-
<MicrosoftCodeAnalysisCSharpVersion>4.4.0-3.22472.13</MicrosoftCodeAnalysisCSharpVersion>
218-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.4.0-3.22472.13</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
230+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
231+
<MicrosoftCodeAnalysisCommonVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCommonVersion>
232+
<MicrosoftCodeAnalysisCSharpVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpVersion>
233+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
219234
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
220235
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.22531.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
221236
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.22531.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
@@ -229,9 +244,6 @@
229244
<MicrosoftOwinTestingVersion>3.0.1</MicrosoftOwinTestingVersion>
230245
<MicrosoftWebAdministrationVersion>11.1.0</MicrosoftWebAdministrationVersion>
231246
<SystemIdentityModelTokensJwtVersion>6.21.0</SystemIdentityModelTokensJwtVersion>
232-
<NuGetPackagingVersion>6.2.0</NuGetPackagingVersion>
233-
<NuGetVersioningVersion>6.2.0</NuGetVersioningVersion>
234-
<NuGetFrameworksVersion>6.2.0</NuGetFrameworksVersion>
235247
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
236248
<SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
237249
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>

‎eng/Workarounds.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
'$(GenerateRazorAssemblyInfo)' == 'true'" />
2121
</ItemGroup>
2222

23-
<!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so define this dummy target which is required for pack. -->
24-
<Import Condition="'$(DotNetBuildFromSource)' == 'true'" Project="WorkaroundsImported.targets" />
25-
2623
<!-- Workaround for netstandard2.1 projects until we can get a preview 8 SDK containing https://github.com/dotnet/sdk/pull/3463 fix. -->
2724
<ItemGroup>
2825
<KnownFrameworkReference Update="NETStandard.Library">

‎eng/WorkaroundsImported.targets

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎eng/targets/CSharp.Common.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
<Features>strict</Features>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<!-- Required to exist in the NuGet package cache to enable code-signing. -->
11-
<PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="All" AllowExplicitReference="true" ExcludeAssets="All" />
12-
</ItemGroup>
13-
149
<ItemGroup Condition=" $(IsTestProject) ">
1510
<Reference Include="Microsoft.AspNetCore.Testing" />
1611
<Reference Include="Moq" />

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
2424
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
2525
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
26+
<!-- Manually updated version from 6.0.0 to address CVE-2021-43877 -->
27+
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(RepoTasksSystemSecurityCryptographyXmlVersion)" />
2628
</ItemGroup>
2729

2830
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

0 commit comments

Comments
 (0)