From 60314069e7a61d95a600d595d7d98b2db93bdfea Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Tue, 6 Jul 2021 10:26:39 -0700
Subject: [PATCH 1/3] Onboard Package Validation SDK

---
 Directory.Build.targets         | 6 ++++++
 eng/Versions.props              | 1 +
 eng/targets/CSharp.Common.props | 2 ++
 global.json                     | 3 ++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index e7501159d6f6..e18216801b4a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -66,6 +66,12 @@
          '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsMicrobenchmarksProject)' == 'true') ">false</IsPackable>
   </PropertyGroup>
 
+  <!-- Properties for Package Validation -->
+  <!-- We only want to check for API changes in servicing branches -->
+  <PropertyGroup Condition=" '$(IsServicingBuild)' != 'true' ">
+    <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
+  </PropertyGroup>
+
   <Import Project="eng\Baseline.Designer.props" />
 
   <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">
diff --git a/eng/Versions.props b/eng/Versions.props
index 4f6e1bea79e1..3a94a62eeb73 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -195,6 +195,7 @@
     <MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.8.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCssParserVersion>1.0.0-20200708.1</MicrosoftCssParserVersion>
+    <MicrosoftDotNetPackageValidationVersion>1.0.0-preview.7.21356.2</MicrosoftDotNetPackageValidationVersion>
     <MicrosoftIdentityModelLoggingVersion>6.10.0</MicrosoftIdentityModelLoggingVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.10.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
     <MicrosoftIdentityModelProtocolsWsFederationVersion>6.10.0</MicrosoftIdentityModelProtocolsWsFederationVersion>
diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props
index 55ff8dac4d21..ec1680a7e6a7 100644
--- a/eng/targets/CSharp.Common.props
+++ b/eng/targets/CSharp.Common.props
@@ -1,5 +1,7 @@
 <Project>
 
+  <Sdk Name="Microsoft.DotNet.PackageValidation" Version="$(MicrosoftDotNetPackageValidationVersion)" />
+
   <PropertyGroup>
     <LangVersion>9.0</LangVersion>
 
diff --git a/global.json b/global.json
index 5c8d3291521f..de14a055d96c 100644
--- a/global.json
+++ b/global.json
@@ -31,6 +31,7 @@
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.1",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.1"
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.1",
+    "Microsoft.DotNet.PackageValidation": "$(MicrosoftDotNetPackageValidationVersion)"
   }
 }

From c769428f17031430b4e16b0293deefdb0130ed1b Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Wed, 7 Jul 2021 09:39:30 -0700
Subject: [PATCH 2/3] Set BaselinePackageVersion

---
 Directory.Build.targets | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index e18216801b4a..4c830a20cc80 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -66,14 +66,15 @@
          '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsMicrobenchmarksProject)' == 'true') ">false</IsPackable>
   </PropertyGroup>
 
+  <Import Project="eng\Baseline.Designer.props" />
+
   <!-- Properties for Package Validation -->
-  <!-- We only want to check for API changes in servicing branches -->
-  <PropertyGroup Condition=" '$(IsServicingBuild)' != 'true' ">
-    <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
+  <PropertyGroup>
+    <PackageValidationBaselineVersion>$(BaselinePackageVersion)</PackageValidationBaselineVersion>
+    <!-- We only want to check for API changes in servicing branches -->
+    <DisablePackageBaselineValidation  Condition=" '$(IsServicingBuild)' != 'true' ">true</DisablePackageBaselineValidation>
   </PropertyGroup>
 
-  <Import Project="eng\Baseline.Designer.props" />
-
   <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">
     <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">true</IsPackageInThisPatch>
     <!-- Used to distinguish between packages building -->

From e07150c06488dbbc105375faab019420480ecca1 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Date: Wed, 14 Jul 2021 10:26:48 -0700
Subject: [PATCH 3/3] updating to latest package version

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 3a94a62eeb73..4ceaa9e9010e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -195,7 +195,7 @@
     <MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.8.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCssParserVersion>1.0.0-20200708.1</MicrosoftCssParserVersion>
-    <MicrosoftDotNetPackageValidationVersion>1.0.0-preview.7.21356.2</MicrosoftDotNetPackageValidationVersion>
+    <MicrosoftDotNetPackageValidationVersion>1.0.0-preview.7.21364.16</MicrosoftDotNetPackageValidationVersion>
     <MicrosoftIdentityModelLoggingVersion>6.10.0</MicrosoftIdentityModelLoggingVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.10.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
     <MicrosoftIdentityModelProtocolsWsFederationVersion>6.10.0</MicrosoftIdentityModelProtocolsWsFederationVersion>