From 258657b1a1f2c1652e0fbdd6bc74dab10d9f9d73 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Thu, 2 Jul 2020 13:29:04 -0700
Subject: [PATCH] Don't ship experimental packages to nuget

---
 Directory.Build.props | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 13aff82cb7724f..e8f9a65ba21783 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -76,12 +76,14 @@
     <!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
     <IsPrerelease>true</IsPrerelease>
 
+    <IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly>
+
     <!-- Experimental packages should not be stable -->
-    <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(MSBuildProjectName.Contains('Experimental'))">true</SuppressFinalPackageVersion>
-    <IsShippingAssembly Condition="$(MSBuildProjectName.Contains('Experimental'))">false</IsShippingAssembly>
+    <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsExperimentalAssembly)">true</SuppressFinalPackageVersion>
+    <IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
 
     <!-- We don't want Private packages to be shipped to NuGet.org -->
-    <IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
+    <IsShippingPackage Condition="($(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
   </PropertyGroup>
 
   <!-- Language configuration -->