Skip to content

Commit d8962f6

Browse files
sharwellsharwell
authored
Merge pull request #1821 from MichaelSimons/prebuilt-detection
Enable source-build prebuilt detection
2 parents 6689fc6 + 9ccec0f commit d8962f6

File tree

5 files changed

+59
-13
lines changed

5 files changed

+59
-13
lines changed

‎Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
1212
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
1313
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
15-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
16-
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
17-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
18-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
19-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
20-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
21-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
16+
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
17+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
18+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVersion)" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
2222
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
2323
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
2424
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />

‎NuGet.config‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<clear />
55
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
66
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
7+
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
8+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
79
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
810
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
911
</packageSources>
@@ -18,6 +20,13 @@
1820
</packageSource>
1921
<packageSource key="dotnet-libraries">
2022
<package pattern="System.*" />
23+
<package pattern="Microsoft.*" />
24+
</packageSource>
25+
<packageSource key="dotnet-libraries-transport">
26+
<package pattern="Microsoft.*" />
27+
</packageSource>
28+
<packageSource key="dotnet8-transport">
29+
<package pattern="Microsoft.*" />
2130
</packageSource>
2231
<packageSource key="dotnet-tools">
2332
<package pattern="Microsoft.*" />

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<UsageData>
22
<IgnorePatterns>
3-
<UsagePattern IdentityGlob="*/*" />
3+
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
4+
5+
<!-- This is a transitive dependency from Microsoft.CodeAnalysis.
6+
This version does not have source build intermediate.
7+
When a newer version is picked up, the intermediate should be utilized. -->
8+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
49
</IgnorePatterns>
510
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,55 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23226.15">
4+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.7.0-1.23226.15">
55
<Uri>https://github.com/dotnet/roslyn</Uri>
66
<Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
7+
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8+
</Dependency>
9+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23221.1">
10+
<Uri>https://github.com/dotnet/source-build-externals</Uri>
11+
<Sha>834923aef31d157aec19a2b99d5494cea29dcc9e</Sha>
12+
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
13+
</Dependency>
14+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23253.2">
15+
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
16+
<Sha>c65b02aef21850de618d37a5304d3bbd829c2733</Sha>
17+
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
18+
</Dependency>
19+
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0-beta-22503-02">
20+
<Uri>https://github.com/dotnet/symreader</Uri>
21+
<Sha>0c29b7109c054bdc578e917515ae7e8635b9cb9d</Sha>
22+
<SourceBuild RepoName="symreader" ManagedOnly="true" />
23+
</Dependency>
24+
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.356401">
25+
<Uri>https://github.com/dotnet/command-line-api</Uri>
26+
<Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
27+
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
728
</Dependency>
829
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22564.1">
930
<Uri>https://github.com/dotnet/command-line-api</Uri>
10-
<Sha>350a618ab44932c568ae2392d7a571281baed59a</Sha>
31+
<Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
1132
</Dependency>
1233
<Dependency Name="System.CommandLine.Rendering" Version="0.4.0-alpha.22564.1">
1334
<Uri>https://github.com/dotnet/command-line-api</Uri>
14-
<Sha>350a618ab44932c568ae2392d7a571281baed59a</Sha>
35+
<Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
1536
</Dependency>
1637
</ProductDependencies>
1738
<ToolsetDependencies>
1839
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23265.1">
1940
<Uri>https://github.com/dotnet/arcade</Uri>
2041
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
42+
<SourceBuild RepoName="arcade" ManagedOnly="true" />
43+
</Dependency>
44+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
45+
<Uri>https://github.com/dotnet/sourcelink</Uri>
46+
<Sha>47c52dd2ebf9edfd40abdcff999c13eb461f6ce2</Sha>
47+
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
48+
</Dependency>
49+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23263.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
50+
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
51+
<Sha>3f7d6c7e742012d9437fcb0d04cac63202d37621</Sha>
52+
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
2153
</Dependency>
2254
</ToolsetDependencies>
2355
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
3030
<NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
3131
<!-- roslyn -->
32-
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23226.15</MicrosoftNetCompilersToolsetPackageVersion>
32+
<MicrosoftCodeAnalysisVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVersion>
3333
<!-- roslyn-sdk -->
3434
<MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>
3535
<!-- runtime -->

0 commit comments

Comments
 (0)