From 61f4e674e5a6b1109f5a5620d406eba5ab5eb0ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 18:41:35 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/arcade build 20200330.5 (#20416) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20180.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20180.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20180.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 +-- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 79 +++++++++++++------ eng/common/pipeline-logging-functions.ps1 | 6 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 + eng/common/sdl/extract-artifact-packages.ps1 | 8 +- eng/common/sdl/init-sdl.ps1 | 6 +- eng/common/sdl/push-gdn.ps1 | 6 +- eng/common/sdl/run-sdl.ps1 | 8 +- .../templates/post-build/common-variables.yml | 6 +- .../templates/post-build/post-build.yml | 66 +++++++++++----- global.json | 4 +- 12 files changed, 142 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54c6b6f9fb..152891101f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -328,17 +328,17 @@ https://github.com/dotnet/extensions 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/arcade - 7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd + 09bb9d929120b402348c9a0e9c8c951e824059aa - + https://github.com/dotnet/arcade - 7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd + 09bb9d929120b402348c9a0e9c8c951e824059aa - + https://github.com/dotnet/arcade - 7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd + 09bb9d929120b402348c9a0e9c8c951e824059aa https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index cb0ea3d54a..c3b48cdf62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> - 5.0.0-beta.20171.1 + 5.0.0-beta.20180.5 3.6.0-3.20177.6 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index a23f895ba1..2cdd82d30d 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -2,15 +2,16 @@ usage() { - echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" + echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" - echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine" + echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." + echo " for FreeBSD can be: freebsd11 or freebsd12." + echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD" echo "--skipunmount - optional, will skip the unmount of rootfs folder." exit 1 } -__LinuxCodeName=xenial +__CodeName=xenial __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) __InitialDir=$PWD __BuildArch=arm @@ -53,6 +54,15 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" +__FreeBSDBase="12.1-RELEASE" +__FreeBSDPkg="1.10.5" +__FreeBSDPackages="libunwind" +__FreeBSDPackages+=" icu" +__FreeBSDPackages+=" libinotify" +__FreeBSDPackages+=" lttng-ust" +__FreeBSDPackages+=" llvm-90" +__FreeBSDPackages+=" krb5" + __UnprocessedBuildArgs= while :; do if [ $# -le 0 ]; then @@ -81,7 +91,7 @@ while :; do __BuildArch=armel __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" - __LinuxCodeName=jessie + __CodeName=jessie ;; x86) __BuildArch=x86 @@ -110,36 +120,36 @@ while :; do unset __LLDB_Package ;; trusty) # Ubuntu 14.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=trusty + if [ "$__CodeName" != "jessie" ]; then + __CodeName=trusty fi ;; xenial) # Ubuntu 16.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=xenial + if [ "$__CodeName" != "jessie" ]; then + __CodeName=xenial fi ;; zesty) # Ubuntu 17.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=zesty + if [ "$__CodeName" != "jessie" ]; then + __CodeName=zesty fi ;; bionic) # Ubuntu 18.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=bionic + if [ "$__CodeName" != "jessie" ]; then + __CodeName=bionic fi ;; jessie) # Debian 8 - __LinuxCodeName=jessie + __CodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" ;; stretch) # Debian 9 - __LinuxCodeName=stretch + __CodeName=stretch __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" ;; buster) # Debian 10 - __LinuxCodeName=buster + __CodeName=buster __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" ;; @@ -149,14 +159,22 @@ while :; do usage; exit 1; fi - __LinuxCodeName= + __CodeName= __UbuntuRepo= __Tizen=tizen ;; alpine) - __LinuxCodeName=alpine + __CodeName=alpine __UbuntuRepo= ;; + freebsd11) + __FreeBSDBase="11.3-RELEASE" + ;& + freebsd12) + __CodeName=freebsd + __BuildArch=x64 + __SkipUnmount=1 + ;; --skipunmount) __SkipUnmount=1 ;; @@ -192,7 +210,7 @@ if [ -d "$__RootfsDir" ]; then rm -rf $__RootfsDir fi -if [[ "$__LinuxCodeName" == "alpine" ]]; then +if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.9.1 __AlpineVersion=3.9 __ApkToolsDir=$(mktemp -d) @@ -218,9 +236,24 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then add $__AlpinePackagesEdgeTesting rm -r $__ApkToolsDir -elif [[ -n $__LinuxCodeName ]]; then - qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo - cp $__CrossDir/$__BuildArch/sources.list.$__LinuxCodeName $__RootfsDir/etc/apt/sources.list +elif [[ "$__CodeName" == "freebsd" ]]; then + mkdir -p $__RootfsDir/usr/local/etc + wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + # For now, ask for 11 ABI even on 12. This can be revisited later. + echo "ABI = \"FreeBSD:11:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf + echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf + mkdir -p $__RootfsDir/tmp + # get and build package manager + wget -O - https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf - + cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg} + ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make install + rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg} + # install packages we need. + $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update + $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages +elif [[ -n $__CodeName ]]; then + qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo + cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list chroot $__RootfsDir apt-get update chroot $__RootfsDir apt-get -f -y install chroot $__RootfsDir apt-get -y install $__UbuntuPackages @@ -230,7 +263,7 @@ elif [[ -n $__LinuxCodeName ]]; then umount $__RootfsDir/* fi - if [[ "$__BuildArch" == "arm" && "$__LinuxCodeName" == "trusty" ]]; then + if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then pushd $__RootfsDir patch -p1 < $__CrossDir/$__BuildArch/trusty.patch patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch diff --git a/eng/common/pipeline-logging-functions.ps1 b/eng/common/pipeline-logging-functions.ps1 index 5042baebf1..8484451f3a 100644 --- a/eng/common/pipeline-logging-functions.ps1 +++ b/eng/common/pipeline-logging-functions.ps1 @@ -67,12 +67,12 @@ function Write-PipelineTaskError { } if(($Type -ne 'error') -and ($Type -ne 'warning')) { - Write-Host $Message - return + Write-Host $Message + return } $PSBoundParameters.Remove('Force') | Out-Null if(-not $PSBoundParameters.ContainsKey('Type')) { - $PSBoundParameters.Add('Type', 'error') + $PSBoundParameters.Add('Type', 'error') } Write-LogIssue @PSBoundParameters } diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 9db582f279..b7f61f9a2f 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -33,6 +33,10 @@ try { $disableConfigureToolsetImport = $true $LASTEXITCODE = 0 + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true . $PSScriptRoot\..\tools.ps1 #Replace repo names to the format of org/repo diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 3c9bf10678..9e5f3cb43c 100644 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -6,10 +6,6 @@ param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 -# `tools.ps1` checks $ci to perform some actions. Since the post-build -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true $disableConfigureToolsetImport = $true function ExtractArtifacts { @@ -29,6 +25,10 @@ function ExtractArtifacts { } try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true . $PSScriptRoot\..\tools.ps1 $ExtractPackage = { diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 285f1ccdb0..1a91bbbc5a 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -12,6 +12,10 @@ Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true $LASTEXITCODE = 0 +# `tools.ps1` checks $ci to perform some actions. Since the SDL +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true . $PSScriptRoot\..\tools.ps1 # Don't display the console progress UI - it's a huge perf hit @@ -58,6 +62,6 @@ try { } catch { Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Sdl' -Message $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 } diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 index 79d3d355c7..d8fd2d82a6 100644 --- a/eng/common/sdl/push-gdn.ps1 +++ b/eng/common/sdl/push-gdn.ps1 @@ -12,6 +12,10 @@ $disableConfigureToolsetImport = $true $LASTEXITCODE = 0 try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true . $PSScriptRoot\..\tools.ps1 # We create the temp directory where we'll store the sdl-config repository @@ -62,4 +66,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'Sdl' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index 40a084f796..fe95ab35aa 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -16,6 +16,10 @@ $disableConfigureToolsetImport = $true $LASTEXITCODE = 0 try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true . $PSScriptRoot\..\tools.ps1 # We store config files in the r directory of .gdn @@ -64,6 +68,6 @@ try { } catch { Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Sdl' -Message $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 61488fd767..867f37cd87 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -9,8 +9,8 @@ variables: - name: PublicDevRelease_31_Channel_Id value: 128 - # .NET Core 5 Dev - - name: NetCore_5_Dev_Channel_Id + # .NET 5 Dev + - name: Net_5_Dev_Channel_Id value: 131 # .NET Eng - Validation @@ -96,4 +96,4 @@ variables: - name: skipComponentGovernanceDetection value: true - name: runCodesignValidationInjection - value: false \ No newline at end of file + value: false diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7be5b0bfad..fbab4cb5dc 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -27,7 +27,7 @@ parameters: # needs to be updated with the new channel ID NetEngLatestChannelId: 2 NetEngValidationChannelId: 9 - NetCoreDev5ChannelId: 131 + NetDev5ChannelId: 131 GeneralTestingChannelId: 529 NETCoreToolingDevChannelId: 548 NETCoreToolingReleaseChannelId: 549 @@ -35,8 +35,10 @@ parameters: NETCoreExperimentalChannelId: 562 NetEngServicesIntChannelId: 678 NetEngServicesProdChannelId: 679 - Net5Preview1ChannelId: 737 Net5Preview2ChannelId: 738 + Net5Preview3ChannelId: 739 + NetCoreSDK313xxChannelId: 759 + NetCoreSDK313xxInternalChannelId: 760 stages: - stage: Validate @@ -63,7 +65,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(InitialChannels)[$(PromoteToMaestroChannelId)]" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetCoreDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview1ChannelId}},${{parameters.Net5Preview2ChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview2ChannelId}},${{parameters.Net5Preview3ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} - job: displayName: NuGet Validation @@ -198,23 +200,9 @@ stages: publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} stageName: 'NetCore_Dev5_Publish' - channelName: '.NET Core 5 Dev' + channelName: '.NET 5 Dev' akaMSChannelName: 'net5/dev' - channelId: ${{ parameters.NetCoreDev5ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview1_Publish' - channelName: '.NET 5 Preview 1' - akaMSChannelName: 'net5/preview1' - channelId: ${{ parameters.Net5Preview1ChannelId }} + channelId: ${{ parameters.NetDev5ChannelId }} transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' @@ -233,6 +221,20 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview3_Publish' + channelName: '.NET 5 Preview 3' + akaMSChannelName: 'net5/preview3' + channelId: ${{ parameters.Net5Preview3ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -352,3 +354,29 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Publishing' + channelName: '.NET Core SDK 3.1.3xx' + channelId: ${{ parameters.NetCoreSDK313xxChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.3xx Internal' + channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index d9cf852876..0d06f3d93b 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20171.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20171.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20180.5", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20180.5" } } From bc140e8722fded9a28f27a2f5e99e86be88993ed Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 1 Apr 2020 12:26:02 -0700 Subject: [PATCH 02/10] Unskip IIS Tests (#20417) --- .../test/Common.FunctionalTests/Inprocess/StartupTests.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs index 5f6fed86e9..c030a87161 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs @@ -212,7 +212,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess } [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task DetectsOverriddenServer() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite); @@ -230,7 +229,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess } [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task LogsStartupExceptionExitError() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite); @@ -709,7 +707,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess [InlineData("DOTNET_ENVIRONMENT", "deVelopment")] [InlineData("ASPNETCORE_DETAILEDERRORS", "1")] [InlineData("ASPNETCORE_DETAILEDERRORS", "TRUE")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task ExceptionIsLoggedToEventLogAndPutInResponseWhenDeveloperExceptionPageIsEnabled(string environmentVariable, string value) { var deploymentParameters = Fixture.GetBaseDeploymentParameters(); @@ -734,7 +731,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess [ConditionalFact] [RequiresNewHandler] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task ExceptionIsLoggedToEventLogAndPutInResponseWhenDeveloperExceptionPageIsEnabledViaWebConfig() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(); @@ -762,7 +758,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess [RequiresNewHandler] [InlineData("ThrowInStartup")] [InlineData("ThrowInStartupGenericHost")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task ExceptionIsLoggedToEventLogAndPutInResponseDuringHostingStartupProcess(string startupType) { var deploymentParameters = Fixture.GetBaseDeploymentParameters(); @@ -785,7 +780,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess [ConditionalFact] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] [RequiresNewHandler] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task ExceptionIsNotLoggedToResponseWhenStartupHookIsDisabled() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(); @@ -808,7 +802,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess [ConditionalFact] [RequiresNewHandler] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task ExceptionIsLoggedToEventLogDoesNotWriteToResponse() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(); From 7d450bba80675838691f1a614acff21a969c135e Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 1 Apr 2020 12:52:33 -0700 Subject: [PATCH 03/10] OpenAPI Flaky fix (#20383) Don't use network in tests unless we have to --- .../test/OpenApiAddURLTests.cs | 2 +- .../test/OpenApiTestBase.cs | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs index d5fa7c9f50..1abb14ed7b 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs @@ -424,7 +424,7 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests { var project = CreateBasicProject(withOpenApi: false); - var app = GetApplication(realHttp: true); + var app = GetApplication(); var url = BrokenUrl; var run = app.Execute(new[] { "add", "url", url }); diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs index fb228eeb96..b8bf1cb8c3 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs @@ -106,7 +106,8 @@ namespace Microsoft.DotNet.OpenApi.Tests { PackageUrl, Tuple.Create(PackageUrlContent, null) }, { NoDispositionUrl, Tuple.Create(Content, null) }, { NoExtensionUrl, Tuple.Create(Content, noExtension) }, - { NoSegmentUrl, Tuple.Create(Content, justAttachments) } + { NoSegmentUrl, Tuple.Create(Content, justAttachments) }, + { BrokenUrl, null } }; } @@ -139,10 +140,14 @@ namespace Microsoft.DotNet.OpenApi.Tests public Task GetResponseAsync(string url) { var result = _results[url]; - byte[] byteArray = Encoding.ASCII.GetBytes(result.Item1); - var stream = new MemoryStream(byteArray); + MemoryStream stream = null; + if(result != null) + { + byte[] byteArray = Encoding.ASCII.GetBytes(result.Item1); + stream = new MemoryStream(byteArray); + } - return Task.FromResult(new TestHttpResponseMessageWrapper(stream, result.Item2)); + return Task.FromResult(new TestHttpResponseMessageWrapper(stream, result?.Item2)); } } @@ -154,7 +159,17 @@ namespace Microsoft.DotNet.OpenApi.Tests public bool IsSuccessCode() { - return true; + switch(StatusCode) + { + case HttpStatusCode.OK: + case HttpStatusCode.Created: + case HttpStatusCode.NoContent: + case HttpStatusCode.Accepted: + return true; + case HttpStatusCode.NotFound: + default: + return false; + } } private readonly ContentDispositionHeaderValue _contentDisposition; @@ -164,6 +179,10 @@ namespace Microsoft.DotNet.OpenApi.Tests ContentDispositionHeaderValue header) { Stream = Task.FromResult(stream); + if (header is null && stream is null) + { + StatusCode = HttpStatusCode.NotFound; + } _contentDisposition = header; } From f1145fb6d7f418b3f1987f94e9f457f8f4c2b18b Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 2 Apr 2020 09:02:09 +1300 Subject: [PATCH 04/10] =?UTF-8?q?Fix=20flaky=20ClientStreaming=5FResponseC?= =?UTF-8?q?ompletesWithoutResponseBody=E2=80=A6=20(#20338)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TestHost/src/HttpContextBuilder.cs | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/Hosting/TestHost/src/HttpContextBuilder.cs b/src/Hosting/TestHost/src/HttpContextBuilder.cs index f425a55b2d..736b0458a6 100644 --- a/src/Hosting/TestHost/src/HttpContextBuilder.cs +++ b/src/Hosting/TestHost/src/HttpContextBuilder.cs @@ -115,10 +115,25 @@ namespace Microsoft.AspNetCore.TestHost // This could throw an error if there was a pending server read. Needs to // happen before completing the response so the response returns the error. var requestBodyInProgress = RequestBodyReadInProgress(); + if (requestBodyInProgress) + { + // If request is still in progress then abort it. + CancelRequestBody(); + } // Matches Kestrel server: response is completed before request is drained await CompleteResponseAsync(); - await CompleteRequestAsync(requestBodyInProgress); + + if (!requestBodyInProgress) + { + // Writer was already completed in send request callback. + await _requestPipe.Reader.CompleteAsync(); + + // Don't wait for request to drain. It could block indefinitely. In a real server + // we would wait for a timeout and then kill the socket. + // Potential future improvement: add logging that the request timed out + } + _application.DisposeContext(_testContext, exception: null); } catch (Exception ex) @@ -165,24 +180,6 @@ namespace Microsoft.AspNetCore.TestHost CancelRequestBody(); } - private async Task CompleteRequestAsync(bool requestBodyInProgress) - { - if (requestBodyInProgress) - { - // If request is still in progress then abort it. - CancelRequestBody(); - } - else - { - // Writer was already completed in send request callback. - await _requestPipe.Reader.CompleteAsync(); - } - - // Don't wait for request to drain. It could block indefinitely. In a real server - // we would wait for a timeout and then kill the socket. - // Potential future improvement: add logging that the request timed out - } - private bool RequestBodyReadInProgress() { try From 96e69d3ae19255a128c888250707dacc1226a937 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 21:28:10 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200401.3 (#20423) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.4.20201.3 - Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.4.20201.3 - Microsoft.CodeAnalysis.Razor - 5.0.0-preview.4.20201.3 - Microsoft.NET.Sdk.Razor - 5.0.0-preview.4.20201.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 152891101f..429a59837e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/dotnet/blazor dd7fb4d3931d556458f62642c2edfc59f6295bfb - + https://github.com/dotnet/aspnetcore-tooling - 96c3140396e48633ddccf327129b55abde0b1b47 + d482750e964120c3cb65546aa9b5e278d2a885c6 - + https://github.com/dotnet/aspnetcore-tooling - 96c3140396e48633ddccf327129b55abde0b1b47 + d482750e964120c3cb65546aa9b5e278d2a885c6 - + https://github.com/dotnet/aspnetcore-tooling - 96c3140396e48633ddccf327129b55abde0b1b47 + d482750e964120c3cb65546aa9b5e278d2a885c6 - + https://github.com/dotnet/aspnetcore-tooling - 96c3140396e48633ddccf327129b55abde0b1b47 + d482750e964120c3cb65546aa9b5e278d2a885c6 https://github.com/dotnet/efcore diff --git a/eng/Versions.props b/eng/Versions.props index c3b48cdf62..44e9615e25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,10 +146,10 @@ 5.0.0-preview.4.20181.3 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.3 + 5.0.0-preview.4.20201.3 + 5.0.0-preview.4.20201.3 + 5.0.0-preview.4.20201.3 5.0.0-beta.20180.5 - 3.6.0-3.20177.6 + 3.6.0-3.20201.6 5.0.0-preview.4-runtime.20201.1 5.0.0-preview.4.20201.1 @@ -96,47 +96,47 @@ 3.2.0-preview1.20067.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 + 5.0.0-preview.4.20201.2 5.0.0-preview.4.20181.3 5.0.0-preview.4.20181.3 @@ -146,10 +146,10 @@ 5.0.0-preview.4.20181.3 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20201.3 - 5.0.0-preview.4.20201.3 - 5.0.0-preview.4.20201.3 - 5.0.0-preview.4.20201.3 + 5.0.0-preview.4.20201.4 + 5.0.0-preview.4.20201.4 + 5.0.0-preview.4.20201.4 + 5.0.0-preview.4.20201.4 - 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20181.3 - 5.0.0-preview.4.20181.3 + 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.1 + 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.4 5.0.0-preview.4.20201.4 From aa57a846101346e43ea8f455edc03f55739373e3 Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 1 Apr 2020 19:12:13 -0700 Subject: [PATCH 09/10] Run Helix Mac on more runs (#20424) --- eng/targets/Helix.Common.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index e77bcd8828..a5ec01a94f 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -22,6 +22,7 @@ + From 0518cb5107372d6057708837cec6650fb962d2b1 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 1 Apr 2020 22:14:41 -0700 Subject: [PATCH 10/10] Suppress a warning (#20390) - Suppress a warning - Clarify a comment --- .../Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj index 867dec8215..d53f7d01fe 100644 --- a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj +++ b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj @@ -10,6 +10,12 @@ + + +