From a22df01870b9f471e246662d25f05511b624e84a Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Fri, 25 Nov 2022 23:40:56 +0800 Subject: [PATCH 01/10] Ignore JSImportGenerator This project fails on the Loongarch and not super nescessary for now. Unlock build --- src/libraries/Directory.Build.props | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index b46ee2f5249a9..d3559f9dea79c 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -68,6 +68,12 @@ + + + + + + From 2763ce1d25f9fd40f49b23888c2611eaaf528ea9 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Thu, 24 Nov 2022 11:43:01 +0800 Subject: [PATCH 02/10] Disable building Crossgen2 Hope that's all what's needed for https://github.com/dotnet/runtime/issues/78749 --- eng/Subsets.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 19a2c9da9e5d5..23f06e6af00bd 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -310,7 +310,7 @@ $(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo.csproj; $(CoreClrProjectRoot)tools\aot\ILCompiler\repro\repro.csproj; $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> - + @@ -355,7 +355,7 @@ Test="true" Category="tools"/> - + From 1fd832f5e0c3e18832e47adf0a899e6dc04373f7 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Wed, 30 Nov 2022 20:59:53 +0800 Subject: [PATCH 03/10] Unlock building test layout Workaround for https://github.com/dotnet/runtime/issues/78854 Basically feed built packages from `./build.sh packs` into test layout build process. --- src/tests/Common/ilasm/ilasm.ilproj | 1 + src/tests/build.proj | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/tests/Common/ilasm/ilasm.ilproj b/src/tests/Common/ilasm/ilasm.ilproj index c73f6efe31f8e..7c787b2e0d5b8 100644 --- a/src/tests/Common/ilasm/ilasm.ilproj +++ b/src/tests/Common/ilasm/ilasm.ilproj @@ -5,5 +5,6 @@ $(OutputRid) + $(NoWarn);NU1603 diff --git a/src/tests/build.proj b/src/tests/build.proj index b0071dff5aa4a..04919fa4b85eb 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -9,6 +9,7 @@ 1 C# $(OutputRid) + $(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir) @@ -432,6 +433,7 @@ <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild) + <_ConfigurationProperties>$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir) "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) From 186ef5249123ca2b86b6a494bb47d14da5c7ba3e Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Fri, 2 Dec 2022 15:05:16 +0600 Subject: [PATCH 04/10] Add custom restore source only for LA64 arch --- src/tests/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/build.proj b/src/tests/build.proj index 04919fa4b85eb..de401a49d5be9 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -9,7 +9,7 @@ 1 C# $(OutputRid) - $(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir) + $(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir) From c0aec517154478cda7f24fa2a7795fcf017a38a9 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Fri, 2 Dec 2022 18:40:11 +0600 Subject: [PATCH 05/10] Hmm, sometimes I do wierd mistakes --- src/tests/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/build.proj b/src/tests/build.proj index de401a49d5be9..f9fbb6676356c 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -433,7 +433,7 @@ <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild) - <_ConfigurationProperties>$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir) + <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir) "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) From bcb228e4614e7a95f82124f119027e7b464acadb Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Mon, 5 Dec 2022 20:06:29 +0600 Subject: [PATCH 06/10] Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarch64 version 7.0.0 which is not existsing. Since I use locally built version it produces 8.0.0-dev and because I'm early in the cycle I "hope" that it's not important yet. src/tests/Common/test_dependencies_fs/test_dependencies.fsproj --- src/tests/Common/ilasm/ilasm.ilproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/Common/ilasm/ilasm.ilproj b/src/tests/Common/ilasm/ilasm.ilproj index 7c787b2e0d5b8..a6c949516187f 100644 --- a/src/tests/Common/ilasm/ilasm.ilproj +++ b/src/tests/Common/ilasm/ilasm.ilproj @@ -5,6 +5,6 @@ $(OutputRid) - $(NoWarn);NU1603 + $(NoWarn);NU1603 From 77392368e3529b177b732d3cd6e3b28a0683efec Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Mon, 20 Feb 2023 10:50:21 +0600 Subject: [PATCH 07/10] Apply PR feedback --- eng/Subsets.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 23f06e6af00bd..8b425d7dbea6e 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -101,6 +101,7 @@ true + true true @@ -310,7 +311,7 @@ $(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo.csproj; $(CoreClrProjectRoot)tools\aot\ILCompiler\repro\repro.csproj; $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> - + @@ -355,7 +356,7 @@ Test="true" Category="tools"/> - + From 3ac071636d21661b8582e6ff05249a22b5b8b642 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Mon, 20 Feb 2023 12:21:28 +0600 Subject: [PATCH 08/10] Move exclusion to tests.proj --- src/libraries/Directory.Build.props | 6 ------ src/libraries/tests.proj | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 67b5ccc26ac7f..fee272a9edca6 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -22,12 +22,6 @@ - - - - - - diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 8e5c828464045..452cb3e4f6245 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -330,6 +330,12 @@ + + + + + + From 874b12f28e05f37ea01af08eaf4d8b971f11da32 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Sun, 26 Feb 2023 19:11:45 +0600 Subject: [PATCH 09/10] Removed warning. Let's see how it worked out from main after this merges --- src/tests/Common/ilasm/ilasm.ilproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tests/Common/ilasm/ilasm.ilproj b/src/tests/Common/ilasm/ilasm.ilproj index a6c949516187f..c73f6efe31f8e 100644 --- a/src/tests/Common/ilasm/ilasm.ilproj +++ b/src/tests/Common/ilasm/ilasm.ilproj @@ -5,6 +5,5 @@ $(OutputRid) - $(NoWarn);NU1603 From 76cad70fb0cadfcdf79e27fa876b2abe7605dec1 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Tue, 18 Apr 2023 08:51:01 +0600 Subject: [PATCH 10/10] Use same method for disabling crossgen as Risk-V --- eng/Subsets.props | 2 +- src/coreclr/crossgen-corelib.proj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 5736ab6b1b41e..9e35431728e24 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -321,7 +321,7 @@ $(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo.csproj; $(CoreClrProjectRoot)tools\aot\ILCompiler\repro\repro.csproj; $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> - + diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 5ba72f0af24c2..62022ee542eab 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -16,7 +16,7 @@ $(BuildArchitecture) true - false + false false true