diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 3ae9c65125c..4340aa36c00 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -5,7 +5,6 @@ - @@ -57,6 +56,7 @@ + diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 207b8b2bae3..83bc0d3118e 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -42,7 +42,7 @@ - + <_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/ <_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 05aabfdd8d3..3206d0b23f6 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -47,7 +47,6 @@ Projects should only use the project references instead of baseline package references when: * preparing a new major or minor release (i.e. a non-servicing builds) * when a project is a test or sample project - We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible. --> true @@ -55,11 +54,11 @@ false - true + true false - true + true false @@ -74,16 +73,23 @@ true + <_ImplicitPackageReference Include="@(PackageReference->WithMetadataValue('IsImplicitlyDefined', 'true'))" /> - <_ExplicitPackageReference Include="@(PackageReference)" Exclude="@(_ImplicitPackageReference)" /> - <_OriginalReferences Include="@(Reference)" /> - - + + <_AllowedExplicitPackageReference Include="@(PackageReference->WithMetadataValue('AllowExplicitReference', 'true'))" /> + + <_ExplicitPackageReference Include="@(PackageReference)" Exclude="@(_ImplicitPackageReference);@(_AllowedExplicitPackageReference)" /> + + <_UnusedProjectReferenceProvider Include="@(ProjectReferenceProvider)" Exclude="@(Reference)" /> - + <_OriginalReferences Include="@(Reference)" /> + <_ProjectReferenceByAssemblyName Condition="'$(UseProjectReferences)' == 'true'" Include="@(ProjectReferenceProvider)" - Exclude="@(UnusedProjectReferenceProvider)" /> + Exclude="@(_UnusedProjectReferenceProvider)" /> @@ -97,15 +103,39 @@ - + + + + + + + + + + + + - + ContentFiles;Build All - + + + + <_BaselinePackageReferenceWithVersion Include="@(Reference)" Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> %(BaselinePackageReference.Identity) %(BaselinePackageReference.Version) @@ -132,7 +163,7 @@ - + <_PrivatePackageReferenceWithVersion Include="@(Reference->WithMetadataValue('PrivateAssets', 'All'))"> %(LatestPackageReference.Identity) %(LatestPackageReference.Version) @@ -145,27 +176,33 @@ - <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" /> <_LatestPackageReferenceWithVersion Remove="@(_LatestPackageReferenceWithVersion)" /> + <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" /> + <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" /> <_ImplicitPackageReference Remove="@(_ImplicitPackageReference)" /> - + <_ExplicitPackageReference Remove="@(_ExplicitPackageReference)" /> - + + + - + Text="Could not resolve this reference. Could not locate the package or project for "%(Reference.Identity)". Did you update baselines and dependencies lists? See docs/ReferenceResolution.md for more details." /> + <_TargetFramework Remove="@(_TargetFramework)" /> @@ -182,13 +219,46 @@ - $([MSBuild]::MakeRelative($(RepoRoot), '$(MSBuildProjectDirectory)/../ref/$(MSBuildProjectFile)')) + $(MSBuildProjectDirectory)/../ref/ + $([MSBuild]::MakeRelative($(RepoRoot), '$(ReferenceAssemblyDirectory)$(MSBuildProjectFile)')) + + + + + $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) + $([MSBuild]::ValueOrDefault($(IsShippingPackage),'false')) $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) $(ReferenceAssemblyProjectFileRelativePath) + + + + <_CustomCollectProjectReferenceDependsOn Condition="'$(TargetFramework)' != ''">ResolveProjectReferences + + + + <_TargetFrameworks Include="$(TargetFrameworks)" /> + + + + + + + + diff --git a/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index b46b3119a23..641424cfc01 100644 --- a/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -9,6 +9,8 @@ + + diff --git a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj index 54e77ec36d7..9129b292f10 100644 --- a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj @@ -9,12 +9,9 @@ true - - - - + diff --git a/src/Logging/Logging/src/ProviderAliasUtilities.cs b/src/Shared/src/ProviderAliasUtilities/ProviderAliasUtilities.cs similarity index 95% rename from src/Logging/Logging/src/ProviderAliasUtilities.cs rename to src/Shared/src/ProviderAliasUtilities/ProviderAliasUtilities.cs index 20610774112..0631b8d833b 100644 --- a/src/Logging/Logging/src/ProviderAliasUtilities.cs +++ b/src/Shared/src/ProviderAliasUtilities/ProviderAliasUtilities.cs @@ -6,7 +6,7 @@ namespace Microsoft.Extensions.Logging { - internal class ProviderAliasUtilities + internal static class ProviderAliasUtilities { private const string AliasAttibuteTypeFullName = "Microsoft.Extensions.Logging.ProviderAliasAttribute"; private const string AliasAttibuteAliasProperty = "Alias"; diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj new file mode 100644 index 00000000000..4606a541110 --- /dev/null +++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj @@ -0,0 +1,32 @@ + + + + netstandard2.0;net46 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.net46.cs b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.net46.cs new file mode 100644 index 00000000000..c90ffb3a0f2 --- /dev/null +++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.net46.cs @@ -0,0 +1,269 @@ +// 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. + +namespace Microsoft.AspNetCore.Testing +{ + [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] + [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalFactDiscoverer", "Microsoft.AspNetCore.Testing")] + public partial class ConditionalFactAttribute : Xunit.FactAttribute + { + public ConditionalFactAttribute() { } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] + [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalTheoryDiscoverer", "Microsoft.AspNetCore.Testing")] + public partial class ConditionalTheoryAttribute : Xunit.TheoryAttribute + { + public ConditionalTheoryAttribute() { } + } + public partial class CultureReplacer : System.IDisposable + { + public CultureReplacer(System.Globalization.CultureInfo culture, System.Globalization.CultureInfo uiCulture) { } + public CultureReplacer(string culture = "en-GB", string uiCulture = "en-US") { } + public static System.Globalization.CultureInfo DefaultCulture { get { throw null; } } + public static string DefaultCultureName { get { throw null; } } + public static string DefaultUICultureName { get { throw null; } } + public void Dispose() { } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method, Inherited=true, AllowMultiple=false)] + public sealed partial class DockerOnlyAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public DockerOnlyAttribute() { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)] + public partial class EnvironmentVariableSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public EnvironmentVariableSkipConditionAttribute(string variableName, params string[] values) { } + public bool IsMet { get { throw null; } } + public bool RunOnMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string SkipReason { get { throw null; } } + } + public static partial class ExceptionAssert + { + public static System.ArgumentException ThrowsArgument(System.Action testCode, string paramName, string exceptionMessage) { throw null; } + public static System.Threading.Tasks.Task ThrowsArgumentAsync(System.Func testCode, string paramName, string exceptionMessage) { throw null; } + public static System.ArgumentNullException ThrowsArgumentNull(System.Action testCode, string paramName) { throw null; } + public static System.ArgumentException ThrowsArgumentNullOrEmpty(System.Action testCode, string paramName) { throw null; } + public static System.Threading.Tasks.Task ThrowsArgumentNullOrEmptyAsync(System.Func testCode, string paramName) { throw null; } + public static System.ArgumentException ThrowsArgumentNullOrEmptyString(System.Action testCode, string paramName) { throw null; } + public static System.Threading.Tasks.Task ThrowsArgumentNullOrEmptyStringAsync(System.Func testCode, string paramName) { throw null; } + public static System.ArgumentOutOfRangeException ThrowsArgumentOutOfRange(System.Action testCode, string paramName, string exceptionMessage, object actualValue = null) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task ThrowsAsync(System.Func testCode, string exceptionMessage) where TException : System.Exception { throw null; } + public static TException Throws(System.Action testCode) where TException : System.Exception { throw null; } + public static TException Throws(System.Action testCode, string exceptionMessage) where TException : System.Exception { throw null; } + public static TException Throws(System.Func testCode, string exceptionMessage) where TException : System.Exception { throw null; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)] + [Xunit.Sdk.TraitDiscovererAttribute("Microsoft.AspNetCore.Testing.FlakyTestDiscoverer", "Microsoft.AspNetCore.Testing")] + public sealed partial class FlakyAttribute : System.Attribute, Xunit.Sdk.ITraitAttribute + { + public FlakyAttribute(string gitHubIssueUrl, string firstFilter, params string[] additionalFilters) { } + public System.Collections.Generic.IReadOnlyList Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string GitHubIssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public static partial class FlakyOn + { + public const string All = "All"; + public static partial class AzP + { + public const string All = "AzP:All"; + public const string Linux = "AzP:OS:Linux"; + public const string macOS = "AzP:OS:Darwin"; + public const string Windows = "AzP:OS:Windows_NT"; + } + public static partial class Helix + { + public const string All = "Helix:Queue:All"; + public const string Centos7Amd64 = "Helix:Queue:Centos.7.Amd64.Open"; + public const string Debian8Amd64 = "Helix:Queue:Debian.8.Amd64.Open"; + public const string Debian9Amd64 = "Helix:Queue:Debian.9.Amd64.Open"; + public const string Fedora27Amd64 = "Helix:Queue:Fedora.27.Amd64.Open"; + public const string Fedora28Amd64 = "Helix:Queue:Fedora.28.Amd64.Open"; + public const string macOS1012Amd64 = "Helix:Queue:OSX.1012.Amd64.Open"; + public const string Redhat7Amd64 = "Helix:Queue:Redhat.7.Amd64.Open"; + public const string Ubuntu1604Amd64 = "Helix:Queue:Ubuntu.1604.Amd64.Open"; + public const string Ubuntu1810Amd64 = "Helix:Queue:Ubuntu.1810.Amd64.Open"; + public const string Windows10Amd64 = "Helix:Queue:Windows.10.Amd64.ClientRS4.VS2017.Open"; + } + } + public partial class FlakyTestDiscoverer : Xunit.Sdk.ITraitDiscoverer + { + public FlakyTestDiscoverer() { } + public System.Collections.Generic.IEnumerable> GetTraits(Xunit.Abstractions.IAttributeInfo traitAttribute) { throw null; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] + public partial class FrameworkSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public FrameworkSkipConditionAttribute(Microsoft.AspNetCore.Testing.RuntimeFrameworks excludedFrameworks) { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public static partial class HelixQueues + { + public const string Centos7Amd64 = "Centos.7.Amd64.Open"; + public const string Debian8Amd64 = "Debian.8.Amd64.Open"; + public const string Debian9Amd64 = "Debian.9.Amd64.Open"; + public const string Fedora27Amd64 = "Fedora.27.Amd64.Open"; + public const string Fedora28Amd64 = "Fedora.28.Amd64.Open"; + public const string macOS1012Amd64 = "OSX.1012.Amd64.Open"; + public const string Redhat7Amd64 = "Redhat.7.Amd64.Open"; + public const string Ubuntu1604Amd64 = "Ubuntu.1604.Amd64.Open"; + public const string Ubuntu1810Amd64 = "Ubuntu.1810.Amd64.Open"; + public const string Windows10Amd64 = "Windows.10.Amd64.ClientRS4.VS2017.Open"; + } + public static partial class HttpClientSlim + { + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task GetSocket(System.Uri requestUri) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task GetStringAsync(string requestUri, bool validateCertificate = true) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task GetStringAsync(System.Uri requestUri, bool validateCertificate = true) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task PostAsync(string requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task PostAsync(System.Uri requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; } + } + public partial interface ITestCondition + { + bool IsMet { get; } + string SkipReason { get; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)] + public partial class MinimumOSVersionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public MinimumOSVersionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, string minVersion) { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + [System.FlagsAttribute] + public enum OperatingSystems + { + Linux = 1, + MacOSX = 2, + Windows = 4, + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)] + public partial class OSSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public OSSkipConditionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, params string[] versions) { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method)] + public partial class ReplaceCultureAttribute : Xunit.Sdk.BeforeAfterTestAttribute + { + public ReplaceCultureAttribute() { } + public ReplaceCultureAttribute(string currentCulture, string currentUICulture) { } + public System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Globalization.CultureInfo UICulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override void After(System.Reflection.MethodInfo methodUnderTest) { } + public override void Before(System.Reflection.MethodInfo methodUnderTest) { } + } + [System.FlagsAttribute] + public enum RuntimeFrameworks + { + None = 0, + Mono = 1, + CLR = 2, + CoreCLR = 4, + } + [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)] + public partial class SkipOnCIAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public SkipOnCIAttribute(string issueUrl = "") { } + public bool IsMet { get { throw null; } } + public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string SkipReason { get { throw null; } } + public static string GetIfOnAzdo() { throw null; } + public static string GetTargetHelixQueue() { throw null; } + public static bool OnAzdo() { throw null; } + public static bool OnCI() { throw null; } + public static bool OnHelix() { throw null; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)] + public partial class SkipOnHelixAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public SkipOnHelixAttribute(string issueUrl) { } + public bool IsMet { get { throw null; } } + public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Queues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string SkipReason { get { throw null; } } + public static string GetTargetHelixQueue() { throw null; } + public static bool OnHelix() { throw null; } + } + public partial class SkippedTestCase : Xunit.Sdk.XunitTestCase + { + [System.ObsoleteAttribute("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")] + public SkippedTestCase() { } + public SkippedTestCase(string skipReason, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Sdk.TestMethodDisplay defaultMethodDisplay, Xunit.Sdk.TestMethodDisplayOptions defaultMethodDisplayOptions, Xunit.Abstractions.ITestMethod testMethod, object[] testMethodArguments = null) { } + public override void Deserialize(Xunit.Abstractions.IXunitSerializationInfo data) { } + protected override string GetSkipReason(Xunit.Abstractions.IAttributeInfo factAttribute) { throw null; } + public override void Serialize(Xunit.Abstractions.IXunitSerializationInfo data) { } + } + public static partial class TaskExtensions + { + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task TimeoutAfter(this System.Threading.Tasks.Task task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute]string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute]int lineNumber = 0) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task TimeoutAfter(this System.Threading.Tasks.Task task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute]string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute]int lineNumber = 0) { throw null; } + } + public static partial class TestMethodExtensions + { + public static string EvaluateSkipConditions(this Xunit.Abstractions.ITestMethod testMethod) { throw null; } + } + [System.ObsoleteAttribute("This API is obsolete and the pattern its usage encouraged should not be used anymore. See https://github.com/aspnet/Extensions/issues/1697 for details.")] + public partial class TestPathUtilities + { + public TestPathUtilities() { } + public static string GetRepoRootDirectory() { throw null; } + public static string GetSolutionRootDirectory(string solution) { throw null; } + } + public static partial class TestPlatformHelper + { + public static bool IsLinux { get { throw null; } } + public static bool IsMac { get { throw null; } } + public static bool IsMono { get { throw null; } } + public static bool IsWindows { get { throw null; } } + } + public static partial class WindowsVersions + { + public const string Win10 = "10.0"; + public const string Win2008R2 = "6.1"; + public const string Win7 = "6.1"; + public const string Win8 = "6.2"; + public const string Win81 = "6.3"; + } +} +namespace Microsoft.AspNetCore.Testing.Tracing +{ + public partial class CollectingEventListener : System.Diagnostics.Tracing.EventListener + { + public CollectingEventListener() { } + public void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { } + public void CollectFrom(string eventSourceName) { } + public System.Collections.Generic.IReadOnlyList GetEventsWritten() { throw null; } + protected override void OnEventSourceCreated(System.Diagnostics.Tracing.EventSource eventSource) { } + protected override void OnEventWritten(System.Diagnostics.Tracing.EventWrittenEventArgs eventData) { } + } + public partial class EventAssert + { + public EventAssert(int expectedId, string expectedName, System.Diagnostics.Tracing.EventLevel expectedLevel) { } + public static void Collection(System.Collections.Generic.IEnumerable events, params Microsoft.AspNetCore.Testing.Tracing.EventAssert[] asserts) { } + public static Microsoft.AspNetCore.Testing.Tracing.EventAssert Event(int id, string name, System.Diagnostics.Tracing.EventLevel level) { throw null; } + public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, System.Action asserter) { throw null; } + public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, object expectedValue) { throw null; } + } + [Xunit.CollectionAttribute("Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection")] + public abstract partial class EventSourceTestBase : System.IDisposable + { + public const string CollectionName = "Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection"; + public EventSourceTestBase() { } + protected void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { } + protected void CollectFrom(string eventSourceName) { } + public void Dispose() { } + protected System.Collections.Generic.IReadOnlyList GetEvents() { throw null; } + } +} diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs new file mode 100644 index 00000000000..c90ffb3a0f2 --- /dev/null +++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs @@ -0,0 +1,269 @@ +// 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. + +namespace Microsoft.AspNetCore.Testing +{ + [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] + [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalFactDiscoverer", "Microsoft.AspNetCore.Testing")] + public partial class ConditionalFactAttribute : Xunit.FactAttribute + { + public ConditionalFactAttribute() { } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] + [Xunit.Sdk.XunitTestCaseDiscovererAttribute("Microsoft.AspNetCore.Testing.ConditionalTheoryDiscoverer", "Microsoft.AspNetCore.Testing")] + public partial class ConditionalTheoryAttribute : Xunit.TheoryAttribute + { + public ConditionalTheoryAttribute() { } + } + public partial class CultureReplacer : System.IDisposable + { + public CultureReplacer(System.Globalization.CultureInfo culture, System.Globalization.CultureInfo uiCulture) { } + public CultureReplacer(string culture = "en-GB", string uiCulture = "en-US") { } + public static System.Globalization.CultureInfo DefaultCulture { get { throw null; } } + public static string DefaultCultureName { get { throw null; } } + public static string DefaultUICultureName { get { throw null; } } + public void Dispose() { } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method, Inherited=true, AllowMultiple=false)] + public sealed partial class DockerOnlyAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public DockerOnlyAttribute() { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)] + public partial class EnvironmentVariableSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public EnvironmentVariableSkipConditionAttribute(string variableName, params string[] values) { } + public bool IsMet { get { throw null; } } + public bool RunOnMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string SkipReason { get { throw null; } } + } + public static partial class ExceptionAssert + { + public static System.ArgumentException ThrowsArgument(System.Action testCode, string paramName, string exceptionMessage) { throw null; } + public static System.Threading.Tasks.Task ThrowsArgumentAsync(System.Func testCode, string paramName, string exceptionMessage) { throw null; } + public static System.ArgumentNullException ThrowsArgumentNull(System.Action testCode, string paramName) { throw null; } + public static System.ArgumentException ThrowsArgumentNullOrEmpty(System.Action testCode, string paramName) { throw null; } + public static System.Threading.Tasks.Task ThrowsArgumentNullOrEmptyAsync(System.Func testCode, string paramName) { throw null; } + public static System.ArgumentException ThrowsArgumentNullOrEmptyString(System.Action testCode, string paramName) { throw null; } + public static System.Threading.Tasks.Task ThrowsArgumentNullOrEmptyStringAsync(System.Func testCode, string paramName) { throw null; } + public static System.ArgumentOutOfRangeException ThrowsArgumentOutOfRange(System.Action testCode, string paramName, string exceptionMessage, object actualValue = null) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task ThrowsAsync(System.Func testCode, string exceptionMessage) where TException : System.Exception { throw null; } + public static TException Throws(System.Action testCode) where TException : System.Exception { throw null; } + public static TException Throws(System.Action testCode, string exceptionMessage) where TException : System.Exception { throw null; } + public static TException Throws(System.Func testCode, string exceptionMessage) where TException : System.Exception { throw null; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)] + [Xunit.Sdk.TraitDiscovererAttribute("Microsoft.AspNetCore.Testing.FlakyTestDiscoverer", "Microsoft.AspNetCore.Testing")] + public sealed partial class FlakyAttribute : System.Attribute, Xunit.Sdk.ITraitAttribute + { + public FlakyAttribute(string gitHubIssueUrl, string firstFilter, params string[] additionalFilters) { } + public System.Collections.Generic.IReadOnlyList Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string GitHubIssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public static partial class FlakyOn + { + public const string All = "All"; + public static partial class AzP + { + public const string All = "AzP:All"; + public const string Linux = "AzP:OS:Linux"; + public const string macOS = "AzP:OS:Darwin"; + public const string Windows = "AzP:OS:Windows_NT"; + } + public static partial class Helix + { + public const string All = "Helix:Queue:All"; + public const string Centos7Amd64 = "Helix:Queue:Centos.7.Amd64.Open"; + public const string Debian8Amd64 = "Helix:Queue:Debian.8.Amd64.Open"; + public const string Debian9Amd64 = "Helix:Queue:Debian.9.Amd64.Open"; + public const string Fedora27Amd64 = "Helix:Queue:Fedora.27.Amd64.Open"; + public const string Fedora28Amd64 = "Helix:Queue:Fedora.28.Amd64.Open"; + public const string macOS1012Amd64 = "Helix:Queue:OSX.1012.Amd64.Open"; + public const string Redhat7Amd64 = "Helix:Queue:Redhat.7.Amd64.Open"; + public const string Ubuntu1604Amd64 = "Helix:Queue:Ubuntu.1604.Amd64.Open"; + public const string Ubuntu1810Amd64 = "Helix:Queue:Ubuntu.1810.Amd64.Open"; + public const string Windows10Amd64 = "Helix:Queue:Windows.10.Amd64.ClientRS4.VS2017.Open"; + } + } + public partial class FlakyTestDiscoverer : Xunit.Sdk.ITraitDiscoverer + { + public FlakyTestDiscoverer() { } + public System.Collections.Generic.IEnumerable> GetTraits(Xunit.Abstractions.IAttributeInfo traitAttribute) { throw null; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] + public partial class FrameworkSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public FrameworkSkipConditionAttribute(Microsoft.AspNetCore.Testing.RuntimeFrameworks excludedFrameworks) { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public static partial class HelixQueues + { + public const string Centos7Amd64 = "Centos.7.Amd64.Open"; + public const string Debian8Amd64 = "Debian.8.Amd64.Open"; + public const string Debian9Amd64 = "Debian.9.Amd64.Open"; + public const string Fedora27Amd64 = "Fedora.27.Amd64.Open"; + public const string Fedora28Amd64 = "Fedora.28.Amd64.Open"; + public const string macOS1012Amd64 = "OSX.1012.Amd64.Open"; + public const string Redhat7Amd64 = "Redhat.7.Amd64.Open"; + public const string Ubuntu1604Amd64 = "Ubuntu.1604.Amd64.Open"; + public const string Ubuntu1810Amd64 = "Ubuntu.1810.Amd64.Open"; + public const string Windows10Amd64 = "Windows.10.Amd64.ClientRS4.VS2017.Open"; + } + public static partial class HttpClientSlim + { + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task GetSocket(System.Uri requestUri) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task GetStringAsync(string requestUri, bool validateCertificate = true) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task GetStringAsync(System.Uri requestUri, bool validateCertificate = true) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task PostAsync(string requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task PostAsync(System.Uri requestUri, System.Net.Http.HttpContent content, bool validateCertificate = true) { throw null; } + } + public partial interface ITestCondition + { + bool IsMet { get; } + string SkipReason { get; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)] + public partial class MinimumOSVersionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public MinimumOSVersionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, string minVersion) { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + [System.FlagsAttribute] + public enum OperatingSystems + { + Linux = 1, + MacOSX = 2, + Windows = 4, + } + [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=true)] + public partial class OSSkipConditionAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public OSSkipConditionAttribute(Microsoft.AspNetCore.Testing.OperatingSystems operatingSystem, params string[] versions) { } + public bool IsMet { get { throw null; } } + public string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Method)] + public partial class ReplaceCultureAttribute : Xunit.Sdk.BeforeAfterTestAttribute + { + public ReplaceCultureAttribute() { } + public ReplaceCultureAttribute(string currentCulture, string currentUICulture) { } + public System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Globalization.CultureInfo UICulture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override void After(System.Reflection.MethodInfo methodUnderTest) { } + public override void Before(System.Reflection.MethodInfo methodUnderTest) { } + } + [System.FlagsAttribute] + public enum RuntimeFrameworks + { + None = 0, + Mono = 1, + CLR = 2, + CoreCLR = 4, + } + [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)] + public partial class SkipOnCIAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public SkipOnCIAttribute(string issueUrl = "") { } + public bool IsMet { get { throw null; } } + public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string SkipReason { get { throw null; } } + public static string GetIfOnAzdo() { throw null; } + public static string GetTargetHelixQueue() { throw null; } + public static bool OnAzdo() { throw null; } + public static bool OnCI() { throw null; } + public static bool OnHelix() { throw null; } + } + [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Method, AllowMultiple=false)] + public partial class SkipOnHelixAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition + { + public SkipOnHelixAttribute(string issueUrl) { } + public bool IsMet { get { throw null; } } + public string IssueUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Queues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string SkipReason { get { throw null; } } + public static string GetTargetHelixQueue() { throw null; } + public static bool OnHelix() { throw null; } + } + public partial class SkippedTestCase : Xunit.Sdk.XunitTestCase + { + [System.ObsoleteAttribute("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")] + public SkippedTestCase() { } + public SkippedTestCase(string skipReason, Xunit.Abstractions.IMessageSink diagnosticMessageSink, Xunit.Sdk.TestMethodDisplay defaultMethodDisplay, Xunit.Sdk.TestMethodDisplayOptions defaultMethodDisplayOptions, Xunit.Abstractions.ITestMethod testMethod, object[] testMethodArguments = null) { } + public override void Deserialize(Xunit.Abstractions.IXunitSerializationInfo data) { } + protected override string GetSkipReason(Xunit.Abstractions.IAttributeInfo factAttribute) { throw null; } + public override void Serialize(Xunit.Abstractions.IXunitSerializationInfo data) { } + } + public static partial class TaskExtensions + { + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task TimeoutAfter(this System.Threading.Tasks.Task task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute]string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute]int lineNumber = 0) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task TimeoutAfter(this System.Threading.Tasks.Task task, System.TimeSpan timeout, [System.Runtime.CompilerServices.CallerFilePathAttribute]string filePath = null, [System.Runtime.CompilerServices.CallerLineNumberAttribute]int lineNumber = 0) { throw null; } + } + public static partial class TestMethodExtensions + { + public static string EvaluateSkipConditions(this Xunit.Abstractions.ITestMethod testMethod) { throw null; } + } + [System.ObsoleteAttribute("This API is obsolete and the pattern its usage encouraged should not be used anymore. See https://github.com/aspnet/Extensions/issues/1697 for details.")] + public partial class TestPathUtilities + { + public TestPathUtilities() { } + public static string GetRepoRootDirectory() { throw null; } + public static string GetSolutionRootDirectory(string solution) { throw null; } + } + public static partial class TestPlatformHelper + { + public static bool IsLinux { get { throw null; } } + public static bool IsMac { get { throw null; } } + public static bool IsMono { get { throw null; } } + public static bool IsWindows { get { throw null; } } + } + public static partial class WindowsVersions + { + public const string Win10 = "10.0"; + public const string Win2008R2 = "6.1"; + public const string Win7 = "6.1"; + public const string Win8 = "6.2"; + public const string Win81 = "6.3"; + } +} +namespace Microsoft.AspNetCore.Testing.Tracing +{ + public partial class CollectingEventListener : System.Diagnostics.Tracing.EventListener + { + public CollectingEventListener() { } + public void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { } + public void CollectFrom(string eventSourceName) { } + public System.Collections.Generic.IReadOnlyList GetEventsWritten() { throw null; } + protected override void OnEventSourceCreated(System.Diagnostics.Tracing.EventSource eventSource) { } + protected override void OnEventWritten(System.Diagnostics.Tracing.EventWrittenEventArgs eventData) { } + } + public partial class EventAssert + { + public EventAssert(int expectedId, string expectedName, System.Diagnostics.Tracing.EventLevel expectedLevel) { } + public static void Collection(System.Collections.Generic.IEnumerable events, params Microsoft.AspNetCore.Testing.Tracing.EventAssert[] asserts) { } + public static Microsoft.AspNetCore.Testing.Tracing.EventAssert Event(int id, string name, System.Diagnostics.Tracing.EventLevel level) { throw null; } + public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, System.Action asserter) { throw null; } + public Microsoft.AspNetCore.Testing.Tracing.EventAssert Payload(string name, object expectedValue) { throw null; } + } + [Xunit.CollectionAttribute("Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection")] + public abstract partial class EventSourceTestBase : System.IDisposable + { + public const string CollectionName = "Microsoft.AspNetCore.Testing.Tracing.EventSourceTestCollection"; + public EventSourceTestBase() { } + protected void CollectFrom(System.Diagnostics.Tracing.EventSource eventSource) { } + protected void CollectFrom(string eventSourceName) { } + public void Dispose() { } + protected System.Collections.Generic.IReadOnlyList GetEvents() { throw null; } + } +} diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj index 9da267c4198..70ac622461a 100644 --- a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj +++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj @@ -10,6 +10,8 @@ false true false + true + true true