From b09c78bb523a7fa511991b0466c1100a60fdc0ef Mon Sep 17 00:00:00 2001 From: Ramanuj Bhattacharjee <103154538+ramanujbhattacharjee93@users.noreply.github.com> Date: Tue, 9 Aug 2022 13:38:21 -0700 Subject: [PATCH 01/12] Rename redirect header for QuickPulse (#2638) * rename redirect header * add changelog Co-authored-by: Ramanuj Bhattacharjee --- CHANGELOG.md | 2 +- .../Implementation/QuickPulse/QuickPulseConstants.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 276ee864b..8e5b08648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## VNext - +- Update endpoint redirect header name for QuickPulse module to v2 - AzureSdkDiagnosticListener modified to use sdkversion prefix "rdddsaz" instead of "dotnet". ## Version 2.21.0 diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs index fd0bf9607..c893039b5 100644 --- a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs @@ -64,7 +64,7 @@ /// Service endpoint redirect. /// /// Contains a URI of the service endpoint we must permanently use for the particular resource. - internal const string XMsQpsServiceEndpointRedirectHeaderName = "x-ms-qps-service-endpoint-redirect"; + internal const string XMsQpsServiceEndpointRedirectHeaderName = "x-ms-qps-service-endpoint-redirect-v2"; /// /// The following authentication headers must be received and submitted back to the service with no modification. From 9b3e18b00c4838d8a94c0fabcca43f543c1a8e5a Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Wed, 10 Aug 2022 18:49:12 -0700 Subject: [PATCH 02/12] fix test for Net7 Preview 7 (#2655) --- .../Extensibility/TelemetryConfigurationFactoryTest.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs index 93227d842..d54804996 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs @@ -1150,7 +1150,11 @@ } [TestMethod] +#if NET7_0_OR_GREATER + [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: The input string '123a' was not in a correct format.")] +#else [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: Input string was not in a correct format.")] +#endif public void LoadPropertiesThrowsExceptionWithPropertyName() { // parsing this integer will throw "System.FormatException: Input string was not in a correct format." @@ -1167,7 +1171,11 @@ } [TestMethod] +#if NET7_0_OR_GREATER + [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: The input string '123a' was not in a correct format.")] +#else [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: Input string was not in a correct format.")] +#endif public void LoadProperties_TelemetryClientThrowsException() { string testConfig = Configuration( From 5b05c9b6c985b3e82712f36e93eaa4b84f43556d Mon Sep 17 00:00:00 2001 From: Rajkumar Rangaraj Date: Wed, 10 Aug 2022 19:05:36 -0700 Subject: [PATCH 03/12] Update versions_and_names.md (#2654) --- docs/versions_and_names.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/versions_and_names.md b/docs/versions_and_names.md index 00ae0b4d8..5d5b066a7 100644 --- a/docs/versions_and_names.md +++ b/docs/versions_and_names.md @@ -117,6 +117,7 @@ Define the prefixes for the SDK. |-----------|:------:|-------------------------------------| | Redfield1 | ad_ | Telemetry from Redfield AppServices attach, using the **default** configuration | | Redfield1 | ar_ | Telemetry from Redfield AppServices attach, using the **recommended** configuration | +| Redfield1 | al_ | Telemetry from Redfield Linux AppServices attach, using the **recommended** configuration | | Redfield1 | csd_ | Telemetry from Redfield CloudServices attach, using the **default** configuration | | Redfield1 | csr_ | Telemetry from Redfield CloudServices attach, using the **recommended** configuration | | Redfield1 | ud_ | Telemetry from Redfield unknown environment attach, using the **default** configuration | From c5f622e767dd65b4ab8ad180d7e918655d642ccd Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Fri, 19 Aug 2022 13:10:44 -0700 Subject: [PATCH 04/12] ignore config files for Visual Studio Live Unit Testing (#2660) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 1ba2c8282..4e569cda5 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,10 @@ ipch/ *.vsp *.vspx +# Visual Studio live unit testing config +*.lutconfig +*.lutignore + # Guidance Automation Toolkit *.gpState From ecda31388bcadc55f6383fc0146bb79ed04b99b8 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Fri, 19 Aug 2022 14:04:50 -0700 Subject: [PATCH 05/12] dependabot (#2659) --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..4cff4d6f1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" From dabb115743a2814bc3dc78b5f01b912e2e2b669e Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Fri, 19 Aug 2022 14:24:36 -0700 Subject: [PATCH 06/12] improve eventsource tests (#2661) --- .../Test/TestFramework/Shared/EventSourceTest.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/BASE/Test/TestFramework/Shared/EventSourceTest.cs b/BASE/Test/TestFramework/Shared/EventSourceTest.cs index 781412765..4c7a28059 100644 --- a/BASE/Test/TestFramework/Shared/EventSourceTest.cs +++ b/BASE/Test/TestFramework/Shared/EventSourceTest.cs @@ -27,10 +27,24 @@ namespace Microsoft.ApplicationInsights.TestFramework listener.EnableEvents(eventSource, EventLevel.Verbose, (EventKeywords)AllKeywords); try { + var guid = Guid.NewGuid(); + EventSource.SetCurrentThreadActivityId(guid); + object[] eventArguments = GenerateEventArguments(eventMethod); eventMethod.Invoke(eventSource, eventArguments); - EventWrittenEventArgs actualEvent = listener.Messages.First(); + EventWrittenEventArgs actualEvent = listener.Messages.FirstOrDefault(x => x.ActivityId == guid); + + if (actualEvent == null) + { + throw new Exception("Listener failed to collect event."); + } + else if (actualEvent.EventId == 0) + { + // an error occurred + throw new Exception(actualEvent.Message); + } + VerifyEventId(eventMethod, actualEvent); VerifyEventLevel(eventMethod, actualEvent); VerifyEventMessage(eventMethod, actualEvent, eventArguments); From ffbc00c02d111d7304f35aa4627068f016e93974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 23:18:11 +0000 Subject: [PATCH 07/12] Bump actions/checkout from 2 to 3 (#2663) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-test-BASE.yml | 2 +- .github/workflows/build-and-test-LOGGING.yml | 2 +- .github/workflows/build-and-test-NETCORE.yml | 2 +- .github/workflows/build-and-test-WEB.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/redfield-sanity-check.yml | 2 +- .github/workflows/sanity.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml index b01f0dd05..707ff2b3f 100644 --- a/.github/workflows/build-and-test-BASE.yml +++ b/.github/workflows/build-and-test-BASE.yml @@ -30,7 +30,7 @@ jobs: args: "--filter TestCategory!=WindowsOnly" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup dotnet uses: actions/setup-dotnet@v2 diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml index c922f851b..82d4646fe 100644 --- a/.github/workflows/build-and-test-LOGGING.yml +++ b/.github/workflows/build-and-test-LOGGING.yml @@ -27,7 +27,7 @@ jobs: framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup dotnet uses: actions/setup-dotnet@v2 diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml index 83fcef0e7..9ce7c5e9a 100644 --- a/.github/workflows/build-and-test-NETCORE.yml +++ b/.github/workflows/build-and-test-NETCORE.yml @@ -30,7 +30,7 @@ jobs: args: "--filter TestCategory!=WindowsOnly" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup dotnet uses: actions/setup-dotnet@v2 diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml index b7374a87c..de9d8b8c1 100644 --- a/.github/workflows/build-and-test-WEB.yml +++ b/.github/workflows/build-and-test-WEB.yml @@ -27,7 +27,7 @@ jobs: framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup dotnet uses: actions/setup-dotnet@v2 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5ffefecaf..7f502b918 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ jobs: solution: [./ProjectsForSigning.sln] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ matrix.branch }} diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml index 464aeb007..80bf6e191 100644 --- a/.github/workflows/redfield-sanity-check.yml +++ b/.github/workflows/redfield-sanity-check.yml @@ -30,7 +30,7 @@ jobs: args: "--filter TestCategory!=WindowsOnly" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup dotnet uses: actions/setup-dotnet@v2 diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml index 8b0503606..259217566 100644 --- a/.github/workflows/sanity.yml +++ b/.github/workflows/sanity.yml @@ -29,7 +29,7 @@ jobs: ./WEB/Src/Microsoft.ApplicationInsights.Web.sln] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup dotnet uses: actions/setup-dotnet@v2 From 6c4f37aed26d37caf6990f6d00afa53fbb6e7094 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 23:34:29 +0000 Subject: [PATCH 08/12] Bump actions/stale from 4.0.0 to 5.1.1 (#2662) Bumps [actions/stale](https://github.com/actions/stale) from 4.0.0 to 5.1.1. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/v5.1.1/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v4.0.0...v5.1.1) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index c61831781..854a27f47 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v4.0.0 + - uses: actions/stale@v5.1.1 id: stale with: stale-issue-message: 'This issue is stale because it has been open 300 days with no activity. Remove stale label or this will be closed in 7 days. Commenting will instruct the bot to automatically remove the label.' From f1a9c0dbd6507ae0a879c8eaf43c944709f5cfc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Baptista?= Date: Thu, 25 Aug 2022 21:31:52 +0100 Subject: [PATCH 09/12] stop considering log entries with LogLevel.None (#2667) --- CHANGELOG.md | 1 + .../src/ILogger/ApplicationInsightsLogger.cs | 2 +- .../ILogger.Tests/ILoggerIntegrationTests.cs | 32 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e5b08648..6c3f646db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## VNext - Update endpoint redirect header name for QuickPulse module to v2 - AzureSdkDiagnosticListener modified to use sdkversion prefix "rdddsaz" instead of "dotnet". +- [ILogger logs with LogLevel.None severity are now ignored by ApplicationInsightsLogger](https://github.com/microsoft/ApplicationInsights-dotnet/pull/2667). Fixes ([#2666](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2666)) ## Version 2.21.0 - no changes since beta. diff --git a/LOGGING/src/ILogger/ApplicationInsightsLogger.cs b/LOGGING/src/ILogger/ApplicationInsightsLogger.cs index 5dec727df..24637a499 100644 --- a/LOGGING/src/ILogger/ApplicationInsightsLogger.cs +++ b/LOGGING/src/ILogger/ApplicationInsightsLogger.cs @@ -65,7 +65,7 @@ namespace Microsoft.Extensions.Logging.ApplicationInsights /// public bool IsEnabled(LogLevel logLevel) { - return this.telemetryClient.IsEnabled(); + return logLevel != LogLevel.None && this.telemetryClient.IsEnabled(); } /// diff --git a/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs b/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs index b2beaf719..4a74e99f6 100644 --- a/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs +++ b/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs @@ -96,6 +96,7 @@ namespace Microsoft.ApplicationInsights testLogger.LogTrace("Trace"); testLogger.LogWarning("Warning"); testLogger.LogDebug("Debug"); + testLogger.Log(LogLevel.None, "None"); Assert.AreEqual(7, itemsReceived.Count); @@ -125,6 +126,37 @@ namespace Microsoft.ApplicationInsights Assert.AreEqual("Debug", (itemsReceived[6] as TraceTelemetry).Message); } + /// + /// Ensures that is invoked when user logs using . + /// + [TestMethod] + [TestCategory("ILogger")] + public void ApplicationInsightsLoggerIsNotInvokedWhenUsingILoggerAndTelemetryIsDisabled() + { + List itemsReceived = new List(); + + IServiceProvider serviceProvider = ILoggerIntegrationTests.SetupApplicationInsightsLoggerIntegration((telemetryItem, telemetryProcessor) => + { + itemsReceived.Add(telemetryItem); + }, configuration => + { + configuration.DisableTelemetry = true; + }); + + ILogger testLogger = serviceProvider.GetRequiredService>(); + + testLogger.LogInformation("Testing"); + testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage"); + testLogger.LogInformation(new EventId(100, "TestEvent"), "TestingEvent"); + testLogger.LogCritical("Critical"); + testLogger.LogTrace("Trace"); + testLogger.LogWarning("Warning"); + testLogger.LogDebug("Debug"); + testLogger.Log(LogLevel.None, "None"); + + Assert.AreEqual(0, itemsReceived.Count); + } + /// /// Ensures that the switch is honored /// and exceptions are logged as trace messages when value is true. From a7ca15790a301275ede66722bab21cc8d71f1509 Mon Sep 17 00:00:00 2001 From: Paul Harrington Date: Tue, 30 Aug 2022 09:52:06 -0700 Subject: [PATCH 10/12] Preserve Context when setting ExceptionTelemetry.Exception (#2668) * Preserve context when setting ExceptionTelemetry.Exception Fixes #2086 * Update CHANGELOG --- .../DataContracts/ExceptionTelemetryTest.cs | 24 +++++++++++++++++++ .../DataContracts/ExceptionTelemetry.cs | 10 +++++++- CHANGELOG.md | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs index eba8dbbf0..5a2e39b1c 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs @@ -265,6 +265,30 @@ Assert.AreEqual(nextException.Message, testExceptionTelemetry.ExceptionDetailsInfoList.First().Message); } + [TestMethod] + public void ExceptionPropertySetterPreservesContext() + { + // ARRANGE + Exception constructorException = new Exception("ConstructorException"); + var testExceptionTelemetry = new ExceptionTelemetry(constructorException); + + const string expectedAccountId = "AccountId"; + testExceptionTelemetry.Context.User.AccountId = expectedAccountId; + const string expectedAuthenticatedUserId = "AuthUserId"; + testExceptionTelemetry.Context.User.AuthenticatedUserId = expectedAuthenticatedUserId; + const string expectedUserAgent = "ExceptionComponent"; + testExceptionTelemetry.Context.User.UserAgent = expectedUserAgent; + + // ACT + Exception nextException = new Exception("NextException"); + testExceptionTelemetry.Exception = nextException; + + // ASSERT + Assert.AreEqual(expectedAccountId, testExceptionTelemetry.Context.User.AccountId); + Assert.AreEqual(expectedAuthenticatedUserId, testExceptionTelemetry.Context.User.AuthenticatedUserId); + Assert.AreEqual(expectedUserAgent, testExceptionTelemetry.Context.User.UserAgent); + } + #pragma warning disable 618 [TestMethod] public void HandledAtReturnsUnhandledByDefault() diff --git a/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs b/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs index 68bb6ee63..8bffa80d9 100644 --- a/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs +++ b/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs @@ -449,7 +449,15 @@ this.Data = new ExceptionInfo(exceptions.Select(ex => new ExceptionDetailsInfo(ex)), this.SeverityLevel, this.ProblemId, this.Properties, this.Metrics); - this.context = new TelemetryContext(this.Data.Properties); + + if (this.context == null) + { + this.context = new TelemetryContext(this.Data.Properties); + } + else + { + this.context = this.context.DeepClone(this.Data.Properties); + } } catch (Exception ex) { diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c3f646db..3d5024187 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Update endpoint redirect header name for QuickPulse module to v2 - AzureSdkDiagnosticListener modified to use sdkversion prefix "rdddsaz" instead of "dotnet". - [ILogger logs with LogLevel.None severity are now ignored by ApplicationInsightsLogger](https://github.com/microsoft/ApplicationInsights-dotnet/pull/2667). Fixes ([#2666](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2666)) +- [Fix ExceptionTelemetry clears all Context when updating Exception property](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2086) ## Version 2.21.0 - no changes since beta. From 708dc9622464050a6f488324fb9c777dbef24993 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Tue, 6 Sep 2022 11:38:11 -0700 Subject: [PATCH 11/12] remove comment (#2671) --- LOGGING/test/Shared/CustomTelemetryChannel.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/LOGGING/test/Shared/CustomTelemetryChannel.cs b/LOGGING/test/Shared/CustomTelemetryChannel.cs index 807da59c8..0a95bce99 100644 --- a/LOGGING/test/Shared/CustomTelemetryChannel.cs +++ b/LOGGING/test/Shared/CustomTelemetryChannel.cs @@ -1,7 +1,6 @@ //----------------------------------------------------------------------------------- // // Copyright (c) Microsoft Corporation. All Rights Reserved. -// Information Contained Herein is Proprietary and Confidential. // //----------------------------------------------------------------------------------- From 19a3ecf77bebd7bbcffb6ca553b920016a412ed4 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Tue, 6 Sep 2022 13:55:27 -0700 Subject: [PATCH 12/12] adding net481 to test matrix (#2664) * adding net481 to test matrix * adding net481 to test matrix * update contrib --- .github/CONTRIBUTING.md | 3 ++- .github/workflows/build-and-test-BASE.yml | 2 +- .github/workflows/build-and-test-LOGGING.yml | 2 +- .github/workflows/build-and-test-NETCORE.yml | 2 +- .github/workflows/build-and-test-WEB.yml | 2 +- .props/Test.props | 2 +- Directory.Build.props | 4 ++-- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2128338a5..63c79d277 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -25,7 +25,8 @@ To successfully build the sources on your machine, make sure you've installed th - .NET Framework 4.6.1 - .NET Framework 4.6.2 - .NET Framework 4.7.2 - - .NET Framework 4.8 + - .NET Framework 4.8.0 + - .NET Framework 4.8.1 - .NET Core 3.1 - .NET 6 - .NET 7 diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml index 707ff2b3f..e9ab04d50 100644 --- a/.github/workflows/build-and-test-BASE.yml +++ b/.github/workflows/build-and-test-BASE.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0] + framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0] include: - os: ubuntu-latest args: "--filter TestCategory!=WindowsOnly" diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml index 82d4646fe..fe73e9488 100644 --- a/.github/workflows/build-and-test-LOGGING.yml +++ b/.github/workflows/build-and-test-LOGGING.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [windows-latest] - framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0] + framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml index 9ce7c5e9a..d496d6f78 100644 --- a/.github/workflows/build-and-test-NETCORE.yml +++ b/.github/workflows/build-and-test-NETCORE.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0] + framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0] include: - os: ubuntu-latest args: "--filter TestCategory!=WindowsOnly" diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml index de9d8b8c1..30c86e2a6 100644 --- a/.github/workflows/build-and-test-WEB.yml +++ b/.github/workflows/build-and-test-WEB.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [windows-latest] - framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0] + framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0] steps: - uses: actions/checkout@v3 diff --git a/.props/Test.props b/.props/Test.props index 797ab6472..c075526ee 100644 --- a/.props/Test.props +++ b/.props/Test.props @@ -19,7 +19,7 @@ - net6.0 (EoL Nov 2024) - net7.0 (GA Nov 2022) --> - net462;net472;net480;netcoreapp3.1;net6.0;net7.0 + net462;net472;net480;net481;netcoreapp3.1;net6.0;net7.0 netcoreapp3.1;net6.0;net7.0 diff --git a/Directory.Build.props b/Directory.Build.props index 808128974..58e3e9f31 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -81,9 +81,9 @@ preview - True + True True - True + True