Skip to content

Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kant2002 wants to merge 12 commits into from
Closed

Exclude things which broken on Loongarch #78850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a22df01
Ignore JSImportGenerator
kant2002 Nov 25, 2022
2763ce1
Disable building Crossgen2
kant2002 Nov 24, 2022
1fd832f
Unlock building test layout
kant2002 Nov 30, 2022
186ef52
Add custom restore source only for LA64 arch
kant2002 Dec 2, 2022
c0aec51
Hmm, sometimes I do wierd mistakes
kant2002 Dec 2, 2022
bcb228e
Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…
kant2002 Dec 5, 2022
7739236
Apply PR feedback
kant2002 Feb 20, 2023
830c779
Merge branch 'main' into kant/exclude-loongarch-not-implemented
kant2002 Feb 20, 2023
3ac0716
Move exclusion to tests.proj
kant2002 Feb 20, 2023
874b12f
Removed warning. Let's see how it worked out from main after this merges
kant2002 Feb 26, 2023
94d0e44
Merge branch 'main' into kant/exclude-loongarch-not-implemented
kant2002 Apr 18, 2023
76cad70
Use same method for disabling crossgen as Risk-V
kant2002 Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/Subsets.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
<PropertyGroup>
<!-- CLR NativeAot only builds in a subset of the matrix -->
<NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
<Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

<!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
<UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
Test="true" Category="tools"/>
</ItemGroup>

<ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
<ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">

@agockeagockeApr 20, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change

<!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
<ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
<ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/crossgen-corelib.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
<CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

<BuildDll>true</BuildDll>
<BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
<BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

<BuildPdb>false</BuildPdb>
<BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down
6 changes: 6 additions & 0 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
<ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
</ItemGroup>

<ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
<!-- https://github.com/dotnet/roslyn/issues/65597. -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down
2 changes: 2 additions & 0 deletions src/tests/build.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
<MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
<Language>C#</Language>
<RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
<RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>

@jkotasjkotasDec 3, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?

cc @MichaelSimons

@ViktorHoferViktorHoferDec 5, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?

@kant2002kant2002Dec 5, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64
as described in #78854

I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)

@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?

Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.

@kant2002kant2002Dec 11, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.

@akoeplingerakoeplingerFeb 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?

@akoeplingerakoeplingerMar 7, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?

@kant2002kant2002Mar 7, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test

</PropertyGroup>

<ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
<Target Name="RestorePackage">
<PropertyGroup>
<_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
<_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
<DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
<DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
</PropertyGroup>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Exclude things which broken on Loongarch by kant2002 · Pull Request #78850 · dotnet/runtime · GitHub
Skip to content
Exclude things which broken on Loongarch#78850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kant2002
wants to merge
12
commits into

from

 Closed


Exclude things which broken on Loongarch
#78850
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
a22df01

Ignore JSImportGenerator


kant2002 Nov 25, 2022
2763ce1

Disable building Crossgen2


kant2002 Nov 24, 2022
1fd832f

Unlock building test layout


kant2002 Nov 30, 2022
186ef52

Add custom restore source only for LA64 arch


kant2002 Dec 2, 2022
c0aec51

Hmm, sometimes I do wierd mistakes


kant2002 Dec 2, 2022
bcb228e

Test project want to use Microsoft.NETCore.App.Runtime.linux-loongarc…


kant2002 Dec 5, 2022
7739236

Apply PR feedback


kant2002 Feb 20, 2023
830c779

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Feb 20, 2023
3ac0716

Move exclusion to tests.proj


kant2002 Feb 20, 2023
874b12f

Removed warning. Let's see how it worked out from main after this merges


kant2002 Feb 26, 2023
94d0e44

Merge branch 'main' into kant/exclude-loongarch-not-implemented


kant2002 Apr 18, 2023
76cad70

Use same method for disabling crossgen as Risk-V


