From 17606b26eb7ab8647b427449d82e16c6695ce7e9 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Fri, 23 Aug 2024 17:05:22 +0200
Subject: [PATCH 1/4] Free some disk space in GitHub Actions
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Sanjam Panda <sanjam.panda@ibm.com>
---
.github/workflows/dotnet.yml | 36 +++++++++++++++++++++++++++++++++
.github/workflows/dotnet.yml.j2 | 6 ++++++
2 files changed, 42 insertions(+)
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 2c58c6b..c83f59c 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -24,6 +24,12 @@ jobs:
- arch: ppc64le
isV6: true
steps:
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
@@ -59,6 +65,12 @@ jobs:
- arch: ppc64le
isV6: true
steps:
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
@@ -98,6 +110,12 @@ jobs:
- arch: ppc64le
isV6: true
steps:
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
@@ -137,6 +155,12 @@ jobs:
- arch: ppc64le
isV6: true
steps:
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
@@ -176,6 +200,12 @@ jobs:
- arch: ppc64le
isV6: true
steps:
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
@@ -211,6 +241,12 @@ jobs:
arch: [x64]
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
steps:
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
diff --git a/.github/workflows/dotnet.yml.j2 b/.github/workflows/dotnet.yml.j2
index e25cd81..98bab08 100644
--- a/.github/workflows/dotnet.yml.j2
+++ b/.github/workflows/dotnet.yml.j2
@@ -38,6 +38,12 @@ EXEC : error : Failed to load assembly 'System.Private.CoreLib'
{%- set image -%}ghcr.io/ibm/dotnet-{% raw %}${{ matrix.arch }}{% endraw %}-toolchain:latest{%- endset %}
{%- set init_steps -%}
+ - name: Show free disk space
+ run: df -h
+ - name: Free some disk space
+ run: rm -r /opt/hostedtoolcache
+ - name: Show free disk space
+ run: df -h
- name: Configure git
run: git config --global user.email iii@linux.ibm.com &&
git config --global user.name "dotnet-s390x bot"
From a5ca48b3bbfab55e10dab8074e8025be594dbb3a Mon Sep 17 00:00:00 2001
From: saitama951 <sanjamkumar360@gmail.com>
Date: Wed, 28 Aug 2024 06:03:28 +0000
Subject: [PATCH 2/4] Enable .NET 10 Support
Signed-off-by: saitama951 <sanjamkumar360@gmail.com>
Signed-off-by: Sanjam Panda <sanjam.panda@ibm.com>
---
dotnet-bump | 2 +-
dotnet-daily@.service | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 dotnet-daily@.service
diff --git a/dotnet-bump b/dotnet-bump
index f958313..2c9c4e8 100755
--- a/dotnet-bump
+++ b/dotnet-bump
@@ -48,7 +48,7 @@ function echo_property {
fi
}
-platform=9.0.1xx
+platform=10.0.1xx
while [ $# -gt 0 ]; do
case "$1" in
--platform)
diff --git a/dotnet-daily@.service b/dotnet-daily@.service
deleted file mode 100644
index fd11279..0000000
--- a/dotnet-daily@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Service]
-User=%I
-Type=oneshot
-ExecStart=-/usr/bin/rm -r /tmp/dotnet-s390x
-ExecStart=/usr/bin/git clone git@github.ibm.com:ztoolchain/dotnet-s390x.git /tmp/dotnet-s390x
-ExecStart=-/tmp/dotnet-s390x/dotnet-daily --platform 7.0.1xx
-ExecStart=/usr/bin/git -C /tmp/dotnet-s390x checkout origin/master
-ExecStart=-/tmp/dotnet-s390x/dotnet-daily --platform 8.0.1xx
-ExecStart=/usr/bin/git -C /tmp/dotnet-s390x checkout origin/master
-ExecStart=-/tmp/dotnet-s390x/dotnet-daily --platform 9.0.1xx
From f63d3c2855f13f8aae39a0429c480f8c897dd370 Mon Sep 17 00:00:00 2001
From: Sanjam Panda <sanjam.panda@ibm.com>
Date: Thu, 2 Jan 2025 16:52:54 +0000
Subject: [PATCH 3/4] add dependency file
Signed-off-by: Sanjam Panda <sanjam.panda@ibm.com>
---
aspnetcore | 2 +-
docker/image/Dockerfile | 1 +
dotnet-versions | 76 ++++++++++++++++++++---------------------
msbuild | 2 +-
roslyn | 2 +-
runtime | 2 +-
sdk | 2 +-
templating | 2 +-
8 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/aspnetcore b/aspnetcore
index 36332c8..ad57bd0 160000
--- a/aspnetcore
+++ b/aspnetcore
@@ -1 +1 @@
-Subproject commit 36332c8183f0205ec098822545dbe65d17d93405
+Subproject commit ad57bd06853f24e06bfe2672a2053fd7193dc17b
diff --git a/docker/image/Dockerfile b/docker/image/Dockerfile
index 30e3759..1241391 100644
--- a/docker/image/Dockerfile
+++ b/docker/image/Dockerfile
@@ -39,6 +39,7 @@ RUN apt-get update && \
apt-get install --no-install-recommends --yes \
binutils-multiarch \
clang-$llvm_version \
+ file \
gawk \
git \
jq \
diff --git a/dotnet-versions b/dotnet-versions
index d023ba3..bddac4f 100644
--- a/dotnet-versions
+++ b/dotnet-versions
@@ -1,45 +1,45 @@
-sdk_version=9.0.100-rc.2.24422.24
-sdk_version_prefix=9.0.100
-sdk_version_suffix=rc.2.24422.24
-sdk_major_version=9
+sdk_version=10.0.100-alpha.1.25052.3
+sdk_version_prefix=10.0.100
+sdk_version_suffix=alpha.1.25052.3
+sdk_major_version=10
sdk_minor_version=0
-sdk_build_id=20240822.24
-runtime_version=9.0.0-rc.2.24422.6
-runtime_version_prefix=9.0.0
-runtime_version_suffix=rc.2.24422.6
-runtime_major_version=9
+sdk_build_id=20250102.3
+runtime_version=10.0.0-alpha.1.24631.2
+runtime_version_prefix=10.0.0
+runtime_version_suffix=alpha.1.24631.2
+runtime_major_version=10
runtime_minor_version=0
-runtime_build_id=20240822.6
-msbuild_version=17.12.0-preview-24421-01
-msbuild_version_prefix=17.12.0
-msbuild_version_suffix=preview-24421-01
+runtime_build_id=20241231.2
+msbuild_version=17.14.0-preview-24624-01
+msbuild_version_prefix=17.14.0
+msbuild_version_suffix=preview-24624-01
msbuild_major_version=17
-msbuild_minor_version=12
-msbuild_build_id=20240821.01
-roslyn_version=4.12.0-2.24421.9
-roslyn_version_prefix=4.12.0
-roslyn_version_suffix=2.24421.9
+msbuild_minor_version=14
+msbuild_build_id=20241224.01
+roslyn_version=4.13.0-3.24629.5
+roslyn_version_prefix=4.13.0
+roslyn_version_suffix=3.24629.5
roslyn_major_version=4
-roslyn_minor_version=12
-roslyn_build_id=20240821.9
-aspnetcore_version=9.0.0-rc.2.24420.12
-aspnetcore_version_prefix=9.0.0
-aspnetcore_version_suffix=rc.2.24420.12
-aspnetcore_major_version=9
+roslyn_minor_version=13
+roslyn_build_id=20241229.5
+aspnetcore_version=10.0.0-alpha.2.24627.1
+aspnetcore_version_prefix=10.0.0
+aspnetcore_version_suffix=alpha.2.24627.1
+aspnetcore_major_version=10
aspnetcore_minor_version=0
-aspnetcore_build_id=20240820.12
-aspnetcore_internal_version=9.0.0-rc.2.24420.12
-aspnetcore_internal_version_prefix=9.0.0
-aspnetcore_internal_version_suffix=rc.2.24420.12
-aspnetcore_internal_major_version=9
+aspnetcore_build_id=20241227.1
+aspnetcore_internal_version=10.0.0-alpha.2.24627.1
+aspnetcore_internal_version_prefix=10.0.0
+aspnetcore_internal_version_suffix=alpha.2.24627.1
+aspnetcore_internal_major_version=10
aspnetcore_internal_minor_version=0
-aspnetcore_internal_build_id=20240820.12
-templating_version=9.0.100-rc.2.24421.3
-templating_version_prefix=9.0.100
-templating_version_suffix=rc.2.24421.3
-templating_major_version=9
+aspnetcore_internal_build_id=20241227.1
+templating_version=10.0.100-alpha.1.24629.1
+templating_version_prefix=10.0.100
+templating_version_suffix=alpha.1.24629.1
+templating_major_version=10
templating_minor_version=0
-templating_build_id=20240821.3
-aspnetcore_transport_version=9.0.0-rc.1.24419.2
-aspnetcore_runtime_version=9.0.0-rc.1.24419.2
-runtime_version_label=rc
+templating_build_id=20241229.1
+aspnetcore_transport_version=10.0.0-alpha.1.24619.8
+aspnetcore_runtime_version=10.0.0-alpha.1.24619.8
+runtime_version_label=alpha
diff --git a/msbuild b/msbuild
index c07c23b..0fe373a 160000
--- a/msbuild
+++ b/msbuild
@@ -1 +1 @@
-Subproject commit c07c23be2d07a7f65f3696ec6b7398b702aec2b9
+Subproject commit 0fe373a11daeafd2d684fe886abdaa5012ea5a92
diff --git a/roslyn b/roslyn
index 08a167c..98ea496 160000
--- a/roslyn
+++ b/roslyn
@@ -1 +1 @@
-Subproject commit 08a167c19e5e04742b0922bdb1ea8046e9364f4b
+Subproject commit 98ea496177bc8e607dbf454abd6b5a5e4678aed2
diff --git a/runtime b/runtime
index 7384dc4..511d266 160000
--- a/runtime
+++ b/runtime
@@ -1 +1 @@
-Subproject commit 7384dc4b40071052d38fef092cefca9f66d3df65
+Subproject commit 511d26611c051c56e546404ea616c220cc78817c
diff --git a/sdk b/sdk
index 4b123a7..0af663a 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 4b123a7034c25bbabca8b0a0c229ceff487b5272
+Subproject commit 0af663a4a6ac3a983708a960cb0b1d5b43af0010
diff --git a/templating b/templating
index 2566cad..f413312 160000
--- a/templating
+++ b/templating
@@ -1 +1 @@
-Subproject commit 2566cadcab2370e97fddf82f9af20e302b7d108c
+Subproject commit f413312269957c4e8a5a839304ffac2fe2bf178a
From 134483986b163261a55446186649ea2cbb6c6beb Mon Sep 17 00:00:00 2001
From: Sanjam Panda <sanjam.panda@ibm.com>
Date: Mon, 6 Jan 2025 12:38:05 +0000
Subject: [PATCH 4/4] add 'file' tool dependency
---
docker/image/Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/docker/image/Dockerfile b/docker/image/Dockerfile
index 5934fce..d5f721c 100644
--- a/docker/image/Dockerfile
+++ b/docker/image/Dockerfile
@@ -40,6 +40,7 @@ RUN apt-get update && \
binutils-multiarch \
clang-$llvm_version \
cpio \
+ file \
gawk \
git \
jq \