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

Migrate to new .csproj format #96

Merged
merged 9 commits into from
Apr 29, 2024
Merged

Conversation

YoshiRulz
Copy link
Contributor

@YoshiRulz YoshiRulz commented Apr 5, 2023

edit 2024-04-26:
I recreated my changes on top of the latest commit, taking a slightly different approach. This time I haven't had the chance to test on a Windows machine.
I kept a backup of the old branch.


Guess I'm done? Wasn't expecting CI to pass with only a couple of tweaks. Builds and runs on my Win10 machine with VS2022.

Didn't expect it to magically work in Mono, and it doesn't, failing with Could not load file or assembly 'PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' or one of its dependencies. (part of WPF I gather).

see #72 (comment)

@YoshiRulz YoshiRulz force-pushed the new-proj-format branch 3 times, most recently from 206c38e to c168b1d Compare April 8, 2023 17:29
@YoshiRulz YoshiRulz marked this pull request as ready for review April 8, 2023 17:34
@YoshiRulz YoshiRulz force-pushed the new-proj-format branch 3 times, most recently from 5315b49 to d4c0792 Compare May 1, 2023 13:58
@danebou
Copy link
Member

danebou commented Apr 25, 2024

Is the Resource directory copy handled? Before: <PreBuildEvent>xcopy /E /Y /I "$(ProjectDir)Resources" "$(TargetDir)Resources" /D</PreBuildEvent>

@danebou
Copy link
Member

danebou commented Apr 25, 2024

Is the Resource directory copy handled? Before: <PreBuildEvent>xcopy /E /Y /I "$(ProjectDir)Resources" "$(TargetDir)Resources" /D</PreBuildEvent>

Yes it is

@danebou
Copy link
Member

danebou commented Apr 29, 2024

Sorry, forgot about your PR and made some more merge conflicts with recent changes. Can you resolve them? I'll try to keep these files untouched in the meantime.

@YoshiRulz
Copy link
Contributor Author

YoshiRulz commented Apr 29, 2024

Please don't make me do that again.

edit: I should add that 440f632 starts a divide-and-conquer, but I don't actually finish the conquer part in this PR. That's partially because I can't glob if only some files have a property, but also I've been meaning to investigate a programmatic solution to marking those Designer files but haven't gotten around to it.

@danebou danebou merged commit 07b2412 into SM64-TAS-ABC:dev Apr 29, 2024
@danebou
Copy link
Member

danebou commented Apr 29, 2024

Thanks. That'd be nice if there was a clean way to handle those.

@YoshiRulz YoshiRulz deleted the new-proj-format branch April 30, 2024 07:07
@YoshiRulz YoshiRulz restored the new-proj-format branch April 30, 2024 07:07
@YoshiRulz
Copy link
Contributor Author

"Clean" and "the WinForms Designer" are mutually exclusive, I've found.

This was good then? Nothing broke? The next thing I wanted to do was take a look at what tests you have, hopefully get them running without code changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants