From 878ac3dcb441fabc536ff981d9683c1ce6158675 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 31 May 2023 22:30:29 +0000
Subject: [PATCH 1/4] Enable source-build pvp flow for installer

---
 CODEOWNERS                                       |  1 +
 eng/SourceBuild.props                            |  2 ++
 eng/SourceBuildPrebuiltBaseline.xml              | 16 ++++------------
 eng/Version.Details.xml                          |  6 +++++-
 eng/Versions.props                               |  3 ++-
 .../content/repo-projects/installer.proj         |  2 ++
 src/core-sdk-tasks/core-sdk-tasks.csproj         |  2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 22fd91a945cb..c40c4e3153e4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,6 +2,7 @@
 # See https://help.github.com/articles/about-code-owners/
 
 /.devcontainer/ @dotnet/source-build-internal
+/src/eng/SourceBuild* @dotnet/source-build-internal
 /src/snaps/ @rbhanda
 /src/SourceBuild/ @dotnet/source-build-internal
 /src/VirtualMonoRepo/ @dotnet/product-construction
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 5f49a568806b..87224ebefacc 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -1,3 +1,5 @@
+<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
+
 <Project>
 
   <PropertyGroup>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 3c67bed75c41..ee09742d35f2 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,3 +1,6 @@
+<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
+<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
+
 <UsageData>
   <IgnorePatterns>
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
@@ -5,19 +8,8 @@
     <!--
       Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
       see: https://github.com/NuGet/Home/issues/11059
-
-      Once that's fixed, NuGet package version should be updated to newest, and intermediate product dependency
-      added to Version.Details.xml
     -->
-    <UsagePattern IdentityGlob="NuGet.Common/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Configuration/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Frameworks/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Packaging/*5.8.0*" />
-    <UsagePattern IdentityGlob="NuGet.Versioning/*5.8.0*" />
-
-    <!-- Referenced by NuGet.Packaging.5.8.0 - could be resolved when version of NuGet packages gets updated. -->
-    <UsagePattern IdentityGlob="System.Security.Cryptography.Cng/5.0.0-preview.3.20214.6" />
-    <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0-preview.3.20214.6" />
+    <UsagePattern IdentityGlob="NuGet.*/*" />
 
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 110fbce6e6b7..94ff92f4f769 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -156,11 +156,15 @@
       <Sha>d4c4d1ec77e88a9abcb229f3d86413fa0b2a57e1</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Packaging" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>a6fff16af6f44927a83851448a99beb1d2801600</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="NuGet.Versioning" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>a6fff16af6f44927a83851448a99beb1d2801600</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
       <Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
       <Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 03d01376418c..59c3c57b36fe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -120,7 +120,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
-    <NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion>
+    <NuGetPackagingPackageVersion>6.7.0-preview.2.50</NuGetPackagingPackageVersion>
+    <NuGetVersioningPackageVersion>6.7.0-preview.2.50</NuGetVersioningPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
   <PropertyGroup>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index b368b83ecddc..8e4875fa8218 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -43,6 +43,8 @@
 
     <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
 
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
+
     <!-- CS9057 - Caused by incoherency of analyzer assemblies during pre-release builds. -->
     <RepoNoWarns>CS9057</RepoNoWarns>
   </PropertyGroup>
diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj
index 5ad1f11af317..d31120da6b27 100644
--- a/src/core-sdk-tasks/core-sdk-tasks.csproj
+++ b/src/core-sdk-tasks/core-sdk-tasks.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
-    <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

From dd8376767bce777fc2c90f68043f600f7162f593 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 1 Jun 2023 10:29:44 -0500
Subject: [PATCH 2/4] Update CODEOWNERS

Co-authored-by: Matt Thalman <mthalman@microsoft.com>
---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index c40c4e3153e4..1272a3799109 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,7 +2,7 @@
 # See https://help.github.com/articles/about-code-owners/
 
 /.devcontainer/ @dotnet/source-build-internal
-/src/eng/SourceBuild* @dotnet/source-build-internal
+/eng/SourceBuild* @dotnet/source-build-internal
 /src/snaps/ @rbhanda
 /src/SourceBuild/ @dotnet/source-build-internal
 /src/VirtualMonoRepo/ @dotnet/product-construction

From 36e546e9b3f9aadda7c94b6da6c747ba86e61b5b Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 1 Jun 2023 15:35:13 +0000
Subject: [PATCH 3/4] Refactor versions.props and versions.details.xml

---
 eng/Version.Details.xml                  | 6 +-----
 eng/Versions.props                       | 3 +--
 src/core-sdk-tasks/core-sdk-tasks.csproj | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 94ff92f4f769..110fbce6e6b7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -156,15 +156,11 @@
       <Sha>d4c4d1ec77e88a9abcb229f3d86413fa0b2a57e1</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Packaging" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>a6fff16af6f44927a83851448a99beb1d2801600</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Versioning" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a6fff16af6f44927a83851448a99beb1d2801600</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
       <Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
       <Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 59c3c57b36fe..1d0eba07fe7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -120,8 +120,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
-    <NuGetPackagingPackageVersion>6.7.0-preview.2.50</NuGetPackagingPackageVersion>
-    <NuGetVersioningPackageVersion>6.7.0-preview.2.50</NuGetVersioningPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.7.0-preview.2.50</NuGetBuildTasksPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
   <PropertyGroup>
diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj
index d31120da6b27..b90bc55a96b0 100644
--- a/src/core-sdk-tasks/core-sdk-tasks.csproj
+++ b/src/core-sdk-tasks/core-sdk-tasks.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.Build" Version="15.7.179" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
-    <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingPackageVersion)" />
+    <PackageReference Include="NuGet.Versioning" Version="$(NuGetBuildTasksPackageVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetBuildTasksPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

From 22eec7e4e23d15cefe7bee2179ad416dbbc7453e Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 1 Jun 2023 15:36:43 +0000
Subject: [PATCH 4/4] Update versions from main

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d2b9c7624c7a..20f6ebf842c4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -120,7 +120,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
-    <NuGetBuildTasksPackageVersion>6.7.0-preview.2.50</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
   <PropertyGroup>