diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 6052c66f6786..ddf7cfa04a56 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -40,6 +40,7 @@ and are generated based on the last package release. + diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index 63a588bf37ec..9ecb76870608 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -21,6 +21,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 461785a88bdc..f93a263e0748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,181 +9,185 @@ --> - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/efcore - d64788ec31bdb0bad17348a788df094613c15b7b + 34af335132ac4fcb0c9ffa456111e920ae9db707 - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a + + + https://github.com/dotnet/runtime + 8986374ea73f1e5b1977dd0058fbdf591936408a https://github.com/dotnet/source-build-externals @@ -195,135 +199,135 @@ 27e584661980ee6d82c419a2a471ae505b7d122e - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a https://github.com/dotnet/xdt @@ -353,16 +357,16 @@ https://github.com/dotnet/roslyn 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a - + https://github.com/dotnet/runtime - 3b21b909f47ee07ec7f4cad0edde5404ebd85dd2 + 8986374ea73f1e5b1977dd0058fbdf591936408a https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 8e82c0af888f..5d73ecef1283 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,88 +64,89 @@ --> - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 8.0.0-rc.1.23408.5 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 + 8.0.0-rc.1.23414.1 8.0.0-rc.1.23406.1 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 - 8.0.0-rc.1.23410.3 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 4.7.0-3.23314.3 4.7.0-3.23314.3 @@ -167,7 +168,7 @@ 2.0.0-beta-23228-03 - 8.0.0-rc.1.23409.17 + 8.0.0-rc.1.23414.1 7.0.0-preview.22423.2 diff --git a/src/DefaultBuilder/DefaultBuilder.slnf b/src/DefaultBuilder/DefaultBuilder.slnf index 0856ee0239fc..e400cee2b819 100644 --- a/src/DefaultBuilder/DefaultBuilder.slnf +++ b/src/DefaultBuilder/DefaultBuilder.slnf @@ -2,6 +2,7 @@ "solution": { "path": "..\\..\\AspNetCore.sln", "projects": [ + "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj", "src\\DefaultBuilder\\samples\\SampleApp\\DefaultBuilder.SampleApp.csproj", "src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj", "src\\DefaultBuilder\\test\\Microsoft.AspNetCore.FunctionalTests\\Microsoft.AspNetCore.FunctionalTests.csproj", @@ -29,6 +30,7 @@ "src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj", "src\\Middleware\\StaticFiles\\src\\Microsoft.AspNetCore.StaticFiles.csproj", "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj", + "src\\Security\\Authentication\\Core\\src\\Microsoft.AspNetCore.Authentication.csproj", "src\\Security\\Authorization\\Core\\src\\Microsoft.AspNetCore.Authorization.csproj", "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj", "src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj", diff --git a/src/DefaultBuilder/src/PublicAPI.Unshipped.txt b/src/DefaultBuilder/src/PublicAPI.Unshipped.txt index ef4151f11458..24b6d0553640 100644 --- a/src/DefaultBuilder/src/PublicAPI.Unshipped.txt +++ b/src/DefaultBuilder/src/PublicAPI.Unshipped.txt @@ -1,4 +1,5 @@ #nullable enable +Microsoft.AspNetCore.Builder.WebApplicationBuilder.Metrics.get -> Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder! static Microsoft.AspNetCore.Builder.WebApplication.CreateEmptyBuilder(Microsoft.AspNetCore.Builder.WebApplicationOptions! options) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Microsoft.AspNetCore.Builder.WebApplication.CreateSlimBuilder() -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Microsoft.AspNetCore.Builder.WebApplication.CreateSlimBuilder(Microsoft.AspNetCore.Builder.WebApplicationOptions! options) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! diff --git a/src/DefaultBuilder/src/WebApplicationBuilder.cs b/src/DefaultBuilder/src/WebApplicationBuilder.cs index c45060f8578c..00a2cfb8d177 100644 --- a/src/DefaultBuilder/src/WebApplicationBuilder.cs +++ b/src/DefaultBuilder/src/WebApplicationBuilder.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -347,6 +348,11 @@ private static void AddDefaultServicesSlim(ConfigurationManager configuration, I /// public ILoggingBuilder Logging => _hostApplicationBuilder.Logging; + /// + /// Allows enabling metrics and directing their output. + /// + public IMetricsBuilder Metrics => _hostApplicationBuilder.Metrics; + /// /// An for configuring server specific properties, but not building. /// To build after configuration, call . diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs index 4d8e3c54a79c..7897bfdd948d 100644 --- a/src/Framework/test/TestData.cs +++ b/src/Framework/test/TestData.cs @@ -120,6 +120,7 @@ static TestData() "Microsoft.Extensions.DependencyInjection", "Microsoft.Extensions.DependencyInjection.Abstractions", "Microsoft.Extensions.Diagnostics", + "Microsoft.Extensions.Diagnostics.Abstractions", "Microsoft.Extensions.Diagnostics.HealthChecks", "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "Microsoft.Extensions.FileProviders.Abstractions", @@ -270,6 +271,7 @@ static TestData() { "Microsoft.Extensions.DependencyInjection.Abstractions" }, { "Microsoft.Extensions.DependencyInjection" }, { "Microsoft.Extensions.Diagnostics" }, + { "Microsoft.Extensions.Diagnostics.Abstractions" }, { "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" }, { "Microsoft.Extensions.Diagnostics.HealthChecks" }, { "Microsoft.Extensions.Features" }, diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj index 70b25e68309c..77e80185d292 100644 --- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj +++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj @@ -19,12 +19,16 @@ - + true + + + +