kant2002 Apr 18, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,7 @@
 <PropertyGroup>
 <!-- CLR NativeAot only builds in a subset of the matrix -->
 <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 <Crossgen2Supported Condition="'$(TargetArchitecture)' != 'loongarch64'">true</Crossgen2Supported>

 <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
 <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
Expand DownExpand Up@@ -365,7 +366,7 @@
 Test="true" Category="tools"/>
 </ItemGroup>

 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+'))">
 <ItemGroup Condition="$(_subset.Contains('+clr.nativecorelib+')) and '$(Crossgen2Supported)' == 'true'">
@agockeagockeApr 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems obsolete with the crossgen-corelib change
 <!-- Build crossgen2 that will be used to compile System.Private.CoreLib library for CoreCLR -->
 <ProjectToBuild Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
 <ProjectToBuild Condition="!(('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(BuildArchitecture)' == 'x64')" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/crossgen-corelib.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>

 <BuildDll>true</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64'">false</BuildDll>
 <BuildDll Condition="'$(TargetArchitecture)' == 'riscv64' or '$(TargetArchitecture)' == 'loongarch64'">false</BuildDll>

 <BuildPdb>false</BuildPdb>
 <BuildPdb Condition="$(BuildDll) and '$(OS)' == 'Windows_NT' and '$(TargetOS)' == 'windows'">true</BuildPdb>
Expand Down

6 changes: 6 additions & 0 deletions
src/libraries/tests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,12 @@
 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
 </ItemGroup>

 <ItemGroup Condition="$(TargetArchitecture) == 'loongarch64'">
 <!-- https://github.com/dotnet/roslyn/issues/65597. -->
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true'">
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.NETCore.Platforms\tests\Microsoft.NETCore.Platforms.Tests.csproj" />
 <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj" />
Expand Down

2 changes: 2 additions & 0 deletions
src/tests/build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
 <MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
 <Language>C#</Language>
 <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
 <RestoreAdditionalProjectSources Condition="$(TargetArchitecture) == 'loongarch64'">$(RestoreAdditionalProjectSources);$(ArtifactsPackagesDir)</RestoreAdditionalProjectSources>
@jkotasjkotasDec 3, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
cc @MichaelSimons
@ViktorHoferViktorHoferDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? Which live built packages do you need to restore and reference here?
@kant2002kant2002Dec 5, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's allow me to use Microsoft.NETCore.App.Runtime.linux-loongarch64

as described in #78854
I use this as temporary stopgap to be able to use test scripts for build tests and run them (to some degree)
@MichaelSimonsMichaelSimonsDec 5, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the build use packages that were just build instead of the one from the feed. Can we unify this with the mechanism that source build uses to achieve the same?
Source-build does not have a special mechanism to do this within a repo. The source-build mechanism is used to pickup packages that were built from a different repo within the source build.
@kant2002kant2002Dec 11, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this line not needed, and only similar line in the file is here. But I assume concerns applied to line below.
@akoeplingerakoeplingerFeb 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer isn't there some other way of forcing tests to use the live built packages?
@akoeplingerakoeplingerMar 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 I'm curious does the restore error only happen for the test_dependencies.fsproj you mentioned in #78854?
@kant2002kant2002Mar 7, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know, since I do not fully understand how test infra setup. So I was worrying that I may break something further down the road. I can play according to your directions if you have some ideas to test
 </PropertyGroup>

 <ItemGroup>
Expand DownExpand Up@@ -435,6 +436,7 @@
 <Target Name="RestorePackage">
 <PropertyGroup>
 <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) /p:CrossBuild=$(CrossBuild)</_ConfigurationProperties>
 <_ConfigurationProperties Condition="$(TargetArchitecture) == 'loongarch64'">$(_ConfigurationProperties) /p:RestoreAdditionalProjectSources=$(ArtifactsPackagesDir)</_ConfigurationProperties>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' == ''">"$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 <DotnetRestoreCommand Condition="'$(__DistroRid)' != ''">"$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties)</DotnetRestoreCommand>
 </PropertyGroup>
Expand Down