diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index b22fc74..15a9a13 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -ea3d59e0bd3c55363d7491c301efbe9b3abcfb0b SOURCES/dotnet-v6.0.105-SDK.tar.gz +c82bfa5f9a642621fed796e5e9286a746d81e8a2 SOURCES/dotnet-v6.0.106-SDK.tar.gz diff --git a/.gitignore b/.gitignore index d1f5881..fed6e16 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.105-SDK.tar.gz +SOURCES/dotnet-v6.0.106-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 new file mode 100644 index 0000000..552d59d --- /dev/null +++ b/SOURCES/command-line-api-use-work-tree-with-git-apply.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..810cf67 --- /dev/null +++ b/SOURCES/fsharp-use-work-tree-with-git-apply.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..58c139f --- /dev/null +++ b/SOURCES/vstest-use-work-tree-with-git-apply.patch @@ -0,0 +1,33 @@ +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 new file mode 100644 index 0000000..810cf67 --- /dev/null +++ b/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch @@ -0,0 +1,11 @@ +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -15,7 +15,7 @@ + + + + diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index ff20602..5220937 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/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.5 -%global runtime_version 6.0.5 +%global host_version 6.0.6 +%global runtime_version 6.0.6 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.105 +%global sdk_version 6.0.106 %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 }') @@ -90,8 +90,19 @@ Patch101: runtime-mono-remove-ilstrip.patch # https://github.com/dotnet/runtime/pull/66594 Patch102: runtime-66594-s390x-debuginfo.patch +# 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 -Patch500: fsharp-no-apphost.patch +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 # Disable apphost, needed for s390x Patch700: arcade-no-apphost.patch @@ -402,8 +413,17 @@ pushd src/runtime %patch102 -p1 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/arcade @@ -626,6 +646,10 @@ echo "Testing build results for debug symbols..." %changelog +* Mon Jun 06 2022 Omair Majid - 6.0.106-1 +- Update to .NET SDK 6.0.106 and Runtime 6.0.6 +- Resolves: RHBZ#2093432 + * Thu May 05 2022 Omair Majid - 6.0.105-1 - Update to .NET SDK 6.0.105 and Runtime 6.0.5 - Resolves: RHBZ#2082267