Skip to content
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

Jump to bottom

Enable PVP flow for nuget.client #16603

Merged
merged 4 commits into from
Jun 8, 2023
Merged

Enable PVP flow for nuget.client #16603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baa0b57
Enable PVP flow for nuget.client
NikolaMilosavljevic Jun 6, 2023
8078c5a
Add missing package dependencies
NikolaMilosavljevic Jun 7, 2023
7b5d6c9
Merge branch 'main' into nuget.pvp
NikolaMilosavljevic Jun 7, 2023
4604dec
Patch only required changes
NikolaMilosavljevic Jun 7, 2023
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
2 changes: 2 additions & 0 deletions src/SourceBuild/content/repo-projects/nuget-client.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>

<BuildCommand>$(ProjectDirectory)eng/source-build/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>

<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
</PropertyGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down
47 changes: 47 additions & 0 deletions src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
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
---
eng/Version.Details.xml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)

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