Fix targets file

Author: BrennanConroy

.azure/pipelines/ci.yml

@@ -699,6 +699,8 @@ stages:
 
   # Source build
   - job: Source_Build
+    # Skipping until someone can look into this
+    condition: false
     displayName: 'Test: Linux Source Build'
     container: centos:7
     pool:

eng/scripts/ci-source-build.sh

@@ -9,26 +9,29 @@ set -euo pipefail
 scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 reporoot="$(dirname "$(dirname "$scriptroot")")"
 
- # For local development, make a backup copy of this file first
-if [ ! -f "$reporoot/global.bak.json" ]; then
-    mv "$reporoot/global.json" "$reporoot/global.bak.json"
-fi
-
- # Detect the current version of .NET Core installed
-export SDK_VERSION=$(dotnet --version)
-echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
-
- # Update the global.json file to match the current .NET environment
-cat "$reporoot/global.bak.json" | \
-    jq '.sdk.version=env.SDK_VERSION' | \
-    jq '.tools.dotnet=env.SDK_VERSION' | \
-    jq 'del(.tools.runtimes)' \
-    > "$reporoot/global.json"
-
- # Restore the original global.json file
-trap "{
-    mv "$reporoot/global.bak.json" "$reporoot/global.json"
-}" EXIT
+#
+# This commented out section is used for servicing branches
+#
+# For local development, make a backup copy of this file first
+# if [ ! -f "$reporoot/global.bak.json" ]; then
+#    mv "$reporoot/global.json" "$reporoot/global.bak.json"
+# fi
+
+# Detect the current version of .NET Core installed
+# export SDK_VERSION=$(dotnet --version)
+# echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
+
+# Update the global.json file to match the current .NET environment
+# cat "$reporoot/global.bak.json" | \
+#    jq '.sdk.version=env.SDK_VERSION' | \
+#    jq '.tools.dotnet=env.SDK_VERSION' | \
+#    jq 'del(.tools.runtimes)' \
+#    > "$reporoot/global.json"
+
+# Restore the original global.json file
+#trap "{
+#    mv "$reporoot/global.bak.json" "$reporoot/global.json"
+#}" EXIT
 
 # Build repo tasks
 "$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

@@ -59,6 +59,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
   <ItemGroup>
     <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
     <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
+    <Reference Include="Microsoft.Internal.Extensions.Refs" Version="$(MicrosoftInternalExtensionsRefsPackageVersion)" IncludeAssets="Build" />
     <!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
     <ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs

@@ -321,10 +321,6 @@ public void Configure(Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions opti
 }
 namespace Microsoft.AspNetCore.Mvc.RazorPages
 {
-    public partial class RazorPagesOptions : System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch>, System.Collections.IEnumerable
-    {
-        public Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection Conventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } }
-    }
     internal static partial class PageLoggerExtensions
     {
         public const string PageFilter = "Page Filter";

src/Servers/Connections.Abstractions/ref/Directory.Build.targets

@@ -1,4 +1,6 @@
 <Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
+
   <PropertyGroup>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
   </PropertyGroup>

src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs

@@ -82,7 +82,7 @@ public override Task RemoveFromGroupAsync(string connectionId, string groupName,
         /// <inheritdoc />
         public override Task SendAllAsync(string methodName, object[] args, CancellationToken cancellationToken = default)
         {
-            return SendToAllConnections(methodName, args, include: null, cancellationToken);
+            return SendToAllConnections(methodName, args, include: null, state: null, cancellationToken);
         }
 
         private Task SendToAllConnections(string methodName, object[] args, Func<HubConnectionContext, object, bool> include, object state = null, CancellationToken cancellationToken = default)