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

fix(assets): Adjust project transitive output path (backport #18966) #18974

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2024

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

  • Adjust transitive assets output paths based on updated hashed wasm output path
  • Removes unused devserver for net9

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):


This is an automatic backport of pull request #18966 done by [Mergify](https://mergify.com).

(cherry picked from commit 983b96d)

# Conflicts:
#	src/Directory.Build.targets
#	src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
(cherry picked from commit 4ae23d8)
@mergify mergify bot added the conflicts label Nov 30, 2024
Copy link
Contributor Author

mergify bot commented Nov 30, 2024

Cherry-pick of 983b96d has failed:

On branch mergify/bp/release/stable/5.5/pr-18966
Your branch is up to date with 'origin/release/stable/5.5'.

You are currently cherry-picking commit 983b96d7d9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
	modified:   src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Directory.Build.targets
	both modified:   src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added area/solution-templates Categorizes an issue or PR as relevant to the solution template area/code-generation Categorizes an issue or PR as relevant to code generation area/automation Categorizes an issue or PR as relevant to project automation labels Nov 30, 2024
@unodevops
Copy link
Contributor

⚠️⚠️ The build 149002 has failed on Uno.UI - CI.

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18974/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18974/index.html

@unodevops
Copy link
Contributor

⚠️⚠️ The build 149018 has failed on Uno.UI - CI.

@jeromelaban jeromelaban disabled auto-merge December 2, 2024 19:01
@jeromelaban jeromelaban merged commit 582da1a into release/stable/5.5 Dec 2, 2024
108 of 111 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.5/pr-18966 branch December 2, 2024 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/automation Categorizes an issue or PR as relevant to project automation area/code-generation Categorizes an issue or PR as relevant to code generation area/solution-templates Categorizes an issue or PR as relevant to the solution template conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants