diff --git a/.gitignore b/.gitignore index bd16b97..6d417d1 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /dotnet-v6.0.123.tar.gz /dotnet-v6.0.124.tar.gz /dotnet-v6.0.125.tar.gz +/dotnet-v6.0.126.tar.gz diff --git a/arcade-no-apphost.patch b/arcade-no-apphost.patch index cec03a1..04507f9 100644 --- a/arcade-no-apphost.patch +++ b/arcade-no-apphost.patch @@ -1,15 +1,3 @@ -Index: a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj -=================================================================== ---- a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj -+++ b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj -@@ -5,6 +5,7 @@ - netcoreapp3.1 - latest - true -+ false - - - Index: a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj =================================================================== --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj diff --git a/dotnet6.0.spec b/dotnet6.0.spec index ccd639c..02e59ac 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.25 -%global runtime_version 6.0.25 +%global host_version 6.0.26 +%global runtime_version 6.0.26 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.125 +%global sdk_version 6.0.126 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -640,6 +640,9 @@ export COMPlus_LTTng=0 %changelog +* Tue Jan 09 2024 Omair Majid - 6.0.126-1 +- Update to .NET SDK 6.0.126 and Runtime 6.0.26 + * Wed Nov 15 2023 Omair Majid - 6.0.125-1 - Update to .NET SDK 6.0.125 and Runtime 6.0.25 diff --git a/sources b/sources index f02afff..b1ee76b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.125.tar.gz) = 276e1495416326c731b036a449a40cdb82c569ba0e3796436c3fb96f1ec2a7f9eb1ef2309aec7b014869e3607eab4ca21c2a1946da0b4fc5a16e0efdc4139f14 +SHA512 (dotnet-v6.0.126.tar.gz) = 1bdbf63069f62ab4b243be45b00724f79af99b4e97719ec45d0a5797bdaacebd40d311af34f22d3cf047de93087ca9b888d8fc57b84833ee4d9b92716ee34d29 diff --git a/update-release b/update-release index ef8091c..5725315 100755 --- a/update-release +++ b/update-release @@ -8,7 +8,7 @@ IFS=$'\n\t' print_usage() { echo " Usage:" - echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]" + echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]" } user_provided_tarball_name="" @@ -28,6 +28,11 @@ while [[ "$#" -gt 0 ]]; do print_usage exit 0 ;; + --release-json) + release_json="$2" + shift; + shift; + ;; --tarball) user_provided_tarball_name="$2" shift; @@ -61,28 +66,10 @@ fi host_version="$runtime_version" -if [[ "$runtime_version" == "3.1"* ]]; then - tag=v${sdk_version}-SDK -else +if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then tag=v${sdk_version} -fi - -if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then - echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball" else - if [[ -n "${user_provided_tarball_name}" ]]; then - cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then - cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then - cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then - cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - fi -fi - -if [[ ! -f "dotnet-${tag}.tar.gz" ]]; then - ./build-dotnet-tarball "${tag}" + tag=v${runtime_version} fi set -x @@ -91,14 +78,54 @@ sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%globa sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file" sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file" + +if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then + if [[ -f "dotnet-${tag}.tar.gz" ]]; then + echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" + else + if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then + echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball" + else + if [[ -n "${user_provided_tarball_name}" ]]; then + cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" + elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then + cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" + elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then + cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then + cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + fi + fi + + ./build-dotnet-tarball "${tag}" + fi +else + if [[ -f "dotnet-${tag}.tar.gz" ]]; then + echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" + elif [[ -n ${user_provided_tarball_name} ]]; then + cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz" + cp -a "${release_json}" release.json + else + rm -f release.json + spectool -g "$spec_file" + fi +fi + comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}" commit_message="$comment " for bug_id in "${bug_ids[@]}"; do - comment="$comment + if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then + comment="$comment - Resolves: RHBZ#$bug_id" - commit_message="$commit_message + commit_message="$commit_message Resolves: RHBZ#$bug_id" + else + comment="$comment +- Resolves: $bug_id" + commit_message="$commit_message +Resolves: $bug_id" + fi done echo "$commit_message" > git-commit-message