Skip to content

Use source-build-assets repo #20839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikolaMilosavljevic merged 5 commits into from
Apr 13, 2026
Merged

Use source-build-assets repo #20839

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85a7f02
Use source-build-assets repo
NikolaMilosavljevic Apr 8, 2026
fa5c30d
Remove unnecessary fallback code
NikolaMilosavljevic Apr 9, 2026
68f6122
Remove support for unused scenario
NikolaMilosavljevic Apr 9, 2026
7c7adf4
Add source mapping for sbrp repo
NikolaMilosavljevic Apr 10, 2026
c3b2d6a
Exclude all files from sbrp repo
NikolaMilosavljevic Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.26203.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>9d83c59ff890ff2020aa38ebcf3bb514e38e9ffe</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-assets" Version="8.0.0-alpha.1.26208.3">
<Uri>https://github.com/dotnet/source-build-assets</Uri>
<Sha>e911a8db53ca72e45e66bb84376e68fe5c5999b9</Sha>
<SourceBuild RepoName="source-build-assets" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
<PropertyGroup Condition="'@(_BuiltIntermediatePackages)' != ''">
<_NupkgDestinationPath>$(SourceBuiltPackagesPath)</_NupkgDestinationPath>
<!-- SBRP packages unpack into the Reference packages directory instead of into blob-feed packages -->
<_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))">$(ReferencePackagesDir)</_NupkgDestinationPath>
<_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-assets'))">$(ReferencePackagesDir)</_NupkgDestinationPath>
</PropertyGroup>

<ZipFileExtractToDirectory Condition="'@(_BuiltIntermediatePackages)' != ''"
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/dotnet.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<!-- Toolsets -->
<RepositoryReference Include="source-build-reference-packages" />
<RepositoryReference Include="source-build-assets" />
<RepositoryReference Include="arcade" />

<!-- Product Repos -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/repo-projects/package-source-build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<!-- Copy PVP to packages dir in order to package them together -->
<Copy SourceFiles="$(IncludedPackageVersionPropsFile)" DestinationFiles="$(SourceBuiltPackagesPath)PackageVersions.props" />

<!-- Expand SBRP intermediate package into separate folder and remove intermediate package -->
<!-- Expand source-build-assets intermediate package into separate folder and remove intermediate package -->
<PropertyGroup>
<SourceBuildReferencePackagesDestination>$(SourceBuiltPackagesPath)SourceBuildReferencePackages/</SourceBuildReferencePackagesDestination>
<SBRPIntermediateWildcard>Microsoft.SourceBuild.Intermediate.source-build-reference-packages*.nupkg</SBRPIntermediateWildcard>
<SBRPIntermediateWildcard>Microsoft.SourceBuild.Intermediate.source-build-assets*.nupkg</SBRPIntermediateWildcard>
</PropertyGroup>
<ItemGroup>
<SourceBuildReferencePackagesIntermediatePackage Include="$(SourceBuiltPackagesPath)$(SBRPIntermediateWildcard)"/>
Expand Down
4 changes: 2 additions & 2 deletions ...ects/source-build-reference-packages.proj → ...nt/repo-projects/source-build-assets.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<LocalNuGetPackageCacheDirectory>$(BaseIntermediatePath)source-build-reference-package-cache</LocalNuGetPackageCacheDirectory>
<LocalNuGetPackageCacheDirectory>$(BaseIntermediatePath)source-build-assets-cache</LocalNuGetPackageCacheDirectory>

<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs>
Expand All @@ -20,7 +20,7 @@

<AddSourceToNuGetConfig
NuGetConfigFile="$(NuGetConfigFile)"
SourceName="source-build-reference-package-cache"
SourceName="source-build-assets-cache"
SourcePath="$(LocalNuGetPackageCacheDirectory)" />
</Target>

Expand Down
20 changes: 10 additions & 10 deletions ...ceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,21 +232,21 @@ src/source-build-externals/src/xunit/xunit.sln|json
src/source-build-externals/patches/application-insights/0002-Remove-WebGrease-from-TPN-2816.patch

#
# source-build-reference-packages
# source-build-assets
#

# False positive
src/source-build-reference-packages/src/targetPacks/ILsrc/microsoft.netcore.app.ref/3.*/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown-license-reference
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library.ref/2.1.0/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.codeanalysis.collections/4.2.0-1.22102.8/ThirdPartyNotices.rtf|json
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown-license-reference
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.*/IntellisenseFiles/*/1033/System.Security.Permissions.xml|unknown-license-reference
src/source-build-assets/src/targetPacks/ILsrc/microsoft.netcore.app.ref/3.*/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
src/source-build-assets/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown-license-reference
src/source-build-assets/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
src/source-build-assets/src/targetPacks/ILsrc/netstandard.library.ref/2.1.0/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
src/source-build-assets/src/textOnlyPackages/src/microsoft.codeanalysis.collections/4.2.0-1.22102.8/ThirdPartyNotices.rtf|json
src/source-build-assets/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown-license-reference
src/source-build-assets/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.*/IntellisenseFiles/*/1033/System.Security.Permissions.xml|unknown-license-reference

# Contains references to licenses which are not applicable to the source
src/source-build-reference-packages/src/packageSourceGenerator/PackageSourceGeneratorTask/RewriteNuspec.cs|unknown-license-reference,ms-net-library-2018-11
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.*/IntellisenseFiles/windowsdesktop/1033/PresentationCore.xml|proprietary-license
src/source-build-assets/src/packageSourceGenerator/PackageSourceGeneratorTask/RewriteNuspec.cs|unknown-license-reference,ms-net-library-2018-11
src/source-build-assets/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.*/IntellisenseFiles/windowsdesktop/1033/PresentationCore.xml|proprietary-license

#
# sourcelink
Expand Down
4 changes: 2 additions & 2 deletions src/VirtualMonoRepo/source-mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@
]
},
{
"name": "source-build-reference-packages",
"defaultRemote": "https://github.com/dotnet/source-build-reference-packages"
"name": "source-build-assets",
"defaultRemote": "https://github.com/dotnet/source-build-assets"
},
{
"name": "sourcelink",
Expand Down
Loading