Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2

Author: wtgodbe

.azure/pipelines/ci.yml

@@ -14,15 +14,44 @@ jobs:
     jobDisplayName: "Build and test: Windows"
     agentOs: Windows
     beforeBuild:
-    - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1"
-      displayName: Setup IISExpress test certificates
+    - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
+      displayName: Setup IISExpress test certificates and schema
 - template: jobs/default-build.yml
   parameters:
-    jobName: macOs_Build
-    jobDisplayName: "Build and test : macOS"
-    agentOs: macOS
+    jobName: MacOs_Build
+    jobDisplayName: "Build and test: macOS"
+    agentOs: macOs
 - template: jobs/default-build.yml
   parameters:
     jobName: Linux_Build
-    jobDisplayName: "Build and test : Linux"
+    jobDisplayName: "Build and test: Linux"
     agentOs: Linux
+# - template: jobs/iisintegration-job.yml
+#   parameters:
+#     TestGroupName: IIS
+#     SkipIISTests: false
+#     SkipIISExpressTests: true
+#     SkipIISForwardsCompatibilityTests: true
+#     SkipIISBackwardsCompatibilityTests: true
+# - template: jobs/iisintegration-job.yml
+#   parameters:
+#     TestGroupName: IISExpress
+#     SkipIISTests: true
+#     SkipIISExpressTests: false
+#     SkipIISForwardsCompatibilityTests: true
+#     SkipIISBackwardsCompatibilityTests: true
+# - template: jobs/iisintegration-job.yml
+#   parameters:
+#     TestGroupName: IISForwardCompat
+#     SkipIISTests: true
+#     SkipIISExpressTests: true
+#     SkipIISForwardsCompatibilityTests: false
+#     SkipIISBackwardsCompatibilityTests: true
+# - template: jobs/iisintegration-job.yml
+#   parameters:
+#     TestGroupName: IISBackCompat
+#     SkipIISTests: true
+#     SkipIISExpressTests: true
+#     SkipIISForwardsCompatibilityTests: true
+#     SkipIISBackwardsCompatibilityTests: false
+

.azure/pipelines/e2e-tests.yml

@@ -51,22 +51,32 @@ jobs:
   pool:
     vmImage: macOS-10.13
   strategy:
-    maxParallel: 4
-    # The ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS
-    # https://github.com/aspnet/Templating/issues/608
+    maxParallel: 8
     matrix:
       Portable_Node8:
         Test.RuntimeIdentifier: none
         Node.Version: 8.x
+      Portable_Node10:
+        Test.RuntimeIdentifier: none
+        Node.Version: 10.x
       SelfContainedWindows_Node8:
         Test.RuntimeIdentifier: win-x64
         Node.Version: 8.x
+      SelfContainedWindows_Node10:
+        Test.RuntimeIdentifier: win-x64
+        Node.Version: 10.x
       SelfContainedLinux_Node8:
         Test.RuntimeIdentifier: linux-x64
         Node.Version: 8.x
+      SelfContainedLinux_Node10:
+        Test.RuntimeIdentifier: linux-x64
+        Node.Version: 10.x
       SelfContainedMacOs_Node8:
         Test.RuntimeIdentifier: osx-x64
         Node.Version: 8.x
+      SelfContainedMacOs_Node10:
+        Test.RuntimeIdentifier: osx-x64
+        Node.Version: 10.x
   steps:
   - task: NodeTool@0
     displayName: Install Node $(Node.Version)

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

@@ -60,7 +60,7 @@ jobs:
 - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
   displayName: ${{ coalesce(parameters.jobDisplayName, parameters.agentOs) }}
   dependsOn: ${{ parameters.dependsOn }}
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
   workspace:
     clean: all
   strategy:
@@ -94,6 +94,8 @@ jobs:
     TeamName: AspNetCore
     ${{ if eq(parameters.agentOs, 'Windows') }}:
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
+    ${{ if eq(parameters.agentOs, 'Linux') }}:
+      JAVA_HOME: $(Agent.BuildDirectory)/.tools/jdk
     ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}:
       _SignType:
     ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -115,6 +117,16 @@ jobs:
       inputs:
         command: custom
         arguments: 'locals all -clear'
+  - ${{ if eq(parameters.agentOs, 'Linux') }}:
+    - script: ./eng/scripts/InstallJdk.sh '10.0.2'
+      displayName: Install JDK 10
+    - script: |
+        sudo apt-get update
+        sudo apt-get install -y libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcairo2 \
+          libgdk-pixbuf2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 \
+          libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxfixes3 libxrandr2 libxrender1 libxss1 libxtst6
+
+      displayName: Install additional packages
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
     - task: MicroBuildSigningPlugin@1
       displayName: Install MicroBuild Signing plugin
