Skip to content

Commit fb39dc2

Browse files
NikolaMilosavljevicNikolaMilosavljevic
authored
Use source-build-assets repo (#20839)
1 parent b863890 commit fb39dc2

7 files changed

Lines changed: 32 additions & 21 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@
248248
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
249249
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
250250
</Dependency>
251-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.26203.3">
252-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
253-
<Sha>9d83c59ff890ff2020aa38ebcf3bb514e38e9ffe</Sha>
254-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
251+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-assets" Version="8.0.0-alpha.1.26208.3">
252+
<Uri>https://github.com/dotnet/source-build-assets</Uri>
253+
<Sha>e911a8db53ca72e45e66bb84376e68fe5c5999b9</Sha>
254+
<SourceBuild RepoName="source-build-assets" ManagedOnly="true" />
255255
</Dependency>
256256
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
257257
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎src/SourceBuild/content/repo-projects/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
<PropertyGroup Condition="'@(_BuiltIntermediatePackages)' != ''">
314314
<_NupkgDestinationPath>$(SourceBuiltPackagesPath)</_NupkgDestinationPath>
315315
<!-- SBRP packages unpack into the Reference packages directory instead of into blob-feed packages -->
316-
<_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))">$(ReferencePackagesDir)</_NupkgDestinationPath>
316+
<_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-assets'))">$(ReferencePackagesDir)</_NupkgDestinationPath>
317317
</PropertyGroup>
318318

319319
<ZipFileExtractToDirectory Condition="'@(_BuiltIntermediatePackages)' != ''"

‎src/SourceBuild/content/repo-projects/dotnet.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<!-- Toolsets -->
21-
<RepositoryReference Include="source-build-reference-packages" />
21+
<RepositoryReference Include="source-build-assets" />
2222
<RepositoryReference Include="arcade" />
2323

2424
<!-- Product Repos -->

‎src/SourceBuild/content/repo-projects/package-source-build.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<!-- Copy PVP to packages dir in order to package them together -->
2626
<Copy SourceFiles="$(IncludedPackageVersionPropsFile)" DestinationFiles="$(SourceBuiltPackagesPath)PackageVersions.props" />
2727

28-
<!-- Expand SBRP intermediate package into separate folder and remove intermediate package -->
28+
<!-- Expand source-build-assets intermediate package into separate folder and remove intermediate package -->
2929
<PropertyGroup>
3030
<SourceBuildReferencePackagesDestination>$(SourceBuiltPackagesPath)SourceBuildReferencePackages/</SourceBuildReferencePackagesDestination>
31-
<SBRPIntermediateWildcard>Microsoft.SourceBuild.Intermediate.source-build-reference-packages*.nupkg</SBRPIntermediateWildcard>
31+
<SBRPIntermediateWildcard>Microsoft.SourceBuild.Intermediate.source-build-assets*.nupkg</SBRPIntermediateWildcard>
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<SourceBuildReferencePackagesIntermediatePackage Include="$(SourceBuiltPackagesPath)$(SBRPIntermediateWildcard)"/>

src/SourceBuild/content/repo-projects/source-build-reference-packages.proj renamed to src/SourceBuild/content/repo-projects/source-build-assets.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
33

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

77
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
88
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs>
@@ -20,7 +20,7 @@
2020

2121
<AddSourceToNuGetConfig
2222
NuGetConfigFile="$(NuGetConfigFile)"
23-
SourceName="source-build-reference-package-cache"
23+
SourceName="source-build-assets-cache"
2424
SourcePath="$(LocalNuGetPackageCacheDirectory)" />
2525
</Target>
2626

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,21 +232,21 @@ src/source-build-externals/src/xunit/xunit.sln|json
232232
src/source-build-externals/patches/application-insights/0002-Remove-WebGrease-from-TPN-2816.patch
233233

234234
#
235-
# source-build-reference-packages
235+
# source-build-assets
236236
#
237237

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

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

251251
#
252252
# sourcelink

‎src/VirtualMonoRepo/source-mappings.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,19 @@
160160
]
161161
},
162162
{
163+
"name": "source-build-assets",
164+
"defaultRemote": "https://github.com/dotnet/source-build-assets"
165+
},
166+
{
167+
// TODO: Remove the source-build-reference-packages mapping once
168+
// the synchronization flags it as unused.
169+
// We no longer synchronize it but we can't remove it yet until
170+
// it disappears from all of the Version.Details.xml files.
171+
// https://github.com/dotnet/source-build/issues/5533
163172
"name": "source-build-reference-packages",
164-
"defaultRemote": "https://github.com/dotnet/source-build-reference-packages"
173+
"defaultRemote": "https://github.com/dotnet/source-build-reference-packages",
174+
"ignoreDefaults": true,
175+
"exclude": [ "**/*" ]
165176
},
166177
{
167178
"name": "sourcelink",

0 commit comments

Comments
 (0)