diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 26c116582f..2c47005dfc 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -69,6 +69,11 @@ parameters:
installJdk: true
timeoutInMinutes: 180
+ # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
+ # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build
+ # timeout due to test hangs.
+ cancelTimeoutInMinutes: 15
+
jobs:
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
displayName: ${{ coalesce(parameters.jobDisplayName, parameters.agentOs) }}
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index a54507bbb0..5e50238a4b 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -101,7 +101,6 @@
-
diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props
index a86f138f9f..a52c31e0ad 100644
--- a/eng/SharedFramework.Local.props
+++ b/eng/SharedFramework.Local.props
@@ -73,7 +73,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ab1a9ceda2..dc483752d9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,412 +9,412 @@
-->
-
+
https://github.com/aspnet/Blazor
- 5228d074e954ca0d8e1adb398d6e0e0043f5168e
+ cd9254a05cfa52defeacd31697d25b2a4ed17510
-
+
https://github.com/aspnet/AspNetCore-Tooling
- cddc572f0bff131346550fb507e5bb970a143be9
+ f039aa935462163dead64ca2d6f9c6d27f4e290b
-
+
https://github.com/aspnet/AspNetCore-Tooling
- cddc572f0bff131346550fb507e5bb970a143be9
+ f039aa935462163dead64ca2d6f9c6d27f4e290b
-
+
https://github.com/aspnet/AspNetCore-Tooling
- cddc572f0bff131346550fb507e5bb970a143be9
+ f039aa935462163dead64ca2d6f9c6d27f4e290b
-
+
https://github.com/aspnet/AspNetCore-Tooling
- cddc572f0bff131346550fb507e5bb970a143be9
+ f039aa935462163dead64ca2d6f9c6d27f4e290b
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/EntityFrameworkCore
- c39853fea2f835b6f06cf7fb23fa45f1115c5a12
+ 49f9f7632c742108e5652f182922cc35c19c9162
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
https://github.com/dotnet/corefx
a28176b5ec68b6da1472934fe9493790d1665cae
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/dotnet/core-setup
- 5d8d5e866113c9f144136a04222f191456dfff1d
+ d15a0adeb874801e7bfaa4fbbb306a2efa268497
-
+
https://github.com/dotnet/core-setup
- 5d8d5e866113c9f144136a04222f191456dfff1d
+ d15a0adeb874801e7bfaa4fbbb306a2efa268497
-
+
https://github.com/dotnet/core-setup
- 5d8d5e866113c9f144136a04222f191456dfff1d
+ d15a0adeb874801e7bfaa4fbbb306a2efa268497
-
+
https://github.com/dotnet/core-setup
- 5d8d5e866113c9f144136a04222f191456dfff1d
+ d15a0adeb874801e7bfaa4fbbb306a2efa268497
-
+
https://github.com/dotnet/corefx
- d594cb2dbc5027d7e996491b0722c5be5204460f
+ 80f411d58df8338ccd9430900b541a037a9cb383
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
https://github.com/dotnet/arcade
@@ -428,13 +428,13 @@
https://github.com/dotnet/arcade
a190d4865fe3c86a168ec49c4fc61c90c96ae051
-
+
https://github.com/aspnet/Extensions
- 45647cef001961bd82c8ac4c112d24d4254e44cf
+ 54d000fda95c2c1f05b13a2e910fc91994da8eb8
-
+
https://github.com/dotnet/roslyn
- e4e7c09bc4d22648b1a6193b3bf645b0aa8a23ea
+ e9b4c66fb2f26bca02d4a718c48c1c39e9963c9f
diff --git a/eng/Versions.props b/eng/Versions.props
index 1f758e7105..684f7d0a43 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,115 +57,115 @@
1.0.0-beta.19369.2
- 3.3.0-beta2-19374-02
+ 3.3.0-beta3-19401-01
- 3.0.0-preview8-28373-17
- 3.0.0-preview8-28373-17
- 3.0.0-preview8-28373-17
- 2.1.0-preview8-28373-17
+ 3.0.0-preview8-28379-05
+ 3.0.0-preview8-28379-05
+ 3.0.0-preview8-28379-05
+ 2.1.0-preview8-28379-05
- 1.0.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
+ 1.0.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
4.7.0-preview6.19264.9
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 1.7.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
- 4.6.0-preview8.19372.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 1.7.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
+ 4.6.0-preview8.19378.8
- 3.0.0-preview8.19372.8
+ 3.0.0-preview8.19378.8
- 0.10.0-preview8.19372.1
+ 3.0.0-preview9.19379.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
+ 3.0.0-preview9.19401.2
- 3.0.0-preview8.19375.5
- 3.0.0-preview8.19375.5
- 3.0.0-preview8.19375.5
- 3.0.0-preview8.19375.5
- 3.0.0-preview8.19375.5
- 3.0.0-preview8.19375.5
- 3.0.0-preview8.19375.5
+ 3.0.0-preview9.19402.9
+ 3.0.0-preview9.19402.9
+ 3.0.0-preview9.19402.9
+ 3.0.0-preview9.19402.9
+ 3.0.0-preview9.19402.9
+ 3.0.0-preview9.19402.9
+ 3.0.0-preview9.19402.9
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
- 3.0.0-preview8.19374.2
+ 3.0.0-preview9.19402.1
+ 3.0.0-preview9.19402.1
+ 3.0.0-preview9.19402.1
+ 3.0.0-preview9.19402.1
true
+
+
+
+ false
+
diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index 83e176a4a8..ed0324f744 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -15,11 +15,6 @@
$(MicrosoftNETCorePlatformsPackageVersion)
-
-
-
-
-
-
-
-
- false
-
-
@@ -47,18 +36,10 @@
-
-
-
-
- Microsoft.NETCore.App.Runtime.**RID**
-
-
+
+
+
+ NETStandard.Library
diff --git a/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs b/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs
index 685483a0b1..764ac23bd5 100644
--- a/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs
+++ b/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs
@@ -13,8 +13,12 @@ namespace Microsoft.AspNetCore.Analyzers.TestFiles.CompilationFeatureDetectorTes
app.UseEndpoints(endpoints =>
{
- endpoints.MapBlazorHub();
+ endpoints.MapBlazorHub("app");
});
}
+
+ public class App : Microsoft.AspNetCore.Components.ComponentBase
+ {
+ }
}
}
diff --git a/src/Components/Analyzers/src/DiagnosticDescriptors.cs b/src/Components/Analyzers/src/DiagnosticDescriptors.cs
index a34102f39b..e0ecbce055 100644
--- a/src/Components/Analyzers/src/DiagnosticDescriptors.cs
+++ b/src/Components/Analyzers/src/DiagnosticDescriptors.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Title), Resources.ResourceManager, typeof(Resources)),
new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Format), Resources.ResourceManager, typeof(Resources)),
"Encapsulation",
- DiagnosticSeverity.Warning,
+ DiagnosticSeverity.Error,
isEnabledByDefault: true,
description: new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Description), Resources.ResourceManager, typeof(Resources)));
@@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
new LocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Title), Resources.ResourceManager, typeof(Resources)),
new LocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Format), Resources.ResourceManager, typeof(Resources)),
"Encapsulation",
- DiagnosticSeverity.Warning,
+ DiagnosticSeverity.Error,
isEnabledByDefault: true,
description: new LocalizableResourceString(nameof(Resources.ComponentParametersShouldBePublic_Description), Resources.ResourceManager, typeof(Resources)));
diff --git a/src/Components/Analyzers/test/ComponentParameterSettersShouldBePublicTest.cs b/src/Components/Analyzers/test/ComponentParameterSettersShouldBePublicTest.cs
index 88b366fd74..f32bc6048e 100644
--- a/src/Components/Analyzers/test/ComponentParameterSettersShouldBePublicTest.cs
+++ b/src/Components/Analyzers/test/ComponentParameterSettersShouldBePublicTest.cs
@@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParameterSettersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty1' should have a public setter.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 7, 39)
@@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParameterSettersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty2' should have a public setter.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 8, 39)
@@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParameterSettersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty3' should have a public setter.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 9, 39)
diff --git a/src/Components/Analyzers/test/ComponentParametersShouldBePublicCodeFixProviderTest.cs b/src/Components/Analyzers/test/ComponentParametersShouldBePublicCodeFixProviderTest.cs
index 69a3f2e310..2e1ee00be0 100644
--- a/src/Components/Analyzers/test/ComponentParametersShouldBePublicCodeFixProviderTest.cs
+++ b/src/Components/Analyzers/test/ComponentParametersShouldBePublicCodeFixProviderTest.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test
{
Id = DiagnosticDescriptors.ComponentParametersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.BadProperty1' should be public.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 8, 40)
@@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test
{
Id = DiagnosticDescriptors.ComponentParameterSettersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty1' should have a public setter.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 8, 39)
@@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test
{
Id = DiagnosticDescriptors.ComponentParameterSettersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty2' should have a public setter.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 9, 39)
@@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test
{
Id = DiagnosticDescriptors.ComponentParameterSettersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty3' should have a public setter.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 10, 39)
diff --git a/src/Components/Analyzers/test/ComponentParametersShouldBePublicTest.cs b/src/Components/Analyzers/test/ComponentParametersShouldBePublicTest.cs
index 2f03b9ea31..97b01c4699 100644
--- a/src/Components/Analyzers/test/ComponentParametersShouldBePublicTest.cs
+++ b/src/Components/Analyzers/test/ComponentParametersShouldBePublicTest.cs
@@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParametersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty1' should be public.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 7, 32)
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParametersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty2' should be public.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 8, 40)
@@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParametersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty3' should be public.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 9, 42)
@@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
{
Id = DiagnosticDescriptors.ComponentParametersShouldBePublic.Id,
Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty4' should be public.",
- Severity = DiagnosticSeverity.Warning,
+ Severity = DiagnosticSeverity.Error,
Locations = new[]
{
new DiagnosticResultLocation("Test0.cs", 10, 41)
diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs
index 5bd3c3d0b1..d56360f9aa 100644
--- a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs
+++ b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs
@@ -1,6 +1,15 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+namespace Microsoft.AspNetCore.Blazor
+{
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+ public static partial class JSInteropMethods
+ {
+ [Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")]
+ public static void NotifyLocationChanged(string uri, bool isInterceptedLink) { }
+ }
+}
namespace Microsoft.AspNetCore.Blazor.Hosting
{
public static partial class BlazorWebAssemblyHost
@@ -68,18 +77,6 @@ namespace Microsoft.AspNetCore.Blazor.Rendering
protected override System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch batch) { throw null; }
}
}
-namespace Microsoft.AspNetCore.Blazor.Services
-{
- public partial class WebAssemblyUriHelper : Microsoft.AspNetCore.Components.UriHelperBase
- {
- internal WebAssemblyUriHelper() { }
- public static readonly Microsoft.AspNetCore.Blazor.Services.WebAssemblyUriHelper Instance;
- protected override void EnsureInitialized() { }
- protected override void NavigateToCore(string uri, bool forceLoad) { }
- [Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")]
- public static void NotifyLocationChanged(string newAbsoluteUri, bool isInterceptedLink) { }
- }
-}
namespace Microsoft.AspNetCore.Components.Builder
{
public static partial class ComponentsApplicationBuilderExtensions
diff --git a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs
index 0b741cbd22..87bdc951c2 100644
--- a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs
+++ b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs
@@ -92,16 +92,16 @@ namespace Microsoft.AspNetCore.Blazor.Hosting
services.AddSingleton();
services.AddSingleton(WebAssemblyJSRuntime.Instance);
services.AddSingleton();
- services.AddSingleton(WebAssemblyUriHelper.Instance);
+ services.AddSingleton(WebAssemblyNavigationManager.Instance);
services.AddSingleton(WebAssemblyNavigationInterception.Instance);
services.AddSingleton();
services.AddSingleton(s =>
{
// Creating the URI helper needs to wait until the JS Runtime is initialized, so defer it.
- var uriHelper = s.GetRequiredService();
+ var navigationManager = s.GetRequiredService();
return new HttpClient
{
- BaseAddress = new Uri(WebAssemblyUriHelper.Instance.GetBaseUri())
+ BaseAddress = new Uri(navigationManager.BaseUri)
};
});
diff --git a/src/Components/Blazor/Blazor/src/JSInteropMethods.cs b/src/Components/Blazor/Blazor/src/JSInteropMethods.cs
new file mode 100644
index 0000000000..239dbb4952
--- /dev/null
+++ b/src/Components/Blazor/Blazor/src/JSInteropMethods.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel;
+using Microsoft.AspNetCore.Blazor.Services;
+using Microsoft.JSInterop;
+
+namespace Microsoft.AspNetCore.Blazor
+{
+ ///
+ /// Contains methods called by interop. Intended for framework use only, not supported for use in application
+ /// code.
+ ///
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public static class JSInteropMethods
+ {
+ ///
+ /// For framework use only.
+ ///
+ [JSInvokable(nameof(NotifyLocationChanged))]
+ public static void NotifyLocationChanged(string uri, bool isInterceptedLink)
+ {
+ WebAssemblyNavigationManager.Instance.SetLocation(uri, isInterceptedLink);
+ }
+ }
+}
diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationInterception.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationInterception.cs
index f7aac51137..74eacbc4f5 100644
--- a/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationInterception.cs
+++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationInterception.cs
@@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Routing;
-using Interop = Microsoft.AspNetCore.Components.Web.BrowserUriHelperInterop;
+using Interop = Microsoft.AspNetCore.Components.Web.BrowserNavigationManagerInterop;
namespace Microsoft.AspNetCore.Blazor.Services
{
diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationManager.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationManager.cs
new file mode 100644
index 0000000000..9d52c8c9a2
--- /dev/null
+++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationManager.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Components;
+using Interop = Microsoft.AspNetCore.Components.Web.BrowserNavigationManagerInterop;
+
+namespace Microsoft.AspNetCore.Blazor.Services
+{
+ ///
+ /// Default client-side implementation of .
+ ///
+ internal class WebAssemblyNavigationManager : NavigationManager
+ {
+ ///
+ /// Gets the instance of .
+ ///
+ public static readonly WebAssemblyNavigationManager Instance = new WebAssemblyNavigationManager();
+
+ // For simplicity we force public consumption of the BrowserNavigationManager through
+ // a singleton. Only a single instance can be updated by the browser through
+ // interop. We can construct instances for testing.
+ internal WebAssemblyNavigationManager()
+ {
+ }
+
+ protected override void EnsureInitialized()
+ {
+ // As described in the comment block above, BrowserNavigationManager is only for
+ // client-side (Mono) use, so it's OK to rely on synchronicity here.
+ var baseUri = WebAssemblyJSRuntime.Instance.Invoke(Interop.GetBaseUri);
+ var uri = WebAssemblyJSRuntime.Instance.Invoke(Interop.GetLocationHref);
+ Initialize(baseUri, uri);
+ }
+
+ public void SetLocation(string uri, bool isInterceptedLink)
+ {
+ Uri = uri;
+ NotifyLocationChanged(isInterceptedLink);
+ }
+
+ ///
+ protected override void NavigateToCore(string uri, bool forceLoad)
+ {
+ if (uri == null)
+ {
+ throw new ArgumentNullException(nameof(uri));
+ }
+
+ WebAssemblyJSRuntime.Instance.Invoke