Use Arcade (dotnet/extensions#586)

Use arcade
\n\nCommit migrated from f0458995c6

src/Configuration.KeyPerFile/Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <GenerateDocumentationFile Condition=" '$(IsTestProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</GenerateDocumentationFile>
+    <GenerateDocumentationFile Condition=" '$(IsUnitTestProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</GenerateDocumentationFile>
     <PackageTags>configuration</PackageTags>
   </PropertyGroup>
 </Project>

src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj

@@ -4,6 +4,7 @@
     <Description>Configuration provider that uses files in a directory for Microsoft.Extensions.Configuration.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <EnableApiCheck>false</EnableApiCheck>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

src/FileProviders/Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <GenerateDocumentationFile Condition=" '$(IsTestProject)' != 'true' ">true</GenerateDocumentationFile>
+    <GenerateDocumentationFile Condition=" '$(IsUnitTestProject)' != 'true' ">true</GenerateDocumentationFile>
     <PackageTags>files;filesystem</PackageTags>
   </PropertyGroup>
 </Project>

src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

@@ -5,8 +5,13 @@
     <Description>File provider for files in embedded resources for Microsoft.Extensions.FileProviders.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Extensions.FileProviders.Embedded.Tests" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <ProjectReference Include="..\..\Manifest.MSBuildTask\src\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
@@ -18,7 +23,6 @@
   </ItemGroup>
 
   <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DocumentationProjectOutputGroup;DebugSymbolsProjectOutputGroup;">
-
     <PropertyGroup>
       <NuspecProperties>
         id=$(PackageId);
@@ -40,10 +44,9 @@
         OutputDocumentation=@(DocumentationProjectOutputGroupOutput);
 
         <!-- Include the assembly and symbols from the tasks project -->
-        TaskAssemblyNetStandard=..\..\Manifest.MSBuildTask\src\bin\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll;
+        TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll;
-        TaskSymbolNetStandard=..\..\Manifest.MSBuildTask\src\bin\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb;
+        TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb;
       </NuspecProperties>
     </PropertyGroup>
   </Target>
-
 </Project>

src/FileProviders/Embedded/src/Properties/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.Extensions.FileProviders.Embedded.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj

@@ -11,6 +11,7 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>diagnostics;healthchecks</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
 </Project>

src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj

@@ -10,8 +10,13 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>diagnostics;healthchecks</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Extensions.Diagnostics.HealthChecks.Tests" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)NonCapturingTimer\**\*.cs" />
     <Compile Include="$(SharedSourceRoot)ValueStopwatch\**\*.cs" />

src/HealthChecks/HealthChecks/src/Properties/AssemblyInfo.cs

@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.Extensions.Diagnostics.HealthChecks.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj

@@ -7,4 +7,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.JSInterop.Tests" />
+  </ItemGroup>
+
 </Project>

src/JSInterop/Microsoft.JSInterop/src/Properties/AssemblyInfo.cs

@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.JSInterop.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

src/JSInterop/Microsoft.JSInterop/test/DotNetDispatcherTest.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.JSInterop.Test
+namespace Microsoft.JSInterop.Tests
 {
     public class DotNetDispatcherTest
     {
@@ -73,7 +73,7 @@ namespace Microsoft.JSInterop.Test
             Assert.Equal($"The assembly '{thisAssemblyName}' does not contain a public method with [JSInvokableAttribute(\"{methodIdentifier}\")].", ex.Message);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1733")]
         public Task CanInvokeStaticVoidMethod() => WithJSRuntime(jsRuntime =>
         {
             // Arrange/Act
@@ -109,7 +109,7 @@ namespace Microsoft.JSInterop.Test
             Assert.Equal(456, result.IntVal);
         });
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1733")]
         public Task CanInvokeStaticWithParams() => WithJSRuntime(jsRuntime =>
         {
             // Arrange: Track a .NET object to use as an arg
@@ -140,7 +140,7 @@ namespace Microsoft.JSInterop.Test
             Assert.Equal(1299, resultDto2.IntVal);
         });
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1733")]
         public Task CanInvokeInstanceVoidMethod() => WithJSRuntime(jsRuntime =>
         {
             // Arrange: Track some instance
@@ -155,7 +155,7 @@ namespace Microsoft.JSInterop.Test
             Assert.True(targetInstance.DidInvokeMyInvocableInstanceVoid);
         });
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1733")]
         public Task CanInvokeBaseInstanceVoidMethod() => WithJSRuntime(jsRuntime =>
         {
             // Arrange: Track some instance
@@ -206,7 +206,7 @@ namespace Microsoft.JSInterop.Test
             Assert.StartsWith("There is no tracked object with id '1'.", ex.Message);
         });
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1733")]
         public Task CanInvokeInstanceMethodWithParams() => WithJSRuntime(jsRuntime =>
         {
             // Arrange: Track some instance plus another object we'll pass as a param
@@ -242,7 +242,7 @@ namespace Microsoft.JSInterop.Test
             Assert.Equal("In call to 'InvocableStaticWithParams', expected 3 parameters but received 4.", ex.Message);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/1733")]
         public Task CanInvokeAsyncMethod() => WithJSRuntime(async jsRuntime =>
         {
             // Arrange: Track some instance plus another object we'll pass as a param
@@ -320,7 +320,8 @@ namespace Microsoft.JSInterop.Test
             protected static void StaticMethodWithoutAttribute() { }
             protected static void InstanceMethodWithoutAttribute() { }
 
-            [JSInvokable("InvocableStaticVoid")] public static void MyInvocableVoid()
+            [JSInvokable("InvocableStaticVoid")]
+            public static void MyInvocableVoid()
             {
                 DidInvokeMyInvocableStaticVoid = true;
             }

src/JSInterop/Microsoft.JSInterop/test/DotNetObjectRefTest.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.JSInterop.Test
+namespace Microsoft.JSInterop.Tests
 {
     public class DotNetObjectRefTest
     {

src/JSInterop/Microsoft.JSInterop/test/JSInProcessRuntimeBaseTest.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Microsoft.JSInterop.Test
+namespace Microsoft.JSInterop.Tests
 {
     public class JSInProcessRuntimeBaseTest
     {
@@ -21,7 +21,7 @@ namespace Microsoft.JSInterop.Test
             };
 
             // Act
-            var syncResult = runtime.Invoke<TestDTO>("test identifier 1", "arg1", 123, true );
+            var syncResult = runtime.Invoke<TestDTO>("test identifier 1", "arg1", 123, true);
             var call = runtime.InvokeCalls.Single();
 
             // Assert

src/JSInterop/Microsoft.JSInterop/test/JSRuntimeBaseTest.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Microsoft.JSInterop.Test
+namespace Microsoft.JSInterop.Tests
 {
     public class JSRuntimeBaseTest
     {
@@ -18,7 +18,7 @@ namespace Microsoft.JSInterop.Test
             var runtime = new TestJSRuntime();
 
             // Act
-            runtime.InvokeAsync<object>("test identifier 1", "arg1", 123, true );
+            runtime.InvokeAsync<object>("test identifier 1", "arg1", 123, true);
             runtime.InvokeAsync<object>("test identifier 2", "some other arg");
 
             // Assert

src/JSInterop/Microsoft.JSInterop/test/JSRuntimeTest.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.JSInterop.Test
+namespace Microsoft.JSInterop.Tests
 {
     public class JSRuntimeTest
     {

src/JSInterop/Microsoft.JSInterop/test/JsonUtilTest.cs

@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using Xunit;
 
-namespace Microsoft.JSInterop.Test
+namespace Microsoft.JSInterop.Tests
 {
     public class JsonUtilTest
     {
@@ -124,10 +124,10 @@ namespace Microsoft.JSInterop.Test
                 BoolProperty = true,
                 NullableIntProperty = 1
             };
-            
+
             // Act
             var result = Json.Serialize(commandResult);
-            
+
             // Assert
             Assert.Equal("{\"stringProperty\":\"Test\",\"boolProperty\":true,\"nullableIntProperty\":1}", result);
         }
@@ -222,12 +222,12 @@ namespace Microsoft.JSInterop.Test
             // Act
             var exception = Assert.Throws<InvalidOperationException>(() =>
             {
-                Json.Deserialize<NonEmptyConstructorPoco>(json); 
+                Json.Deserialize<NonEmptyConstructorPoco>(json);
             });
 
             // Assert
             Assert.Equal(
-                $"Cannot deserialize JSON into type '{type.FullName}' because it does not have a public parameterless constructor.", 
+                $"Cannot deserialize JSON into type '{type.FullName}' because it does not have a public parameterless constructor.",
                 exception.Message);
         }
 
@@ -277,7 +277,7 @@ namespace Microsoft.JSInterop.Test
 
         class NonEmptyConstructorPoco
         {
-            public NonEmptyConstructorPoco(int parameter) {}
+            public NonEmptyConstructorPoco(int parameter) { }
 
             public int Property { get; set; }
         }

src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Test.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.JSInterop" />
-  </ItemGroup>
-
-</Project>

src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../src/Microsoft.JSInterop.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+</Project>

src/JSInterop/Microsoft.JSInterop/test/xunit.runner.json

@@ -0,0 +1,3 @@
+{
+  "shadowCopy": true
+}

src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj

@@ -10,6 +10,7 @@ Microsoft.Extensions.Localization.IStringLocalizer&lt;T&gt;</Description>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>localization</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
 </Project>

src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj

@@ -7,6 +7,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>localization</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,4 +17,8 @@
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Extensions.Localization.Tests" />
+  </ItemGroup>
+
 </Project>

src/Localization/Localization/src/Properties/AssemblyInfo.cs

@@ -1,6 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.Extensions.Localization.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj

@@ -6,6 +6,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>pooling</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
 </Project>

src/Shared/ActivatorUtilities/sharedsources.props

@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <IsShipping>false</IsShipping>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)..\ParameterDefaultValue\ParameterDefaultValue.cs">
       <Pack>true</Pack>

src/Shared/BenchmarkRunner/Directory.Build.props

@@ -1,8 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <PackageId>Microsoft.AspNetCore.BenchmarkRunner.Sources</PackageId>
-  </PropertyGroup>
-</Project>

src/Shared/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.shproj

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>00947d4a-c20e-46e3-90c3-6cd6bc87ee72</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Microsoft.Extensions.CommandLineUtils.Sources.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

src/Testing/src/Microsoft.AspNetCore.Testing.csproj

@@ -8,10 +8,15 @@
     <PackageTags>aspnetcore</PackageTags>
     <EnableApiCheck>false</EnableApiCheck>
     <IsPackable>true</IsPackable>
+    <IsShipping>false</IsShipping>
     <!-- This package is internal, so we don't generate a package baseline. Always build against the latest dependencies. -->
     <UseLatestPackageReferences>true</UseLatestPackageReferences>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Testing.Tests" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.Win32.Registry" />
     <Reference Include="System.ValueTuple" />

src/Testing/src/Properties/AssemblyInfo.cs

@@ -1,6 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Testing.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

src/Testing/src/TestPathUtilities.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -8,6 +8,11 @@ namespace Microsoft.AspNetCore.Testing
 {
     public class TestPathUtilities
     {
+        public static string GetRepoRootDirectory()
+        {
+            return GetSolutionRootDirectory("Extensions");
+        }
+
         public static string GetSolutionRootDirectory(string solution)
         {
             var applicationBasePath = AppContext.BaseDirectory;

src/Testing/src/xunit/ConditionalFactDiscoverer.cs

@@ -20,8 +20,8 @@ namespace Microsoft.AspNetCore.Testing.xunit
         {
             var skipReason = testMethod.EvaluateSkipConditions();
             return skipReason != null
-                ? new SkippedTestCase(skipReason, _diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod)
+                ? new SkippedTestCase(skipReason, _diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod)
                 : base.CreateTestCase(discoveryOptions, testMethod, factAttribute);
         }
     }
-}
+}

src/Testing/src/xunit/ConditionalTheoryAttribute.cs

@@ -12,4 +12,4 @@ namespace Microsoft.AspNetCore.Testing.xunit
     public class ConditionalTheoryAttribute : TheoryAttribute
     {
     }
-}
+}

src/Testing/src/xunit/ConditionalTheoryDiscoverer.cs

@@ -14,11 +14,30 @@ namespace Microsoft.AspNetCore.Testing.xunit
         {
         }
 
+        private sealed class OptionsWithPreEnumerationEnabled : ITestFrameworkDiscoveryOptions
+        {
+            private const string PreEnumerateTheories = "xunit.discovery.PreEnumerateTheories";
+
+            private readonly ITestFrameworkDiscoveryOptions _original;
+
+            public OptionsWithPreEnumerationEnabled(ITestFrameworkDiscoveryOptions original)
+                => _original = original;
+
+            public TValue GetValue<TValue>(string name)
+                => (name == PreEnumerateTheories) ? (TValue)(object)true : _original.GetValue<TValue>(name);
+
+            public void SetValue<TValue>(string name, TValue value)
+                => _original.SetValue(name, value);
+        }
+
+        public override IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute)
+            => base.Discover(new OptionsWithPreEnumerationEnabled(discoveryOptions), testMethod, theoryAttribute);
+
         protected override IEnumerable<IXunitTestCase> CreateTestCasesForTheory(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute)
         {
             var skipReason = testMethod.EvaluateSkipConditions();
             return skipReason != null
-               ? new[] { new SkippedTestCase(skipReason, DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }
+               ? new[] { new SkippedTestCase(skipReason, DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) }
                : base.CreateTestCasesForTheory(discoveryOptions, testMethod, theoryAttribute);
         }
 
@@ -44,4 +63,4 @@ namespace Microsoft.AspNetCore.Testing.xunit
                 : base.CreateTestCasesForDataRow(discoveryOptions, testMethod, theoryAttribute, dataRow);
         }
     }
-}
+}

src/Testing/src/xunit/SkippedTestCase.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -16,8 +16,14 @@ namespace Microsoft.AspNetCore.Testing.xunit
         {
         }
 
-        public SkippedTestCase(string skipReason, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, object[] testMethodArguments = null)
+        public SkippedTestCase(
-            : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments)
+            string skipReason,
+            IMessageSink diagnosticMessageSink,
+            TestMethodDisplay defaultMethodDisplay,
+            TestMethodDisplayOptions defaultMethodDisplayOptions,
+            ITestMethod testMethod,
+            object[] testMethodArguments = null)
+            : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments)
         {
             _skipReason = skipReason;
         }
@@ -37,4 +43,4 @@ namespace Microsoft.AspNetCore.Testing.xunit
             data.AddValue(nameof(_skipReason), _skipReason);
         }
     }
-}
+}

src/Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj

@@ -24,5 +24,4 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
-
 </Project>

src/Testing/test/TestPathUtilitiesTest.cs

@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Testing
             // Testing\test\Microsoft.AspNetCore.Testing.Tests\bin\Debug\netcoreapp2.0
             // Testing\test\Microsoft.AspNetCore.Testing.Tests\bin\Debug\net461
             // Testing\test\Microsoft.AspNetCore.Testing.Tests\bin\Debug\net46
-            var expectedPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "..", "..", ".."));
+            var expectedPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", ".."));
 
             Assert.Equal(expectedPath, TestPathUtilities.GetSolutionRootDirectory("Extensions"));
         }

src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj

@@ -7,6 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>