Merge branch 'master' into merge/release/3.0-preview4-to-master

xutsing · Apr 14, 2019 · 0d16b79 · 0d16b79
2 parents b162108 + 7bd1e5e
commit 0d16b79
Show file tree

Hide file tree

Showing 316 changed files with 6,216 additions and 29,487 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -303,15 +303,10 @@ jobs:
       displayName: Install SQL Server 2016 Express LocalDB
     - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
       displayName: Setup IISExpress test certificates and schema
-    - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Setup signalrclienttests.exe"
-      displayName: Start AppVerifier
     afterBuild:
     - powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunFlakyTests=true"
       displayName: Run Flaky Tests
       continueOnError: true
-    - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Shutdown signalrclienttests.exe"
-      displayName: Stop AppVerifier
-      condition: always()
     artifacts:
     - name: Windows_Test_Logs
       path: artifacts/logs/

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -189,13 +189,21 @@ jobs:
       buildConfiguration: $(BuildConfiguration)
       buildPlatform: $(AgentOsName)
   - task: PublishTestResults@2
-    displayName: Publish junit test results
+    displayName: Publish js test results
     condition: always()
     inputs:
       testRunner: junit
       testResultsFiles: '**/artifacts/logs/**/*.junit.xml'
       buildConfiguration: $(BuildConfiguration)
       buildPlatform: $(AgentOsName)
+  - task: PublishTestResults@2
+    displayName: Publish Java test results
+    condition: always()
+    inputs:
+      testRunner: junit
+      testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
+      buildConfiguration: $(BuildConfiguration)
+      buildPlatform: $(AgentOsName)
   - ${{ each artifact in parameters.artifacts }}:
     - task: PublishBuildArtifacts@1
       displayName: Upload artifacts from ${{ artifact.path }}

diff --git a/.azure/pipelines/signalr-daily-tests.yml b/.azure/pipelines/signalr-daily-tests.yml
@@ -14,11 +14,4 @@ jobs:
     agentOs: Windows
     jobName: SignalRDailyTests
     jobDisplayName: "SignalR Daily Tests"
