diff --git a/src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj b/src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj new file mode 100644 index 00000000000000..85545d30c81002 --- /dev/null +++ b/src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj @@ -0,0 +1,14 @@ + + + + + + + true + $(ContentTargetFolders)\cs\netstandard1.0\ + + + + + + diff --git a/src/libraries/Common/src/Extensions/ActivatorUtilities/sharedsources.props b/src/libraries/Common/src/Extensions/ActivatorUtilities/sharedsources.props index b35fe34b10f63e..f754677531954f 100644 --- a/src/libraries/Common/src/Extensions/ActivatorUtilities/sharedsources.props +++ b/src/libraries/Common/src/Extensions/ActivatorUtilities/sharedsources.props @@ -1,4 +1,8 @@ + + false + + true diff --git a/src/libraries/Common/src/Extensions/BenchmarkRunner/Directory.Build.props b/src/libraries/Common/src/Extensions/BenchmarkRunner/Directory.Build.props deleted file mode 100644 index d2f65e8d3dc4a2..00000000000000 --- a/src/libraries/Common/src/Extensions/BenchmarkRunner/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Microsoft.AspNetCore.BenchmarkRunner.Sources - - diff --git a/src/libraries/Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj b/src/libraries/Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.csproj b/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.projitems b/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.projitems index 5da4522c6afb36..72e5498e44b99b 100644 --- a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.projitems +++ b/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.projitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.shproj b/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.shproj deleted file mode 100644 index c728fe1012ce79..00000000000000 --- a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 00947d4a-c20e-46e3-90c3-6cd6bc87ee72 - 14.0 - - - - - - - - diff --git a/src/libraries/Common/src/Extensions/Directory.Build.props b/src/libraries/Common/src/Extensions/Directory.Build.props index b98d9229f1b105..264f2f4cfac7e2 100644 --- a/src/libraries/Common/src/Extensions/Directory.Build.props +++ b/src/libraries/Common/src/Extensions/Directory.Build.props @@ -1,9 +1,31 @@ - + + netstandard1.0 + true + false + true + false + false + false false - Microsoft.Extensions.$(ProjectDirName).Sources + contentFiles + true + $(DefaultExcludeItems);$(BaseOutputPath);$(BaseIntermediateOutputPath); + $(NoWarn);NU5105;CS8021 + + + + true + $(ContentTargetFolders)\cs\netstandard1.0\shared\ + + + true + $(ContentTargetFolders)\any\any\shared\ + + + diff --git a/src/libraries/Common/src/Extensions/HashCodeCombiner/Microsoft.Extensions.HashCodeCombiner.Sources.csproj b/src/libraries/Common/src/Extensions/HashCodeCombiner/Microsoft.Extensions.HashCodeCombiner.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/HashCodeCombiner/Microsoft.Extensions.HashCodeCombiner.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/src/Extensions/NonCapturingTimer/Microsoft.Extensions.NonCapturingTimer.Sources.csproj b/src/libraries/Common/src/Extensions/NonCapturingTimer/Microsoft.Extensions.NonCapturingTimer.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/NonCapturingTimer/Microsoft.Extensions.NonCapturingTimer.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/src/Extensions/ParameterDefaultValue/Microsoft.Extensions.ParameterDefaultValue.Sources.csproj b/src/libraries/Common/src/Extensions/ParameterDefaultValue/Microsoft.Extensions.ParameterDefaultValue.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/ParameterDefaultValue/Microsoft.Extensions.ParameterDefaultValue.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/src/Extensions/TypeNameHelper/Microsoft.Extensions.TypeNameHelper.Sources.csproj b/src/libraries/Common/src/Extensions/TypeNameHelper/Microsoft.Extensions.TypeNameHelper.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/TypeNameHelper/Microsoft.Extensions.TypeNameHelper.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/src/Extensions/ValueStopwatch/Microsoft.Extensions.ValueStopWatch.Sources.csproj b/src/libraries/Common/src/Extensions/ValueStopwatch/Microsoft.Extensions.ValueStopWatch.Sources.csproj new file mode 100644 index 00000000000000..dec7fff6e5fd14 --- /dev/null +++ b/src/libraries/Common/src/Extensions/ValueStopwatch/Microsoft.Extensions.ValueStopWatch.Sources.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj index 64e0b3c4e1d6d8..0e33852b62d78d 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj @@ -8,10 +8,15 @@ aspnetcore false true + false true + + + + diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Properties/AssemblyInfo.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 0212e111ee0824..00000000000000 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/TestPathUtilities.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/TestPathUtilities.cs index ebd10897c382f2..f982471f39b24b 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/TestPathUtilities.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.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; diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalFactDiscoverer.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalFactDiscoverer.cs index 819373fa313680..cf49b29e5a7ff6 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalFactDiscoverer.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalFactDiscoverer.cs @@ -20,8 +20,8 @@ protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions { 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); } } -} \ No newline at end of file +} diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryAttribute.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryAttribute.cs index 9249078cc5c3ed..fe45f2ffc66623 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryAttribute.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryAttribute.cs @@ -12,4 +12,4 @@ namespace Microsoft.AspNetCore.Testing.xunit public class ConditionalTheoryAttribute : TheoryAttribute { } -} \ No newline at end of file +} diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryDiscoverer.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryDiscoverer.cs index d24421f5cd32e0..9e413cd5801a16 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryDiscoverer.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/ConditionalTheoryDiscoverer.cs @@ -14,11 +14,30 @@ public ConditionalTheoryDiscoverer(IMessageSink diagnosticMessageSink) { } + 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(string name) + => (name == PreEnumerateTheories) ? (TValue)(object)true : _original.GetValue(name); + + public void SetValue(string name, TValue value) + => _original.SetValue(name, value); + } + + public override IEnumerable Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute) + => base.Discover(new OptionsWithPreEnumerationEnabled(discoveryOptions), testMethod, theoryAttribute); + protected override IEnumerable 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 @@ protected override IEnumerable CreateTestCasesForDataRow(ITestFr : base.CreateTestCasesForDataRow(discoveryOptions, testMethod, theoryAttribute, dataRow); } } -} \ No newline at end of file +} diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/SkippedTestCase.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/SkippedTestCase.cs index c2e15fa640c4be..1c25c507b97258 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/SkippedTestCase.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.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 @@ public SkippedTestCase() : base() { } - public SkippedTestCase(string skipReason, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, object[] testMethodArguments = null) - : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments) + public SkippedTestCase( + 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 @@ public override void Serialize(IXunitSerializationInfo data) data.AddValue(nameof(_skipReason), _skipReason); } } -} \ No newline at end of file +} diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj index 691c9ccd769d51..acfb34b32028b9 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj @@ -24,5 +24,4 @@ - diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/TestPathUtilitiesTest.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/TestPathUtilitiesTest.cs index 0c9a7c5ee4a8dc..c77194a548cee4 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/TestPathUtilitiesTest.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/TestPathUtilitiesTest.cs @@ -16,7 +16,7 @@ public void GetSolutionRootDirectory_ResolvesSolutionRoot() // 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")); } diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props index f25c1d90ce80d1..e97b192d02f95b 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Directory.Build.props @@ -3,5 +3,6 @@ true + true diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index 10c48ef6da8937..e8b9e95dc8c0ec 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -6,8 +6,13 @@ $(NoWarn);CS1591 true cache;memorycache + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 4f93c2ee4b4a31..00000000000000 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.Caching.Memory.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index 8462647cc69b84..5497a4356438f6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -9,6 +9,7 @@ Microsoft.Extensions.Configuration.IConfigurationBuilder Microsoft.Extensions.Configuration.IConfigurationProvider Microsoft.Extensions.Configuration.IConfigurationRoot Microsoft.Extensions.Configuration.IConfigurationSection + true diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index c9907e5cb95885..e966d7790cff4f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -3,8 +3,13 @@ Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration. netstandard2.0 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 0b09b6109b0792..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.Binder.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index 01333469a721b3..40735c8422fc6d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -4,8 +4,13 @@ Command line configuration provider implementation for Microsoft.Extensions.Configuration. netstandard2.0 $(PackageTags);commandline + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Properties/AssemblyInfo.cs deleted file mode 100644 index cbed6537583310..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.CommandLine.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index 33501d496f1ed5..be6017a3f39781 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -4,8 +4,13 @@ Environment variables configuration provider implementation for Microsoft.Extensions.Configuration. netstandard2.0 $(PackageTags);envvar;environmentvariable + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 26f9f3e3a93f8e..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.EnvironmentVariables.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index af8591bb097349..dc0c7536b6114d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -3,8 +3,13 @@ Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration. netstandard2.0 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 14a9dc7a3df3b5..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.FileExtensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index 8c0032d6539c94..39533f64e59bd8 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -4,8 +4,13 @@ INI configuration provider implementation for Microsoft.Extensions.Configuration. netstandard2.0 $(PackageTags);ini + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 643b15312a1cd3..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.Ini.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 967200081fe17a..fd79783bdefdb0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -4,8 +4,13 @@ JSON configuration provider implementation for Microsoft.Extensions.Configuration. netstandard2.0 $(PackageTags);json + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/AssemblyInfo.cs deleted file mode 100644 index fd57c913feaf84..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.Json.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index ef913550a38dfb..8705a3fe8fcdcf 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -4,8 +4,13 @@ User secrets configuration provider implementation for Microsoft.Extensions.Configuration. netstandard2.0 $(PackageTags);secrets;usersecrets + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 74683a8406b335..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.Configuration.UserSecrets.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs index 020318d7d578b1..595da49cd849dd 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs @@ -95,6 +95,21 @@ open System break; } + foreach (var file in new[] { Path.Join(_tempDir, "Directory.Build.props"), Path.Join(_tempDir, "Directory.Build.targets") }) + { + if (!File.Exists(file)) + { + using (var fileStream = File.CreateText(file)) + { + fileStream.WriteLine(@" + + + +"); + } + } + } + var assemblyInfoFile = Path.Combine(_tempDir, $"obj/Debug/{testTfm}/test.AssemblyInfo" + sourceExt); AssertDotNet("restore"); @@ -103,7 +118,7 @@ open System AssertDotNet("build --configuration Debug"); - Assert.True(File.Exists(assemblyInfoFile), $"{assemblyInfoFile} should not exist but does not"); + Assert.True(File.Exists(assemblyInfoFile), $"{assemblyInfoFile} should exist but does not"); var contents = File.ReadAllText(assemblyInfoFile); Assert.Contains("assembly: Microsoft.Extensions.Configuration.UserSecrets.UserSecretsIdAttribute(\"xyz123\")", contents); var lastWrite = new FileInfo(assemblyInfoFile).LastWriteTimeUtc; @@ -134,10 +149,12 @@ void LogData(object obj, DataReceivedEventArgs e) StartInfo = processInfo }; process.OutputDataReceived += LogData; + process.ErrorDataReceived += LogData; process.Start(); process.BeginOutputReadLine(); process.WaitForExit(); process.OutputDataReceived -= LogData; + process.ErrorDataReceived -= LogData; Assert.Equal(0, process.ExitCode); } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index 7fdc3bdd1debcb..c7b0436f803c64 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -4,8 +4,13 @@ XML configuration provider implementation for Microsoft.Extensions.Configuration. netstandard2.0 $(PackageTags);xml + true + + + + @@ -13,4 +18,3 @@ - diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 0167d5f561de53..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.Xml.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj index 206aeb9f4a1604..3d43b315b11d82 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -3,8 +3,13 @@ Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider. netstandard2.0 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Configuration/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 7e380883e02f3a..00000000000000 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Configuration.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index f25f0b81919548..fe4826538fb645 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -8,8 +8,13 @@ Microsoft.Extensions.DependencyInjection.IServiceCollection true dependencyinjection;di $(DefineConstants);ActivatorUtilities_In_DependencyInjection + true + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 7586e5bfdadfbc..00000000000000 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.DependencyInjection.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index 394dc76e0d583a..1f3566bd15a02c 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -5,6 +5,7 @@ netcoreapp3.0;net461;netstandard2.0 true dependencyinjection;di + true True $(DefineConstants);IL_EMIT @@ -15,6 +16,11 @@ $(DefineConstants);SAVE_ASSEMBLIES + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 4afefbd651eaad..00000000000000 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.DependencyInjection.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyInjection.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj index 22a1db02439415..84fbab29666ce5 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj @@ -6,8 +6,13 @@ $(NoWarn);CS1591 $(PackageTags);testing false + true + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Properties/AssemblyInfo.cs deleted file mode 100644 index a5cc6c1da7e695..00000000000000 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.Logging.Testing.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalFactDiscoverer.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalFactDiscoverer.cs index ebb9ecf92e81af..4ac4c6fe9cb998 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalFactDiscoverer.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalFactDiscoverer.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 Microsoft.AspNetCore.Testing.xunit; @@ -20,7 +20,7 @@ protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions { 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); } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalTheoryDiscoverer.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalTheoryDiscoverer.cs index d239b1147c2750..773ef715410f4d 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalTheoryDiscoverer.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedConditionalTheoryDiscoverer.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.Collections.Generic; @@ -22,7 +22,7 @@ protected override IEnumerable CreateTestCasesForTheory( { 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); } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedFactDiscoverer.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedFactDiscoverer.cs index c52d99c822e2ea..e2268d96cbec47 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedFactDiscoverer.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedFactDiscoverer.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 Xunit.Abstractions; @@ -13,6 +13,6 @@ public LoggedFactDiscoverer(IMessageSink diagnosticMessageSink) : base(diagnosti } protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute) - => new LoggedTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod); + => new LoggedTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod); } } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestCase.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestCase.cs index b8d3684c18c977..c43180df89ce28 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestCase.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestCase.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; @@ -19,9 +19,10 @@ public LoggedTestCase() : base() public LoggedTestCase( IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, + TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod, object[] testMethodArguments = null) - : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments) + : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments) { } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestFrameworkDiscoverer.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestFrameworkDiscoverer.cs index 4b1668ce9536f1..9905404ed9be05 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestFrameworkDiscoverer.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTestFrameworkDiscoverer.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; @@ -43,7 +43,7 @@ protected override bool FindTestsForMethod( if (factAttributes.Count() > 1) { var message = $"Test method '{testMethod.TestClass.Class.Name}.{testMethod.Method.Name}' has multiple [Fact]-derived attributes"; - var testCase = new ExecutionErrorTestCase(DiagnosticMessageSink, TestMethodDisplay.ClassAndMethod, testMethod, message); + var testCase = new ExecutionErrorTestCase(DiagnosticMessageSink, TestMethodDisplay.ClassAndMethod, TestMethodDisplayOptions.None, testMethod, message); return ReportDiscoveredTestCase(testCase, includeSourceInformation, messageBus); } @@ -77,4 +77,4 @@ protected override bool FindTestsForMethod( } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryDiscoverer.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryDiscoverer.cs index 535099c690990a..9d5402a09b5d7e 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryDiscoverer.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryDiscoverer.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.Collections.Generic; @@ -18,12 +18,12 @@ protected override IEnumerable CreateTestCasesForDataRow( ITestMethod testMethod, IAttributeInfo theoryAttribute, object[] dataRow) - => new[] { new LoggedTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod, dataRow) }; + => new[] { new LoggedTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod, dataRow) }; protected override IEnumerable CreateTestCasesForTheory( ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute) - => new[] { new LoggedTheoryTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; + => new[] { new LoggedTheoryTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) }; } } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryTestCase.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryTestCase.cs index db78f093c2d6ce..fa3e3a050d866a 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryTestCase.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/src/Xunit/LoggedTheoryTestCase.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; @@ -19,8 +19,9 @@ public LoggedTheoryTestCase() : base() public LoggedTheoryTestCase( IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, + TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod) - : base(diagnosticMessageSink, defaultMethodDisplay, testMethod) + : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod) { } diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/test/Properties/AssemlyInfo.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/test/Properties/AssemblyInfo.cs similarity index 67% rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/test/Properties/AssemlyInfo.cs rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/test/Properties/AssemblyInfo.cs index 63c2b71d23da35..82616e2737ea08 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/test/Properties/AssemlyInfo.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Common/Common/test/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; [assembly: LogLevel(LogLevel.Trace)] diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/Directory.Build.props b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/Directory.Build.props index f25c1d90ce80d1..6acc2b26b3661d 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/Directory.Build.props @@ -3,5 +3,7 @@ true + false + false diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/ActivatorUtilitiesTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/ActivatorUtilitiesTests.cs index a9798e05fc1bd8..8ee67cbbc551a2 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/ActivatorUtilitiesTests.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/ActivatorUtilitiesTests.cs @@ -111,9 +111,9 @@ public void TypeActivatorWorksWithCtorWithOptionalArgs_WithStructDefaults(Create // Assert Assert.NotNull(anotherClass); Assert.Equal(ConsoleColor.DarkGreen, anotherClass.Color); - Assert.Equal(null, anotherClass.ColorNull); + Assert.Null(anotherClass.ColorNull); Assert.Equal(12, anotherClass.Integer); - Assert.Equal(null, anotherClass.IntegerNull); + Assert.Null(anotherClass.IntegerNull); } [Theory] @@ -248,7 +248,7 @@ public void TypeActivatorUsesMarkedConstructor(CreateInstanceFunc createFunc) public void TypeActivatorThrowsOnMultipleMarkedCtors(CreateInstanceFunc createFunc) { // Act - var exception = Assert.Throws(() => CreateInstance(createFunc, null, "hello")); + var exception = Assert.Throws(() => CreateInstance(createFunc, null, "hello")); // Assert Assert.Equal("Multiple constructors were marked with ActivatorUtilitiesConstructorAttribute.", exception.Message); @@ -259,7 +259,7 @@ public void TypeActivatorThrowsOnMultipleMarkedCtors(CreateInstanceFunc createFu public void TypeActivatorThrowsWhenMarkedCtorDoesntAcceptArguments(CreateInstanceFunc createFunc) { // Act - var exception = Assert.Throws(() => CreateInstance(createFunc, null, 0, "hello")); + var exception = Assert.Throws(() => CreateInstance(createFunc, null, 0, "hello")); // Assert Assert.Equal("Constructor marked with ActivatorUtilitiesConstructorAttribute does not accept all given argument types.", exception.Message); diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index 2a39e8a61a671b..0731f2e828e2bd 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -11,7 +11,10 @@ https://github.com/dotnet/corefx/issues/12338 & https://github.com/dotnet/corefx/issues/11797 --> false + false false + + true @@ -22,5 +25,4 @@ - diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index 1ba11387eb4aae..0d2537f5d02172 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -8,6 +8,7 @@ Microsoft.Extensions.FileProviders.IDirectoryContents Microsoft.Extensions.FileProviders.IFileInfo Microsoft.Extensions.FileProviders.IFileProvider netstandard2.0 + true diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index c62b87af8805a6..b96e7951271835 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -4,6 +4,7 @@ Microsoft.Extensions.FileProviders Composite file and directory providers for Microsoft.Extensions.FileProviders. netstandard2.0 + true diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj index 73db507fe71867..58643969948d03 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index be7270c25e4d20..3327ca9999bea9 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -5,8 +5,14 @@ File provider for physical files for Microsoft.Extensions.FileProviders. netstandard2.0 true + true + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/AssemblyInfo.cs deleted file mode 100644 index ef640f1a711e04..00000000000000 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.FileProviders.Physical.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj index fb190152000c3e..ef0b47af0b2f2e 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -8,8 +8,13 @@ $(NoWarn);CS1591 files;filesystem;glob;globbing true + true + + + + diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/AssemblyInfo.cs deleted file mode 100644 index b1a0714e4f72b0..00000000000000 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.FileSystemGlobbing.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index 746fbaf96d7e45..e4bfd8802d8dac 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -8,6 +8,7 @@ hosting false Microsoft.Extensions.Hosting + true @@ -16,5 +17,5 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index 1e7bd1e6b1d2d9..1e258ee5bb31b1 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -7,6 +7,7 @@ true hosting false + true diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs index 144fb0ad959668..44b2fd7733682d 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs @@ -119,8 +119,7 @@ public void CanConfigureAppConfigurationAndRetrieveFromDI() public void CanConfigureAppConfigurationFromFile() { // Needs to look in the project directory like VS would - var projectDir = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), - "Hosting/test"); + var projectDir = Path.Combine(TestPathUtilities.GetRepoRootDirectory(), "src", "Hosting", "Hosting", "test"); var hostBuilder = new HostBuilder() .UseContentRoot(projectDir) .ConfigureAppConfiguration((context, configBuilder) => diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index fc98b928d9552b..acaaa8d8123836 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -10,8 +10,14 @@ $(NoWarn);CS1591 true aspnetcore;httpclient + true + + + + + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Http/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 68708b3935bbc3..00000000000000 --- a/src/libraries/Microsoft.Extensions.Http/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Http.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 5c19dc08a417c6..b5c83240519f12 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -12,8 +12,13 @@ Microsoft.Extensions.Logging.LoggerMessage Microsoft.Extensions.Logging.Abstractions.NullLogger netstandard2.0 $(NoWarn);CS1591 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 7d5d0d3e039db4..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.Logging.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index 626f3130ad25f7..6027d5b5630bfd 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -3,6 +3,7 @@ Configuration support for Microsoft.Extensions.Logging. netstandard2.0 + true diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index ddd7d5af55aa68..4346e4f9bc8538 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -4,8 +4,13 @@ Console logger provider implementation for Microsoft.Extensions.Logging. netstandard2.0 $(NoWarn);CS1591 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 32e0f3469aefd5..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Logging.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 993ff6e16cd0f9..1520e7e022849a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -4,8 +4,13 @@ Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine(). netstandard2.0 $(NoWarn);CS1591 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 32e0f3469aefd5..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Logging.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index d842f524f802f1..5c49866ceb4072 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -5,8 +5,13 @@ netstandard2.0;net461 $(NoWarn);CS1591 $(PackageTags);eventlog;windowseventlog + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 32e0f3469aefd5..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +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.Logging.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 0d8b6d00a17d72..3e160c4d17ac77 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -5,6 +5,7 @@ netstandard2.0 $(PackageTags);EventSource;ETW true + true diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/AssemblyInfo.cs index e46bc08b81f317..0e9cac920bd775 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/AssemblyInfo.cs +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/AssemblyInfo.cs @@ -7,4 +7,4 @@ // all existing listeners that enabled that EventSource will receive the event. // This makes running EventSourceLogger tests in parallel difficult. We mark this assembly // with CollectionBehavior.CollectionPerAssembly to ensure that all tests in this assembly are executed serially. -[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)] \ No newline at end of file +[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)] diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index 7f8e7416c40517..3c7fd657f7a1ca 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -6,6 +6,7 @@ $(NoWarn);CS1591 true logging;tracesource + true diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index 2c0555af1af1d9..ecd86224d0102a 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -4,8 +4,13 @@ Logging infrastructure default implementation for Microsoft.Extensions.Logging. netstandard2.0 $(NoWarn);CS1591 + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Properties/AssemlyInfo.cs b/src/libraries/Microsoft.Extensions.Logging/src/Properties/AssemlyInfo.cs deleted file mode 100644 index a603dd0845dc13..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/src/Properties/AssemlyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Extensions.Logging.Configuration, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 60b92a75b4663f..67be2787d161c4 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -5,6 +5,7 @@ netstandard2.0 true aspnetcore;configuration;options + true diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index bcb7ac68b91eb7..29467cc0d98049 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -5,6 +5,7 @@ netstandard2.0 true aspnetcore;validation;options + true diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index d1f4bcd4207544..6b0ada3d770c2e 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -5,8 +5,13 @@ netstandard2.0 true aspnetcore;options + true + + + + diff --git a/src/libraries/Microsoft.Extensions.Options/src/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Options/src/Properties/AssemblyInfo.cs deleted file mode 100644 index a25556153c1d11..00000000000000 --- a/src/libraries/Microsoft.Extensions.Options/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -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.Options.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index ca59eda0241c75..e8f17a9091d8bf 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -10,6 +10,7 @@ Microsoft.Extensions.Primitives.StringSegment true true primitives + true