Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions dotnet-6.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: dotnet-6
version: 6.0.123
version: 6.0.125
epoch: 0
description: ".NET SDK, version 6"
target-architecture:
Expand Down Expand Up @@ -43,7 +43,7 @@ pipeline:
with:
repository: https://github.com/dotnet/installer
tag: v${{package.version}}
expected-commit: a33389fcc17c512c4ce21b1cf88863aa55e7307a
expected-commit: e898a826c2b7f66602c8962134ef165fb9e6d44b
destination: /home/build/installer

- working-directory: /home/build/installer
Expand All @@ -52,33 +52,33 @@ pipeline:

- working-directory: /home/build/src
pipeline:
- uses: patch
with:
patches: /home/build/build_14816-non-portable-build.patch
- uses: patch
with:
patches: /home/build/build_14816-stop-overriding-aspnetcore-version.patch
- uses: patch
with:
patches: /home/build/build_14816-update-portable-rid-logic.patch
- uses: patch
with:
patches: /home/build/installer_14816-crossgen2-rid.patch
- uses: patch
with:
patches: /home/build/installer_14816-update-portable-rid-logic.patch
- runs: |
sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime/eng/SourceBuild.props
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
./prep.sh --bootstrap
- runs: |
./build.sh --online --clean-while-building \
-- \
/v:n \
/p:ContinueOnPrebuiltBaselineError=true \
/p:MinimalConsoleLogOutput=false \
/p:PrebuiltPackagesPath=/home/build/src/packages \
/p:SkipPortableRuntimeBuild=true
- assertions:
required-steps: 1
pipeline:
- if: ${{build.arch}} == 'aarch64'
runs: |
./build.sh --online --clean-while-building \
-- \
/v:n \
/p:ContinueOnPrebuiltBaselineError=true \
/p:MinimalConsoleLogOutput=false \
/p:PrebuiltPackagesPath=/home/build/src/packages \
/p:SkipPortableRuntimeBuild=true \
/p:TargetRid=linux-arm64
- if: ${{build.arch}} == 'x86_64'
runs: |
./build.sh --online --clean-while-building \
-- \
/v:n \
/p:ContinueOnPrebuiltBaselineError=true \
/p:MinimalConsoleLogOutput=false \
/p:PrebuiltPackagesPath=/home/build/src/packages \
/p:SkipPortableRuntimeBuild=true \
/p:TargetRid=linux-x64
- runs: |
mkdir -p "${{targets.destdir}}"/usr/share/dotnet
mkdir -p "${{targets.destdir}}"/usr/bin
Expand Down
208 changes: 0 additions & 208 deletions dotnet-6/build_14816-non-portable-build.patch

This file was deleted.

69 changes: 0 additions & 69 deletions dotnet-6/build_14816-stop-overriding-aspnetcore-version.patch

This file was deleted.

38 changes: 0 additions & 38 deletions dotnet-6/build_14816-update-portable-rid-logic.patch

This file was deleted.

Loading