@@ -143,7 +155,7 @@ jobs:
     inputs:
       testRunTitle: $(AgentOsName)-$(BuildConfiguration)
       testRunner: vstest
-      testResultsFiles: 'artifacts/logs/**/*.trx'
+      testResultsFiles: '**/artifacts/**/*.trx'
       mergeTestResults: true
   - ${{ if eq(parameters.artifacts.publish, 'true') }}:
     - task: PublishBuildArtifacts@1

.azure/pipelines/jobs/iisintegration-job.yml

@@ -1,13 +1,11 @@
 jobs:
 - template: default-build.yml
   parameters:
-    jobName: 'IISIntegration'
-    jobDisplayName: 'IISIntegration'
     beforeBuild:
-      - powershell: "& ./src/servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Setup"
+      - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1; & ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Setup"
         displayName: Prepare repo
     afterBuild:
-      - powershell: "& ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown"
+      - powershell: "& ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown"
         displayName: Stop AppVerifier
         condition: always()
       - task: PublishBuildArtifacts@1
@@ -16,5 +14,9 @@ jobs:
         inputs:
           artifactName: logs
           artifactType: Container
-          pathtoPublish: src/servers/IIS/artifacts/logs
-    buildDirectory: src/servers/IIS
+          pathtoPublish: src/IISIntegration/artifacts/logs
+    buildDirectory: src/Servers/IIS
+    buildArgs: "/p:SkipIISBackwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }} /p:SkipIISTests=${{ parameters.SkipIISTests }} /p:SkipIISExpressTests=${{ parameters.SkipIISExpressTests }} /p:SkipIISForwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }}"
+    jobName: IISIntegration_${{ parameters.TestGroupName }}
+    jobDisplayName: IISIntegration_${{ parameters.TestGroupName }}
+

.azure/pipelines/project-ci.yml

@@ -0,0 +1,43 @@
+trigger:
+  branches:
+    include:
+    - release/2.2
+  paths:
+    include:
+    - src/SiteExtensions
+
+name: $(Date:yyMMdd)-$(Rev:rr)
+
+phases:
+- phase: SiteExtensions
+  variables:
+    CI: true
+    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+    # This variable is required by MicroBuildSigningPlugin to determine permissions for codesigning.
+    TeamName: AspNetCore
+
+    # SignType = { test, real }
+    # This is prefixed underscore because variables automatically become environment variables (and therefore MSBuild properties),
+    # and this one was causing issues in MSBuild projects which use the $(SignType) MSbuild prop.
+    _SignType: real
+
+  steps:
+  - task: MicroBuildSigningPlugin@1
+    displayName: Install MicroBuild plugin
+    condition: and(succeeded(), in(variables['_SignType'], 'test', 'real'))
+    inputs:
+      signType: $(_SignType)
+      zipSources: false
+  - script: src/SiteExtensions/LoggingAggregate/build.cmd -ci
+    displayName: Run src/SiteExtensions/LoggingAggregate/build.cmd
+  - task: PublishBuildArtifacts@1
+    displayName: Upload artifacts
+    condition: eq(variables['system.pullrequest.isfork'], false)
+    inputs:
+      pathtoPublish: ./src/SiteExtensions/LoggingAggregate/artifacts/
+      artifactName: artifacts-Windows-Release
+      artifactType: Container
+  - task: MicroBuildCleanup@1
+    displayName: Cleanup MicroBuild tasks
+    condition: always()

.azure/pipelines/site-extensions.yml

@@ -11,7 +11,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{cs}]
+[*.cs]
 indent_size = 4
 dotnet_sort_system_directives_first = true:warning
 

.editorconfig

@@ -19,12 +19,12 @@ node_modules/
 .r
 .w
 .deps
-global.json
 msbuild.ProjectImports.zip
 .env
 scripts/tmp/
 .dotnet/
 .tools/
+src/**/global.json
 launchSettings.json
 korebuild-lock.txt
 .gradle/

.gitignore

@@ -1,4 +1,7 @@
 [submodule "modules/EntityFrameworkCore"]
-       path = modules/EntityFrameworkCore
-       url = https://github.com/aspnet/EntityFrameworkCore.git
-       branch = release/2.1
+	path = modules/EntityFrameworkCore
+	url = https://github.com/aspnet/EntityFrameworkCore.git
+	branch = release/2.2
+[submodule "googletest"]
+	path = src/submodules/googletest
+	url = https://github.com/google/googletest

