merge (#6)

merge Co-authored-by: Brennan <brecon@microsoft.com> Co-authored-by: dotnet bot <dotnet-bot@microsoft.com> Co-authored-by: Nate McMaster <natemcmaster@users.noreply.github.com> Co-authored-by: dotnet-maestro <@dotnet-maestro> Co-authored-by: Matt Mitchell <mmitche@microsoft.com> Co-authored-by: Pranav K <prkrishn@hotmail.com> Co-authored-by: John Luo <johluo@microsoft.com> Co-authored-by: null <shawn@saluce.com> Co-authored-by: Mikael Mengistu <mikaelm12@users.noreply.github.com> Co-authored-by: Ryan Brandenburg <rybrande@microsoft.com> Co-authored-by: David Fowler <davidfowl@gmail.com> Co-authored-by: null <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com> Co-authored-by: Arthur Vickers <ajcvickers@hotmail.com> Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com> Co-authored-by: Justin Kotalik <jukotali@microsoft.com> Co-authored-by: Cory Nelson <phrosty@gmail.com> Co-authored-by: null <dotnet-maestro-bot@microsoft.com> Co-authored-by: Stephen Halter <halter73@gmail.com> Co-authored-by: Andrew Stanton-Nurse <andrew@stanton-nurse.com> Co-authored-by: null <distinctiveangle@outlook.com> Co-authored-by: Kahbazi <A.Kahbazi@gmail.com> Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com> Co-authored-by: Daniel Roth <daroth@microsoft.com> Co-authored-by: Chris Ross <Tratcher@Outlook.com> Co-authored-by: Ben Adams <thundercat@illyriad.co.uk> Co-authored-by: Artak <34246760+mkArtakMSFT@users.noreply.github.com>
dotnet · Jun 18, 2019 · a2b16bf · a2b16bf
2 parents 887872d + c288baf
commit a2b16bf
Show file tree

Hide file tree

Showing 711 changed files with 12,622 additions and 25,283 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -20,7 +20,15 @@ pr:
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
-
+- name: _TeamName
+  value:  AspNetCore
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - name: _BuildArgs
+    value: /p:TeamName=$(_TeamName)
+           /p:OfficialBuildId=$(Build.BuildNumber)
+- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+  - name: _BuildArgs
+    value: ''
 jobs:
 - template: jobs/default-build.yml
   parameters:
@@ -40,28 +48,47 @@ jobs:
     agentOs: Windows
     steps:
     - script: "echo ##vso[build.addbuildtag]daily-build"
-      condition: and(ne(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true'))
+      condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
       displayName: 'Set CI tags'
     - script: "echo ##vso[build.addbuildtag]release-candidate"
-      condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['IsFinalBuild'], 'true'))
+      condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
       displayName: 'Set CI tags'
     # !!! NOTE !!! Some of these steps have disabled code signing.
     # This is intentional to workaround https://github.com/dotnet/arcade/issues/1957 which always re-submits for code-signing, even
     # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing.
     # The sign settings have been configured to
 
-    - script: ./eng/scripts/cibuild.cmd -BuildNative -arch x64 /p:DisableCodeSigning=true /bl:artifacts/log/build.x64.binlog
+    - script: ./eng/scripts/cibuild.cmd
+          -arch x64
+          -BuildNative
+          /p:DisableCodeSigning=true
+          /bl:artifacts/log/build.x64.binlog
+          $(_BuildArgs)
       displayName: Build x64
     # TODO: make it possible to build for one Windows architecture at a time
     # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196
 
     # Build the x86 shared framework
     # Set DisableSignCheck because we'll run sign check in an explicit step after installers build
-    - script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore -BuildNative /t:BuildSharedFx /p:DisableCodeSigning=true /bl:artifacts/log/build.x86.binlog
+    - script: ./eng/scripts/cibuild.cmd
+            -arch x86
+            -NoRestore
+            -BuildNative
+            /t:BuildSharedFx
+            /p:OnlyPackPlatformSpecificPackages=true
+            /p:DisableCodeSigning=true
+            /bl:artifacts/log/build.x86.binlog
+            $(_BuildArgs)
       displayName: Build x86
 
     # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
-    - script: ./build.cmd -ci -sign -forceCoreMsbuild /p:DisableCodeSigning=true -projects ./src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+    - script: ./build.cmd
+            -ci
+            -sign
+            -forceCoreMsbuild
+            /p:DisableCodeSigning=true
+            -projects ./src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+            $(_BuildArgs)
       displayName: Build SiteExtension
 
     # Remove all task build output
@@ -71,30 +98,50 @@ jobs:
     # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
     # consider running code-signing inline with the other previous steps.
     # Sign check is disabled because it is run in a separate step below, after installers are built.
-    - script: ./build.cmd -ci -sign -NoRestore /t:CodeSign /p:SignType=$(_SignType) /p:DisableSignCheck=true /bl:artifacts/log/build.codesign.binlog
+    - script: ./build.cmd
+              -ci
+              -sign
+              -NoRestore
+              /t:CodeSign
+              /p:SignType=$(_SignType)
+              /p:DisableSignCheck=true
+              /bl:artifacts/log/build.codesign.binlog
+              $(_BuildArgs)
       displayName: Code sign packages
 
     # Windows installers bundle both x86 and x64 assets
-    - powershell: ./src/Installers/Windows/build.ps1 -ci /p:SignType=$(_SignType)
+    - powershell: ./src/Installers/Windows/build.ps1
+        -ci
+        /p:SignType=$(_SignType)
+         $(_BuildArgs)
       displayName: Build Installers
 
     # Run sign check to verify everything was code signed.
-    - script: ./build.cmd -ci -sign -NoRestore /t:SignCheck /p:SignType=$(_SignType) /bl:artifacts/log/build.signcheck.binlog
+    - script: ./build.cmd
+        -ci
+        -sign
+        -NoRestore
+        /t:SignCheck
+        /p:SignType=$(_SignType)
+        /bl:artifacts/log/build.signcheck.binlog
+         $(_BuildArgs)
       displayName: Run sign check
-      condition: eq(variables['_SignType'], 'real')
+      condition: and(succeeded(), eq(variables['_SignType'], 'real'))
 
     artifacts:
+    - name: Windows_Logs
+      path: artifacts/log/
+      publishOnError: true
     - name: Windows_Packages
       path: artifacts/packages/
+    - name: Windows_Symbols
+      path: artifacts/symbols/
     - name: Windows_VSIX
       path: artifacts/VSSetup/
     - name: Windows_Manifests
       path: artifacts/manifests/
     - name: Windows_Installers
       path: artifacts/installers/
-    - name: Windows_Logs
-      path: artifacts/log/
-      publishOnError: true
 
 # Build Windows ARM
 - template: jobs/default-build.yml
@@ -104,13 +151,15 @@ jobs:
     jobDisplayName: "Build: Windows ARM"
     agentOs: Windows
     buildScript: ./eng/scripts/cibuild.cmd
-    buildArgs: -arch arm -NoBuildNodeJS -NoBuildJava /p:SignType=$(_SignType) /bl:artifacts/log/build.win-arm.binlog
+    buildArgs: -arch arm
+      -NoBuildNodeJS
+      -NoBuildJava
+      /p:OnlyPackPlatformSpecificPackages=true
+      /p:SignType=$(_SignType)
+      /bl:artifacts/log/build.win-arm.binlog
+      $(_BuildArgs)
     installNodeJs: false
     installJdk: false
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so builds only produce runtime packages
-    - powershell: gci artifacts/packages/ -recurse -exclude 'runtime.*', 'Microsoft.AspNetCore.App.Runtime.*' -file | rm -ea ignore
     artifacts:
     - name: Windows_arm_Packages
       path: artifacts/packages/
@@ -129,13 +178,12 @@ jobs:
     jobDisplayName: "Build: macOS"
     agentOs: macOs
     buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --no-build-nodejs --no-build-java /bl:artifacts/log/build.macos.binlog
+    buildArgs: --no-build-nodejs
+      --no-build-java
+      -p:OnlyPackPlatformSpecificPackages=true
+      -bl:artifacts/log/build.macos.binlog
+      $(_BuildArgs)
     installNodeJs: false
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so macOS/Linux builds only produce runtime packages
-    - script: if [ -d 'artifacts/packages' ]; then find artifacts/packages/ -type f -not -name 'runtime.*' -not -name 'Microsoft.AspNetCore.App.Runtime.*' -delete; fi
-      condition: always()
     artifacts:
     - name: MacOS_x64_Packages
       path: artifacts/packages/
@@ -158,7 +206,13 @@ jobs:
     agentOs: Linux
     installNodeJs: false
     steps:
-    - script: ./eng/scripts/cibuild.sh --arch x64 --no-build-nodejs --no-build-java /bl:artifacts/log/build.lin-x64.binlog
+    - script: ./eng/scripts/cibuild.sh
+          --arch x64
+          --no-build-nodejs
+          --no-build-java
+          -p:OnlyPackPlatformSpecificPackages=true
+          -bl:artifacts/log/build.linux-x64.binlog
+          $(_BuildArgs)
       displayName: Run cibuild.sh
     - script: |
         rm -rf .dotnet/
@@ -169,10 +223,12 @@ jobs:
           -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
           --no-restore \
           --no-build-deps \
-          /t:BuildSharedFx  \
-          /p:BuildRuntimeArchive=false \
-          /p:LinuxInstallerType=deb \
-          /bl:artifacts/log/build.deb.binlog
+          -t:BuildSharedFx  \
+          -p:OnlyPackPlatformSpecificPackages=true \
+          -p:BuildRuntimeArchive=false \
+          -p:LinuxInstallerType=deb \
+          -bl:artifacts/log/build.deb.binlog \
+          $(_BuildArgs)
       displayName: Build Debian installers
     - script: |
         rm -rf .dotnet/
@@ -183,16 +239,13 @@ jobs:
           -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
           --no-restore \
           --no-build-deps \
-          /t:BuildSharedFx  \
-          /p:BuildRuntimeArchive=false \
-          /p:LinuxInstallerType=rpm \
-          /bl:artifacts/log/build.rpm.binlog
+          -t:BuildSharedFx  \
+          -p:OnlyPackPlatformSpecificPackages=true \
+          -p:BuildRuntimeArchive=false \
+          -p:LinuxInstallerType=rpm \
+          -bl:artifacts/log/build.rpm.binlog \
+          $(_BuildArgs)
       displayName: Build RPM installers
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so macOS/Linux builds only produce runtime packages
-    - script: if [ -d 'artifacts/packages' ]; then find artifacts/packages/ -type f -not -name 'runtime.*' -not -name 'Microsoft.AspNetCore.App.Runtime.*' -delete; fi
-      condition: always()
     artifacts:
     - name: Linux_x64_Packages
       path: artifacts/packages/
@@ -214,13 +267,13 @@ jobs:
     jobDisplayName: "Build: Linux ARM"
     agentOs: Linux
     buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --arch arm --no-build-nodejs --no-build-java /bl:artifacts/log/build.lin-arm.binlog
+    buildArgs: --arch arm
+      --no-build-nodejs
+      --no-build-java
+      -p:OnlyPackPlatformSpecificPackages=true
+      -bl:artifacts/log/build.linux-arm.binlog
+      $(_BuildArgs)
     installNodeJs: false
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so macOS/Linux builds only produce runtime packages
-    - script: if [ -d 'artifacts/packages' ]; then find artifacts/packages/ -type f -not -name 'runtime.*' -not -name 'Microsoft.AspNetCore.App.Runtime.*' -delete; fi
-      condition: always()
     artifacts:
     - name: Linux_arm_Packages
       path: artifacts/packages/
@@ -242,13 +295,13 @@ jobs:
     jobDisplayName: "Build: Linux ARM64"
     agentOs: Linux
     buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --arch arm64 --no-build-nodejs --no-build-java /bl:artifacts/log/build.arm64.binlog
+    buildArgs: --arch arm64
+      --no-build-nodejs
+      --no-build-java
+      -p:OnlyPackPlatformSpecificPackages=true
+      -bl:artifacts/log/build.arm64.binlog
+      $(_BuildArgs)
     installNodeJs: false
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so macOS/Linux builds only produce runtime packages
-    - script: if [ -d 'artifacts/packages' ]; then find artifacts/packages/ -type f -not -name 'runtime.*' -not -name 'Microsoft.AspNetCore.App.Runtime.*' -delete; fi
-      condition: always()
     artifacts:
     - name: Linux_arm64_Packages
       path: artifacts/packages/
@@ -270,13 +323,18 @@ jobs:
     jobDisplayName: "Build: Linux Musl x64"
     agentOs: Linux
     buildScript: ./dockerbuild.sh alpine
-    buildArgs: --ci --pack --all -e KOREBUILD_SKIP_INSTALL_NETFX=0 --arch x64 --os-name linux-musl --no-build-nodejs --no-build-java /bl:artifacts/log/build.musl.binlog
+    buildArgs: --ci
+      --pack
+      --all
+      -e KOREBUILD_SKIP_INSTALL_NETFX=0
+      --arch x64
+      --os-name linux-musl
+      --no-build-nodejs
+      --no-build-java
+      -p:OnlyPackPlatformSpecificPackages=true
+      -bl:artifacts/log/build.musl.binlog
+      $(_BuildArgs)
     installNodeJs: false
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so macOS/Linux builds only produce runtime packages
-    - script: if [ -d 'artifacts/packages' ]; then find artifacts/packages/ -type f -not -name 'runtime.*' -not -name 'Microsoft.AspNetCore.App.Runtime.*' -delete; fi
-      condition: always()
     artifacts:
     - name: Linux_musl_x64_Packages
       path: artifacts/packages/
@@ -298,13 +356,18 @@ jobs:
     jobDisplayName: "Build: Linux Musl ARM64"
     agentOs: Linux
     buildScript: ./dockerbuild.sh ubuntu-alpine37
-    buildArgs: --ci --pack --all -e KOREBUILD_SKIP_INSTALL_NETFX=0 --arch arm64 --os-name linux-musl --no-build-nodejs --no-build-java /bl:artifacts/log/build.musl.binlog
+    buildArgs: --ci
+      --pack
+      --all
+      -e KOREBUILD_SKIP_INSTALL_NETFX=0
+      --arch arm64
+      --os-name linux-musl
+      --no-build-nodejs
+      --no-build-java
+      -p:OnlyPackPlatformSpecificPackages=true
+      -bl:artifacts/log/build.musl.binlog
+      $(_BuildArgs)
     installNodeJs: false
-    afterBuild:
-    # Remove packages that are not rid-specific.
-    # TODO add a flag so macOS/Linux builds only produce runtime packages
-    - script: if [ -d 'artifacts/packages' ]; then find artifacts/packages/ -type f -not -name 'runtime.*' -not -name 'Microsoft.AspNetCore.App.Runtime.*' -delete; fi
-      condition: always()
     artifacts:
     - name: Linux_musl_arm64_Packages
       path: artifacts/packages/
@@ -328,7 +391,7 @@ jobs:
     agentOs: Windows
     isTestingJob: true
     buildScript: ./eng/scripts/cibuild.cmd
-    buildArgs: -test -BuildNative "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true /p:RunTemplateTests=false /p:BuildSiteExtensions=false"
+    buildArgs: -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:BuildSiteExtensions=false"
     beforeBuild:
     - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
       displayName: Setup IISExpress test certificates and schema

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -191,6 +191,23 @@ jobs:
       continueOnError: true
       condition: always()
 
+  - ${{ each artifact in parameters.artifacts }}:
+    - task: PublishBuildArtifacts@1
+      displayName: Upload artifacts from ${{ artifact.path }}
+      condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
+      continueOnError: true
+      inputs:
+        ${{ if eq(parameters.buildDirectory, '') }}:
+          pathtoPublish: ${{ artifact.path }}
+        ${{ if ne(parameters.buildDirectory, '') }}:
+          pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
+        ${{ if eq(artifact.name, '') }}:
+          artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
+        ${{ if ne(artifact.name, '') }}:
+          artifactName: ${{ artifact.name }}
+        artifactType: Container
+        parallel: true
+
   - task: PublishTestResults@2
     displayName: Publish test results
     condition: always()
@@ -218,22 +235,6 @@ jobs:
       testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
       buildConfiguration: $(BuildConfiguration)
       buildPlatform: $(AgentOsName)
-  - ${{ each artifact in parameters.artifacts }}:
-    - task: PublishBuildArtifacts@1
-      displayName: Upload artifacts from ${{ artifact.path }}
-      condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
-      continueOnError: true
-      inputs:
-        ${{ if eq(parameters.buildDirectory, '') }}:
-          pathtoPublish: ${{ artifact.path }}
-        ${{ if ne(parameters.buildDirectory, '') }}:
-          pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
-        ${{ if eq(artifact.name, '') }}:
-          artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
-        ${{ if ne(artifact.name, '') }}:
-          artifactName: ${{ artifact.name }}
-        artifactType: Container
-        parallel: true
 
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
     - task: MicroBuildCleanup@1

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,7 +16,7 @@
 /src/Middleware/                @tratcher @anurse
 /src/ProjectTemplates/          @ryanbrandenburg
 /src/Security/                  @tratcher @anurse
-/src/Servers/                   @tratcher @jkotalik @anurse
+/src/Servers/                   @tratcher @jkotalik @anurse @halter73
 /src/Middleware/Rewrite         @jkotalik @anurse
 /src/Middleware/HttpsPolicy     @jkotalik @anurse
 /src/SignalR/                   @mikaelm12 @BrennanConroy @halter73 @anurse