Skip to content

Commit b02309f

Browse files
wtgodbewtgodbe
committed
merge
2 parents 08309b1 + e6a163b commit b02309f

File tree

534 files changed

+6835
-21205
lines changed

Some content is hidden

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

534 files changed

+6835
-21205
lines changed

‎.azure/pipelines/quarantined-pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
jobName: Helix_quarantined_x64
2929
jobDisplayName: 'Tests: Helix'
3030
agentOs: Windows
31-
timeoutInMinutes: 240
31+
timeoutInMinutes: 120
3232
steps:
3333
# Build the shared framework
3434
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
@@ -53,7 +53,7 @@ jobs:
5353
jobName: Windows_Quarantined_x64
5454
jobDisplayName: 'Tests: Windows x64'
5555
agentOs: Windows
56-
timeoutInMinutes: 240
56+
timeoutInMinutes: 90
5757
isTestingJob: true
5858
steps:
5959
- powershell: "& ./build.ps1 -CI -nobl -all -pack -NoBuildJava"
@@ -86,7 +86,7 @@ jobs:
8686
jobName: MacOS_Quarantined_Test
8787
jobDisplayName: "Tests: macOS 10.14"
8888
agentOs: macOS
89-
timeoutInMinutes: 240
89+
timeoutInMinutes: 60
9090
isTestingJob: true
9191
steps:
9292
- bash: ./build.sh --all --pack --ci --nobl --no-build-java
@@ -119,7 +119,7 @@ jobs:
119119
jobName: Linux_Quarantined_Test
120120
jobDisplayName: "Tests: Ubuntu 16.04 x64"
121121
agentOs: Linux
122-
timeoutInMinutes: 240
122+
timeoutInMinutes: 60
123123
isTestingJob: true
124124
useHostedUbuntu: false
125125
steps:

‎AspNetCore.sln

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

‎Directory.Build.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,12 @@
8888

8989
<IncludeSymbols>true</IncludeSymbols>
9090

91-
<!-- Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props -->
91+
<!--
92+
Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props and
93+
the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
94+
-->
9295
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
96+
<DefaultNetFxTargetFramework>net461</DefaultNetFxTargetFramework>
9397
</PropertyGroup>
9498

9599
<!-- Warnings and errors -->

‎Directory.Build.targets

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,20 @@
134134
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
135135
</PropertyGroup>
136136

137+
<PropertyGroup>
138+
<KnownAppHostPackOrFrameworkReferenceTfm>$(DefaultNetCoreTargetFramework)</KnownAppHostPackOrFrameworkReferenceTfm>
139+
<KnownAppHostPackOrFrameworkReferenceTfm Condition=" '$(TargetFrameworkIdentifier)' == '$(NETCoreAppFrameworkIdentifier)' AND
140+
$([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '5.0')) ">netcoreapp$(TargetFrameworkVersion.TrimStart('vV'))</KnownAppHostPackOrFrameworkReferenceTfm>
141+
</PropertyGroup>
142+
137143
<ItemGroup>
138144
<KnownFrameworkReference Update="Microsoft.NETCore.App">
139145
<!-- Always update the 'latest version', whether the repo is servicing or not. -->
140-
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
146+
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(KnownAppHostPackOrFrameworkReferenceTfm)'">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
141147
<!-- Only update the default runtime version for preview builds. -->
142-
<DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
148+
<DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(KnownAppHostPackOrFrameworkReferenceTfm)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
143149
<!-- Only update the targeting pack version for preview builds. -->
144-
<TargetingPackVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
150+
<TargetingPackVersion Condition="'%(TargetFramework)' == '$(KnownAppHostPackOrFrameworkReferenceTfm)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
145151
</KnownFrameworkReference>
146152

147153
<KnownFrameworkReference Condition="'$(UseAspNetCoreSharedRuntime)' != 'true'" Remove="Microsoft.AspNetCore.App" />

‎eng/Baseline.Designer.props

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

‎eng/Dependencies.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ and are generated based on the last package release.
6969
<LatestPackageReference Include="System.IO.Pipelines" />
7070
<LatestPackageReference Include="System.Net.Http" />
7171
<LatestPackageReference Include="System.Net.Http.Json" />
72+
<LatestPackageReference Include="System.Net.Sockets" />
7273
<LatestPackageReference Include="System.Reflection.Metadata" />
7374
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" />
7475
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
@@ -123,6 +124,7 @@ and are generated based on the last package release.
123124
<LatestPackageReference Include="Microsoft.Internal.AspNetCore.H2Spec.All" />
124125
<LatestPackageReference Include="Microsoft.Extensions.Internal.Transport" />
125126
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" />
127+
<LatestPackageReference Include="Microsoft.NETCore.BrowserDebugHost.Transport" />
126128
<LatestPackageReference Include="Microsoft.Owin.Security.Cookies" />
127129
<LatestPackageReference Include="Microsoft.Owin.Testing" />
128130
<LatestPackageReference Include="Microsoft.Web.Administration" />
@@ -166,7 +168,6 @@ and are generated based on the last package release.
166168
<LatestPackageReference Include="MessagePackAnalyzer" />
167169
<LatestPackageReference Include="Microsoft.Data.SqlClient" />
168170
<LatestPackageReference Include="Microsoft.Identity.Web.UI" />
169-
<LatestPackageReference Include="Microsoft.Graph" />
170171
<LatestPackageReference Include="Mono.Cecil" />
171172
<LatestPackageReference Include="Moq" />
172173
<LatestPackageReference Include="Newtonsoft.Json.Bson" />

‎eng/ProjectReferences.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,12 @@
8686
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization.Routing" ProjectPath="$(RepoRoot)src\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj" />
8787
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization" ProjectPath="$(RepoRoot)src\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj" />
8888
<ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepoRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
89-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices" ProjectPath="$(RepoRoot)src\Middleware\NodeServices\src\Microsoft.AspNetCore.NodeServices.csproj" />
9089
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" ProjectPath="$(RepoRoot)src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
9190
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching" ProjectPath="$(RepoRoot)src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj" />
9291
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepoRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
9392
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepoRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
9493
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Session" ProjectPath="$(RepoRoot)src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj" />
9594
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices.Extensions" ProjectPath="$(RepoRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
96-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices" ProjectPath="$(RepoRoot)src\Middleware\SpaServices\src\Microsoft.AspNetCore.SpaServices.csproj" />
9795
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepoRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
9896
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepoRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
9997
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" ProjectPath="$(RepoRoot)src\Razor\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
@@ -142,6 +140,7 @@
142140
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepoRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" />
143141
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Forms" ProjectPath="$(RepoRoot)src\Components\Forms\src\Microsoft.AspNetCore.Components.Forms.csproj" />
144142
<ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj" />
143+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.ProtectedBrowserStorage" ProjectPath="$(RepoRoot)src\Components\ProtectedBrowserStorage\src\Microsoft.AspNetCore.Components.ProtectedBrowserStorage.csproj" />
145144
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Server" ProjectPath="$(RepoRoot)src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj" />
146145
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Web.Extensions" ProjectPath="$(RepoRoot)src\Components\Web.Extensions\src\Microsoft.AspNetCore.Components.Web.Extensions.csproj" />
147146
<ProjectReferenceProvider Include="Microsoft.Authentication.WebAssembly.Msal" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj" />

0 commit comments

Comments
 (0)