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

Move GirTool, Integration folders and props files #995

Merged
merged 1 commit into from
Jan 12, 2024

Conversation

kashifsoofi
Copy link
Contributor

  • I agree that my contribution may be licensed either under MIT or any version of LGPL license.

@badcel badcel linked an issue Jan 9, 2024 that may be closed by this pull request
@badcel
Copy link
Member

badcel commented Jan 9, 2024

Thank you for your contribution 👍

Some comments:

  • The Integration project does not show up in the solution Extensions folder. Please add it via your ide and remove the project which is still in the wrong place in the solution file, via your ide, too. I don't know why your change does not work. Unfortunately the file format is not very human readable.
  • The GirTool project does not show up in the solution Generation folder. Please add it via your ide and remove the project which is still in the wrong place in the solution file, via your ide, too. I don't know why your change does not work. Unfortunately the file format is not very human readable.
  • Please remove the import tags from GirTool.csproj as those are already imported via the Directory.Build.props file in the Generation folder (a warning is shown during compilation):
  <Import Project="../../Properties/GirCore.Tooling.props" />
  <Import Project="../../Properties/GirCore.Logging.props" />
  • Please remove the import tags from Integration.csproj as those are already imported via the Directory.Build.props file in the Extensions folder (a warning is shown during compilation):
  <Import Project="../../Properties/GirCore.Libraries.props" />
  <Import Project="../../Properties/GirCore.Publishing.props" />
  • You did change some Id from the FontDialog sample in the solution file which results in the project being not in the samples folder any more.

@kashifsoofi kashifsoofi force-pushed the clean-up-src-folder branch 2 times, most recently from c3d2a97 to 601a737 Compare January 9, 2024 21:09
@kashifsoofi
Copy link
Contributor Author

I didn't have instant access to Windows machine (Visual Studio), I have now updated using Visual Studio

@badcel
Copy link
Member

badcel commented Jan 10, 2024

Hm, for some reason the solution file is not working for me with Jetbrains Rider. The Libs virtual folder is inside the Samples virtual folder. I fixed the file with Rider. Additonally I added a Properties virtual folder inside the SolutionItems virtual folder. The code is in the following gist: https://gist.github.com/badcel/1d51a74ff50dbb91977d733fb67f16a0

Can you copy the content into your GirCore.sln file and verify it works for you?

@kashifsoofi kashifsoofi force-pushed the clean-up-src-folder branch 5 times, most recently from 1103054 to c293305 Compare January 10, 2024 22:49
@kashifsoofi
Copy link
Contributor Author

kashifsoofi commented Jan 10, 2024

Updated, can you please try again

@kashifsoofi kashifsoofi force-pushed the clean-up-src-folder branch 3 times, most recently from 898072c to e964bf5 Compare January 10, 2024 23:35
@badcel
Copy link
Member

badcel commented Jan 11, 2024

I think the solution file is fine now.

Can you try to update the 2 solution filter files? I updated them (there was one project missing in them) and updated the / to \\.

Gist with the content is here: https://gist.github.com/badcel/a5f9544ffe39ea6bcc5ed91fe0bd0690

@kashifsoofi
Copy link
Contributor Author

Thanks the build passed, can you please check the solution file?

@badcel badcel merged commit 14cd764 into gircore:main Jan 12, 2024
@badcel
Copy link
Member

badcel commented Jan 12, 2024

Thank you for your contribution 👍

@kashifsoofi kashifsoofi deleted the clean-up-src-folder branch January 12, 2024 18:12
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.

Cleanup "src" folder
2 participants