Update to .NET SDK 6.0.114 and Runtime 6.0.14
Resolves: RHBZ#2166767
This commit is contained in:
Omair Majid
parent
e2eef68845
commit
6126f6afd0
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@
|
||||
/dotnet-v6.0.111.tar.gz
|
||||
/dotnet-v6.0.112.tar.gz
|
||||
/dotnet-v6.0.113.tar.gz
|
||||
/dotnet-v6.0.114.tar.gz
|
||||
|
||||
@ -124,21 +124,19 @@ if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
|
||||
git submodule update --init --recursive
|
||||
clean_dotnet_cache
|
||||
mkdir -p "../${unmodified_tarball_name}"
|
||||
./build.sh /p:ArcadeBuildTarball=true /p:TarballDir="$(readlink -f ../"${unmodified_tarball_name}")"
|
||||
./build.sh /p:ArcadeBuildTarball=true
|
||||
mv artifacts/packages/Debug/Shipping/dotnet-sdk-source-6.*.tar.gz \
|
||||
../../"${unmodified_tarball_name}.tar.gz"
|
||||
popd
|
||||
|
||||
popd
|
||||
|
||||
tar cf "${unmodified_tarball_name}.tar.gz" -C "${temp_dir}" "${unmodified_tarball_name}"
|
||||
|
||||
rm -rf "${temp_dir}"
|
||||
fi
|
||||
|
||||
rm -rf "${tarball_name}"
|
||||
tar xf "${unmodified_tarball_name}.tar.gz"
|
||||
mv "${unmodified_tarball_name}" "${tarball_name}"
|
||||
|
||||
mkdir -p "${tarball_name}"
|
||||
pushd "${tarball_name}"
|
||||
tar xf ../"${unmodified_tarball_name}.tar.gz"
|
||||
|
||||
if [[ ${build_bootstrap} == true ]]; then
|
||||
if [[ "$(wc -l < packages/archive/archiveArtifacts.txt)" != 1 ]]; then
|
||||
|
||||
@ -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.13
|
||||
%global runtime_version 6.0.13
|
||||
%global host_version 6.0.14
|
||||
%global runtime_version 6.0.14
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 6.0.113
|
||||
%global sdk_version 6.0.114
|
||||
%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 }')
|
||||
@ -110,8 +110,6 @@ Patch1001: msbuild-no-systemconfiguration.patch
|
||||
|
||||
# Disable telemetry by default; make it opt-in
|
||||
Patch1500: sdk-telemetry-optout.patch
|
||||
# https://github.com/dotnet/sdk/pull/22373
|
||||
Patch1501: sdk-22373-portablerid.patch
|
||||
|
||||
|
||||
|
||||
@ -409,7 +407,6 @@ popd
|
||||
|
||||
pushd src/sdk
|
||||
%patch1500 -p1
|
||||
%patch1501 -p1
|
||||
popd
|
||||
|
||||
pushd src/installer
|
||||
@ -612,6 +609,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 16 2023 Omair Majid <omajid@redhat.com> - 6.0.114-2
|
||||
- Update to .NET SDK 6.0.114 and Runtime 6.0.14
|
||||
- Resolves: RHBZ#2166767
|
||||
|
||||
* Wed Jan 11 2023 Omair Majid <omajid@redhat.com> - 6.0.113-2
|
||||
- Update to .NET SDK 6.0.113 and Runtime 6.0.13
|
||||
- Resolves: RHBZ#2154457
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Usage:
|
||||
# ./rename-tarball original-name.tar.gz new-name.tar.gz
|
||||
#
|
||||
# The generated new-name.tar.gz will always have a single main
|
||||
# directory (named new-name to match the tarball name) in the archive.
|
||||
# If the original tarball had multiple files in the main directory of
|
||||
# the archive, all those files will be moved to under the new main
|
||||
# directory.
|
||||
|
||||
set -euo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
positional_args=()
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
arg="${1}"
|
||||
case "${arg}" in
|
||||
-h|--help)
|
||||
print_usage
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
positional_args+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z "${positional_args[0]:-}" ]]; then
|
||||
echo "error: missing original tarball name"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
original_path=$(readlink -f "${positional_args[0]:-}")
|
||||
original_name=$(basename "$original_path")
|
||||
|
||||
new_name=${positional_args[1]:-}
|
||||
if [[ -z ${new_name} ]]; then
|
||||
echo "error: missing new tarball name"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
original_name=${original_name/%.tar.gz}
|
||||
new_name=${new_name/.tar.gz}
|
||||
|
||||
echo "Original: ${original_name}.tar.gz"
|
||||
echo "New name: ${new_name}.tar.gz"
|
||||
|
||||
rm -rf "temp-${new_name}"
|
||||
mkdir "temp-${new_name}"
|
||||
pushd "temp-${new_name}" > /dev/null
|
||||
tar xf "${original_path}"
|
||||
# `find` always shows the current directory as one of the entries in
|
||||
# the output. A total of 2 entries means there is only one main
|
||||
# directory in the extracted archive, and we can just move it to the
|
||||
# expected location.
|
||||
if [[ $(find . -maxdepth 1 | wc -l) == 2 ]]; then
|
||||
mv -- ./* ../"${new_name}"
|
||||
else
|
||||
mkdir -p ../"${new_name}"
|
||||
mv -- ./* ../"${new_name}"
|
||||
fi
|
||||
popd > /dev/null
|
||||
tar czf "${new_name}.tar.gz" "${new_name}"
|
||||
rm -rf "${new_name}"
|
||||
rmdir "temp-${new_name}"
|
||||
@ -1,22 +0,0 @@
|
||||
From 499fcf6e3b0e4b01a9c340a06f00cfc3e1fcc5d2 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Tue, 5 Oct 2021 09:04:14 +0200
|
||||
Subject: [PATCH] Use the portable rid for --use-current-runtime.
|
||||
|
||||
---
|
||||
.../targets/Microsoft.NET.RuntimeIdentifierInference.targets | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
index 17308aa9160..e764b2d9845 100644
|
||||
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
|
||||
@@ -62,7 +62,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == 'true'">
|
||||
- <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
|
||||
+ <RuntimeIdentifier>$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifier>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(PlatformTarget)' == ''">
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dotnet-v6.0.113.tar.gz) = 79ccf823bfad42e8ac8c42241a2a2a955d15ffa9031ab4bf18a2e9d12700e7453f13741f2dec545a92c590dd571648041280ad2be14ff393e9751bcfe06367a6
|
||||
SHA512 (dotnet-v6.0.114.tar.gz) = 71f78ca0e993064622fcef076ddd9348c163789804005bb95074aedddc6b2fba325c50a25f690af3ad2c3ef9037a28ea21789c6c2a1df8be93ea36b18e679bfe
|
||||
|
||||
@ -71,13 +71,13 @@ 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
|
||||
./rename-tarball "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
|
||||
cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
|
||||
./rename-tarball "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
|
||||
./rename-tarball "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
|
||||
./rename-tarball "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user