diff --git a/.props/Product.props b/.props/Product.props index da6f6ec38f..f81957c02d 100644 --- a/.props/Product.props +++ b/.props/Product.props @@ -13,9 +13,6 @@ - - All - All @@ -52,7 +49,6 @@ - $(RelativeOutputPathBase) $(BinRoot)\$(Configuration)\$(CorePath) diff --git a/.props/Test.props b/.props/Test.props index cd017bd74a..38bffa770b 100644 --- a/.props/Test.props +++ b/.props/Test.props @@ -6,7 +6,6 @@ - + None + false diff --git a/NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs b/NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs index bb78ef685c..381b779c6a 100644 --- a/NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs @@ -45,7 +45,13 @@ public IActionResult Exception() public IActionResult Dependency() { - this.telemetryClient.TrackDependency("MyDependency", "MyCommand", DateTimeOffset.Now, TimeSpan.FromMilliseconds(1), success: true); + this.telemetryClient.TrackDependency( + dependencyTypeName: "test", + dependencyName: "MyDependency", + data: "MyCommand", + startTime: DateTimeOffset.Now, + duration: TimeSpan.FromMilliseconds(1), + success: true); return View(); } diff --git a/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj index 960b363ed1..8be95b5c86 100644 --- a/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj @@ -1,4 +1,5 @@  + 2.0.0 diff --git a/NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj b/NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj index 9badb1837d..b261f98a15 100644 --- a/NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj +++ b/NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj @@ -1,4 +1,5 @@  + netcoreapp3.1;net5.0;net6.0 diff --git a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs index c4a1ea8733..10e8112fcc 100644 --- a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs @@ -136,12 +136,16 @@ public void ActiveConfigurationIsNotCorruptedAfterWebHostIsDisposed() // Active config could be used multiple times in the same process before this test // let's reassign it +#pragma warning disable CS0618 // Type or member is obsolete TelemetryConfiguration.Active.Dispose(); +#pragma warning restore CS0618 // Type or member is obsolete MethodInfo setActive = typeof(TelemetryConfiguration).GetMethod("set_Active", BindingFlags.Static | BindingFlags.NonPublic); setActive.Invoke(null, new object[] { TelemetryConfiguration.CreateDefault() }); +#pragma warning disable CS0618 // Type or member is obsolete var activeConfig = TelemetryConfiguration.Active; +#pragma warning restore CS0618 // Type or member is obsolete using (var server = new InProcessServer(assemblyName, this.output, (aiOptions) => aiOptions.EnableActiveTelemetryConfigurationSetup = true)) { this.ExecuteRequest(server.BaseHost + requestPath); diff --git a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj index de8cae49ca..8a2e94742d 100644 --- a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj @@ -1,4 +1,5 @@  + netcoreapp3.1;net5.0;net6.0 diff --git a/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj b/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj index 0fcc09062f..36e9c7074c 100644 --- a/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj +++ b/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj @@ -1,5 +1,6 @@  - + +