Allow mono samples to build and run again #54089

lambdageek · 2021-06-12T01:31:28Z

Copied from src/libraries/Directory.Build.props

Evidently this is sufficient for the console samples to build again:

$ make run MONO_CONFIG=Release MONO_ENV_OPTIONS=
../../../.././dotnet.sh publish -c Release -r linux-x64
Microsoft (R) Build Engine version 16.11.0-preview-21254-21+e73d08c28 for .NET
Copyright (C) Microsoft Corporation. All rights reserved.

  Determining projects to restore...
  All projects are up-to-date for restore.
  Used runtime pack: /home/aleksey/working/dotnet-runtime/artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/
  Used runtime pack: /home/aleksey/.nuget/packages/microsoft.aspnetcore.app.runtime.linux-x64/6.0.0-preview.4.21253.5
  HelloWorld -> /home/aleksey/working/dotnet-runtime/artifacts/bin/HelloWorld/x64/Release/linux-x64/HelloWorld.dll
  HelloWorld -> /home/aleksey/working/dotnet-runtime/artifacts/bin/HelloWorld/x64/Release/linux-x64/publish/
COMPlus_DebugWriteToStdErr=1 \
MONO_ENV_OPTIONS="" \
../../../../artifacts/bin/HelloWorld/x64/Release/linux-x64/publish/HelloWorld
Hello World from Mono!
System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e
HelloWorld, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35
.NET 6.0.0-dev

ghost · 2021-06-12T01:31:35Z

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

Copied from src/libraries/Directory.Build.props

Evidently this is sufficient for the console samples to build again:

$ make run MONO_CONFIG=Release MONO_ENV_OPTIONS=
../../../.././dotnet.sh publish -c Release -r linux-x64
Microsoft (R) Build Engine version 16.11.0-preview-21254-21+e73d08c28 for .NET
Copyright (C) Microsoft Corporation. All rights reserved.

  Determining projects to restore...
  All projects are up-to-date for restore.
  Used runtime pack: /home/aleksey/working/dotnet-runtime/artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/
  Used runtime pack: /home/aleksey/.nuget/packages/microsoft.aspnetcore.app.runtime.linux-x64/6.0.0-preview.4.21253.5
  HelloWorld -> /home/aleksey/working/dotnet-runtime/artifacts/bin/HelloWorld/x64/Release/linux-x64/HelloWorld.dll
  HelloWorld -> /home/aleksey/working/dotnet-runtime/artifacts/bin/HelloWorld/x64/Release/linux-x64/publish/
COMPlus_DebugWriteToStdErr=1 \
MONO_ENV_OPTIONS="" \
../../../../artifacts/bin/HelloWorld/x64/Release/linux-x64/publish/HelloWorld
Hello World from Mono!
System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e
HelloWorld, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35
.NET 6.0.0-dev

Author:	lambdageek
Assignees:	-
Labels:	`area-Infrastructure-mono`
Milestone:	-

lambdageek · 2021-06-12T01:32:24Z

@akoeplinger @ViktorHofer once again I don't really know what I'm doing... How wrong is this?

akoeplinger

LGTM, though we should probably look at moving these properties from src/librares/Directory.Build.props to some common location so we don't need to duplicate them.

ViktorHofer

Thanks for the fix. Can you please avoid the duplication and move the properties into the root's Directory.Build.props file after the block in which PackageRID and $(NetCoreAppCurrent) is defined?

Also when doing so, please remove this block:

runtime/src/libraries/Directory.Build.props

Lines 139 to 146 in bc16a7b

    
           <MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir> 
        
           <MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir> 
        
           <MicrosoftNetCoreAppRefPackDataDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data'))</MicrosoftNetCoreAppRefPackDataDir> 
        
           <MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(Configuration)'))</MicrosoftNetCoreAppRuntimePackDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(PackageRID)'))</MicrosoftNetCoreAppRuntimePackRidDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'lib', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRuntimePackRidLibTfmDir> 
        
           <MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>

lambdageek · 2021-06-14T13:05:07Z

@ViktorHofer Done, thanks!

ViktorHofer · 2021-06-14T13:11:25Z

