import dotnet6.0-6.0.107-2.el8

.dotnet6.0.metadata

@@ -1 +1 @@
-c82bfa5f9a642621fed796e5e9286a746d81e8a2 SOURCES/dotnet-v6.0.106-SDK.tar.gz
+f1384f6c18605ec8d9074197e752a5275361b9ab SOURCES/dotnet-v6.0.107-SDK.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dotnet-v6.0.106-SDK.tar.gz
+SOURCES/dotnet-v6.0.107-SDK.tar.gz

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 <omajid@redhat.com>
+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 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
++      Command="git --work-tree=&quot;$(RepoRoot)&quot; apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(RepoRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>
+-- 
+2.31.1
+

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 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
++      Command="git --work-tree=&quot;$(RepoRoot)&quot; apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(RepoRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>

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 <omajid@redhat.com>
+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 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
++      Command="git --work-tree=&quot;$(InnerSourceBuildRepoRoot)&quot; apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>
+-- 
+2.31.1
+

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.6
+%global host_version 6.0.7
-%global runtime_version 6.0.6
+%global runtime_version 6.0.7
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.106
+%global sdk_version 6.0.107
 %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,16 @@ 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
@@ -405,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/xliff-tasks
@@ -634,6 +651,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu Jul 21 2022 Omair Majid <omajid@redhat.com> - 6.0.107-2
+- Update to .NET SDK 6.0.107 and Runtime 6.0.7
+- Resolves: RHBZ#2103268
+
 * Thu Jun 23 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
 - Update to .NET SDK 6.0.106 and Runtime 6.0.6
 - Resolves: RHBZ#2093430