Skip to content

Commit ba53c21

Browse files
authored
Merge pull request #10256 from debasishbsws/dotnet-6-pu
dotnet-6 package update to `6.0.125`
2 parents b7d4cff + c137535 commit ba53c21

6 files changed

+25
-444
lines changed

dotnet-6.yaml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: dotnet-6
3-
version: 6.0.123
3+
version: 6.0.125
44
epoch: 0
55
description: ".NET SDK, version 6"
66
target-architecture:
@@ -43,7 +43,7 @@ pipeline:
4343
with:
4444
repository: https://github.com/dotnet/installer
4545
tag: v${{package.version}}
46-
expected-commit: a33389fcc17c512c4ce21b1cf88863aa55e7307a
46+
expected-commit: e898a826c2b7f66602c8962134ef165fb9e6d44b
4747
destination: /home/build/installer
4848

4949
- working-directory: /home/build/installer
@@ -52,33 +52,33 @@ pipeline:
5252
5353
- working-directory: /home/build/src
5454
pipeline:
55-
- uses: patch
56-
with:
57-
patches: /home/build/build_14816-non-portable-build.patch
58-
- uses: patch
59-
with:
60-
patches: /home/build/build_14816-stop-overriding-aspnetcore-version.patch
61-
- uses: patch
62-
with:
63-
patches: /home/build/build_14816-update-portable-rid-logic.patch
64-
- uses: patch
65-
with:
66-
patches: /home/build/installer_14816-crossgen2-rid.patch
67-
- uses: patch
68-
with:
69-
patches: /home/build/installer_14816-update-portable-rid-logic.patch
7055
- runs: |
7156
sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime/eng/SourceBuild.props
7257
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
7358
./prep.sh --bootstrap
74-
- runs: |
75-
./build.sh --online --clean-while-building \
76-
-- \
77-
/v:n \
78-
/p:ContinueOnPrebuiltBaselineError=true \
79-
/p:MinimalConsoleLogOutput=false \
80-
/p:PrebuiltPackagesPath=/home/build/src/packages \
81-
/p:SkipPortableRuntimeBuild=true
59+
- assertions:
60+
required-steps: 1
61+
pipeline:
62+
- if: ${{build.arch}} == 'aarch64'
63+
runs: |
64+
./build.sh --online --clean-while-building \
65+
-- \
66+
/v:n \
67+
/p:ContinueOnPrebuiltBaselineError=true \
68+
/p:MinimalConsoleLogOutput=false \
69+
/p:PrebuiltPackagesPath=/home/build/src/packages \
70+
/p:SkipPortableRuntimeBuild=true \
71+
/p:TargetRid=linux-arm64
72+
- if: ${{build.arch}} == 'x86_64'
73+
runs: |
74+
./build.sh --online --clean-while-building \
75+
-- \
76+
/v:n \
77+
/p:ContinueOnPrebuiltBaselineError=true \
78+
/p:MinimalConsoleLogOutput=false \
79+
/p:PrebuiltPackagesPath=/home/build/src/packages \
80+
/p:SkipPortableRuntimeBuild=true \
81+
/p:TargetRid=linux-x64
8282
- runs: |
8383
mkdir -p "${{targets.destdir}}"/usr/share/dotnet
8484
mkdir -p "${{targets.destdir}}"/usr/bin

dotnet-6/build_14816-non-portable-build.patch

Lines changed: 0 additions & 208 deletions
This file was deleted.

dotnet-6/build_14816-stop-overriding-aspnetcore-version.patch

Lines changed: 0 additions & 69 deletions
This file was deleted.

dotnet-6/build_14816-update-portable-rid-logic.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)