Skip to content

Commit 569a14e

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.1' into release/2.2
2 parents fcfefd3 + 5d777b2 commit 569a14e

File tree

595 files changed

+746
-2582
lines changed

Some content is hidden

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

595 files changed

+746
-2582
lines changed

‎.azure/pipelines/fast-pr-validation.yml renamed to ‎.azure/pipelines/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1+
# Don't run CI for this config yet. We're not ready to move official builds on to Azure Pipelines
2+
trigger: none
13

2-
trigger:
3-
- master
4-
- release/*
4+
# Run PR validation on all branches
5+
pr:
6+
branches:
7+
include:
8+
- '*'
59

610
jobs:
7-
- template: jobs/default-build.yml
8-
parameters:
9-
jobName: PR_FastCheck
10-
jobDisplayName: Fast Check
11-
agentOs: Windows
12-
buildArgs: "/t:FastCheck"
1311
- template: jobs/default-build.yml
1412
parameters:
1513
jobName: Windows_Build
16-
jobDisplayName: "Build: Windows"
14+
jobDisplayName: "Build and test: Windows"
1715
agentOs: Windows
1816
beforeBuild:
1917
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/update_schema.ps1"

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
6464
displayName: ${{ coalesce(parameters.jobDisplayName, parameters.agentOs) }}
6565
dependsOn: ${{ parameters.dependsOn }}
66-
timeoutInMinutes: 90
66+
timeoutInMinutes: 120
6767
workspace:
6868
clean: all
6969
strategy:
@@ -103,6 +103,9 @@ jobs:
103103
steps:
104104
- checkout: self
105105
clean: true
106+
- task: NodeTool@0
107+
inputs:
108+
versionSpec: 10.x
106109
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
107110
- task: MicroBuildSigningPlugin@1
108111
displayName: Install MicroBuild Signing plugin
@@ -123,7 +126,7 @@ jobs:
123126
inputs:
124127
testRunTitle: $(AgentOsName)-$(BuildConfiguration)
125128
testRunner: vstest
126-
testResultsFiles: 'artifacts/logs/**/*.trx'
129+
testResultsFiles: '**/artifacts/**/*.trx'
127130
mergeTestResults: true
128131
- ${{ if eq(parameters.artifacts.publish, 'true') }}:
129132
- task: PublishBuildArtifacts@1

‎.azure/pipelines/pr-validation-temp.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This configuration is temporary while we work on getting all unit tests to pass on PR checks
2+
3+
# Don't run CI for this config
4+
trigger: none
5+
6+
# Run PR validation on all branches
7+
pr:
8+
branches:
9+
include:
10+
- '*'
11+
12+
jobs:
13+
- template: jobs/default-build.yml
14+
parameters:
15+
jobName: Windows_Build
16+
jobDisplayName: "Build only : Windows"
17+
agentOs: Windows
18+
buildArgs: '/p:SkipTests=true'
19+
- template: jobs/default-build.yml
20+
parameters:
21+
jobName: macOs_Build
22+
jobDisplayName: "Build only : macOS"
23+
agentOs: macOS
24+
buildArgs: '/p:SkipTests=true'
25+
- template: jobs/default-build.yml
26+
parameters:
27+
jobName: Linux_Build
28+
jobDisplayName: "Build only : Linux"
29+
agentOs: Linux
30+
buildArgs: '/p:SkipTests=true'

‎Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
1111
<!-- Always include framework metapackages in patch updates. -->
12-
<IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true'">true</IsPackageInThisPatch>
12+
<IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true' OR '$(IsSharedSourcePackage)' == 'true' ">true</IsPackageInThisPatch>
1313
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
1414
</PropertyGroup>
1515

‎THIRD-PARTY-NOTICES

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,14 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
8484
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
8585
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
8686
SOFTWARE
87+
88+
License notice for viz.js
89+
------------------------------------
90+
91+
Copyright (c) 2014-2018 Michael Daines
92+
93+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
94+
95+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
96+
97+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎build/PackageArchive.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ArchiveProjects Include="$(RepositoryRoot)src\PackageArchive\Archive.*\*.*proj" />
99
</ItemGroup>
1010