.gitmodules

@@ -3,22 +3,75 @@
 
   <PropertyGroup>
     <Product>Microsoft ASP.NET Core</Product>
+
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft Corporation.</Company>
+    <RpmPackageVendor>.NET Foundation</RpmPackageVendor>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt</PackageLicenseUrl>
+    <!-- The SPDX name for the source license. See https://spdx.org/licenses/. -->
+    <PackageLicenseType>Apache-2.0</PackageLicenseType>
+    <!--
+      Suppress a warning about upcoming deprecation of PackageLicenseUrl. When embedding licenses are supported,
+      replace PackageLicenseUrl with PackageLicenseExpression.
+    -->
+    <NoWarn>$(NoWarn);NU5125</NoWarn>
+    <!-- Suppress warnings about using SemVer 2.0. -->
+    <NoWarn>$(NoWarn);NU5105</NoWarn>
+
+    <!-- Contact email address for NuGet packages and Linux installers. -->
+    <MaintainerEmail>[email protected]</MaintainerEmail>
+
+    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageProjectUrl>https://asp.net</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Serviceable>true</Serviceable>
+
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+
+    <SharedFxProductName>$(Product) $(PackageVersion) Shared Framework</SharedFxProductName>
+    <SharedFxDescription>Shared Framework for hosting of Microsoft ASP.NET Core applications. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub ($(RepositoryUrl)). We happily accept issues and PRs.</SharedFxDescription>
+  </PropertyGroup>
+
+  <!-- Compilation options -->
+  <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <!-- Instructs the compiler to use SHA256 instead of SHA1 when adding file hashes to PDBs. -->
+    <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
+    <!-- Suppress the message about using a preview version of .NET Core SDK. We are okay with this and don't need the warning. -->
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+
+    <!-- Fixes a common error in targets implementing a NoBuild mode. -->
+    <BuildProjectReferences Condition=" '$(NoBuild)' == 'true' ">false</BuildProjectReferences>
+  </PropertyGroup>
+
+  <!-- Certificate names used for Authenticode signing. -->
+  <PropertyGroup Condition=" '$(DisableCodeSigning)' != 'true' ">
+    <AssemblySigningCertName>Microsoft400</AssemblySigningCertName>
+    <AssemblySigning3rdPartyCertName>3PartySHA2</AssemblySigning3rdPartyCertName>
+    <PowerShellSigningCertName>Microsoft400</PowerShellSigningCertName>
+    <PackageSigningCertName>NuGet</PackageSigningCertName>
+    <VsixSigningCertName>VsixSHA2</VsixSigningCertName>
+    <JarSigningCertName>MicrosoftJARSHA2</JarSigningCertName>
   </PropertyGroup>
 
   <Import Project="build\external-dependencies.props" />
   <Import Project="build\sources.props" />
 
+  <!-- Folder layout -->
   <PropertyGroup>
     <ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(RepositoryRoot)artifacts\</ArtifactsDir>
     <ArtifactsObjDir>$(ArtifactsDir)obj\</ArtifactsObjDir>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
     <ArtifactsBinDir>$(ArtifactsConfigurationDir)bin\</ArtifactsBinDir>
+    <InstallersOutputPath>$(ArtifactsConfigurationDir)installers\</InstallersOutputPath>
     <PackageOutputPath>$(ArtifactsDir)build\</PackageOutputPath>
 
     <RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir>
@@ -32,6 +85,7 @@
     <IncludeSymbols>true</IncludeSymbols>
 
     <SharedSourceRoot>$(MSBuildThisFileDirectory)src\Shared\</SharedSourceRoot>
+    <GoogleTestSubmoduleRoot>$(RepositoryRoot)src\submodules\googletest\</GoogleTestSubmoduleRoot>
 
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <DisableDeterministicSourceRoot Condition="'$(IsSampleProject)' == 'true' OR '$(IsTestAssetProject)' == 'true'">true</DisableDeterministicSourceRoot>
@@ -45,9 +99,11 @@
   <Import Project="eng\Dependencies.props" />
   <Import Project="eng\PatchConfig.props" />
   <Import Project="eng\ProjectReferences.props" />
-  <Import Project="eng\targets\Wix.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
-  <Import Project="eng\targets\CSharp.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
+  <Import Project="eng\targets\RuntimeIdentifiers.props" />
   <Import Project="eng\targets\Cpp.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
+  <Import Project="eng\targets\CSharp.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
+  <Import Project="eng\targets\SharedFx.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
+  <Import Project="eng\targets\Wix.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
   <Import Project="eng\targets\Npm.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
 
 </Project>