Update to .NET SDK 6.0.108 and Runtime 6.0.8

2022-08-09 15:09:25 -04:00 · 2022-08-09 15:09:25 -04:00 · 4071ed66ca
commit 4071ed66ca
parent 31b13506e4
7 changed files with 9 additions and 111 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,3 +20,4 @@
 /dotnet-v6.0.105.tar.gz
 /dotnet-v6.0.106.tar.gz
 /dotnet-v6.0.107.tar.gz
+/dotnet-v6.0.108.tar.gz
--- a/command-line-api-use-work-tree-with-git-apply.patch
+++ b/command-line-api-use-work-tree-with-git-apply.patch
@ -1,27 +0,0 @@
-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
-
--- 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.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 }')
@ -60,7 +60,7 @@

 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@ -89,18 +89,8 @@ 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
-
 # Disable apphost, needed for s390x
 Patch500:       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

@ -400,7 +390,6 @@ rm -rf packages/source-built

 mkdir -p packages/archive
 ln -s %{_libdir}/dotnet/source-built-artifacts/Private.SourceBuilt.Artifacts.*.tar.gz packages/archive/
-ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages*.tar.gz packages/archive/
 %endif

 # Fix bad hardcoded path in build
@ -412,23 +401,10 @@ 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
 popd

-pushd src/xliff-tasks
-%patch600 -p1
-popd
-
 pushd src/arcade
 %patch700 -p1
 popd
@ -662,6 +638,9 @@ export COMPlus_LTTng=0


 %changelog
+* Tue Aug 09 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
+- Update to .NET SDK 6.0.108 and Runtime 6.0.8
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.107-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

--- a/fsharp-use-work-tree-with-git-apply.patch
+++ b/fsharp-use-work-tree-with-git-apply.patch
@ -1,11 +0,0 @@
--- 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>
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (dotnet-v6.0.107.tar.gz) = baf0a372adb168dd39c38628667a0afb688133bb666060a46f8db95cfe57a29a7bd5b3e088ce7511fd32f808ab82bc346ef232ded5cfa1a76052ba22e4d96be0
+SHA512 (dotnet-v6.0.108.tar.gz) = 3fe1f3ae9ee96813e8af42222542e89ee74f7f4098ba4ef5bad83e1fbcd029319758db204a2e167b5cb47134193f84a2c800e4158bfc2299801f1418c28e24a7
--- a/vstest-use-work-tree-with-git-apply.patch
+++ b/vstest-use-work-tree-with-git-apply.patch
@ -1,33 +0,0 @@
-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
-
--- a/xliff-tasks-use-work-tree-with-git-apply.patch
+++ b/xliff-tasks-use-work-tree-with-git-apply.patch
@ -1,11 +0,0 @@
--- 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>