11-
<Target Name="BuildFallbackArchive" DependsOnTargets="GetProjectArtifactInfo;GetFxProjectArtifactInfo;ResolveRepoInfo;GeneratePropsFiles">
11+
<Target Name="BuildFallbackArchive" DependsOnTargets="ResolveSharedSourcesPackageInfo;GetProjectArtifactInfo;GetFxProjectArtifactInfo;ResolveRepoInfo;GeneratePropsFiles">
1212
<PropertyGroup>
1313
<ArchiveBuildProps>
1414
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);

‎build/Publish.targets

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,16 @@
8383
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
8484
</FilesToPublish>
8585

86-
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip" >
86+
<!-- This file is conditionally included because it may not exist in servicing builds -->
87+
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip"
88+
Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip')" >
8789
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip</RelativeBlobPath>
8890
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
8991
</FilesToPublish>
9092

91-
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip" >
93+
<!-- This file is conditionally included because it may not exist in servicing builds -->
94+
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip"
95+
Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip')">
9296
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip</RelativeBlobPath>
9397
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
9498
</FilesToPublish>

‎build/RepositoryBuild.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:BuildNumber=$(BuildNumber)</RepositoryBuildArguments>
8888
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:Configuration=$(Configuration)</RepositoryBuildArguments>
8989
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild)</RepositoryBuildArguments>
90-
<RepositoryBuildArguments>$(RepositoryBuildArguments) /noconsolelogger '/l:RepoTasks.FlowLogger,$(MSBuildThisFileDirectory)tasks\bin\publish\RepoTasks.dll;Summary;FlowId=$(RepositoryToBuild)'</RepositoryBuildArguments>
90+
<!-- We collect all output and code sign at the end. We don't need to code sign when we build each submodule. -->
91+
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DisableCodeSigning=true</RepositoryBuildArguments>
9192
<RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)'</RepositoryBuildArguments>
9293
<RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)'</RepositoryBuildArguments>
9394
<RepositoryBuildArguments Condition=" '$(SkipTestsDueToMissingSharedFx)' == 'true' ">$(RepositoryBuildArguments) /p:SkipAspNetCoreRuntimeInstall=true</RepositoryBuildArguments>

‎build/SharedFx.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</SharedFxBuildProperties>
5454
</PropertyGroup>
5555

56-
<MSBuild Projects="$(MSBuildToolsPath)\NuGet.targets"
56+
<MSBuild Projects="$(NuGetRestoreTargets)"
5757
Targets="Restore"
5858
Properties="$(SharedFxBuildProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" />
5959

‎build/artifacts.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<PackageArtifact Include="dotnet-sql-cache" Category="ship" />
2020
<PackageArtifact Include="dotnet-user-secrets" Category="ship" />
2121
<PackageArtifact Include="dotnet-watch" Category="ship" />
22-
<PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" />
2322
<PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
2423
<PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" />
2524
<PackageArtifact Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Category="noship" />
@@ -82,7 +81,6 @@
8281
<PackageArtifact Include="Microsoft.AspNetCore.Http" Category="ship" />
8382
<PackageArtifact Include="Microsoft.AspNetCore.HttpOverrides" Category="ship" />
8483
<PackageArtifact Include="Microsoft.AspNetCore.HttpsPolicy" Category="ship" />
85-
<PackageArtifact Include="Microsoft.AspNetCore.HttpSys.Sources" Category="noship" />
8684
<PackageArtifact Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Category="ship" />
8785
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Specification.Tests" Category="ship" />
8886
<PackageArtifact Include="Microsoft.AspNetCore.Identity.UI" Category="ship" />
@@ -125,7 +123,6 @@
125123
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCompression" Category="ship" />
126124
<PackageArtifact Include="Microsoft.AspNetCore.Rewrite" Category="ship" />
127125
<PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" Category="ship" />
128-
<PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
129126
<PackageArtifact Include="Microsoft.AspNetCore.Routing" Category="ship" />
130127
<PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" Category="ship" />
131128
<PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="ship" />
@@ -201,5 +198,7 @@
201198
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" />
202199
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
203200
<PackageArtifact Include="RazorPageGenerator" Category="noship" />
201+
202+
<PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship"/>
204203
</ItemGroup>
205204
</Project>

0 commit comments

Comments
 (0)