import dotnet6.0-6.0.108-1.el8_6
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
7b0d2b35c6
commit
39bbff1cf1
|
|
@ -1 +1 @@
|
|||
a5abc5efe395a8000a187a636c3a826822f42d62 SOURCES/dotnet-v6.0.107-SDK.tar.gz
|
||||
fa3960a7a58e87c1c7faf53772479e2f2025ccb2 SOURCES/dotnet-v6.0.108-SDK.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/dotnet-v6.0.107-SDK.tar.gz
|
||||
SOURCES/dotnet-v6.0.108-SDK.tar.gz
|
||||
|
|
|
|||
|
|
@ -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 "%(SourceBuildPatchFile.FullPath)""
|
||||
+ Command="git --work-tree="$(RepoRoot)" apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
||||
WorkingDirectory="$(RepoRoot)"
|
||||
Condition="'@(SourceBuildPatchFile)' != ''" />
|
||||
</Target>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -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 "%(SourceBuildPatchFile.FullPath)""
|
||||
+ Command="git --work-tree="$(RepoRoot)" apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
||||
WorkingDirectory="$(RepoRoot)"
|
||||
Condition="'@(SourceBuildPatchFile)' != ''" />
|
||||
</Target>
|
||||
|
|
@ -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 "%(SourceBuildPatchFile.FullPath)""
|
||||
+ Command="git --work-tree="$(InnerSourceBuildRepoRoot)" apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
||||
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
|
||||
Condition="'@(SourceBuildPatchFile)' != ''" />
|
||||
</Target>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -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 "%(SourceBuildPatchFile.FullPath)""
|
||||
+ Command="git --work-tree="$(RepoRoot)" apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
||||
WorkingDirectory="$(RepoRoot)"
|
||||
Condition="'@(SourceBuildPatchFile)' != ''" />
|
||||
</Target>
|
||||
|
|
@ -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 }')
|
||||
|
|
@ -90,19 +90,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
|
||||
|
||||
# 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
|
||||
|
|
@ -413,17 +402,8 @@ 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
|
||||
|
|
@ -646,6 +626,10 @@ echo "Testing build results for debug symbols..."
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 29 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
|
||||
- Update to .NET SDK 6.0.108 and Runtime 6.0.8
|
||||
- Resolves: RHBZ#2112412
|
||||
|
||||
* Fri Jul 01 2022 Andrew Slice <andrew.slice@redhat.com> - 6.0.107-1
|
||||
- Update to .NET SDK 6.0.107 and Runtime 6.0.7
|
||||
- Resolves: RHBZ#2103268
|
||||
|
|
|
|||
Loading…
Reference in New Issue