v7 preview 1

Servarr · Feb 17, 2022 · c876901 · c876901
1 parent d50e0fd
commit c876901
Showing 1 changed file with 9 additions and 12 deletions.
diff --git 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
+  default: v7.0.0-preview.1
 - name: aspBranch
   displayName: Tag for aspnetcore repository
   type: string
-  default: v6.0.0
+  default: v7.0.0-preview.1
 - name: sdkBranch
   displayName: Tag for sdk repository
   type: string
-  default: v6.0.100-rtm
+  default: v7.0.100-preview.1
 - name: installerBranch
   displayName: Tag for installer repository
   type: string
-  default: v6.0.100-rtm
+  default: v7.0.100-preview.1
 
 variables:
   runCounter: $[counter('runNumber', 1)]
@@ -45,11 +45,10 @@ resources:
 trigger:
   branches:
     include:
-    - master
-    - v6
+    - v7
 
 pr:
-- master
+- v7
 
 stages:
   - stage: Runtime
@@ -73,14 +72,12 @@ stages:
           - checkout: runtime
           - bash: |
               set -e
-              git -C runtime checkout ${{ parameters.runtimeBranch }}
-              git -C runtime cherry-pick -n 3633a7d0930abaca701385c1059b80ca157e98c6
-              git -C runtime cherry-pick -n 3e6d492bdf6fbf2d8af3871379f31dcc6e27716b
+              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: |
               source dotnet-bsd/common.sh
-              DOTNET_DOCKER_TAG=mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-11-20210917001307-f13d79e
+              get_runtime_docker
               echo $DOTNET_DOCKER_TAG
               calculate_build_id $(git -C runtime tag --points-at HEAD)
               echo $OFFICIALBUILDID
@@ -139,7 +136,7 @@ stages:
             submodules: true
           - bash: |
               set -e
-              git -C aspnetcore checkout ${{ parameters.aspBranch }}
+              git -C aspnetcore tag | grep ${{ parameters.aspBranch }} | xargs git -C aspnetcore checkout
               git -C aspnetcore submodule update --init
               sed -i '/linux-x64;/a \ \ \ \ \ \ freebsd-x64;' aspnetcore/Directory.Build.props
               sed -i '/<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-x64" \/>/a \ \ \ \ <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-x64" \/>' aspnetcore/eng/Dependencies.props