diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2507d72647b..ad258377573b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -248,10 +248,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - - https://github.com/dotnet/source-build-reference-packages - 9d83c59ff890ff2020aa38ebcf3bb514e38e9ffe - + + https://github.com/dotnet/source-build-assets + e911a8db53ca72e45e66bb84376e68fe5c5999b9 + https://github.com/dotnet/xliff-tasks diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index e1a5734ad5f1..cb213bc9ad07 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -313,7 +313,7 @@ <_NupkgDestinationPath>$(SourceBuiltPackagesPath) - <_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))">$(ReferencePackagesDir) + <_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-assets'))">$(ReferencePackagesDir) - + diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index 89d2631d876b..ce64608d9de7 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -25,10 +25,10 @@ - + $(SourceBuiltPackagesPath)SourceBuildReferencePackages/ - Microsoft.SourceBuild.Intermediate.source-build-reference-packages*.nupkg + Microsoft.SourceBuild.Intermediate.source-build-assets*.nupkg diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-assets.proj similarity index 90% rename from src/SourceBuild/content/repo-projects/source-build-reference-packages.proj rename to src/SourceBuild/content/repo-projects/source-build-assets.proj index 4c535e89c9e3..8c328dc3a331 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-assets.proj @@ -2,7 +2,7 @@ - $(BaseIntermediatePath)source-build-reference-package-cache + $(BaseIntermediatePath)source-build-assets-cache $(StandardSourceBuildArgs) $(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier) @@ -20,7 +20,7 @@ diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt index cafa0d1d448c..0660c9f5cf46 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt @@ -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 diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 2afa3189d6ba..7c2ec48a9795 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -160,8 +160,19 @@ ] }, { + "name": "source-build-assets", + "defaultRemote": "https://github.com/dotnet/source-build-assets" + }, + { + // TODO: Remove the source-build-reference-packages mapping once + // the synchronization flags it as unused. + // We no longer synchronize it but we can't remove it yet until + // it disappears from all of the Version.Details.xml files. + // https://github.com/dotnet/source-build/issues/5533 "name": "source-build-reference-packages", - "defaultRemote": "https://github.com/dotnet/source-build-reference-packages" + "defaultRemote": "https://github.com/dotnet/source-build-reference-packages", + "ignoreDefaults": true, + "exclude": [ "**/*" ] }, { "name": "sourcelink",