Fix runtime package version
Related: RHEL-13838
This commit is contained in:
parent
bd3f792a13
commit
ff19966742
38
dotnet-3673-rc2-version-mismatch.patch
Normal file
38
dotnet-3673-rc2-version-mismatch.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matt Thalman <mthalman@microsoft.com>
|
||||||
|
Date: Tue, 24 Oct 2023 16:20:26 -0500
|
||||||
|
Subject: [PATCH] Use correct runtime package version
|
||||||
|
|
||||||
|
---
|
||||||
|
prereqs/git-info/AllRepoVersions.props | 2 +-
|
||||||
|
prereqs/git-info/runtime.props | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/prereqs/git-info/AllRepoVersions.props b/prereqs/git-info/AllRepoVersions.props
|
||||||
|
index 79a789e1cd..a3f3ccf094 100644
|
||||||
|
--- a/prereqs/git-info/AllRepoVersions.props
|
||||||
|
+++ b/prereqs/git-info/AllRepoVersions.props
|
||||||
|
@@ -32,7 +32,7 @@
|
||||||
|
<roslynGitCommitHash>bdd9c5ba66b00beebdc3516acc5e29b83efd89af</roslynGitCommitHash>
|
||||||
|
<roslynOutputPackageVersion>4.8.0-3.23471.11</roslynOutputPackageVersion>
|
||||||
|
<runtimeGitCommitHash>0b25e38ad32a69cd83ae246104b32449203cc71c</runtimeGitCommitHash>
|
||||||
|
- <runtimeOutputPackageVersion>8.0.0-rc.2.23475.17</runtimeOutputPackageVersion>
|
||||||
|
+ <runtimeOutputPackageVersion>8.0.0-rc.2.23479.6</runtimeOutputPackageVersion>
|
||||||
|
<sdkGitCommitHash>67e671f384bee6937630b52b02cc78e69b27e280</sdkGitCommitHash>
|
||||||
|
<sdkOutputPackageVersion>8.0.100-rc.2.23480.5</sdkOutputPackageVersion>
|
||||||
|
<sourcebuildexternalsGitCommitHash>6dbf3aaa0fc9664df86462f5c70b99800934fccd</sourcebuildexternalsGitCommitHash>
|
||||||
|
diff --git a/prereqs/git-info/runtime.props b/prereqs/git-info/runtime.props
|
||||||
|
index 546469c3a0..20c2bf8840 100644
|
||||||
|
--- a/prereqs/git-info/runtime.props
|
||||||
|
+++ b/prereqs/git-info/runtime.props
|
||||||
|
@@ -2,8 +2,8 @@
|
||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<GitCommitHash>0b25e38ad32a69cd83ae246104b32449203cc71c</GitCommitHash>
|
||||||
|
- <OfficialBuildId>20230925.17</OfficialBuildId>
|
||||||
|
- <OutputPackageVersion>8.0.0-rc.2.23475.17</OutputPackageVersion>
|
||||||
|
+ <OfficialBuildId>20230929.6</OfficialBuildId>
|
||||||
|
+ <OutputPackageVersion>8.0.0-rc.2.23479.6</OutputPackageVersion>
|
||||||
|
<PreReleaseVersionLabel>rc.2</PreReleaseVersionLabel>
|
||||||
|
<IsStable>false</IsStable>
|
||||||
|
</PropertyGroup>
|
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
%global dotnetver 8.0
|
%global dotnetver 8.0
|
||||||
|
|
||||||
%global host_version 8.0.0-rc.2.23475.17
|
%global host_version 8.0.0-rc.2.23479.6
|
||||||
%global runtime_version 8.0.0-rc.2.23475.17
|
%global runtime_version 8.0.0-rc.2.23479.6
|
||||||
%global aspnetcore_runtime_version 8.0.0-rc.2.23480.2
|
%global aspnetcore_runtime_version 8.0.0-rc.2.23480.2
|
||||||
%global sdk_version 8.0.100-rc.2.23502.1
|
%global sdk_version 8.0.100-rc.2.23502.1
|
||||||
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||||
@ -54,7 +54,7 @@
|
|||||||
|
|
||||||
Name: dotnet%{dotnetver}
|
Name: dotnet%{dotnetver}
|
||||||
Version: %{sdk_rpm_version}
|
Version: %{sdk_rpm_version}
|
||||||
Release: 0.1%{?dist}
|
Release: 0.2%{?dist}
|
||||||
Summary: .NET Runtime and SDK
|
Summary: .NET Runtime and SDK
|
||||||
License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib
|
License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib
|
||||||
|
|
||||||
@ -94,6 +94,8 @@ Patch2: vstest-intent-net8.0.patch
|
|||||||
Patch3: runtime-92274-webcil-s390x.patch
|
Patch3: runtime-92274-webcil-s390x.patch
|
||||||
# https://github.com/dotnet/runtime/pull/92920
|
# https://github.com/dotnet/runtime/pull/92920
|
||||||
Patch4: runtime-92920-multiple-ssl-dirs.patch
|
Patch4: runtime-92920-multiple-ssl-dirs.patch
|
||||||
|
# https://github.com/dotnet/source-build/issues/3673
|
||||||
|
Patch5: dotnet-3673-rc2-version-mismatch.patch
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
@ -663,6 +665,10 @@ export COMPlus_LTTng=0
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 25 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.2
|
||||||
|
- Fix runtime package version
|
||||||
|
- Related: RHEL-13838
|
||||||
|
|
||||||
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.1
|
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.1
|
||||||
- Update to .NET 8 RC 2
|
- Update to .NET 8 RC 2
|
||||||
- Resolves: RHEL-13838
|
- Resolves: RHEL-13838
|
||||||
|
Loading…
Reference in New Issue
Block a user