I believe this code block is now dead:

runtime/src/mono/wasm/build/WasmApp.Native.targets

Lines 33 to 36 in ccec848

    
           <MicrosoftNetCoreAppRuntimePackDir Condition="'$(MicrosoftNetCoreAppRuntimePackDir)' == ''">$([MSBuild]::NormalizeDirectory($(NuGetPackageRoot), 'microsoft.netcore.app.runtime.mono.browser-wasm', '$(BundledNETCoreAppPackageVersion)'))</MicrosoftNetCoreAppRuntimePackDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidDir Condition="'$(MicrosoftNetCoreAppRuntimePackRidDir)' == ''">$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackDir), 'runtimes', 'browser-wasm'))</MicrosoftNetCoreAppRuntimePackRidDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackRidDir)))</MicrosoftNetCoreAppRuntimePackRidDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidNativeDir>$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackRidDir), 'native'))</MicrosoftNetCoreAppRuntimePackRidNativeDir>

ViktorHofer · 2021-06-14T13:15:59Z

And a few more that should also be removed. Would be great if you could do that as well in the PR:

runtime/src/mono/wasm/wasm.proj

Lines 10 to 12 in 8818fb0

    
           <MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(Configuration)'))</MicrosoftNetCoreAppRuntimePackDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(PackageRID)'))</MicrosoftNetCoreAppRuntimePackRidDir> 
        
           <MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>

runtime/src/tests/run.proj

Line 644 in b8b3ef1

    
           <MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.android-$(TargetArchitecture)\$(Configuration)\runtimes\android-$(TargetArchitecture)\</MicrosoftNetCoreAppRuntimePackDir>

runtime/src/mono/wasm/build/WasmApp.targets

Lines 85 to 88 in 6722c0b

    
           <MicrosoftNetCoreAppRuntimePackDir Condition="'$(MicrosoftNetCoreAppRuntimePackDir)' == ''">$([MSBuild]::NormalizeDirectory($(NuGetPackageRoot), 'microsoft.netcore.app.runtime.mono.browser-wasm', '$(BundledNETCoreAppPackageVersion)'))</MicrosoftNetCoreAppRuntimePackDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidDir Condition="'$(MicrosoftNetCoreAppRuntimePackRidDir)' == ''">$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackDir), 'runtimes', 'browser-wasm'))</MicrosoftNetCoreAppRuntimePackRidDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackRidDir)))</MicrosoftNetCoreAppRuntimePackRidDir> 
        
           <MicrosoftNetCoreAppRuntimePackRidNativeDir>$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackRidDir), 'native'))</MicrosoftNetCoreAppRuntimePackRidNativeDir>

runtime/src/mono/sample/Android/AndroidSampleApp.csproj

Line 9 in 8698d0f

    
           <MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\</MicrosoftNetCoreAppRuntimePackDir>

runtime/src/mono/sample/iOS/Program.csproj

Line 8 in 8698d0f

    
           <MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\</MicrosoftNetCoreAppRuntimePackDir>

runtime/src/mono/sample/mbr/apple/AppleDelta.csproj

Line 6 in 8698d0f

    
           <MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\</MicrosoftNetCoreAppRuntimePackDir>

radical · 2021-06-17T03:06:13Z

You can remove https://github.com/dotnet/runtime/blob/main/src/mono/wasm/build/WasmApp.InTree.props#L9 too

radical

Other than removing the entry from src/mono/wasm/build/WasmApp.InTree.props, LGTM!

Applied all the suggested changes, aside from ones that made the tests fail

ViktorHofer · 2021-06-17T09:32:28Z

Any idea why tests started failing when removing the properties from the two wasm files? I thought those are dead anyway.

lambdageek · 2021-06-17T13:02:00Z

Any idea why tests started failing when removing the properties from the two wasm files? I thought those are dead anyway.

Not sure - I didn't have a chance to look into it yet. If I had to guess - the wasm runtime build is different from other platforms because there's a step that runs after the libraries are built. So perhaps the final runtime artifacts for testing are in a slightly different location.

radical · 2021-06-17T16:09:13Z

Any idea why tests started failing when removing the properties from the two wasm files? I thought those are dead anyway.

Which files? And where are these failing?

lambdageek · 2021-06-17T16:23:27Z

@radical WasmApp.targets and WasmApp.Native.targets

This is what I did initially after adding the properties to the root Directory.Build.props: 3a6c7bc#diff-9aef04edc740c7aadf146f6890e8316ec4e65030186727ea6286411efea20d02

I don't recall what was failing specifically, but it was the general wasm app building for the libraries tests, I believe. (don't seem to have AzDO links to the oldest CI runs)

radical · 2021-06-17T16:27:22Z

@radical WasmApp.targets and WasmApp.Native.targets

Those files are used outside the tree too, like in workloads. So, we can't depend on runtime repo's Directory.Build.props providing the values.

lambdageek · 2021-06-17T16:59:13Z

There's one failure still that I can't explain: "runtime (CoreCLR Pri0 Runtime Tests Run windows arm64 checked)"

##[error].packages\microsoft.dotnet.helix.sdk\6.0.0-beta.21311.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) Work item JIT.IL_Conformance in job 54ff2c22-c6df-4b58-8d1b-fe28a368448a has failed.
Failure log: https://helix.dot.net/api/2019-06-17/jobs/54ff2c22-c6df-4b58-8d1b-fe28a368448a/workitems/JIT.IL_Conformance/console
D:\workspace\_work\1\s\.packages\microsoft.dotnet.helix.sdk\6.0.0-beta.21311.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : Work item JIT.jit64 in job 54ff2c22-c6df-4b58-8d1b-fe28a368448a has failed. [D:\workspace\_work\1\s\src\tests\Common\helixpublishwitharcade.proj]
D:\workspace\_work\1\s\.packages\microsoft.dotnet.helix.sdk\6.0.0-beta.21311.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : Failure log: https://helix.dot.net/api/2019-06-17/jobs/54ff2c22-c6df-4b58-8d1b-fe28a368448a/workitems/JIT.jit64/console [D:\workspace\_work\1\s\src\tests\Common\helixpublishwitharcade.proj]
##[error].packages\microsoft.dotnet.helix.sdk\6.0.0-beta.21311.3\tools\Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) Work item JIT.jit64 in job 54ff2c22-c6df-4b58-8d1b-fe28a368448a has failed.
Failure log: https://helix.dot.net/api/2019-06-17/jobs/54ff2c22-c6df-4b58-8d1b-fe28a368448a/workitems/JIT.jit64/console

The consoles are empty https://helix.dot.net/api/2019-06-17/jobs/54ff2c22-c6df-4b58-8d1b-fe28a368448a/workitems/JIT.IL_Conformance/console

{"Message":"NotFound","ActivityId":"ed4d27eef51d024bb9c5b5a78855025b"}

and https://helix.dot.net/api/2019-06-17/jobs/54ff2c22-c6df-4b58-8d1b-fe28a368448a/workitems/JIT.jit64/console

{"Message":"NotFound","ActivityId":"6f884237d396f94496fdfcb8581f0336"}

Not sure if that could be related to the changes here.

Copied from src/libraries/Directory.Build.props Evidently this is sufficient for the console samples to build again: ``` $ make run MONO_CONFIG=Release MONO_ENV_OPTIONS= ../../../.././dotnet.sh publish -c Release -r linux-x64 Microsoft (R) Build Engine version 16.11.0-preview-21254-21+e73d08c28 for .NET Copyright (C) Microsoft Corporation. All rights reserved. Determining projects to restore... All projects are up-to-date for restore. Used runtime pack: /home/aleksey/working/dotnet-runtime/artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/ Used runtime pack: /home/aleksey/.nuget/packages/microsoft.aspnetcore.app.runtime.linux-x64/6.0.0-preview.4.21253.5 HelloWorld -> /home/aleksey/working/dotnet-runtime/artifacts/bin/HelloWorld/x64/Release/linux-x64/HelloWorld.dll HelloWorld -> /home/aleksey/working/dotnet-runtime/artifacts/bin/HelloWorld/x64/Release/linux-x64/publish/ COMPlus_DebugWriteToStdErr=1 \ MONO_ENV_OPTIONS="" \ ../../../../artifacts/bin/HelloWorld/x64/Release/linux-x64/publish/HelloWorld Hello World from Mono! System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e HelloWorld, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 .NET 6.0.0-dev ```

They are not based on the ArtifactsBinDir property

The tests seem to otherwise look in a coreclr directory for libmono

lambdageek requested a review from marek-safar as a code owner June 12, 2021 01:31

dotnet-issue-labeler bot added the area-Infrastructure-mono label Jun 12, 2021

lambdageek requested review from ViktorHofer and akoeplinger June 12, 2021 01:31

akoeplinger approved these changes Jun 14, 2021

View reviewed changes

ViktorHofer previously requested changes Jun 14, 2021

View reviewed changes

lambdageek force-pushed the fixup-mono-samples branch from bf2eeee to fc797d4 Compare June 14, 2021 13:04

lambdageek force-pushed the fixup-mono-samples branch from edede82 to 59baba6 Compare June 16, 2021 13:43

lewing requested a review from radical June 17, 2021 01:46

radical approved these changes Jun 17, 2021

View reviewed changes

karelz mentioned this pull request Jun 17, 2021

[wasm] SendReceive_VaryingLengthBuffers_Success failing in CI #53957

Closed

lambdageek added 5 commits June 18, 2021 20:33

move in-tree runtime pack directory props to root props file

3b77eee

Remove a few more duplicated property definitions

ea3c6e6

Revert WasmApp.targets and WasmApp.Native.targets changes

317e4d9

They are not based on the ArtifactsBinDir property

Also put back the android runtime tests runtime pack dir setting

695bafb

The tests seem to otherwise look in a coreclr directory for libmono

Remove runtime pack dir prop from WasmApp.InTree.props

cd0656b

lambdageek force-pushed the fixup-mono-samples branch from ae0e9a3 to cd0656b Compare June 19, 2021 00:33

marek-safar merged commit 30f4269 into dotnet:main Jun 21, 2021

ghost locked as resolved and limited conversation to collaborators Jul 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow mono samples to build and run again #54089

Allow mono samples to build and run again #54089

lambdageek commented Jun 12, 2021

ghost commented Jun 12, 2021

lambdageek commented Jun 12, 2021

akoeplinger left a comment

ViktorHofer left a comment •

edited

Loading

lambdageek commented Jun 14, 2021

ViktorHofer commented Jun 14, 2021

ViktorHofer commented Jun 14, 2021

radical commented Jun 17, 2021

radical left a comment

ViktorHofer commented Jun 17, 2021

lambdageek commented Jun 17, 2021

radical commented Jun 17, 2021

lambdageek commented Jun 17, 2021

radical commented Jun 17, 2021

lambdageek commented Jun 17, 2021

	<MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir>
	<MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir>
	<MicrosoftNetCoreAppRefPackDataDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data'))</MicrosoftNetCoreAppRefPackDataDir>

	<MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(Configuration)'))</MicrosoftNetCoreAppRuntimePackDir>
	<MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(PackageRID)'))</MicrosoftNetCoreAppRuntimePackRidDir>
	<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'lib', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
	<MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>

Allow mono samples to build and run again #54089

Allow mono samples to build and run again #54089

Conversation

lambdageek commented Jun 12, 2021

ghost commented Jun 12, 2021

lambdageek commented Jun 12, 2021

akoeplinger left a comment

Choose a reason for hiding this comment

ViktorHofer left a comment • edited Loading

Choose a reason for hiding this comment

lambdageek commented Jun 14, 2021

ViktorHofer commented Jun 14, 2021

ViktorHofer commented Jun 14, 2021

radical commented Jun 17, 2021

radical left a comment

Choose a reason for hiding this comment

ViktorHofer commented Jun 17, 2021

lambdageek commented Jun 17, 2021

radical commented Jun 17, 2021

lambdageek commented Jun 17, 2021

radical commented Jun 17, 2021

lambdageek commented Jun 17, 2021

ViktorHofer left a comment •

edited

Loading