From e3ec6dc3ba1c30743479bdb29b49efd7fdac18d8 Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 11 Mar 2021 21:49:25 +0000 Subject: [PATCH 1/5] Build dotnet 6 --- azure-pipelines.yml | 45 ++++++++++++++++++++++++++++----------------- build.sh | 39 --------------------------------------- common.sh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 56 deletions(-) delete mode 100755 build.sh create mode 100755 common.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a9c34b1..c3e06cc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,16 +1,16 @@ parameters: - name: runtimeBranch - displayName: Branch for runtime repository + displayName: Tag for runtime repository type: string - default: v5.0.3 + default: v6.0.0-preview.1 - name: aspBranch - displayName: Branch for aspnetcore repository + displayName: Tag for aspnetcore repository type: string - default: v5.0.3 + default: v6.0.0-preview.1 - name: sdkBranch - displayName: Branch for installer repository + displayName: Tag for installer repository type: string - default: v5.0.103 + default: v6.0.100-preview.1 variables: runCounter: $[counter('runNumber', 1)] @@ -62,17 +62,24 @@ stages: - checkout: runtime - bash: | set -e - git -C runtime checkout ${{ parameters.runtimeBranch }} + git -C runtime tag | grep ${{ parameters.runtimeBranch }} | xargs git -C runtime checkout sed -i '/\/dnceng\/internal\//d' runtime/NuGet.config displayName: Checkout and patch - bash: | - DOTNET_DOCKER_TAG="mcr.microsoft.com/dotnet-buildtools/prereqs:$(curl -s https://raw.githubusercontent.com/dotnet/versions/master/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json | jq -r '.repos[0].images[] | select(.platforms[0].dockerfile | contains("freebsd/11")) | .platforms[0].simpleTags[0]')" + source dotnet-bsd/common.sh + get_runtime_docker echo $DOTNET_DOCKER_TAG - docker run -e ROOTFS_DIR=/crossrootfs/x64 -v ${BUILD_SOURCESDIRECTORY}/runtime:/runtime $DOTNET_DOCKER_TAG /runtime/build.sh -ci -c Release -cross -os freebsd /p:BuildNumberMajor=21102 /p:BuildNumberMinor=12 /p:OfficialBuildId=20210202.12 /p:IsEligibleForNgenOptimization=false + calculate_build_id $(git -C runtime tag --points-at HEAD) + echo $OFFICIALBUILDID + docker run -e ROOTFS_DIR=/crossrootfs/x64 -v ${BUILD_SOURCESDIRECTORY}/runtime:/runtime $DOTNET_DOCKER_TAG /runtime/eng/build.sh -ci -c Release -cross -os freebsd /p:IsEligibleForNgenOptimization=false /p:OfficialBuildId=$OFFICIALBUILDID displayName: Build Runtime - publish: '$(Build.SourcesDirectory)/runtime/artifacts/packages/Release/Shipping' artifact: RuntimePackages displayName: Publish Runtime + - publish: '$(Build.SourcesDirectory)/runtime/artifacts/logs' + artifact: RuntimeLogs + displayName: Publish Build Logs + - stage: AspNetCore dependsOn: Runtime @@ -87,12 +94,12 @@ stages: submodules: true - bash: | set -e - git -C aspnetcore checkout ${{ parameters.aspBranch }} + git -C aspnetcore tag | grep ${{ parameters.aspBranch }} | xargs git -C aspnetcore checkout sed -i '/linux-x64;/a \ \ \ \ \ \ freebsd-x64;' aspnetcore/Directory.Build.props sed -i '//a \ \ \ \ ' aspnetcore/eng/Dependencies.props dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name local --configfile aspnetcore/NuGet.config sed -i '/\/dnceng\/internal\//d' aspnetcore/NuGet.config - displayName: Apply patches + displayName: Checkout and patch - task: DownloadPipelineArtifact@2 inputs: buildType: 'current' @@ -102,11 +109,13 @@ stages: dotnet-runtime-*-freebsd-x64.tar.gz Microsoft.*.freebsd-x64.*.nupkg - bash: | - set -e + source dotnet-bsd/common.sh + calculate_build_id $(git -C aspnetcore tag --points-at HEAD) + echo $OFFICIALBUILDID ls -lR runtime mkdir -p aspnetcore/artifacts/obj/Microsoft.AspNetCore.App.Runtime cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-x64.tar.gz aspnetcore/artifacts/obj/Microsoft.AspNetCore.App.Runtime - aspnetcore/build.sh -c Release -ci --os-name freebsd -pack -nobl /p:CrossgenOutput=false /p:OfficialBuildId=$(date +%Y%m%d)-99 + aspnetcore/eng/build.sh -c Release -ci --os-name freebsd -pack -nobl /p:CrossgenOutput=false /p:OfficialBuildId=$OFFICIALBUILDID displayName: Build AspNetCore - publish: '$(Build.SourcesDirectory)/aspnetcore/artifacts/packages/Release/Shipping' artifact: AspNetCorePackages @@ -127,7 +136,7 @@ stages: - checkout: installer - bash: | set -e - git -C installer checkout ${{ parameters.sdkBranch }} + git -C installer tag | grep ${{ parameters.sdkBranch }} | xargs git -C installer checkout git -C installer apply ../dotnet-bsd/patches/installer/0001-freebsd-support.patch sed -i 's/NetCore5AppHostRids Include="@(NetCore31RuntimePackRids)/NetCore5AppHostRids Include="@(NetCore31RuntimePackRids);freebsd-x64/' installer/src/redist/targets/GenerateBundledVersions.targets sed -i 's/AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids)/AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);freebsd-x64/' installer/src/redist/targets/GenerateBundledVersions.targets @@ -136,7 +145,7 @@ stages: dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name runtime --configfile installer/NuGet.config dotnet nuget add source ../aspnetcore/artifacts/packages/Release/Shipping --name aspnetcore --configfile installer/NuGet.config sed -i '/\/dnceng\/internal\//d' installer/NuGet.config - displayName: Apply patches + displayName: Checkout and patch - task: DownloadPipelineArtifact@2 inputs: buildType: 'current' @@ -159,13 +168,15 @@ stages: targetPath: '$(Build.SourcesDirectory)/aspnetcore/artifacts/installers/Release' patterns: 'aspnetcore-runtime-*' - bash: | - set -e + source dotnet-bsd/common.sh + calculate_build_id $(git -C installer tag --points-at HEAD) + echo $OFFICIALBUILDID ls -lR runtime ls -lR aspnetcore mkdir -p installer/artifacts/obj/redist/Release/downloads/ cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-x64.tar.gz installer/artifacts/obj/redist/Release/downloads/ cp aspnetcore/artifacts/installers/Release/aspnetcore-runtime-* installer/artifacts/obj/redist/Release/downloads/ - installer/build.sh -c Release -ci -pack -nobl --runtime-id freebsd-x64 /p:OSName=freebsd /p:CrossgenOutput=false /p:OfficialBuildId=$(date +%Y%m%d)-99 /p:DISABLE_CROSSGEN=True /p:IncludeAspNetCoreRuntime=True + installer/build.sh -c Release -ci -pack -nobl --runtime-id freebsd-x64 /p:OSName=freebsd /p:CrossgenOutput=false /p:DISABLE_CROSSGEN=True /p:IncludeAspNetCoreRuntime=True /p:OfficialBuildId=$OFFICIALBUILDID displayName: Build Installer - publish: '$(Build.SourcesDirectory)/installer/artifacts/packages/Release/Shipping' artifact: Installer diff --git a/build.sh b/build.sh deleted file mode 100755 index 0a03e75..0000000 --- a/build.sh +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/bash - -set -e - -RUNTIMETAG=v5.0.3 -SDKTAG=v5.0.103 - -## Runtime -git clone --depth 1 --branch $RUNTIMETAG https://github.com/dotnet/runtime.git -sed -i '/\/dnceng\/internal\//d' runtime/NuGet.config - -DOTNET_DOCKER_TAG="mcr.microsoft.com/dotnet-buildtools/prereqs:$(curl -s https://raw.githubusercontent.com/dotnet/versions/master/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-master.json | jq -r '.repos[0].images[] | select(.platforms[0].dockerfile | contains("freebsd/11")) | .platforms[0].simpleTags[0]')" -docker run -e ROOTFS_DIR=/crossrootfs/x64 -v $(pwd)/runtime:/runtime $DOTNET_DOCKER_TAG /runtime/build.sh -c Release -cross -os freebsd - -## AspNetCore -git clone --recursive --depth 1 --branch $RUNTIMETAG https://github.com/dotnet/aspnetcore.git -git -C aspnetcore apply ../dotnet-bsd/patches/aspnetcore/0001-freebsd-support.patch -dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name runtime --configfile aspnetcore/NuGet.config -sed -i '/\/dnceng\/internal\//d' aspnetcore/NuGet.config - -mkdir -p aspnetcore/artifacts/obj/Microsoft.AspNetCore.App.Runtime -cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-5.*-freebsd-x64.tar.gz aspnetcore/artifacts/obj/Microsoft.AspNetCore.App.Runtime - -aspnetcore/build.sh -c Release -ci --os-name freebsd -pack -nobl /p:CrossgenOutput=false /p:OfficialBuildId=$(date +%Y%m%d)-99 - -## Installer -git clone --depth 1 --branch $SDKTAG https://github.com/dotnet/installer.git -git -C installer apply ../dotnet-bsd/patches/installer/0001-freebsd-support.patch -dotnet nuget remove source msbuild --configfile installer/NuGet.config -dotnet nuget remove source nuget-build --configfile installer/NuGet.config -dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name runtime --configfile installer/NuGet.config -dotnet nuget add source ../aspnetcore/artifacts/packages/Release/Shipping --name aspnetcore --configfile installer/NuGet.config -sed -i '/\/dnceng\/internal\//d' installer/NuGet.config - -mkdir -p installer/artifacts/obj/redist/Release/downloads/ -cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-x64.tar.gz installer/artifacts/obj/redist/Release/downloads/ -cp aspnetcore/artifacts/installers/Release/aspnetcore-runtime-* installer/artifacts/obj/redist/Release/downloads/ - -installer/build.sh -c Release -ci -pack -nobl --runtime-id freebsd-x64 /p:OSName=freebsd /p:CrossgenOutput=false /p:OfficialBuildId=$(date +%Y%m%d)-99 /p:DISABLE_CROSSGEN=True /p:IncludeAspNetCoreRuntime=True diff --git a/common.sh b/common.sh new file mode 100755 index 0000000..05ae23f --- /dev/null +++ b/common.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +set -e + +function calculate_build_id() +{ + local TAG=$1 + local REGEX='-preview\.[0-9]\.([0-9]{5})\.([0-9]{1,2})' + + if [[ $TAG =~ $REGEX ]] + then + local MAJOR=${BASH_REMATCH[1]} + local MINOR=${BASH_REMATCH[2]} + + YEAR=$((MAJOR / 1000 + 2000)) + MONTH=$(((MAJOR % 1000) / 50)) + DAY=$((MAJOR % 50)) + + DATE=$((YEAR * 10000 + MONTH * 100 + DAY)) + + OFFICIALBUILDID="${DATE}.${MINOR}" + else + OFFICIALBUILDID=$(date +%Y%m%d).99 + fi +} + +function get_runtime_docker() +{ + DOTNET_DOCKER_TAG="mcr.microsoft.com/dotnet-buildtools/prereqs:$(curl -s https://raw.githubusercontent.com/dotnet/versions/master/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json | jq -r '.repos[0].images[] | select(.platforms[0].dockerfile | contains("freebsd/11")) | .platforms[0].simpleTags[0]')" +} From 2e38363cbbf41a18ac834cadef2ae3fa7ef691d2 Mon Sep 17 00:00:00 2001 From: ta264 Date: Wed, 23 Jun 2021 18:29:47 +0100 Subject: [PATCH 2/5] Try to fix preview > 1 --- azure-pipelines.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c3e06cc..d21798b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,15 +2,15 @@ parameters: - name: runtimeBranch displayName: Tag for runtime repository type: string - default: v6.0.0-preview.1 + default: v6.0.0-preview.3 - name: aspBranch displayName: Tag for aspnetcore repository type: string - default: v6.0.0-preview.1 + default: v6.0.0-preview.3 - name: sdkBranch displayName: Tag for installer repository type: string - default: v6.0.100-preview.1 + default: v6.0.100-preview.3 variables: runCounter: $[counter('runNumber', 1)] @@ -63,6 +63,7 @@ stages: - bash: | set -e git -C runtime tag | grep ${{ parameters.runtimeBranch }} | xargs git -C runtime checkout + git -C runtime revert -n 6055dfa7ecb7628fdb2570d8897e83520f69f280 sed -i '/\/dnceng\/internal\//d' runtime/NuGet.config displayName: Checkout and patch - bash: | @@ -76,9 +77,9 @@ stages: - publish: '$(Build.SourcesDirectory)/runtime/artifacts/packages/Release/Shipping' artifact: RuntimePackages displayName: Publish Runtime - - publish: '$(Build.SourcesDirectory)/runtime/artifacts/logs' - artifact: RuntimeLogs - displayName: Publish Build Logs + # - publish: '$(Build.SourcesDirectory)/runtime/artifacts/logs' + # artifact: RuntimeLogs + # displayName: Publish Build Logs - stage: AspNetCore From a646514072248424115d90d02704bad907cef100 Mon Sep 17 00:00:00 2001 From: ta264 Date: Mon, 28 Jun 2021 21:08:21 +0000 Subject: [PATCH 3/5] Fix installer rid patch --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d21798b..d0b5415 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -139,8 +139,8 @@ stages: set -e git -C installer tag | grep ${{ parameters.sdkBranch }} | xargs git -C installer checkout git -C installer apply ../dotnet-bsd/patches/installer/0001-freebsd-support.patch - sed -i 's/NetCore5AppHostRids Include="@(NetCore31RuntimePackRids)/NetCore5AppHostRids Include="@(NetCore31RuntimePackRids);freebsd-x64/' installer/src/redist/targets/GenerateBundledVersions.targets - sed -i 's/AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids)/AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);freebsd-x64/' installer/src/redist/targets/GenerateBundledVersions.targets + sed -i 's/@(NetCore31RuntimePackRids);/@(NetCore31RuntimePackRids);freebsd-x64;/' installer/src/redist/targets/GenerateBundledVersions.targets + sed -i 's/@(AspNetCore31RuntimePackRids);/@(AspNetCore31RuntimePackRids);freebsd-x64;/' installer/src/redist/targets/GenerateBundledVersions.targets dotnet nuget remove source msbuild --configfile installer/NuGet.config || true dotnet nuget remove source nuget-build --configfile installer/NuGet.config || true dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name runtime --configfile installer/NuGet.config From 0ddb26738620e000fc8afc61aefb5ad63b855adf Mon Sep 17 00:00:00 2001 From: ta264 Date: Mon, 28 Jun 2021 21:08:27 +0000 Subject: [PATCH 4/5] Revert bad sdk commit --- azure-pipelines.yml | 77 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d0b5415..9c5107f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,6 +8,10 @@ parameters: type: string default: v6.0.0-preview.3 - name: sdkBranch + displayName: Tag for sdk repository + type: string + default: v6.0.100-preview.3 +- name: installerBranch displayName: Tag for installer repository type: string default: v6.0.100-preview.3 @@ -27,6 +31,11 @@ resources: endpoint: Servarr name: dotnet/aspnetcore ref: release/5.0 + - repository: sdk + type: github + endpoint: Servarr + name: dotnet/sdk + ref: release/5.0.1xx - repository: installer type: github endpoint: Servarr @@ -43,6 +52,7 @@ pr: stages: - stage: Runtime + dependsOn: [] pool: vmImage: 'ubuntu-20.04' @@ -72,14 +82,46 @@ stages: echo $DOTNET_DOCKER_TAG calculate_build_id $(git -C runtime tag --points-at HEAD) echo $OFFICIALBUILDID - docker run -e ROOTFS_DIR=/crossrootfs/x64 -v ${BUILD_SOURCESDIRECTORY}/runtime:/runtime $DOTNET_DOCKER_TAG /runtime/eng/build.sh -ci -c Release -cross -os freebsd /p:IsEligibleForNgenOptimization=false /p:OfficialBuildId=$OFFICIALBUILDID + docker run -e ROOTFS_DIR=/crossrootfs/x64 -v ${BUILD_SOURCESDIRECTORY}/runtime:/runtime $DOTNET_DOCKER_TAG /runtime/eng/build.sh -ci -c Release -cross -os freebsd /p:IsEligibleForNgenOptimization=false /p:OfficialBuildId=$OFFICIALBUILDID || true displayName: Build Runtime - publish: '$(Build.SourcesDirectory)/runtime/artifacts/packages/Release/Shipping' artifact: RuntimePackages displayName: Publish Runtime - # - publish: '$(Build.SourcesDirectory)/runtime/artifacts/logs' - # artifact: RuntimeLogs - # displayName: Publish Build Logs + - publish: '$(Build.SourcesDirectory)/runtime/artifacts/log' + condition: succeededOrFailed() + artifact: RuntimeLogs + displayName: Publish Build Logs + + - stage: Sdk + dependsOn: [] + + pool: + vmImage: 'ubuntu-20.04' + + jobs: + - job: Sdk + timeoutInMinutes: 0 + steps: + - checkout: self + - checkout: sdk + - bash: | + set -e + git -C sdk tag | grep ${{ parameters.sdkBranch }} | xargs git -C sdk checkout + git -C sdk revert -n 9a1e8af8667f9315b5c9a61aae3f5c07d467f37c -m 1 -Xours + displayName: Checkout and patch + - bash: | + source dotnet-bsd/common.sh + calculate_build_id $(git -C sdk tag --points-at HEAD) + echo $OFFICIALBUILDID + sdk/build.sh -c Release -pack -ci /p:OfficialBuildId=$OFFICIALBUILDID + displayName: Build SDK + - publish: '$(Build.SourcesDirectory)/sdk/artifacts/packages/Release/NonShipping/' + artifact: SdkPackages + displayName: Publish SDK + - publish: '$(Build.SourcesDirectory)/sdk/artifacts/log' + condition: succeededOrFailed() + artifact: SdkLogs + displayName: Publish Build Logs - stage: AspNetCore @@ -116,7 +158,7 @@ stages: ls -lR runtime mkdir -p aspnetcore/artifacts/obj/Microsoft.AspNetCore.App.Runtime cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-x64.tar.gz aspnetcore/artifacts/obj/Microsoft.AspNetCore.App.Runtime - aspnetcore/eng/build.sh -c Release -ci --os-name freebsd -pack -nobl /p:CrossgenOutput=false /p:OfficialBuildId=$OFFICIALBUILDID + aspnetcore/eng/build.sh -c Release -ci --os-name freebsd -pack /p:CrossgenOutput=false /p:OfficialBuildId=$OFFICIALBUILDID displayName: Build AspNetCore - publish: '$(Build.SourcesDirectory)/aspnetcore/artifacts/packages/Release/Shipping' artifact: AspNetCorePackages @@ -124,9 +166,16 @@ stages: - publish: '$(Build.SourcesDirectory)/aspnetcore/artifacts/installers/Release' artifact: AspNetCoreInstallers displayName: Publish AspNetCore Installers + - publish: '$(Build.SourcesDirectory)/aspnetcore/artifacts/log' + condition: succeededOrFailed() + artifact: AspNetCoreLogs + displayName: Publish Build Logs + - stage: Installer - dependsOn: AspNetCore + dependsOn: + - AspNetCore + - Sdk pool: vmImage: 'ubuntu-20.04' jobs: @@ -137,7 +186,7 @@ stages: - checkout: installer - bash: | set -e - git -C installer tag | grep ${{ parameters.sdkBranch }} | xargs git -C installer checkout + git -C installer tag | grep ${{ parameters.installerBranch }} | xargs git -C installer checkout git -C installer apply ../dotnet-bsd/patches/installer/0001-freebsd-support.patch sed -i 's/@(NetCore31RuntimePackRids);/@(NetCore31RuntimePackRids);freebsd-x64;/' installer/src/redist/targets/GenerateBundledVersions.targets sed -i 's/@(AspNetCore31RuntimePackRids);/@(AspNetCore31RuntimePackRids);freebsd-x64;/' installer/src/redist/targets/GenerateBundledVersions.targets @@ -168,6 +217,13 @@ stages: artifactName: AspNetCoreInstallers targetPath: '$(Build.SourcesDirectory)/aspnetcore/artifacts/installers/Release' patterns: 'aspnetcore-runtime-*' + - task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: SdkPackages + targetPath: '$(Build.SourcesDirectory)/sdk/artifacts/packages/Release/NonShipping/' + patterns: | + dotnet-toolset-internal-*.zip - bash: | source dotnet-bsd/common.sh calculate_build_id $(git -C installer tag --points-at HEAD) @@ -177,8 +233,13 @@ stages: mkdir -p installer/artifacts/obj/redist/Release/downloads/ cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-x64.tar.gz installer/artifacts/obj/redist/Release/downloads/ cp aspnetcore/artifacts/installers/Release/aspnetcore-runtime-* installer/artifacts/obj/redist/Release/downloads/ - installer/build.sh -c Release -ci -pack -nobl --runtime-id freebsd-x64 /p:OSName=freebsd /p:CrossgenOutput=false /p:DISABLE_CROSSGEN=True /p:IncludeAspNetCoreRuntime=True /p:OfficialBuildId=$OFFICIALBUILDID + cp sdk/artifacts/packages/Release/NonShipping/dotnet-toolset-internal-*.zip installer/artifacts/obj/redist/Release/downloads/ + installer/build.sh -c Release -ci -pack --runtime-id freebsd-x64 /p:OSName=freebsd /p:CrossgenOutput=false /p:DISABLE_CROSSGEN=True /p:IncludeAspNetCoreRuntime=True /p:OfficialBuildId=$OFFICIALBUILDID displayName: Build Installer - publish: '$(Build.SourcesDirectory)/installer/artifacts/packages/Release/Shipping' artifact: Installer displayName: Publish Installer + - publish: '$(Build.SourcesDirectory)/installer/artifacts/log' + condition: succeededOrFailed() + artifact: InstallerLogs + displayName: Publish Build Logs From aac923a26e062a9ea9c1db08457d75f0bf957e3e Mon Sep 17 00:00:00 2001 From: ta264 Date: Mon, 28 Jun 2021 22:44:22 +0000 Subject: [PATCH 5/5] Fix preview 5 --- azure-pipelines.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9c5107f..414ad1e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,19 +2,19 @@ parameters: - name: runtimeBranch displayName: Tag for runtime repository type: string - default: v6.0.0-preview.3 + default: v6.0.0-preview.5 - name: aspBranch displayName: Tag for aspnetcore repository type: string - default: v6.0.0-preview.3 + default: v6.0.0-preview.5 - name: sdkBranch displayName: Tag for sdk repository type: string - default: v6.0.100-preview.3 + default: v6.0.100-preview.5 - name: installerBranch displayName: Tag for installer repository type: string - default: v6.0.100-preview.3 + default: v6.0.100-preview.5 variables: runCounter: $[counter('runNumber', 1)] @@ -140,6 +140,7 @@ stages: git -C aspnetcore tag | grep ${{ parameters.aspBranch }} | xargs git -C aspnetcore checkout sed -i '/linux-x64;/a \ \ \ \ \ \ freebsd-x64;' aspnetcore/Directory.Build.props sed -i '//a \ \ \ \ ' aspnetcore/eng/Dependencies.props + sed -i 's/