diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28c003cd0562..3ac599d73f34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,337 +9,337 @@ --> - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/efcore - 2b564f7c09dd9fba0d9e1daa2e41056dd8b8b673 + 74350ae885367e46ee0c3622c26ceebeef02168f - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 https://github.com/dotnet/xdt @@ -379,9 +379,9 @@ afdd413cee50c16318620252e4e64dc326e2d300 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 @@ -392,9 +392,9 @@ - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + 31289efa35151a4e60dcd2e6471c51f620f78c28 https://github.com/dotnet/arcade @@ -450,25 +450,25 @@ https://github.com/nuget/nuget.client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f0670b0742edbc53c8a2803fa86e5e4417a0e681 + bff9b4a349cfa7e3d83264d8953613d98a7b04eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f0670b0742edbc53c8a2803fa86e5e4417a0e681 + bff9b4a349cfa7e3d83264d8953613d98a7b04eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f0670b0742edbc53c8a2803fa86e5e4417a0e681 + bff9b4a349cfa7e3d83264d8953613d98a7b04eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f0670b0742edbc53c8a2803fa86e5e4417a0e681 + bff9b4a349cfa7e3d83264d8953613d98a7b04eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f0670b0742edbc53c8a2803fa86e5e4417a0e681 + bff9b4a349cfa7e3d83264d8953613d98a7b04eb diff --git a/eng/Versions.props b/eng/Versions.props index 62a3543545ca..c1131c54b96a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,95 +67,95 @@ --> - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 + 10.0.0-preview.4.25223.8 9.5.0-preview.1.25211.2 9.5.0-preview.1.25211.2 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 - 10.0.0-preview.4.25214.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 + 10.0.0-preview.5.25222.1 4.13.0-3.24613.7 4.13.0-3.24613.7 @@ -183,11 +183,11 @@ 10.0.0-preview.25210.1 10.0.0-preview.25210.1 - 1.0.0-prerelease.25171.2 - 1.0.0-prerelease.25171.2 - 1.0.0-prerelease.25171.2 - 1.0.0-prerelease.25171.2 - 1.0.0-prerelease.25171.2 + 1.0.0-prerelease.25217.3 + 1.0.0-prerelease.25217.3 + 1.0.0-prerelease.25217.3 + 1.0.0-prerelease.25217.3 + 1.0.0-prerelease.25217.3 + false diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props index f2833275dc68..beb16f5da1bb 100644 --- a/src/Components/test/testassets/Directory.Build.props +++ b/src/Components/test/testassets/Directory.Build.props @@ -20,6 +20,7 @@ + false false diff --git a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs index 005dec786bbf..ff6735d1b5e3 100644 --- a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs +++ b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs @@ -740,13 +740,13 @@ public void ActivityParentIdAndBaggageReadFromHeaders() { Headers = new HeaderDictionary() { - {"Request-Id", "ParentId1"}, + {"Request-Id", "ParentId1"}, // non-standard header, won't apply to Activity {"baggage", "Key1=value1, Key2=value2"} } }); hostingApplication.CreateContext(features); Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", Activity.Current.OperationName); - Assert.Equal("ParentId1", Activity.Current.ParentId); + Assert.Null(Activity.Current.ParentId); Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1"); Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2"); } @@ -928,7 +928,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders() Headers = new HeaderDictionary() { {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"}, - {"tracestate", "TraceState1"}, + {"tracestate", "tracestate=1"}, {"baggage", "Key1=value1, Key2=value2"} } }); @@ -937,7 +937,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders() Assert.Equal(ActivityIdFormat.W3C, Activity.Current.IdFormat); Assert.Equal("0123456789abcdef0123456789abcdef", Activity.Current.TraceId.ToHexString()); Assert.Equal("0123456789abcdef", Activity.Current.ParentSpanId.ToHexString()); - Assert.Equal("TraceState1", Activity.Current.TraceStateString); + Assert.Equal("tracestate=1", Activity.Current.TraceStateString); Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1"); Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2"); diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs index 08e3f22e9b83..54844d00f5bc 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs @@ -127,7 +127,7 @@ public async Task ThrowsForUnregisteredRequiredKeyService() var exception = await Assert.ThrowsAsync( async () => await endpoint.RequestDelegate(httpContext)); - Assert.Equal("No service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' has been registered.", exception.Message); + Assert.Equal("No keyed service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' using key type 'System.String' has been registered.", exception.Message); } [Fact] diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs index 61219bedcf29..ba54aa4043b8 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs @@ -132,7 +132,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders() var headers = new Dictionary { {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"}, - {"tracestate", "TraceState1"}, + {"tracestate", "tracestate=1"}, {"baggage", "Key1=value1, Key2=value2"} }; @@ -149,7 +149,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders() Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat); Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString()); Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString()); - Assert.Equal("TraceState1", invocationActivity.TraceStateString); + Assert.Equal("tracestate=1", invocationActivity.TraceStateString); client.Dispose(); @@ -262,7 +262,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders() var headers = new Dictionary { {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"}, - {"tracestate", "TraceState1"}, + {"tracestate", "tracestate=1"}, {"baggage", "Key1=value1, Key2=value2"} }; @@ -275,7 +275,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders() Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat); Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString()); Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString()); - Assert.Equal("TraceState1", invocationActivity.TraceStateString); + Assert.Equal("tracestate=1", invocationActivity.TraceStateString); client.Dispose();