diff --git a/scripts/SlngenReferencing.ps1 b/scripts/SlngenReferencing.ps1 index 2f2296a44d6..1bee1e39959 100644 --- a/scripts/SlngenReferencing.ps1 +++ b/scripts/SlngenReferencing.ps1 @@ -2,10 +2,9 @@ <# .SYNOPSIS -Create solution file that contains all packages referencing mentioned keywords. +Creates a solution file that contains all the packages referencing specific keywords. .DESCRIPTION -This script will help you when changing public API of the package and would like to adjust all internal R9 usages. -It will generate a solution file with all packages that references a project matching given keywords. +This script will generate a solution file with all the packages that reference a project matching given keywords. .EXAMPLE PS> .\SlngenReferencing.ps1 AsyncState #> diff --git a/src/Libraries/Microsoft.AspNetCore.Testing/FakeSslCertificateFactory.cs b/src/Libraries/Microsoft.AspNetCore.Testing/FakeSslCertificateFactory.cs index 4e2d838942c..2473fee5dc9 100644 --- a/src/Libraries/Microsoft.AspNetCore.Testing/FakeSslCertificateFactory.cs +++ b/src/Libraries/Microsoft.AspNetCore.Testing/FakeSslCertificateFactory.cs @@ -23,7 +23,7 @@ internal static class FakeSslCertificateFactory public static X509Certificate2 CreateSslCertificate() { var request = new CertificateRequest( - new X500DistinguishedName("CN=r9-self-signed-unit-test-certificate"), + new X500DistinguishedName("CN=dotnet-extensions-self-signed-unit-test-certificate"), _rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Http/TelemetryConstants.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Http/TelemetryConstants.cs index 58b6ea8a0be..5e600f29ed4 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Http/TelemetryConstants.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Http/TelemetryConstants.cs @@ -11,7 +11,7 @@ public static class TelemetryConstants /// /// Request metadata key that is used when storing request metadata object. /// - public const string RequestMetadataKey = "R9-RequestMetadata"; + public const string RequestMetadataKey = "Extensions-RequestMetadata"; /// /// Represents the placeholder text for an unknown request name or dependency name in telemetry. diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Microsoft.Extensions.Diagnostics.ExtraAbstractions.json b/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Microsoft.Extensions.Diagnostics.ExtraAbstractions.json index 3d7bd4beb33..44dd7b3edd0 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Microsoft.Extensions.Diagnostics.ExtraAbstractions.json +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions/Microsoft.Extensions.Diagnostics.ExtraAbstractions.json @@ -893,7 +893,7 @@ { "Member": "const string Microsoft.Extensions.Http.Diagnostics.TelemetryConstants.RequestMetadataKey", "Stage": "Stable", - "Value": "R9-RequestMetadata" + "Value": "Extensions-RequestMetadata" }, { "Member": "const string Microsoft.Extensions.Http.Diagnostics.TelemetryConstants.ServerApplicationNameHeader", diff --git a/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json b/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json index e4ea7bcd360..046247fa87e 100644 --- a/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json +++ b/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json @@ -867,7 +867,7 @@ { "Member": "const string Microsoft.Extensions.Http.Diagnostics.TelemetryConstants.RequestMetadataKey", "Stage": "Stable", - "Value": "R9-RequestMetadata" + "Value": "Extensions-RequestMetadata" }, { "Member": "const string Microsoft.Extensions.Http.Diagnostics.TelemetryConstants.ServerApplicationNameHeader", diff --git a/test/Generators/Microsoft.Gen.MetricsReports/Unit/EmitterTests.cs b/test/Generators/Microsoft.Gen.MetricsReports/Unit/EmitterTests.cs index 98af82ebec4..d6df799b261 100644 --- a/test/Generators/Microsoft.Gen.MetricsReports/Unit/EmitterTests.cs +++ b/test/Generators/Microsoft.Gen.MetricsReports/Unit/EmitterTests.cs @@ -65,13 +65,13 @@ public class EmitterTests }, new ReportedMetricMethod { - MetricName = "R9\\Test\\MemoryUsage", + MetricName = "Test\\MemoryUsage", Summary = "MemoryUsage summary.", Kind = InstrumentKind.Gauge, Dimensions = new() { "Path"}, DimensionsDescriptions = new Dictionary { - { "Path", "R9\\Test\\Description\\Path" } + { "Path", "Test\\Description\\Path" } }, } } @@ -166,11 +166,11 @@ public void EmitterShouldOutputInJSONFormat() newLine + " \"InstrumentName\": \"Counter\"" + newLine + " }," + newLine + " {" + - newLine + " \"MetricName\": \"R9\\\\Test\\\\MemoryUsage\"," + + newLine + " \"MetricName\": \"Test\\\\MemoryUsage\"," + newLine + " \"MetricDescription\": \"MemoryUsage summary.\"," + newLine + " \"InstrumentName\": \"Gauge\"," + newLine + " \"Dimensions\": {" + - newLine + " \"Path\": \"R9\\\\Test\\\\Description\\\\Path\"" + + newLine + " \"Path\": \"Test\\\\Description\\\\Path\"" + newLine + " }" + newLine + " }" + newLine + " ]" + diff --git a/test/Libraries/Microsoft.AspNetCore.Testing.Tests/FakeCertificateFactoryTests.cs b/test/Libraries/Microsoft.AspNetCore.Testing.Tests/FakeCertificateFactoryTests.cs index 5feeb5459e6..1da6dc74ddc 100644 --- a/test/Libraries/Microsoft.AspNetCore.Testing.Tests/FakeCertificateFactoryTests.cs +++ b/test/Libraries/Microsoft.AspNetCore.Testing.Tests/FakeCertificateFactoryTests.cs @@ -16,7 +16,7 @@ public void Create_CreatesCertificate() { using var certificate = FakeSslCertificateFactory.CreateSslCertificate(); - Assert.Equal("CN=r9-self-signed-unit-test-certificate", certificate.SubjectName.Name); + Assert.Equal("CN=dotnet-extensions-self-signed-unit-test-certificate", certificate.SubjectName.Name); Assert.Equal("localhost", certificate.GetNameInfo(X509NameType.DnsFromAlternativeName, false)); Assert.True(DateTime.Now > certificate.NotBefore + TimeSpan.FromHours(1)); Assert.True(DateTime.Now < certificate.NotAfter - TimeSpan.FromHours(1)); diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions.Tests/Http/AbstractionTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions.Tests/Http/AbstractionTests.cs index d05259dd38c..7f383cf1c7c 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions.Tests/Http/AbstractionTests.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ExtraAbstractions.Tests/Http/AbstractionTests.cs @@ -35,7 +35,7 @@ public void RequestMetadata_ParameterizedConsrtuctor_HasProvidedValues() [Fact] public void Ensure_TelemetryConstantValuesAreNotChanged() { - Assert.Equal("R9-RequestMetadata", TelemetryConstants.RequestMetadataKey); + Assert.Equal("Extensions-RequestMetadata", TelemetryConstants.RequestMetadataKey); Assert.Equal("unknown", TelemetryConstants.Unknown); Assert.Equal("REDACTED", TelemetryConstants.Redacted); } diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs index d0acbad4074..ce49066f3f5 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs @@ -130,7 +130,7 @@ public void Adding_Linux_Resource_Utilization_With_Section_Registers_SnapshotPro Assert.Equal(104_767_488UL, provider.Resources.MaximumMemoryInBytes); // meminfo * 1024 } - [ConditionalFact(Skip = "Flaky test, see https://github.com/dotnet/r9/issues/406")] + [ConditionalFact(Skip = "Flaky test, see https://github.com/dotnet/extensions/issues/3997")] [OSSkipCondition(OperatingSystems.Windows | OperatingSystems.MacOSX, SkipReason = "Linux specific package.")] public Task ResourceUtilizationTracker_Reports_The_Same_Values_As_One_Can_Observe_From_Gauges() { diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs index 6a1d768642d..fdfdf41da2d 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs @@ -344,7 +344,7 @@ public async Task ResourceUtilizationTracker_InitializedProperly_InvokesPublishe Assert.True(publisherCalled); } - [Fact(Skip = "Broken test, see https://github.com/dotnet/r9/issues/404")] + [Fact(Skip = "Broken test, see https://github.com/dotnet/extensions/issues/4529")] public async Task ResourceUtilizationTracker_WhenInitializedWithZeroSnapshots_ReportsHighCpuSpikesThenConvergeInFewCycles() { // This test shows that initializing the internal buffer of the tracker with snapshots diff --git a/test/Libraries/Microsoft.Extensions.Http.Diagnostics.Tests/Logging/HttpClientLoggerTest.cs b/test/Libraries/Microsoft.Extensions.Http.Diagnostics.Tests/Logging/HttpClientLoggerTest.cs index 0f932569999..0d589f46603 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Diagnostics.Tests/Logging/HttpClientLoggerTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Diagnostics.Tests/Logging/HttpClientLoggerTest.cs @@ -454,7 +454,7 @@ public async Task HttpLoggingHandler_AllOptionsSendAsyncFailed_LogsRequestInform Assert.DoesNotContain(logRecordState, kvp => kvp.Key.StartsWith(HttpClientLoggingTagNames.ResponseHeaderPrefix)); } - [Fact(Skip = "Flaky test, see https://github.com/dotnet/r9/issues/372")] + [Fact(Skip = "Flaky test, see https://github.com/dotnet/extensions/issues/4530")] public async Task HttpLoggingHandler_ReadResponseThrows_LogsException() { var requestContent = _fixture.Create(); diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Microsoft.Extensions.Http.Resilience.Tests.csproj b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Microsoft.Extensions.Http.Resilience.Tests.csproj index 5edac760ac0..583bee2681b 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Microsoft.Extensions.Http.Resilience.Tests.csproj +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Microsoft.Extensions.Http.Resilience.Tests.csproj @@ -5,7 +5,7 @@ - + true diff --git a/test/Libraries/Microsoft.Extensions.Resilience.Tests/Microsoft.Extensions.Resilience.Tests.csproj b/test/Libraries/Microsoft.Extensions.Resilience.Tests/Microsoft.Extensions.Resilience.Tests.csproj index 0fdfe0445ba..67c25dd1e90 100644 --- a/test/Libraries/Microsoft.Extensions.Resilience.Tests/Microsoft.Extensions.Resilience.Tests.csproj +++ b/test/Libraries/Microsoft.Extensions.Resilience.Tests/Microsoft.Extensions.Resilience.Tests.csproj @@ -9,7 +9,7 @@ - + true