diff --git a/dotnet.spec b/dotnet.spec index c437819f495b09f9a861cd1dc27d6dd0a80403ab..bc68641d097bb5f6a2b64cb13bded0edd2e5631c 100644 --- a/dotnet.spec +++ b/dotnet.spec @@ -46,7 +46,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 1.0.1 +Release: 1.0.2 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 MIT 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 @@ -101,7 +101,7 @@ Patch1004: openEuler-dotnet-8.patch ExclusiveArch: aarch64 ppc64le s390x x86_64 BuildRequires: clang -BuildRequires: cmake +BuildRequires: cmake >= 3.20 BuildRequires: coreutils BuildRequires: findutils BuildRequires: git @@ -666,5 +666,8 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buil %changelog +* Thu Sep 12 2024 WangKui - 8.0.104-1.0.2 +- fix Razor compile failed issue + * Wed Jul 31 2024 WangKui - 8.0.104-1.0.1 - Support openEuler diff --git a/openEuler-sdk-8.patch b/openEuler-sdk-8.patch index 4bb29216ff22bc0490276052da50bc6d7e50845d..3191d4996f0714d500357513fc85dd3dd5914e56 100644 --- a/openEuler-sdk-8.patch +++ b/openEuler-sdk-8.patch @@ -1,5 +1,5 @@ diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs -index 3547fd59ed..8613529153 100644 +index 3547fd5..8613529 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -4,6 +4,7 @@ @@ -50,3 +50,25 @@ index 3547fd59ed..8613529153 100644 private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-")); private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-") + 1, rid.Length - rid.LastIndexOf("-") - 1); +diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets +index eab01ef..e582384 100644 +--- a/src/Layout/redist/targets/GenerateLayout.targets ++++ b/src/Layout/redist/targets/GenerateLayout.targets +@@ -135,9 +135,17 @@ + BeforeTargets="Build"> + + ++ ++ ++ ++ + + + ++ ++ ++ ++ + + + $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk