Skip to content

Commit d6c5a50

Browse files
add source-build pre-built detection (#933)
* add pre-build detection * downgrade MSBuild to 16.8 * add clarifying comments; move source-build RID prop in CI * fixup sbrp definition; fixup invalid msbuild version prop * update changes made * remove redundant CI arg * add missing sb attribute; bump arcade dep versions * remove obsolete pre-built exclusions; fixup dep versions * remove obsolete nuget source; fixup sourcebuild metadata * fixup duplicate dependency declaration * add explanation for dotnet-sourcelink exclusion
1 parent a97fab9 commit d6c5a50

File tree

4 files changed

+27
-6
lines changed

4 files changed

+27
-6
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
77
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
88
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
9+
<!-- Feeds for source-build command-line-api intermediate -->
10+
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
911
</packageSources>
1012
<disabledPackageSources>
1113
<clear />
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
12
<UsageData>
23
<IgnorePatterns>
3-
<UsagePattern IdentityGlob="*/*" />
4+
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
45
</IgnorePatterns>
5-
</UsageData>
6+
</UsageData>

eng/Version.Details.xml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,32 @@
1313
<Uri>https://github.com/dotnet/command-line-api</Uri>
1414
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
1515
</Dependency>
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.327201">
17+
<Uri>https://github.com/dotnet/command-line-api</Uri>
18+
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
19+
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
20+
</Dependency>
21+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23265.3">
22+
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
23+
<Sha>e2e64d25662c00a35726d3c52f969a50edaa4f48</Sha>
24+
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
25+
</Dependency>
1626
</ProductDependencies>
1727
<ToolsetDependencies>
1828
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23262.5">
1929
<Uri>https://github.com/dotnet/arcade</Uri>
2030
<Sha>1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4</Sha>
31+
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2132
</Dependency>
22-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23265.3">
23-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
24-
<Sha>e2e64d25662c00a35726d3c52f969a50edaa4f48</Sha>
25-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
33+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
34+
<Uri>https://github.com/dotnet/sourcelink</Uri>
35+
<Sha>759f344923a0859f3fae83431d0ba1cc62108118</Sha>
36+
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
37+
</Dependency>
38+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23261.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
39+
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
40+
<Sha>519d565b45c46ac452fe5a77ab63295138992e07</Sha>
41+
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
2642
</Dependency>
2743
</ToolsetDependencies>
2844
</Dependencies>

src/dotnet-sourcelink/dotnet-sourcelink.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFrameworks>$(NetCurrent)</TargetFrameworks>
55
<!-- Allow tool to roll forward to a newer major version. -->
66
<RollForward>Major</RollForward>
7+
<!-- Will be removed by https://github.com/dotnet/sourcelink/issues/1028 -->
8+
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
79

810
<!-- NuGet -->
911
<IsPackable>true</IsPackable>

0 commit comments

Comments
 (0)