diff --git a/.gitignore b/.gitignore index be96751..8c93664 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.107-SDK.tar.gz +SOURCES/dotnet-v6.0.108-SDK.tar.gz diff --git a/.rh-dotnet60-dotnet.metadata b/.rh-dotnet60-dotnet.metadata index be72972..9bdb138 100644 --- a/.rh-dotnet60-dotnet.metadata +++ b/.rh-dotnet60-dotnet.metadata @@ -1 +1 @@ -e2335161e7af91198770e174bc50bf2e4980574a SOURCES/dotnet-v6.0.107-SDK.tar.gz +bda646d7f3a51e865ca1e10a9c843b8ad2d62a59 SOURCES/dotnet-v6.0.108-SDK.tar.gz diff --git a/SOURCES/command-line-api-use-work-tree-with-git-apply.patch b/SOURCES/command-line-api-use-work-tree-with-git-apply.patch deleted file mode 100644 index 552d59d..0000000 --- a/SOURCES/command-line-api-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7a752928ed3588246c4b296feb6cf4946f1b29b7 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Thu, 9 Sep 2021 12:11:39 -0400 -Subject: [PATCH] [ArPow] Use --work-tree with git apply - -This makes things work better in a source-tarball build, where there may -be a .git directory but it's for a different repo than command-line-api. ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 6cc85018..5e223747 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - --- -2.31.1 - diff --git a/SOURCES/fsharp-use-work-tree-with-git-apply.patch b/SOURCES/fsharp-use-work-tree-with-git-apply.patch deleted file mode 100644 index 810cf67..0000000 --- a/SOURCES/fsharp-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - diff --git a/SOURCES/vstest-use-work-tree-with-git-apply.patch b/SOURCES/vstest-use-work-tree-with-git-apply.patch deleted file mode 100644 index 58c139f..0000000 --- a/SOURCES/vstest-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b2c4b2427d8c1a2410c4210789caccf1ec87e64a Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Thu, 9 Sep 2021 13:21:51 -0400 -Subject: [PATCH] [ArPow] Use --work-tree with git apply - -This makes things work better in a source-tarball build, where there may -be a .git directory somewhere in our parent directories but it's for a -different repo than vstest. In a situation like that a plain `git apply` -will (silently!) ignore patches because they wont apply to the unrelated -repository. That will (eventually) make the source-build fail. -`--work-tree` makes git directly use the directory that we care about. - -See https://github.com/dotnet/source-build/issues/2445 for more details. ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index b365645c..68f82592 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -24,7 +24,7 @@ - - - - --- -2.31.1 - diff --git a/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch b/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch deleted file mode 100644 index 810cf67..0000000 --- a/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 9f8e348..dcb8d1b 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -23,10 +23,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.7 -%global runtime_version 6.0.7 +%global host_version 6.0.8 +%global runtime_version 6.0.8 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.107 +%global sdk_version 6.0.108 %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 }') @@ -81,19 +81,8 @@ Source0: dotnet-%{upstream_tag}.tar.gz Source10: check-debug-symbols.py Source11: dotnet.sh.in -# https://github.com/dotnet/command-line-api/pull/1401 -Patch300: command-line-api-use-work-tree-with-git-apply.patch - -# https://github.com/microsoft/vstest/pull/3046 -Patch400: vstest-use-work-tree-with-git-apply.patch - -# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied -Patch500: fsharp-use-work-tree-with-git-apply.patch # Disable apphost, needed for s390x -Patch501: fsharp-no-apphost.patch - -# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied -Patch600: xliff-tasks-use-work-tree-with-git-apply.patch +Patch500: fsharp-no-apphost.patch # Disable apphost, needed for s390x Patch700: arcade-no-apphost.patch @@ -381,21 +370,8 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/ pushd src/runtime popd -pushd src/command-line-api -%patch300 -p1 -popd - -pushd src/vstest -%patch400 -p1 -popd - pushd src/fsharp %patch500 -p1 -%patch501 -p1 -popd - -pushd src/xliff-tasks -%patch600 -p1 popd pushd src/arcade @@ -616,6 +592,10 @@ echo "Testing build results for debug symbols..." %changelog +* Fri Jul 29 2022 Omair Majid - 6.0.108-1 +- Update to .NET SDK 6.0.108 and Runtime 6.0.8 +- Resolves: RHBZ#2112407 + * Thu Jul 14 2022 Andrew Slice - 6.0.107-1 - Update to .NET SDK 6.0.107 and Runtime 6.0.7 - Resolves: RHBZ#2103267