diff --git a/build/dependencies.props b/build/dependencies.props index 0a6c8d6eb5..226b77c333 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,7 +4,7 @@ 2.1.0-* 4.7.1 $(BundledNETStandardPackageVersion) - 15.0.0 - 2.2.0 + 15.3.0-* + 2.3.0-beta2-* diff --git a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj index 368597c791..39f0c5afc4 100644 --- a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj +++ b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj @@ -22,8 +22,4 @@ - - - - diff --git a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj b/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj index b12ddb4f4a..9c2f0d1fc0 100644 --- a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj +++ b/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -29,8 +29,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj index 98723ee18e..285f41ea13 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -19,8 +19,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj index 8130f620c6..4fe34ef3dd 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -29,8 +29,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/StackTraceTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/StackTraceTest.cs index 5ab8041347..b94e05e7a9 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/StackTraceTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/StackTraceTest.cs @@ -20,8 +20,8 @@ namespace Microsoft.Extensions.Internal.Test public static TheoryData CanGetStackTraceData => new TheoryData { { - ThrowsException, - $"{typeof(StackTraceTest).GetTypeInfo().FullName}.{nameof(ThrowsException)}()" + TestMethods.ThrowsException, + $"{typeof(TestMethods).GetTypeInfo().FullName}.{nameof(TestMethods.ThrowsException)}()" }, { new ExceptionType().MethodThatThrows, @@ -84,19 +84,18 @@ namespace Microsoft.Extensions.Internal.Test { get { - var thisType = typeof(StackTraceTest); var intParse = ((Func)int.Parse).GetMethodInfo(); var dateTimeOffsetTryParse = typeof(DateTimeOffset).GetMethods() .First(m => m.Name == nameof(DateTimeOffset.TryParse) && m.GetParameters().Length == 2); var genericTypeMethod = typeof(List).GetMethod(nameof(List.Remove)); - var genericMethod = thisType.GetMethod(nameof(GenericMethod)); - var multiGenericMethod = thisType.GetMethod(nameof(MultiParameterGenericMethod)); - var byRefMethod = thisType.GetMethod(nameof(ByRefMethod)); - var asyncMethod = thisType.GetMethod(nameof(AsyncMethod)); - var nullableParam = thisType.GetMethod(nameof(MethodWithNullableParams)); - var nestedMethod = thisType.GetNestedType(nameof(NestedType), BindingFlags.Public) + var genericMethod = typeof(TestMethods).GetMethod(nameof(TestMethods.GenericMethod)); + var multiGenericMethod = typeof(TestMethods).GetMethod(nameof(TestMethods.MultiParameterGenericMethod)); + var byRefMethod = typeof(TestMethods).GetMethod(nameof(TestMethods.ByRefMethod)); + var asyncMethod = typeof(TestMethods).GetMethod(nameof(TestMethods.AsyncMethod)); + var nullableParam = typeof(TestMethods).GetMethod(nameof(TestMethods.MethodWithNullableParams)); + var nestedMethod = typeof(StackTraceTest).GetNestedType(nameof(NestedType), BindingFlags.Public) .GetMethod(nameof(NestedType.NestedMethod)); - var nestedGenericMethod = thisType.GetNestedType(nameof(NestedType), BindingFlags.Public) + var nestedGenericMethod = typeof(StackTraceTest).GetNestedType(nameof(NestedType), BindingFlags.Public) .GetMethod(nameof(NestedType.NestedGenericMethod)); return new TheoryData @@ -104,11 +103,11 @@ namespace Microsoft.Extensions.Internal.Test { intParse, "int.Parse(string s)" }, { dateTimeOffsetTryParse, "System.DateTimeOffset.TryParse(string input, out DateTimeOffset result)" }, { genericTypeMethod, "System.Collections.Generic.List.Remove(Process item)" }, - { genericMethod, $"{thisType}.{nameof(GenericMethod)}(TVal value)" }, - { multiGenericMethod, $"{thisType}.{nameof(MultiParameterGenericMethod)}(KeyValuePair keyValuePair)" }, - { byRefMethod, $"{thisType}.{nameof(ByRefMethod)}(int a, CultureInfo b, ref long c)" }, - { asyncMethod, $"{thisType}.{nameof(AsyncMethod)}(string name)" }, - { nullableParam, $"{thisType}.{nameof(MethodWithNullableParams)}(Nullable name, string value)" }, + { genericMethod, $"{typeof(TestMethods)}.{nameof(TestMethods.GenericMethod)}(TVal value)" }, + { multiGenericMethod, $"{typeof(TestMethods)}.{nameof(TestMethods.MultiParameterGenericMethod)}(KeyValuePair keyValuePair)" }, + { byRefMethod, $"{typeof(TestMethods)}.{nameof(TestMethods.ByRefMethod)}(int a, CultureInfo b, ref long c)" }, + { asyncMethod, $"{typeof(TestMethods)}.{nameof(TestMethods.AsyncMethod)}(string name)" }, + { nullableParam, $"{typeof(TestMethods)}.{nameof(TestMethods.MethodWithNullableParams)}(Nullable name, string value)" }, { nestedMethod, $"{typeof(NestedType)}.{nameof(NestedType.NestedMethod)}(string value)" }, { nestedGenericMethod, $"{typeof(NestedType)}.{nameof(NestedType.NestedGenericMethod)}(NestedParameterType a, TKey key)" } }; @@ -126,23 +125,26 @@ namespace Microsoft.Extensions.Internal.Test Assert.Equal(expected, actual.ToString()); } - public static void ThrowsException() + public class TestMethods { - throw new Exception(); - } + public static void ThrowsException() + { + throw new Exception(); + } - public string GenericMethod(TVal value) => value.ToString(); + public string GenericMethod(TVal value) => value.ToString(); - public void MultiParameterGenericMethod(KeyValuePair keyValuePair) - { - } + public void MultiParameterGenericMethod(KeyValuePair keyValuePair) + { + } - public decimal ByRefMethod(int a, CultureInfo b, ref long c) => a + c; + public decimal ByRefMethod(int a, CultureInfo b, ref long c) => a + c; - public async Task AsyncMethod(string name) => await Task.FromResult(0); + public async Task AsyncMethod(string name) => await Task.FromResult(0); - public void MethodWithNullableParams(int? name, string value) - { + public void MethodWithNullableParams(int? name, string value) + { + } } public class NestedType diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj index 3ba7507c37..b9e4874410 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj @@ -21,8 +21,4 @@ - - - -