-
Notifications
You must be signed in to change notification settings - Fork 447
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.
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
Enable PVP flow for nuget.client #16603
Merged
NikolaMilosavljevic
merged 4 commits into
dotnet:main
from
NikolaMilosavljevic:nuget.pvp
Jun 8, 2023
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
60 changes: 60 additions & 0 deletions
60
src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Nikola Milosavljevic <nikolam@microsoft.com> | ||
Date: Wed, 7 Jun 2023 03:03:22 +0000 | ||
Subject: [PATCH] Add dependencies for PVP flow | ||
|
||
Backport: https://github.com/NuGet/NuGet.Client/pull/5207 | ||
--- | ||
Directory.Packages.props | 1 + | ||
eng/Version.Details.xml | 27 +++++++++++++++++++++++++++ | ||
2 files changed, 28 insertions(+) | ||
|
||
diff --git a/Directory.Packages.props b/Directory.Packages.props | ||
index baec21914..2461e41f0 100644 | ||
--- a/Directory.Packages.props | ||
+++ b/Directory.Packages.props | ||
@@ -16,6 +16,7 @@ | ||
<MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion> | ||
|
||
<!-- Overridden by source build to ensure the same version is used across products, do not remove these properties --> | ||
+ <!-- For each property here, there is an appropriate package dependency in eng/Version.Details.xml --> | ||
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion Condition="'$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> | ||
<MicrosoftExtensionsFileSystemGlobbingPackageVersion Condition="'$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion> | ||
<MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion> | ||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml | ||
index ff6bc71b5..bbadad4c0 100644 | ||
--- a/eng/Version.Details.xml | ||
+++ b/eng/Version.Details.xml | ||
@@ -5,4 +5,31 @@ | ||
See https://github.com/dotnet/arcade/issues/2396 for details. | ||
See https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#details-file for schema. | ||
--> | ||
+ | ||
+ <!-- | ||
+ Following dependencies are required for PVP flow. | ||
+ PVP flow infra will automatically bump the version to the latest live one. | ||
+ --> | ||
+ <ProductDependencies> | ||
+ <Dependency Name="Microsoft.Build" Version="17.3.1"> | ||
+ <Uri>https://github.com/dotnet/msbuild</Uri> | ||
+ <Sha>80f618ad45d38475773fd1a6eaa059f118a0ad5a</Sha> | ||
+ </Dependency> | ||
+ <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0"> | ||
+ <Uri>https://github.com/dotnet/runtime</Uri> | ||
+ <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha> | ||
+ </Dependency> | ||
+ <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0"> | ||
+ <Uri>https://github.com/dotnet/runtime</Uri> | ||
+ <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha> | ||
+ </Dependency> | ||
+ <Dependency Name="Microsoft.Web.Xdt" Version="3.0.0"> | ||
+ <Uri>https://github.com/aspnet/xdt</Uri> | ||
+ <Sha>d4d088b6a9c793525b1a27a119cb66ba4587bb39</Sha> | ||
+ </Dependency> | ||
+ <Dependency Name="System.ComponentModel.Composition" Version="4.5.0"> | ||
+ <Uri>https://github.com/dotnet/corefx</Uri> | ||
+ <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha> | ||
+ </Dependency> | ||
+ </ProductDependencies> | ||
</Dependencies> | ||
\ No newline at end of file |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In order to reduce the chance of patch conflicts, this change should be removed since it provides no functional behavior.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, makes sense. I'll remove it from the patch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed with 4604dec