Skip to content
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.

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

Avoid special casing work items in sendtohelixhelp.proj #46315

Closed
wants to merge 11 commits into from

Conversation

MaximLipnin
Copy link
Contributor

@MaximLipnin MaximLipnin commented Dec 22, 2020

Addresses #46156

@Dotnet-GitSync-Bot
Copy link
Collaborator

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@MaximLipnin MaximLipnin requested review from akoeplinger, radical and safern and removed request for akoeplinger and radical December 22, 2020 08:48
@MaximLipnin
Copy link
Contributor Author

@MaximLipnin MaximLipnin marked this pull request as ready for review December 23, 2020 12:16
</RunScriptCommand>
</PropertyGroup>

<MSBuild Projects ="$(RepoRoot)eng/testing/tests.targets"
Copy link
Member

Choose a reason for hiding this comment

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

Why not import the tests.targets file and just set your target to depend on GenerateRunScript? Would that work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If the "tests.targets" file is imported into the project, there will be such error during build:
error MSB4011: "/runtime/src/mono/wasm/build/WasmApp.targets" cannot be imported again. It was already imported at "/runtime/src/mono/netcore/sample/wasm/console/WasmSample.csproj (73,3)". This is most likely a build authoring error. This subsequent import will be ignored.

Copy link
Member

Choose a reason for hiding this comment

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

I see... what you could do is remove the WasmApp.targets import in WasmSample.csproj and then that issue would be gone.

<Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" />

MaximLipnin and others added 3 commits December 24, 2020 12:51
Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
@@ -60,6 +60,19 @@
</Content>
</ItemGroup>

<Target Name="PrepareRunScript" BeforeTargets="CopySampleAppToHelixTestDir" Condition="'$(ArchiveTests)' == 'true'" >
Copy link
Member

Choose a reason for hiding this comment

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

We can do the same as we did for the console sample, right?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I'll push that one up too.

@MaximLipnin
Copy link
Contributor Author

After the merge with the latest master there is another error

eng/illink.targets(215,11): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Build) The target "GetBinPlaceTargetFramework" does not exist in the project.  /__w/1/s/eng/illink.targets

@safern
Copy link
Member

safern commented Jan 8, 2021

It seems like that was caused because tests.mobile.targets now import illink.targets. 1e6826a#diff-56a2c52766d355ebc47b5efbd7bedb042780d0945ba5353a315fc162ed988122R224

What we could do is condition that import to a property like MobileTestsSkipLinkImport != true and then set that property to true on the sample apps.

# Conflicts:
#	src/mono/netcore/sample/wasm/browser/Wasm.Browser.Sample.csproj
#	src/mono/netcore/sample/wasm/console/Makefile
#	src/mono/netcore/sample/wasm/console/Wasm.Console.Sample.csproj
@akoeplinger
Copy link
Member

@MaximLipnin would you mind updating this PR and solving the merge conflicts?

@ghost
Copy link

ghost commented Feb 19, 2021

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

Issue Details

Addresses #46156

Author: MaximLipnin
Assignees: -
Labels:

area-Infrastructure-mono

Milestone: -

Base automatically changed from master to main March 1, 2021 09:07
@ViktorHofer
Copy link
Member

gentle ping @MaximLipnin

@MaximLipnin
Copy link
Contributor Author

It will be addressed in other PR, closing it

@MaximLipnin MaximLipnin closed this Mar 2, 2021
@MaximLipnin MaximLipnin deleted the wasm_sample_use_run_script branch March 2, 2021 07:31
@ghost ghost locked as resolved and limited conversation to collaborators Apr 1, 2021
@karelz karelz added this to the 6.0.0 milestone May 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants