search

unoplatform / Uno.Wasm.Bootstrap

A simple nuget package to run C# code in a WASM-compatible browser
Other
374 stars 57 forks source link

fix: Remove linked satellite assemblies refs in interp mode (backport #766) #767

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #766 done by Mergify. Cherry-pick of 781b152318a229f2b3fb8bc5c9c863a62585d695 has failed:

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

You are currently cherry-picking commit 781b152.
  (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/Uno.Wasm.Bootstrap/ShellTask.cs
    new file:   src/Uno.Wasm.Sample.Library/ClassLibrary01.cs
    new file:   src/Uno.Wasm.Sample.Library/Uno.Wasm.Sample.Library.csproj
    modified:   src/Uno.Wasm.Sample/Program.cs
    modified:   src/Uno.Wasm.Sample/sample.common.props

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   src/Uno.Wasm.Bootstrap.sln
    both modified:   src/Uno.Wasm.SampleNet7/Uno.Wasm.SampleNet7.csproj

Cherry-pick of d6ff2f1f03e52e6d158442f17171a22e005fdc54 has failed:

On branch mergify/bp/release/stable/7.0/pr-766
Your branch is ahead of 'origin/release/stable/7.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d6ff2f1.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   src/Uno.Wasm.SampleNet6.LogProfiler/Uno.Wasm.SampleNet6.LogProfiler.csproj
    both modified:   src/Uno.Wasm.SampleNet6/Uno.Wasm.SampleNet6.csproj

no changes added to commit (use "git add" and/or "git commit -a")

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

Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com