From 6e56c72dc57d413f405b51e5daea731d278440d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 19:08:46 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/arcade build 20200330.5 (#20366) - 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 | 54 ++++++++++--- global.json | 4 +- 12 files changed, 136 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2aa2b1946eb..f8aaabfdc937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -328,17 +328,17 @@ https://github.com/dotnet/extensions 951d398e6addaab208efee2020752322f333c3e4 - + 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 70f5b6c1176c..dca4ad6e44fe 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 a23f895ba1c3..2cdd82d30df6 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 5042baebf11d..8484451f3a56 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 9db582f279ee..b7f61f9a2f1c 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 3c9bf106789f..9e5f3cb43c7e 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 285f1ccdb07e..1a91bbbc5a9a 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 79d3d355c7e5..d8fd2d82a68d 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 40a084f79698..fe95ab35aa5d 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 61488fd7679a..867f37cd8758 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 7be5b0bfad4e..fbab4cb5dce0 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,9 +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 }} + 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' @@ -211,10 +213,10 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview1_Publish' - channelName: '.NET 5 Preview 1' - akaMSChannelName: 'net5/preview1' - channelId: ${{ parameters.Net5Preview1ChannelId }} + stageName: 'Net5_Preview2_Publish' + channelName: '.NET 5 Preview 2' + akaMSChannelName: 'net5/preview2' + channelId: ${{ parameters.Net5Preview2ChannelId }} 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' @@ -225,10 +227,10 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview2_Publish' - channelName: '.NET 5 Preview 2' - akaMSChannelName: 'net5/preview2' - channelId: ${{ parameters.Net5Preview2ChannelId }} + 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' @@ -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 d9cf85287621..0d06f3d93bfb 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 435d2475c382f445a8a45a00171b57d3c6ee41a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 22:02:09 +0000 Subject: [PATCH 02/17] Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200331.3 (#20376) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.3.20181.3 - Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.3.20181.3 - Microsoft.CodeAnalysis.Razor - 5.0.0-preview.3.20181.3 - Microsoft.NET.Sdk.Razor - 5.0.0-preview.3.20181.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 f8aaabfdc937..2db4876a6f8e 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 - c1c501215e8be5830090a41fd4bd87135ce35923 + e0536845ee2eec39dede1b177d4f45c51297489d - + https://github.com/dotnet/aspnetcore-tooling - c1c501215e8be5830090a41fd4bd87135ce35923 + e0536845ee2eec39dede1b177d4f45c51297489d - + https://github.com/dotnet/aspnetcore-tooling - c1c501215e8be5830090a41fd4bd87135ce35923 + e0536845ee2eec39dede1b177d4f45c51297489d - + https://github.com/dotnet/aspnetcore-tooling - c1c501215e8be5830090a41fd4bd87135ce35923 + e0536845ee2eec39dede1b177d4f45c51297489d https://github.com/dotnet/efcore diff --git a/eng/Versions.props b/eng/Versions.props index dca4ad6e44fe..00fabd7ce185 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,10 +146,10 @@ 5.0.0-preview.3.20179.1 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20180.3 - 5.0.0-preview.3.20180.3 - 5.0.0-preview.3.20180.3 - 5.0.0-preview.3.20180.3 + 5.0.0-preview.3.20181.3 + 5.0.0-preview.3.20181.3 + 5.0.0-preview.3.20181.3 + 5.0.0-preview.3.20181.3 3.2.0-preview1.20067.1 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 - 5.0.0-preview.3.20180.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 - 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20179.1 - 5.0.0-preview.3.20179.1 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 + 5.0.0-preview.3.20181.2 - 5.0.0-preview.3.20181.3 - 5.0.0-preview.3.20181.3 - 5.0.0-preview.3.20181.3 - 5.0.0-preview.3.20181.3 + 5.0.0-preview.3.20181.4 + 5.0.0-preview.3.20181.4 + 5.0.0-preview.3.20181.4 + 5.0.0-preview.3.20181.4 - + https://github.com/dotnet/runtime - 38bef8c60e9483eeb16d85850ad6109c4bc47f5d + c39af4fc45c05e862815c34239b33de3b0259705 - + https://github.com/dotnet/runtime - 38bef8c60e9483eeb16d85850ad6109c4bc47f5d + c39af4fc45c05e862815c34239b33de3b0259705 - + https://github.com/dotnet/runtime - 38bef8c60e9483eeb16d85850ad6109c4bc47f5d + c39af4fc45c05e862815c34239b33de3b0259705 - + https://github.com/dotnet/extensions - 4582d69f2ae488869432b9fb661ec7b788060965 + 6d1dad26c4622fdb8b5fc226598748c06f5dd21f https://github.com/dotnet/arcade @@ -340,9 +340,9 @@ https://github.com/dotnet/arcade 7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd - + https://github.com/dotnet/roslyn - c9f2423cb5a2ab1ee8de0ef10e536d7672b1a2ea + 9250a5196fc3dbd251768a9c6e3e9b9489ac4993 \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 9bd476b8d8b5..241a65b1d9ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,79 +64,79 @@ 5.0.0-beta.20171.1 - 3.6.0-3.20177.6 + 3.6.0-3.20170.19 - 5.0.0-preview.3-runtime.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 + 5.0.0-preview.3-runtime.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 - 5.0.0-preview.3.20180.1 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 + 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20180.1 + 5.0.0-preview.3.20174.7 3.2.0-preview1.20067.1 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 - 5.0.0-preview.4.20180.4 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 + 5.0.0-preview.3.20175.7 5.0.0-preview.4.20181.1 5.0.0-preview.4.20181.1 @@ -146,10 +146,10 @@ 5.0.0-preview.4.20181.1 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20180.7 - 5.0.0-preview.4.20180.7 - 5.0.0-preview.4.20180.7 - 5.0.0-preview.4.20180.7 + 5.0.0-preview.3.20181.6 + 5.0.0-preview.3.20181.6 + 5.0.0-preview.3.20181.6 + 5.0.0-preview.3.20181.6 - 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20181.1 - 5.0.0-preview.4.20181.1 + 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.3.20181.6 5.0.0-preview.3.20181.6 From ca5cd91d6854a4ce941887cca6a1d04fa67d36be Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 1 Apr 2020 09:01:34 -0700 Subject: [PATCH 09/17] Replace RunTests scripts with .NET app (#20337) --- .../content/RunTests/Directory.Build.props | 2 + .../content/RunTests/Directory.Build.targets | 2 + eng/helix/content/RunTests/ProcessResult.cs | 20 ++ eng/helix/content/RunTests/ProcessUtil.cs | 158 ++++++++++++ eng/helix/content/RunTests/Program.cs | 235 ++++++++++++++++++ eng/helix/content/RunTests/RunTests.csproj | 11 + eng/helix/content/default.NuGet.config | 1 + eng/helix/content/runtests.cmd | 90 +------ eng/helix/content/runtests.sh | 84 +------ src/ProjectTemplates/test/Helpers/Project.cs | 14 +- 10 files changed, 444 insertions(+), 173 deletions(-) create mode 100644 eng/helix/content/RunTests/Directory.Build.props create mode 100644 eng/helix/content/RunTests/Directory.Build.targets create mode 100644 eng/helix/content/RunTests/ProcessResult.cs create mode 100644 eng/helix/content/RunTests/ProcessUtil.cs create mode 100644 eng/helix/content/RunTests/Program.cs create mode 100644 eng/helix/content/RunTests/RunTests.csproj diff --git a/eng/helix/content/RunTests/Directory.Build.props b/eng/helix/content/RunTests/Directory.Build.props new file mode 100644 index 000000000000..c1df2220ddc6 --- /dev/null +++ b/eng/helix/content/RunTests/Directory.Build.props @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/eng/helix/content/RunTests/Directory.Build.targets b/eng/helix/content/RunTests/Directory.Build.targets new file mode 100644 index 000000000000..c1df2220ddc6 --- /dev/null +++ b/eng/helix/content/RunTests/Directory.Build.targets @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/eng/helix/content/RunTests/ProcessResult.cs b/eng/helix/content/RunTests/ProcessResult.cs new file mode 100644 index 000000000000..9e293c02c805 --- /dev/null +++ b/eng/helix/content/RunTests/ProcessResult.cs @@ -0,0 +1,20 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace RunTests +{ + public class ProcessResult + { + public ProcessResult(string standardOutput, string standardError, int exitCode) + { + StandardOutput = standardOutput; + StandardError = standardError; + ExitCode = exitCode; + } + + public string StandardOutput { get; } + public string StandardError { get; } + public int ExitCode { get; } + } +} diff --git a/eng/helix/content/RunTests/ProcessUtil.cs b/eng/helix/content/RunTests/ProcessUtil.cs new file mode 100644 index 000000000000..8c25f9fb5db3 --- /dev/null +++ b/eng/helix/content/RunTests/ProcessUtil.cs @@ -0,0 +1,158 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +#nullable enable + +namespace RunTests +{ + public static class ProcessUtil + { + [DllImport("libc", SetLastError = true, EntryPoint = "kill")] + private static extern int sys_kill(int pid, int sig); + + public static async Task RunAsync( + string filename, + string arguments, + string? workingDirectory = null, + bool throwOnError = true, + IDictionary? environmentVariables = null, + Action? outputDataReceived = null, + Action? errorDataReceived = null, + Action? onStart = null, + CancellationToken cancellationToken = default) + { + Console.WriteLine($"Running '{filename} {arguments}'"); + using var process = new Process() + { + StartInfo = + { + FileName = filename, + Arguments = arguments, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + CreateNoWindow = true, + }, + EnableRaisingEvents = true + }; + + + if (workingDirectory != null) + { + process.StartInfo.WorkingDirectory = workingDirectory; + } + + if (environmentVariables != null) + { + foreach (var kvp in environmentVariables) + { + process.StartInfo.Environment.Add(kvp); + } + } + + var outputBuilder = new StringBuilder(); + process.OutputDataReceived += (_, e) => + { + if (e.Data != null) + { + if (outputDataReceived != null) + { + outputDataReceived.Invoke(e.Data); + } + else + { + outputBuilder.AppendLine(e.Data); + } + } + }; + + var errorBuilder = new StringBuilder(); + process.ErrorDataReceived += (_, e) => + { + if (e.Data != null) + { + if (errorDataReceived != null) + { + errorDataReceived.Invoke(e.Data); + } + else + { + errorBuilder.AppendLine(e.Data); + } + } + }; + + var processLifetimeTask = new TaskCompletionSource(); + + process.Exited += (_, e) => + { + Console.WriteLine($"'{process.StartInfo.FileName} {process.StartInfo.Arguments}' completed with exit code '{process.ExitCode}'"); + if (throwOnError && process.ExitCode != 0) + { + processLifetimeTask.TrySetException(new InvalidOperationException($"Command {filename} {arguments} returned exit code {process.ExitCode}")); + } + else + { + processLifetimeTask.TrySetResult(new ProcessResult(outputBuilder.ToString(), errorBuilder.ToString(), process.ExitCode)); + } + }; + + process.Start(); + onStart?.Invoke(process.Id); + + process.BeginOutputReadLine(); + process.BeginErrorReadLine(); + + var cancelledTcs = new TaskCompletionSource(); + await using var _ = cancellationToken.Register(() => cancelledTcs.TrySetResult(null)); + + var result = await Task.WhenAny(processLifetimeTask.Task, cancelledTcs.Task); + + if (result == cancelledTcs.Task) + { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + sys_kill(process.Id, sig: 2); // SIGINT + + var cancel = new CancellationTokenSource(); + + await Task.WhenAny(processLifetimeTask.Task, Task.Delay(TimeSpan.FromSeconds(5), cancel.Token)); + + cancel.Cancel(); + } + + if (!process.HasExited) + { + process.CloseMainWindow(); + + if (!process.HasExited) + { + process.Kill(); + } + } + } + + return await processLifetimeTask.Task; + } + + public static void KillProcess(int pid) + { + try + { + using var process = Process.GetProcessById(pid); + process?.Kill(); + } + catch (ArgumentException) { } + catch (InvalidOperationException) { } + } + } +} diff --git a/eng/helix/content/RunTests/Program.cs b/eng/helix/content/RunTests/Program.cs new file mode 100644 index 000000000000..1535d6663e7a --- /dev/null +++ b/eng/helix/content/RunTests/Program.cs @@ -0,0 +1,235 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.CommandLine; +using System.IO; +using System.Runtime.InteropServices; +using System.Threading.Tasks; + +namespace RunTests +{ + class Program + { + static async Task Main(string[] args) + { + var command = new RootCommand() + { + new Option( + aliases: new string[] { "--target", "-t" }, + description: "The test dll to run") + { Argument = new Argument(), Required = true }, + + new Option( + aliases: new string[] { "--sdk" }, + description: "The version of the sdk being used") + { Argument = new Argument(), Required = true }, + + new Option( + aliases: new string[] { "--runtime" }, + description: "The version of the runtime being used") + { Argument = new Argument(), Required = true }, + + new Option( + aliases: new string[] { "--queue" }, + description: "The name of the Helix queue being run on") + { Argument = new Argument(), Required = true }, + + new Option( + aliases: new string[] { "--arch" }, + description: "The architecture being run on") + { Argument = new Argument(), Required = true }, + + new Option( + aliases: new string[] { "--quarantined" }, + description: "Whether quarantined tests should run or not") + { Argument = new Argument(), Required = true }, + + new Option( + aliases: new string[] { "--ef" }, + description: "The version of the EF tool to use") + { Argument = new Argument(), Required = true }, + }; + + var parseResult = command.Parse(args); + var target = parseResult.ValueForOption("--target"); + var sdkVersion = parseResult.ValueForOption("--sdk"); + var runtimeVersion = parseResult.ValueForOption("--runtime"); + var helixQueue = parseResult.ValueForOption("--queue"); + var architecture = parseResult.ValueForOption("--arch"); + var quarantined = parseResult.ValueForOption("--quarantined"); + var efVersion = parseResult.ValueForOption("--ef"); + + var HELIX_WORKITEM_ROOT = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"); + + var path = Environment.GetEnvironmentVariable("PATH"); + var dotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT"); + + // Rename default.NuGet.config to NuGet.config if there is not a custom one from the project + // We use a local NuGet.config file to avoid polluting global machine state and avoid relying on global machine state + if (!File.Exists("NuGet.config")) + { + File.Copy("default.NuGet.config", "NuGet.config"); + } + + var environmentVariables = new Dictionary(); + environmentVariables.Add("PATH", path); + environmentVariables.Add("DOTNET_ROOT", dotnetRoot); + environmentVariables.Add("helix", helixQueue); + + Console.WriteLine($"Current Directory: {HELIX_WORKITEM_ROOT}"); + var helixDir = HELIX_WORKITEM_ROOT; + Console.WriteLine($"Setting HELIX_DIR: {helixDir}"); + environmentVariables.Add("HELIX_DIR", helixDir); + environmentVariables.Add("NUGET_FALLBACK_PACKAGES", helixDir); + var nugetRestore = Path.Combine(helixDir, "nugetRestore"); + Console.WriteLine($"Creating nuget restore directory: {nugetRestore}"); + environmentVariables.Add("NUGET_RESTORE", nugetRestore); + var dotnetEFFullPath = Path.Combine(nugetRestore, $"dotnet-ef/{efVersion}/tools/netcoreapp3.1/any/dotnet-ef.exe"); + Console.WriteLine($"Set DotNetEfFullPath: {dotnetEFFullPath}"); + environmentVariables.Add("DotNetEfFullPath", dotnetEFFullPath); + + Console.WriteLine("Checking for Microsoft.AspNetCore.App/"); + if (Directory.Exists("Microsoft.AspNetCore.App")) + { + Console.WriteLine($"Found Microsoft.AspNetCore.App/, copying to {dotnetRoot}/shared/Microsoft.AspNetCore.App/{runtimeVersion}"); + foreach (var file in Directory.EnumerateFiles("Microsoft.AspNetCore.App", "*.*", SearchOption.AllDirectories)) + { + File.Copy(file, $"{dotnetRoot}/shared/Microsoft.AspNetCore.App/{runtimeVersion}", overwrite: true); + } + + Console.WriteLine($"Adding current directory to nuget sources: {HELIX_WORKITEM_ROOT}"); + + await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + $"nuget add source {HELIX_WORKITEM_ROOT} --configfile NuGet.config", + environmentVariables: environmentVariables); + + await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + "nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config", + environmentVariables: environmentVariables); + + // Write nuget sources to console, useful for debugging purposes + await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + "nuget list source", + environmentVariables: environmentVariables, + outputDataReceived: Console.WriteLine, + errorDataReceived: Console.WriteLine); + + await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + $"tool install dotnet-ef --global --version {efVersion}", + environmentVariables: environmentVariables); + + // ';' is the path separator on Windows, and ':' on Unix + path += RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ";" : ":"; + path += $"{Environment.GetEnvironmentVariable("DOTNET_CLI_HOME")}/.dotnet/tools"; + environmentVariables["PATH"] = path; + } + + Directory.CreateDirectory(nugetRestore); + + // Rename default.runner.json to xunit.runner.json if there is not a custom one from the project + if (!File.Exists("xunit.runner.json")) + { + File.Copy("default.runner.json", "xunit.runner.json"); + } + + Console.WriteLine(); + Console.WriteLine("Displaying directory contents:"); + foreach (var file in Directory.EnumerateFiles("./")) + { + Console.WriteLine(Path.GetFileName(file)); + } + foreach (var file in Directory.EnumerateDirectories("./")) + { + Console.WriteLine(Path.GetFileName(file)); + } + Console.WriteLine(); + + // Run test discovery so we know if there are tests to run + var discoveryResult = await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + $"vstest {target} -lt", + environmentVariables: environmentVariables); + + if (discoveryResult.StandardOutput.Contains("Exception thrown")) + { + Console.WriteLine("Exception thrown during test discovery."); + Console.WriteLine(discoveryResult.StandardOutput); + Environment.Exit(1); + return; + } + + var exitCode = 0; + var commonTestArgs = $"vstest {target} --logger:xunit --logger:\"console;verbosity=normal\" --blame"; + if (quarantined) + { + Console.WriteLine("Running quarantined tests."); + + // Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md + var result = await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + commonTestArgs + " --TestCaseFilter:\"Quarantined=true\"", + environmentVariables: environmentVariables, + outputDataReceived: Console.WriteLine, + errorDataReceived: Console.WriteLine, + throwOnError: false); + + if (result.ExitCode != 0) + { + Console.WriteLine($"Failure in quarantined tests. Exit code: {result.ExitCode}."); + } + } + else + { + Console.WriteLine("Running non-quarantined tests."); + + // Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md + var result = await ProcessUtil.RunAsync($"{dotnetRoot}/dotnet", + commonTestArgs + " --TestCaseFilter:\"Quarantined!=true\"", + environmentVariables: environmentVariables, + outputDataReceived: Console.WriteLine, + errorDataReceived: Console.Error.WriteLine, + throwOnError: false); + + if (result.ExitCode != 0) + { + Console.WriteLine($"Failure in non-quarantined tests. Exit code: {result.ExitCode}."); + exitCode = result.ExitCode; + } + } + + // 'testResults.xml' is the file Helix looks for when processing test results + Console.WriteLine(); + if (File.Exists("TestResults/TestResults.xml")) + { + Console.WriteLine("Copying TestResults/TestResults.xml to ./testResults.xml"); + File.Copy("TestResults/TestResults.xml", "testResults.xml"); + } + else + { + Console.WriteLine("No test results found."); + } + + var HELIX_WORKITEM_UPLOAD_ROOT = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT"); + Console.WriteLine($"Copying artifacts/log/ to {HELIX_WORKITEM_UPLOAD_ROOT}/"); + if (Directory.Exists("artifacts/log")) + { + foreach (var file in Directory.EnumerateFiles("artifacts/log", "*.log", SearchOption.AllDirectories)) + { + // Combine the directory name + log name for the copied log file name to avoid overwriting duplicate test names in different test projects + var logName = $"{Path.GetFileName(Path.GetDirectoryName(file))}_{Path.GetFileName(file)}"; + Console.WriteLine($"Copying: {file} to {Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, logName)}"); + // Need to copy to HELIX_WORKITEM_UPLOAD_ROOT and HELIX_WORKITEM_UPLOAD_ROOT/../ in order for Azure Devops attachments to link properly and for Helix to store the logs + File.Copy(file, Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, logName)); + File.Copy(file, Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, "..", logName)); + } + } + else + { + Console.WriteLine("No logs found in artifacts/log"); + } + + Console.WriteLine("Completed Helix job."); + Environment.Exit(exitCode); + } + } +} diff --git a/eng/helix/content/RunTests/RunTests.csproj b/eng/helix/content/RunTests/RunTests.csproj new file mode 100644 index 000000000000..39f671c64108 --- /dev/null +++ b/eng/helix/content/RunTests/RunTests.csproj @@ -0,0 +1,11 @@ + + + + Exe + netcoreapp5.0 + + + + + + diff --git a/eng/helix/content/default.NuGet.config b/eng/helix/content/default.NuGet.config index ade663053533..3a9f6b327265 100644 --- a/eng/helix/content/default.NuGet.config +++ b/eng/helix/content/default.NuGet.config @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 18e47240edd6..d71ff1b6ceff 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -3,13 +3,9 @@ REM Need delayed expansion !PATH! so parens in the path don't mess up the parens setlocal enabledelayedexpansion REM Use '$' as a variable name prefix to avoid MSBuild variable collisions with these variables -set $target=%1 set $sdkVersion=%2 set $runtimeVersion=%3 -set $helixQueue=%4 set $arch=%5 -set $quarantined=%6 -set $efVersion=%7 set DOTNET_HOME=%HELIX_CORRELATION_PAYLOAD%\sdk set DOTNET_ROOT=%DOTNET_HOME%\%$arch% @@ -24,89 +20,11 @@ powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePo echo "Installing Runtime" powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %$arch% -Runtime dotnet -Version %$runtimeVersion% -InstallDir %DOTNET_ROOT%" -REM "Rename default.NuGet.config to NuGet.config if there is not a custom one from the project" -if not EXIST ".\NuGet.config" ( - copy default.NuGet.config NuGet.config -) - -echo "Checking for Microsoft.AspNetCore.App" -if EXIST ".\Microsoft.AspNetCore.App" ( - echo "Found Microsoft.AspNetCore.App, copying to %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%" - xcopy /i /y ".\Microsoft.AspNetCore.App" %DOTNET_ROOT%\shared\Microsoft.AspNetCore.App\%runtimeVersion%\ - - echo "Adding current directory to nuget sources: %HELIX_WORKITEM_ROOT%" - dotnet nuget add source %HELIX_WORKITEM_ROOT% --configfile NuGet.config - dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config - dotnet nuget list source - dotnet tool install dotnet-ef --global --version %$efVersion% - - set PATH=!PATH!;%DOTNET_CLI_HOME%\.dotnet\tools -) - -echo "Current Directory: %HELIX_WORKITEM_ROOT%" -set HELIX=%$helixQueue% -set HELIX_DIR=%HELIX_WORKITEM_ROOT% -set NUGET_FALLBACK_PACKAGES=%HELIX_DIR% -set NUGET_RESTORE=%HELIX_DIR%\nugetRestore -set DotNetEfFullPath=%HELIX_DIR%\nugetRestore\dotnet-ef\%$efVersion%\tools\netcoreapp3.1\any\dotnet-ef.exe -echo "Set DotNetEfFullPath: %DotNetEfFullPath%" -echo "Setting HELIX_DIR: %HELIX_DIR%" -echo Creating nuget restore directory: %NUGET_RESTORE% -mkdir %NUGET_RESTORE% -mkdir logs - -REM "Rename default.runner.json to xunit.runner.json if there is not a custom one from the project" -if not EXIST ".\xunit.runner.json" ( - copy default.runner.json xunit.runner.json -) - -dir - -%DOTNET_ROOT%\dotnet vstest %$target% -lt >discovered.txt -find /c "Exception thrown" discovered.txt -REM "ERRORLEVEL is not %ERRORLEVEL%" https://blogs.msdn.microsoft.com/oldnewthing/20080926-00/?p=20743/ -if not errorlevel 1 ( - echo Exception thrown during test discovery. 1>&2 - type discovered.txt 1>&2 - exit /b 1 -) - set exit_code=0 - -if %$quarantined%==True ( - set %$quarantined=true -) - -REM Disable "!Foo!" expansions because they break the filter syntax -setlocal disabledelayedexpansion -set NONQUARANTINE_FILTER="Quarantined!=true" -set QUARANTINE_FILTER="Quarantined=true" -if %$quarantined%==true ( - echo Running quarantined tests. - %DOTNET_ROOT%\dotnet vstest %$target% --logger:xunit --logger:"console;verbosity=normal" --blame --TestCaseFilter:%QUARANTINE_FILTER% - if errorlevel 1 ( - echo Failure in quarantined test 1>&2 - REM DO NOT EXIT and DO NOT SET EXIT_CODE to 1 - ) -) else ( - REM Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md - echo Running non-quarantined tests. - %DOTNET_ROOT%\dotnet vstest %$target% --logger:xunit --logger:"console;verbosity=normal" --blame --TestCaseFilter:%NONQUARANTINE_FILTER% - if errorlevel 1 ( - echo Failure in non-quarantined test 1>&2 - set exit_code=1 - REM DO NOT EXIT - ) -) - -echo "Copying TestResults\TestResults.xml to ." -copy TestResults\TestResults.xml testResults.xml -echo "Copying artifacts/logs to %HELIX_WORKITEM_UPLOAD_ROOT%\..\" -for /R artifacts/log %%f in (*.log) do ( - echo "Copying: %%f" - copy "%%f" %HELIX_WORKITEM_UPLOAD_ROOT%\..\ - copy "%%f" %HELIX_WORKITEM_UPLOAD_ROOT%\ +dotnet restore RunTests\RunTests.csproj --source https://api.nuget.org/v3/index.json --ignore-failed-sources +dotnet run --project RunTests\RunTests.csproj -- --target %1 --sdk %2 --runtime %3 --queue %4 --arch %5 --quarantined %6 --ef %7 +if errorlevel 1 ( + set exit_code=1 ) exit /b %exit_code% - diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 26a9f45339f7..a8665ab51c03 100755 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -1,12 +1,7 @@ #!/usr/bin/env bash -test_binary_path="$1" dotnet_sdk_version="$2" dotnet_runtime_version="$3" -helix_queue_name="$4" -target_arch="$5" -quarantined="$6" -efVersion="$7" RESET="\033[0m" RED="\033[0;31m" @@ -30,19 +25,6 @@ export DOTNET_CLI_HOME="$DIR/.home$RANDOM" export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 -# Used by SkipOnHelix attribute -export helix="$helix_queue_name" -export HELIX_DIR="$DIR" -export NUGET_FALLBACK_PACKAGES="$DIR" -export DotNetEfFullPath=$DIR\nugetRestore\dotnet-ef\$efVersion\tools\netcoreapp3.1\any\dotnet-ef.dll -echo "Set DotNetEfFullPath: $DotNetEfFullPath" -export NUGET_RESTORE="$DIR/nugetRestore" -echo "Creating nugetRestore directory: $NUGET_RESTORE" -mkdir $NUGET_RESTORE -mkdir logs - -ls -laR - RESET="\033[0m" RED="\033[0;31m" YELLOW="\033[0;33m" @@ -93,35 +75,6 @@ if [ $? -ne 0 ]; then done fi -# Rename default.NuGet.config to NuGet.config if there is not a custom one from the project -if [ ! -f "NuGet.config" ] -then - cp default.NuGet.config NuGet.config -fi - -# Copy over any local shared fx if found -if [ -d "Microsoft.AspNetCore.App" ] -then - echo "Found Microsoft.AspNetCore.App directory, copying to $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version." - cp -r Microsoft.AspNetCore.App $DOTNET_ROOT/shared/Microsoft.AspNetCore.App/$dotnet_runtime_version - - echo "Adding current directory to nuget sources: $DIR" - dotnet nuget add source $DIR --configfile NuGet.config - dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config - dotnet nuget list source - - dotnet tool install dotnet-ef --global --version $efVersion - - # Ensure tools are on on PATH - export PATH="$PATH:$DOTNET_CLI_HOME/.dotnet/tools" -fi - -# Rename default.runner.json to xunit.runner.json if there is not a custom one from the project -if [ ! -f "xunit.runner.json" ] -then - cp default.runner.json xunit.runner.json -fi - if [ -e /proc/self/coredump_filter ]; then # Include memory in private and shared file-backed mappings in the dump. # This ensures that we can see disassembly from our shared libraries when @@ -129,40 +82,11 @@ if [ -e /proc/self/coredump_filter ]; then echo -n 0x3F > /proc/self/coredump_filter fi +# dontet-install.sh seems to affect the Linux filesystem and causes test flakiness unless we sync the filesystem before running tests sync -$DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt -if grep -q "Exception thrown" discovered.txt; then - echo -e "${RED}Exception thrown during test discovery${RESET}". - cat discovered.txt - exit 1 -fi - exit_code=0 +$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --source https://api.nuget.org/v3/index.json --ignore-failed-sources +$DOTNET_ROOT/dotnet run --project RunTests/RunTests.csproj -- --target $1 --sdk $2 --runtime $3 --queue $4 --arch $5 --quarantined $6 --ef $7 -# Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md -NONQUARANTINE_FILTER="Quarantined!=true" -QUARANTINE_FILTER="Quarantined=true" -if [ "$quarantined" == true ]; then - echo "Running all tests including quarantined." - $DOTNET_ROOT/dotnet vstest $test_binary_path --logger:xunit --logger:"console;verbosity=normal" --blame --TestCaseFilter:"$QUARANTINE_FILTER" - if [ $? != 0 ]; then - echo "Quarantined tests failed!" 1>&2 - # DO NOT EXIT - fi -else - echo "Running non-quarantined tests." - $DOTNET_ROOT/dotnet vstest $test_binary_path --logger:xunit --logger:"console;verbosity=normal" --blame --TestCaseFilter:"$NONQUARANTINE_FILTER" - exit_code=$? - if [ $exit_code != 0 ]; then - echo "Non-quarantined tests failed!" 1>&2 - # DO NOT EXIT - fi -fi - -echo "Copying TestResults/TestResults to ." -cp TestResults/TestResults.xml testResults.xml -echo "Copying artifacts/logs to $HELIX_WORKITEM_UPLOAD_ROOT/" -cp `find . -name \*.log` $HELIX_WORKITEM_UPLOAD_ROOT/../ -cp `find . -name \*.log` $HELIX_WORKITEM_UPLOAD_ROOT/ -exit $exit_code +exit $? diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index 68642c48f462..64f21104c40d 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -27,11 +27,11 @@ public class Project public static bool IsCIEnvironment => typeof(Project).Assembly.GetCustomAttributes() .Any(a => a.Key == "ContinuousIntegrationBuild"); - public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HELIX_DIR"))) + public static string ArtifactsLogDir => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT"))) ? GetAssemblyMetadata("ArtifactsLogDir") - : Path.Combine(Environment.GetEnvironmentVariable("HELIX_DIR"), "logs"); - - public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DotNetEfFullPath"))) + : Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT"); + + public static string DotNetEfFullPath => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DotNetEfFullPath"))) ? typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes() .First(attribute => attribute.Key == "DotNetEfFullPath") .Value @@ -309,7 +309,7 @@ private async Task RestoreAsync(ITestOutputHelper output, string work internal async Task RunDotNetEfCreateMigrationAsync(string migrationName) { var args = $"--verbose --no-build migrations add {migrationName}"; - + // Only run one instance of 'dotnet new' at once, as a workaround for // https://github.com/aspnet/templating/issues/63 await DotNetNewLock.WaitAsync(); @@ -324,7 +324,7 @@ internal async Task RunDotNetEfCreateMigrationAsync(string migrationN { command = "dotnet-ef"; } - + var result = ProcessEx.Run(Output, TemplateOutputDir, command, args); await result.Exited; return result; @@ -353,7 +353,7 @@ internal async Task RunDotNetEfUpdateDatabaseAsync() { command = "dotnet-ef"; } - + var result = ProcessEx.Run(Output, TemplateOutputDir, command, args); await result.Exited; return result; From 15c486d8dc516464e2b5c7284dca7b76a050d430 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 16:32:36 +0000 Subject: [PATCH 10/17] [master] Update dependencies from dotnet/aspnetcore-tooling (#20393) * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200331.8 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.4.20181.8 - Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.4.20181.8 - Microsoft.CodeAnalysis.Razor - 5.0.0-preview.4.20181.8 - Microsoft.NET.Sdk.Razor - 5.0.0-preview.4.20181.8 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Abstractions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Memory - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.SqlServer - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Abstractions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Binder - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.CommandLine - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Ini - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Json - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Xml - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DiagnosticAdapter - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Composite - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Physical - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileSystemGlobbing - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting.Abstractions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Http - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Abstractions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Configuration - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Console - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Debug - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventSource - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventLog - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.TraceSource - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Testing - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.DataAnnotations - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Primitives - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Internal.Extensions.Refs - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Win32.Registry - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20180.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Win32.SystemEvents - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 5.0.0-preview.3-runtime.20180.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20180.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20180.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20180.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 5.0.0-preview.4.20180.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Net.Compilers.Toolset - 3.6.0-3.20177.6 (parent: Microsoft.Extensions.Logging) * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200401.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.4.20201.1 - Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.4.20201.1 - Microsoft.CodeAnalysis.Razor - 5.0.0-preview.4.20201.1 - Microsoft.NET.Sdk.Razor - 5.0.0-preview.4.20201.1 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Abstractions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Memory - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.SqlServer - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Abstractions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Binder - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.CommandLine - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Ini - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Json - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Xml - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DiagnosticAdapter - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Composite - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Physical - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileSystemGlobbing - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting.Abstractions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Http - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Abstractions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Configuration - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Console - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Debug - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventSource - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventLog - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.TraceSource - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Testing - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.DataAnnotations - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Primitives - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Internal.Extensions.Refs - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Win32.Registry - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.4.20201.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Win32.SystemEvents - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 5.0.0-preview.4-runtime.20201.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 5.0.0-preview.4.20201.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 5.0.0-preview.4.20201.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 5.0.0-preview.4.20201.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 5.0.0-preview.4.20201.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Net.Compilers.Toolset - 3.6.0-3.20177.6 (parent: Microsoft.Extensions.Logging) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 284 ++++++++++++++++++++-------------------- eng/Versions.props | 142 ++++++++++---------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b7532728064..54c6b6f9fb3d 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 - 191f37daed4cca323ad5bee7b4ee30a0b93d941b + 96c3140396e48633ddccf327129b55abde0b1b47 - + https://github.com/dotnet/aspnetcore-tooling - 191f37daed4cca323ad5bee7b4ee30a0b93d941b + 96c3140396e48633ddccf327129b55abde0b1b47 - + https://github.com/dotnet/aspnetcore-tooling - 191f37daed4cca323ad5bee7b4ee30a0b93d941b + 96c3140396e48633ddccf327129b55abde0b1b47 - + https://github.com/dotnet/aspnetcore-tooling - 191f37daed4cca323ad5bee7b4ee30a0b93d941b + 96c3140396e48633ddccf327129b55abde0b1b47 https://github.com/dotnet/efcore @@ -57,276 +57,276 @@ https://github.com/dotnet/efcore 7eac3aac8aa7956eb80c524409a075fb1efa1ada - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/runtime - c39af4fc45c05e862815c34239b33de3b0259705 + e1fa5d7648d46f067e265211fc2c695d409fe788 - + https://github.com/dotnet/extensions - 6d1dad26c4622fdb8b5fc226598748c06f5dd21f + 050d3aea0c8b18579c426d7ff2cb196953540327 https://github.com/dotnet/arcade @@ -340,9 +340,9 @@ https://github.com/dotnet/arcade 7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd - + https://github.com/dotnet/roslyn - 9250a5196fc3dbd251768a9c6e3e9b9489ac4993 + c9f2423cb5a2ab1ee8de0ef10e536d7672b1a2ea diff --git a/eng/Versions.props b/eng/Versions.props index 3f81b8432f82..cb0ea3d54af8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,79 +64,79 @@ 5.0.0-beta.20171.1 - 3.6.0-3.20170.19 + 3.6.0-3.20177.6 - 5.0.0-preview.3-runtime.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 + 5.0.0-preview.4-runtime.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.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 - 5.0.0-preview.3.20174.7 + 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.3.20174.7 + 5.0.0-preview.4.20201.1 3.2.0-preview1.20067.1 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 - 5.0.0-preview.3.20175.7 + 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.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.3.20181.6 - 5.0.0-preview.3.20181.6 - 5.0.0-preview.3.20181.6 - 5.0.0-preview.3.20181.6 + 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-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 a23f895ba1c3..2cdd82d30df6 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 5042baebf11d..8484451f3a56 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 9db582f279ee..b7f61f9a2f1c 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 3c9bf106789f..9e5f3cb43c7e 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 285f1ccdb07e..1a91bbbc5a9a 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 79d3d355c7e5..d8fd2d82a68d 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 40a084f79698..fe95ab35aa5d 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 61488fd7679a..867f37cd8758 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 7be5b0bfad4e..fbab4cb5dce0 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,9 +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 }} + 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' @@ -211,10 +213,10 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview1_Publish' - channelName: '.NET 5 Preview 1' - akaMSChannelName: 'net5/preview1' - channelId: ${{ parameters.Net5Preview1ChannelId }} + stageName: 'Net5_Preview2_Publish' + channelName: '.NET 5 Preview 2' + akaMSChannelName: 'net5/preview2' + channelId: ${{ parameters.Net5Preview2ChannelId }} 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' @@ -225,10 +227,10 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview2_Publish' - channelName: '.NET 5 Preview 2' - akaMSChannelName: 'net5/preview2' - channelId: ${{ parameters.Net5Preview2ChannelId }} + 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' @@ -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 d9cf85287621..0d06f3d93bfb 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 14/17] 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 5f6fed86e976..c030a87161e2 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 @@ public async Task StartsWithPortableAndBootstraperExe() } [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task DetectsOverriddenServer() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite); @@ -230,7 +229,6 @@ public async Task DetectsOverriddenServer() } [ConditionalFact] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task LogsStartupExceptionExitError() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite); @@ -709,7 +707,6 @@ public async Task StartupIsSuspendedWhenEventIsUsed() [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 @@ public async Task ExceptionIsLoggedToEventLogAndPutInResponseWhenDeveloperExcept [ConditionalFact] [RequiresNewHandler] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/20153")] public async Task ExceptionIsLoggedToEventLogAndPutInResponseWhenDeveloperExceptionPageIsEnabledViaWebConfig() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(); @@ -762,7 +758,6 @@ public async Task ExceptionIsLoggedToEventLogAndPutInResponseWhenDeveloperExcept [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 @@ public async Task ExceptionIsLoggedToEventLogAndPutInResponseDuringHostingStartu [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 @@ public async Task ExceptionIsNotLoggedToResponseWhenStartupHookIsDisabled() [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 15/17] 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 d5fa7c9f50b4..1abb14ed7bfe 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs @@ -424,7 +424,7 @@ public async Task OpenAPi_Add_URL_InvalidUrl() { 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 fb228eeb96f0..b8bf1cb8c3e5 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs @@ -106,7 +106,8 @@ private IDictionary> Downlo { 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 @@ public void Dispose() 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 @@ public class TestHttpResponseMessageWrapper : IHttpResponseMessageWrapper 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 @@ public TestHttpResponseMessageWrapper( 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 16/17] =?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 f425a55b2d4c..736b0458a641 100644 --- a/src/Hosting/TestHost/src/HttpContextBuilder.cs +++ b/src/Hosting/TestHost/src/HttpContextBuilder.cs @@ -115,10 +115,25 @@ async Task RunRequestAsync() // 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 @@ internal void ClientInitiatedAbort() 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 17/17] 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 152891101f62..429a59837e0f 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 c3b48cdf62c0..44e9615e25a0 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