Don't build UTF8String.Experimental in release/3.0

Commit migrated from https://github.com/dotnet/corefx/commit/9fb566123fc1f4d5f662eee44847a2161933de5d

diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj
index 6563d2c..701f218 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj
+++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj
@@ -4,10 +4,10 @@
     <ProjectGuid>{7AF57E6B-2CED-45C9-8BCA-5BBA60D018E0}</ProjectGuid>
     <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsPrerelease)' != 'false'">
     <Compile Include="System.Utf8String.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsPrerelease)' != 'false'">
     <ProjectReference Include="..\..\System.Net.Http\ref\System.Net.Http.csproj" />
     <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />

diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
index 964097b..2da4e76 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
+++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
@@ -6,11 +6,11 @@
     <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;</Configurations>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsPrerelease)' != 'false'">
     <Compile Include="System\IO\Utf8StringStream.cs" />
     <Compile Include="System\Net\Http\Utf8StringContent.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsPrerelease)' != 'false'">
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Primitives" />

diff --git a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj
index 5ce4935..83d935c 100644 (file)
--- a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj
+++ b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj
@@ -11,7 +11,7 @@
     <!-- Must reference the Utf8String reference assembly, which is normally excluded from unit test projects. -->
     <IncludeUtf8StringAsmRef>true</IncludeUtf8StringAsmRef>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsPrerelease)' != 'false'">
     <Compile Include="System\Char8Tests.cs" />
     <Compile Include="System\MemoryTests.cs" />
     <Compile Include="System\Net\Http\Utf8StringContentTests.cs" />

diff --git a/src/libraries/packages.builds b/src/libraries/packages.builds
index eb33cae..9444387 100644 (file)
--- a/src/libraries/packages.builds
+++ b/src/libraries/packages.builds
@@ -5,7 +5,7 @@
     <Project Include="$(MSBuildThisFileDirectory)..\pkg\*\*.builds" Condition="'$(SkipManagedPackageBuild)' != 'true'">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
-    <Project Include="*\pkg\**\*.pkgproj" Condition="'$(SkipManagedPackageBuild)' != 'true' AND '$(BuildAllConfigurations)' == 'true'">
+    <Project Include="*\pkg\**\*.pkgproj" Exclude="*Experimental*" Condition="'$(SkipManagedPackageBuild)' != 'true' AND '$(BuildAllConfigurations)' == 'true'">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
   </ItemGroup>