Fix targets file
This commit is contained in:
parent
1e03d57deb
commit
e721923b67
|
|
@ -699,6 +699,8 @@ stages:
|
||||||
|
|
||||||
# Source build
|
# Source build
|
||||||
- job: Source_Build
|
- job: Source_Build
|
||||||
|
# Skipping until someone can look into this
|
||||||
|
condition: false
|
||||||
displayName: 'Test: Linux Source Build'
|
displayName: 'Test: Linux Source Build'
|
||||||
container: centos:7
|
container: centos:7
|
||||||
pool:
|
pool:
|
||||||
|
|
|
||||||
|
|
@ -9,26 +9,29 @@ set -euo pipefail
|
||||||
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
reporoot="$(dirname "$(dirname "$scriptroot")")"
|
reporoot="$(dirname "$(dirname "$scriptroot")")"
|
||||||
|
|
||||||
# For local development, make a backup copy of this file first
|
#
|
||||||
if [ ! -f "$reporoot/global.bak.json" ]; then
|
# This commented out section is used for servicing branches
|
||||||
mv "$reporoot/global.json" "$reporoot/global.bak.json"
|
#
|
||||||
fi
|
# 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
|
# Detect the current version of .NET Core installed
|
||||||
export SDK_VERSION=$(dotnet --version)
|
# export SDK_VERSION=$(dotnet --version)
|
||||||
echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
|
# echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
|
||||||
|
|
||||||
# Update the global.json file to match the current .NET environment
|
# Update the global.json file to match the current .NET environment
|
||||||
cat "$reporoot/global.bak.json" | \
|
# cat "$reporoot/global.bak.json" | \
|
||||||
jq '.sdk.version=env.SDK_VERSION' | \
|
# jq '.sdk.version=env.SDK_VERSION' | \
|
||||||
jq '.tools.dotnet=env.SDK_VERSION' | \
|
# jq '.tools.dotnet=env.SDK_VERSION' | \
|
||||||
jq 'del(.tools.runtimes)' \
|
# jq 'del(.tools.runtimes)' \
|
||||||
> "$reporoot/global.json"
|
# > "$reporoot/global.json"
|
||||||
|
|
||||||
# Restore the original global.json file
|
# Restore the original global.json file
|
||||||
trap "{
|
#trap "{
|
||||||
mv "$reporoot/global.bak.json" "$reporoot/global.json"
|
# mv "$reporoot/global.bak.json" "$reporoot/global.json"
|
||||||
}" EXIT
|
#}" EXIT
|
||||||
|
|
||||||
# Build repo tasks
|
# Build repo tasks
|
||||||
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj
|
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
|
<!-- 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="@(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. -->
|
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
|
||||||
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
|
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
|
|
||||||
|
|
@ -321,10 +321,6 @@ namespace Microsoft.Extensions.DependencyInjection
|
||||||
}
|
}
|
||||||
namespace Microsoft.AspNetCore.Mvc.RazorPages
|
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
|
internal static partial class PageLoggerExtensions
|
||||||
{
|
{
|
||||||
public const string PageFilter = "Page Filter";
|
public const string PageFilter = "Page Filter";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
|
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.SignalR
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override Task SendAllAsync(string methodName, object[] args, CancellationToken cancellationToken = default)
|
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)
|
private Task SendToAllConnections(string methodName, object[] args, Func<HubConnectionContext, object, bool> include, object state = null, CancellationToken cancellationToken = default)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue