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.

Sign up for GitHub

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

Jump to bottom

netcore: Merging dosymep/netcore to develop 4 #2338

Closed
wants to merge 109 commits into from
Closed

netcore: Merging dosymep/netcore to develop 4 #2338

wants to merge 109 commits into from

Conversation

jmcouffin
Copy link
Contributor

No description provided.

@dosymep
add net8.0-window targetframework
63f86ea
@dosymep
update dependencies path
794190b
@dosymep
remove runtime outdated links
db13a9a
@dosymep
remove unnecessary build configurations
d77c139
@dosymep
fix slashes
18ecfc3
@dosymep
add revit 2025 libraries
698038f
@dosymep
add revit 2016-2024 versions documentation
68af819
@dosymep
add revit 2025 project
1b1afdc
@dosymep
add revit versions props
05bdc2d
@dosymep
update projects files
1cc2e50
@dosymep
fix pyrevit runtime build
385cfe4
@dosymep
fix pyrevitLoader build
fa4e7d7
@dosymep
fix pyRevitLabs build
979c529
@dosymep
Merge branch 'develop' into dosymep/netcore
d09467c 
# Conflicts:
#	dev/pyRevitLoader/pyRevitLoader.2710.csproj
#	dev/pyRevitLoader/pyRevitLoader.273.csproj
#	dev/pyRevitLoader/pyRevitLoader.277.csproj
#	dev/pyRevitLoader/pyRevitLoader.278.csproj
#	dev/pyRevitLoader/pyRevitLoader.279.csproj
#	dev/pyRevitLoader/pyRevitRunner.2710.csproj
#	dev/pyRevitLoader/pyRevitRunner.273.csproj
#	dev/pyRevitLoader/pyRevitRunner.277.csproj
#	dev/pyRevitLoader/pyRevitRunner.278.csproj
#	dev/pyRevitLoader/pyRevitRunner.279.csproj
@dosymep
fix configuration revit runtime 2025
431d70f
@dosymep
make all configurations to x64
284098d
@dosymep
remove revit api docs
d2940f8
@dosymep
fix compile
2e61b9b
@dosymep
fix ambiguous MenuItem, ContextMenu
5634d41
@dosymep
add compiled libs net8.0
828c64d
@dosymep
remove deprecated engines
a043449
@dosymep
fix build 2025
9c22d71
@dosymep
fix resove dependencies
e9c6347
@dosymep
update projects
aa68900
@dosymep
update dependencies
a55d535
@dosymep
update dependencies
6aac378
@dosymep
fix build
3425766
@dosymep
update
6458428
@dosymep
update
ecbe93f
@dosymep
update build test
a28853e
dosymep and others added 23 commits June 22, 2024 22:15
@dosymep
fix builds
a2a4a98
@dosymep
fix builds
368baba
@dosymep
bump version to 5.0.0
64b98f8
@dosymep
fix build
2933c14
@dosymep
fix build
4bf9ae4
@dosymep
update workflow
3afa0d7
@dosymep
update workflow
b6f6e6e
@dosymep
fix build
a81fd2d
@dosymep
fix build
6266420
@jmcouffin
Update pyrevit-hosts.json
2d70cdd
@dosymep
fix build
82b38b4
@dosymep
Merge remote-tracking branch 'origin/dosymep/netcore' into dosymep/ne…
71cc7ab 
…tcore
move python.net to libraries, fix ironpython versions, update to cpyt…
ef56004 
…hon 3.12.3
build: ensure mahappsmetro xaml styles
5d8eb85
fix: installer doesn't create the addin files
9fe5ae8
fix: wrong cpython engines paths
311e15c
build: add configuration parameter to some pyrevit build commands
6a00a08
fix: avoid python builtins overwrite
7d15802
refactor: use linq and simplify engin searches
83fbf08
build: fix pyrevit build product script default config
7b3b254
fix: cannot find netcore engines
76bef4f
feat(cli): non-zero exit code on error
3ec046d
@jmcouffin
Squashed and merged develop 4 changes to dosymep/netcore fork and branch
3eed7c7
@jmcouffin jmcouffin added the pyRevit 5 pyRevit 5 coming release label Aug 13, 2024
@jmcouffin
Copy link
Contributor Author

@sanzoghenzo @dosymep I am having difficulties making this not a mess 😩
Any advice appreciated

@sanzoghenzo
Copy link
Contributor

Sorry I was at work until now, and I'm heading out...
You can just copy the missing .cs files from the commit before the merge and create a new commit with only those files (be it as a new pr or directly on develop)

@sanzoghenzo
Copy link
Contributor

Sorry, I see only now that it is a different PR and that you tried various things unsuccessfully 😉

I would do the following:

  • do an hard reset and force push of the develop and develop-4 branches to set it to what they were before netcore #2088 was merged
  • add the missing files to dosymep/netcore
  • do a new PR with the updated dosymep/netcore

I started working on the last two points, I hope to get something working by tomorrow at noon or before.

@sanzoghenzo
Copy link
Contributor

Closing this in, @jmcouffin you've got a DM on discourse for how to solve this 😉

@jmcouffin
Copy link
Contributor Author

Closing this in, @jmcouffin you've got a DM on discourse for how to solve this 😉

Looking at it in a few minutes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pyRevit 5 pyRevit 5 coming release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jmcouffin @sanzoghenzo @dosymep