Applies all patches from dotnet/source-build for 5.0 #3511
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dominoFire
requested review from
aortiz-msft,
cristinamanum,
donnie-msft,
dtivel,
heng-liu,
kartheekp-ms,
nkolev92,
rrelyea,
zivkan and
zkat
as code owners
zivkan
reviewed
Jul 10, 2020
...Get.VisualStudio.OnlineEnvironment.Client/NuGet.VisualStudio.OnlineEnvironment.Client.csproj
Outdated
Show resolved
Hide resolved
src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
Outdated
Show resolved
Hide resolved
nkolev92
reviewed
Jul 10, 2020
src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
Outdated
Show resolved
Hide resolved
dominoFire
changed the title
added 16 commits
July 13, 2020 21:29
added 9 commits
July 13, 2020 21:29
…Identifier in N.B.T.P
dominoFire
force-pushed
the
dev-dominofire-sourcebuild5
branch
from
c6ac986 to
8ab12f9
Compare
zivkan
approved these changes
Jul 14, 2020
nkolev92
approved these changes
Jul 14, 2020
src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
Outdated
Show resolved
Hide resolved
src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
Outdated
Show resolved
Hide resolved
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bug
Fixes: https://github.com/NuGet/Client.Engineering/issues/384
Regression: No
Fix
Details: Applies all patches located at: https://github.com/dotnet/source-build/tree/master/patches/nuget-client
NOTE: This PR blocks dotnet/source-build#1649
Details on patches
0001-Set-final-5.4-branding-3100.patchAdds
IsEscrow = trueproperty when in source-build mode. No effect.0002-experimental-nuget-patch.patch
Remove IL merged assemblies that conflicts with source-build. Seems related to ILMerge does not run in source-build dotnet/source-build#739
0003-MSBuild-package-versions-for-dotnet-Source-Build-285.patchAdds RepoApi (source-build package injection) to NuGet.Client repo. It is already integrated in this repo
0004-Pin-newtonsoft-json-to-a-specific-version.patch
Sets Newtonsoft.Json to 9.0.1; already done in NuGet.Client via defaults and RepoApi
0005-New-version-of-ref-assemblies.patchUpdates netfx reference assemblies to 1.0.0-preview.1; removed ref. assembly since 5.0 is only building netcore assemblies.
0006-Do-not-build-NET-Fx-binaries-in-source-build.patch
Avoid adding any mention to netframework TFMs to avoid conflicts with source-build
0007-Do-not-set-RID-in-source-build.patch
When compiling NuGet.Build.Tasks.Pack in source-build, avoid setting the RuntimeIdentifier to win7-x64. This RID is needed to copy runtime-specifc assets from System.Security.Cryptography.ProtectedData 4.3.0 to the final netcore NuGet.Build.Task.Pack package.
0008-Remove-unneeded-feeds.patchRemove feeds that conflicts with source-build at those could introduce unneeded prebuilt packages. Those feeds are VS-specific and added conditionally with the help of
RestoreAdditionalProjectSources0009-Clear-VsToolsPath-for-source-build.patch
It seems that VSToolsPath confuses source-build, so it is set to blank
0010-Remove-trailing-separator-for-PackagePath.patch
Removes trailing backslashes in project file. Known issue documented here: Invalid Nuget.Build.Tasks.Console package when building from source Home#9705
Testing
Tests Added: No
Reason for not adding tests: Build infrastructure, it only needs to have a full green build to validate changes
Validation: source-build CI run:
All but MacOS are green builds. CI Mac pipeline failure seems to be related with dotnet/installer repo