-    beforeBuild:
-    - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Setup signalrclienttests.exe"
-      displayName: Start AppVerifier
-    afterBuild:
-    - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Shutdown signalrclienttests.exe"
-      displayName: Stop AppVerifier
-      condition: always()
 
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,18 +1,18 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
-/.azure/ @dougbu
-/.config/ @dougbu
-/build/ @dougbu
-/eng/ @dougbu
-/src/Components/ @SteveSandersonMS
-/src/DefaultBuilder/ @tratcher @anurse
-/src/Hosting/ @tratcher @anurse
-/src/Http/ @tratcher @jkotalik @anurse
-/src/Middleware/ @tratcher @anurse
-/src/ProjectTemplates/ @ryanbrandenburg
-/src/Security/ @tratcher @anurse
-/src/Servers/ @tratcher @jkotalik @anurse
-/src/Middleware/Rewrite @jkotalik @anurse
-/src/Middleware/HttpsPolicy @jkotalik @anurse
-/src/SignalR/ @mikaelm12 @BrennanConroy @halter73 @anurse
+/.azure/                        @aspnet/build
+/.config/                       @aspnet/build
+/build/                         @aspnet/build
+/eng/                           @aspnet/build
+/src/Components/                @SteveSandersonMS
+/src/DefaultBuilder/            @tratcher @anurse
+/src/Hosting/                   @tratcher @anurse
+/src/Http/                      @tratcher @jkotalik @anurse
+/src/Middleware/                @tratcher @anurse
+/src/ProjectTemplates/          @ryanbrandenburg
+/src/Security/                  @tratcher @anurse
+/src/Servers/                   @tratcher @jkotalik @anurse
+/src/Middleware/Rewrite         @jkotalik @anurse
+/src/Middleware/HttpsPolicy     @jkotalik @anurse
+/src/SignalR/                   @mikaelm12 @BrennanConroy @halter73 @anurse
diff --git a/build/repo.props b/build/repo.props
@@ -54,8 +54,6 @@
                       $(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
                       $(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj;
                       $(RepositoryRoot)src\submodules\**\*.*proj;
-                      $(RepositoryRoot)src\SignalR\clients\cpp\samples\**\*.*proj;
-                      $(RepositoryRoot)src\SignalR\clients\cpp\test\signalrclient-testhost\**\*.*proj;
                       $(RepositoryRoot)src\Installers\**\*.*proj;
                       $(RepositoryRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
                       $(RepositoryRoot)src\Components\Blazor\Templates\src\content\**\*.*proj;

diff --git a/build/sources.props b/build/sources.props
@@ -20,6 +20,7 @@
       https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
       https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
       https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+      https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
       https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
       https://dotnet.myget.org/F/roslyn/api/v3/index.json;
       https://vside.myget.org/F/devcore/api/v3/index.json;

diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Remove="Internal.AspNetCore.Sdk" />
-    <PackageReference Include="NuGet.Build.Tasks" Version="4.9.3" />
+    <PackageReference Include="NuGet.Build.Tasks" Version="5.1.0-rtm.5921" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
     <PackageReference Include="Yarn.MSBuild" Version="1.13.0" />
   </ItemGroup>

diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
@@ -19,9 +19,8 @@ Building ASP.NET Core on Windows requires:
         PS> ./eng/scripts/InstallVisualStudio.ps1
         ```
 * Git. <https://git-scm.org>
-* (Optional) some optional components, like the SignalR Java client, may require
-    * NodeJS. LTS version of 10.14.2 or newer recommended <https://nodejs.org>
-    * Java Development Kit (JDK) v8 with Java Runtime Environment (JRE) v8. See https://www.oracle.com/technetwork/java/javase/downloads/index.html
+* NodeJS. LTS version of 10.14.2 or newer <https://nodejs.org>
+* Java Development Kit (JDK) v8 with Java Runtime Environment (JRE) v8. See https://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 ### macOS/Linux
 
@@ -31,11 +30,10 @@ Building ASP.NET Core on macOS or Linux requires:
 * If using Linux, you need a machine with all .NET Core Linux prerequisites: <https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites>
 * At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies)
 * Git <https://git-scm.org>
-* (Optional) some optional components, like the SignalR Java client, may require
-    * NodeJS. LTS version of 10.14.2 or newer recommended <https://nodejs.org>
-    * Java Development Kit 10 or newer. Either:
-        * OpenJDK <http://jdk.java.net/10/>
-        * Oracle's JDK <https://www.oracle.com/technetwork/java/javase/downloads/index.html>
+* NodeJS. LTS version of 10.14.2 or newer <https://nodejs.org>
+* Java Development Kit 10 or newer. Either:
+    * OpenJDK <http://jdk.java.net/10/>
+    * Oracle's JDK <https://www.oracle.com/technetwork/java/javase/downloads/index.html>
 
 ## Clone the source code
 

diff --git a/docs/DailyBuilds.md b/docs/DailyBuilds.md
@@ -14,6 +14,10 @@ If you want to download the latest daily build and use it in a project, then you
       <packageSources>
           <clear />
           <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+          <add key="extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
+          <add key="entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
+          <add key="aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
+          <add key="aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
           <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
       </packageSources>
   </configuration>

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.2.3</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.2.4</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -81,7 +81,7 @@
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
-    <BaselinePackageVersion>2.2.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.4</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
   <!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->

diff --git a/eng/Baseline.xml b/eng/Baseline.xml
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
 build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
 
 -->
-<Baseline Version="2.2.3">
+<Baseline Version="2.2.4">
   <Package Id="dotnet-dev-certs" Version="2.2.0" />
   <Package Id="dotnet-sql-cache" Version="2.2.0" />
   <Package Id="dotnet-user-secrets" Version="2.2.0" />
@@ -13,7 +13,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
   <Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.1" />
-  <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.2" />
+  <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.4" />
   <Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" />

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -36,6 +36,15 @@ Later on, this will be checked using this condition:
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
     <PackagesInPatch>
       @aspnet/signalr;
+      Microsoft.AspNetCore.AspNetCoreModuleV2;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
+    <PackagesInPatch>
+      Microsoft.AspNetCore.AspNetCoreModule;
+      Microsoft.AspNetCore.AspNetCoreModuleV2;
+      java:signalr;
+    </PackagesInPatch>
+  </PropertyGroup>
+
 </Project>
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
@@ -119,6 +119,7 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Connections.Client" ProjectPath="$(RepositoryRoot)src\SignalR\clients\csharp\Http.Connections.Client\src\Microsoft.AspNetCore.Http.Connections.Client.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\clients\csharp\Http.Connections.Client\ref\Microsoft.AspNetCore.Http.Connections.Client.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Connections.Common" ProjectPath="$(RepositoryRoot)src\SignalR\common\Http.Connections.Common\src\Microsoft.AspNetCore.Http.Connections.Common.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\common\Http.Connections.Common\ref\Microsoft.AspNetCore.Http.Connections.Common.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Connections" ProjectPath="$(RepositoryRoot)src\SignalR\common\Http.Connections\src\Microsoft.AspNetCore.Http.Connections.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\common\Http.Connections\ref\Microsoft.AspNetCore.Http.Connections.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Protocols.Json" ProjectPath="$(RepositoryRoot)src\SignalR\common\Protocols.Json\src\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\common\Protocols.Json\ref\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" ProjectPath="$(RepositoryRoot)src\SignalR\common\Protocols.MessagePack\src\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\common\Protocols.MessagePack\ref\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" ProjectPath="$(RepositoryRoot)src\SignalR\common\Protocols.NewtonsoftJson\src\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\common\Protocols.NewtonsoftJson\ref\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Common" ProjectPath="$(RepositoryRoot)src\SignalR\common\SignalR.Common\src\Microsoft.AspNetCore.SignalR.Common.csproj" RefProjectPath="$(RepositoryRoot)src\SignalR\common\SignalR.Common\ref\Microsoft.AspNetCore.SignalR.Common.csproj" />

diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props
@@ -11,6 +11,7 @@
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Features" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Connections.Abstractions" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Connections.Common" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Common" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components.Browser" />