Skip to content

Commit 3063a1c

Browse files
HaoKHaoK
authored
Merge branch 'master' into haok/helix-fxtests
2 parents 9e57372 + 7bb3130 commit 3063a1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2368
-698
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Follow the [Getting Started](https://docs.microsoft.com/aspnet/core/getting-star
99

1010
Also check out the [.NET Homepage](https://www.microsoft.com/net) for released versions of .NET, getting started guides, and learning resources.
1111

12-
See the [Issue Management Policies](https://github.com/dotnet/aspnetcore/blob/anurse/issue-policies/docs/IssueManagementPolicies.md) document for more information on how we handle incoming issues.
12+
See the [Issue Management Policies](https://github.com/dotnet/aspnetcore/blob/master/docs/IssueManagementPolicies.md) document for more information on how we handle incoming issues.
1313

1414
## How to Engage, Contribute, and Give Feedback
1515

‎eng/Version.Details.xml

Lines changed: 106 additions & 106 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<!-- Packages from dotnet/arcade -->
6565
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20180.5</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
67-
<MicrosoftNetCompilersToolsetPackageVersion>3.6.0-3.20177.6</MicrosoftNetCompilersToolsetPackageVersion>
67+
<MicrosoftNetCompilersToolsetPackageVersion>3.6.0-3.20201.6</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->
6969
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.4-runtime.20201.1</MicrosoftExtensionsDependencyModelPackageVersion>
7070
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.4.20201.1</MicrosoftNETCoreAppInternalPackageVersion>
@@ -96,60 +96,60 @@
9696
<!-- Packages from dotnet/blazor -->
9797
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.2.0-preview1.20067.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
9898
<!-- Packages from dotnet/extensions -->
99-
<InternalAspNetCoreAnalyzersPackageVersion>5.0.0-preview.4.20201.1</InternalAspNetCoreAnalyzersPackageVersion>
100-
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-preview.4.20201.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
101-
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
102-
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsCachingMemoryPackageVersion>
103-
<MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
104-
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
105-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
106-
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
107-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
108-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
109-
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
110-
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationIniPackageVersion>
111-
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
112-
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationPackageVersion>
113-
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
114-
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
115-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
116-
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
117-
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
118-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
119-
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
120-
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
121-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
122-
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
123-
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsHostingPackageVersion>
124-
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsHttpPackageVersion>
125-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
126-
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
127-
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
128-
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingConsolePackageVersion>
129-
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingDebugPackageVersion>
130-
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
131-
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingEventLogPackageVersion>
132-
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingPackageVersion>
133-
<MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingTestingPackageVersion>
134-
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
135-
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
136-
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
137-
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsOptionsPackageVersion>
138-
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.4.20201.1</MicrosoftExtensionsPrimitivesPackageVersion>
139-
<MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftInternalExtensionsRefsPackageVersion>
99+
<InternalAspNetCoreAnalyzersPackageVersion>5.0.0-preview.4.20201.2</InternalAspNetCoreAnalyzersPackageVersion>
100+
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-preview.4.20201.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
101+
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsCachingAbstractionsPackageVersion>
102+
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsCachingMemoryPackageVersion>
103+
<MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsCachingSqlServerPackageVersion>
104+
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
105+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
106+
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationBinderPackageVersion>
107+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
108+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
109+
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
110+
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationIniPackageVersion>
111+
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
112+
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationPackageVersion>
113+
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
114+
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsConfigurationXmlPackageVersion>
115+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
116+
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
117+
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
118+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
119+
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsFileProvidersCompositePackageVersion>
120+
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
121+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
122+
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsHostingAbstractionsPackageVersion>
123+
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsHostingPackageVersion>
124+
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsHttpPackageVersion>
125+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
126+
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
127+
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingConfigurationPackageVersion>
128+
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingConsolePackageVersion>
129+
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingDebugPackageVersion>
130+
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingEventSourcePackageVersion>
131+
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingEventLogPackageVersion>
132+
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingPackageVersion>
133+
<MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingTestingPackageVersion>
134+
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
135+
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
136+
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
137+
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsOptionsPackageVersion>
138+
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsPrimitivesPackageVersion>
139+
<MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftInternalExtensionsRefsPackageVersion>
140140
<!-- Packages from dotnet/efcore -->
141-
<dotnetefPackageVersion>5.0.0-preview.4.20181.3</dotnetefPackageVersion>
142-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.4.20181.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
143-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.4.20181.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
144-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.4.20181.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
145-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.4.20181.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
146-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.4.20181.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
147-
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.4.20181.3</MicrosoftEntityFrameworkCorePackageVersion>
141+
<dotnetefPackageVersion>5.0.0-preview.4.20201.1</dotnetefPackageVersion>
142+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
143+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
144+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
145+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
146+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
147+
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCorePackageVersion>
148148
<!-- Packages from dotnet/aspnetcore-tooling -->
149-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.4.20201.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
150-
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.4.20201.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
151-
<MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.4.20201.3</MicrosoftCodeAnalysisRazorPackageVersion>
152-
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.4.20201.3</MicrosoftNETSdkRazorPackageVersion>
149+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.4.20201.4</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
150+
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.4.20201.4</MicrosoftAspNetCoreRazorLanguagePackageVersion>
151+
<MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.4.20201.4</MicrosoftCodeAnalysisRazorPackageVersion>
152+
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.4.20201.4</MicrosoftNETSdkRazorPackageVersion>
153153
</PropertyGroup>
154154
<!--
155155

‎eng/targets/Helix.Common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64'">
2323
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
2424
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
25+
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
2526
</ItemGroup>
2627

2728
<!-- daily scheduled only queues -->

‎src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<Reference Include="Mono.WebAssembly.Interop" />
1111
<Reference Include="Microsoft.AspNetCore.Components.Web" />
1212
<Reference Include="Microsoft.Extensions.Options" />
13+
14+
<!--
15+
Supress a "BUILD001: Reference to 'Microsoft.Extensions.Configuration' was removed since the last stable release
16+
of this package." warning.
17+
-->
18+
<SuppressBaselineReference Include="Microsoft.Extensions.Configuration" />
1319
</ItemGroup>
1420

1521
<ItemGroup>

‎src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
<_Parameter1>TargetingPackLayoutRoot</_Parameter1>
4040
<_Parameter2>$(TargetingPackLayoutRoot)</_Parameter2>
4141
</AssemblyAttribute>
42+
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
43+
<_Parameter1>IsTargetingPackBuilding</_Parameter1>
44+
<_Parameter2>$(IsTargetingPackBuilding)</_Parameter2>
45+
</AssemblyAttribute>
4246
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
4347
<_Parameter1>VerifyAncmBinary</_Parameter1>
4448
<_Parameter2>$(VerifyAncmBinary)</_Parameter2>

‎src/Framework/test/TargetingPackTests.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class TargetingPackTests
2020
private readonly string _expectedRid;
2121
private readonly string _targetingPackRoot;
2222
private readonly ITestOutputHelper _output;
23+
private readonly bool _isTargetingPackBuilding;
2324

2425
public TargetingPackTests(ITestOutputHelper output)
2526
{
@@ -28,11 +29,17 @@ public TargetingPackTests(ITestOutputHelper output)
2829
_targetingPackRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))
2930
? Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"))
3031
: Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Microsoft.AspNetCore.App.Ref");
32+
_isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding"));
3133
}
3234

3335
[Fact]
3436
public void AssembliesAreReferenceAssemblies()
3537
{
38+
if (!_isTargetingPackBuilding)
39+
{
40+
return;
41+
}
42+
3643
IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
3744
Assert.NotEmpty(dlls);
3845

@@ -60,6 +67,11 @@ public void AssembliesAreReferenceAssemblies()
6067
[Fact]
6168
public void PlatformManifestListsAllFiles()
6269
{
70+
if (!_isTargetingPackBuilding)
71+
{
72+
return;
73+
}
74+
6375
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
6476
var expectedAssemblies = TestData.GetSharedFxDependencies()
6577
.Split(';', StringSplitOptions.RemoveEmptyEntries)

‎src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public partial class KestrelServerOptions
127127
{
128128
public KestrelServerOptions() { }
129129
public bool AddServerHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
130+
public bool AllowResponseHeaderCompression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
130131
public bool AllowSynchronousIO { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
131132
public System.IServiceProvider ApplicationServices { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
132133
public Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader ConfigurationLoader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }

0 commit comments

Comments
 (0)