Upgraded project files to .Net SDK project file format #569
+519
−28,395
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi Cedric, The Code Bot at https://james-ross.co.uk/projects/or reports a merge/delete conflict for Source/Orts.Simulation/packages.config Are you able to sort this out? Thanks, Chris |
|
That's to be expected. The packages.config will be deleted (its information are now integrated in the csproj file) while another pull request wants to modify the packages.config file (it should be the script compiler pull request). |
Sharpe49
force-pushed
the
dotnetsdk-project-files-upgrade
branch
from
9b757a1
to
347b3df
Compare
twpol
pushed a commit
that referenced
this pull request
Aug 3, 2022
- Pull request #525 at 614b222: TCS extensions - Pull request #569 at 347b3df: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #672 at e4ba722: Calculate distance to signal in explorer mode - Pull request #673 at 3080e85: hu locales update
|
Ok, rebased my branch and taking it out of draft. |
twpol
pushed a commit
that referenced
this pull request
Aug 3, 2022
- Pull request #569 at 347b3df: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #672 at e4ba722: Calculate distance to signal in explorer mode - Pull request #673 at 3080e85: hu locales update
twpol
pushed a commit
that referenced
this pull request
Aug 3, 2022
- Pull request #569 at 686d0ba: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #672 at e4ba722: Calculate distance to signal in explorer mode - Pull request #673 at 3080e85: hu locales update
twpol
pushed a commit
that referenced
this pull request
Aug 4, 2022
- Pull request #569 at 686d0ba: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #672 at e4ba722: Calculate distance to signal in explorer mode - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons
Sharpe49
force-pushed
the
dotnetsdk-project-files-upgrade
branch
2 times, most recently
from
a981086
to
7e31427
Compare
twpol
pushed a commit
that referenced
this pull request
Aug 4, 2022
- Pull request #569 at a981086: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons
Sharpe49
force-pushed
the
dotnetsdk-project-files-upgrade
branch
from
7e31427
to
4c5b3b2
Compare
twpol
pushed a commit
that referenced
this pull request
Aug 4, 2022
- Pull request #569 at 4c5b3b2: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons
|
Unstable builds are failing because other branches are adding files to the csproj files, which is forbidden. |
Sharpe49
added
the
not-for-unstable
cjakeman
removed
the
not-for-unstable
twpol
pushed a commit
that referenced
this pull request
Aug 6, 2022
- Pull request #569 at 4c5b3b2: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #665 at 5956412: 02n: Removes some redundant experimental options - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons
twpol
pushed a commit
that referenced
this pull request
Aug 6, 2022
- Pull request #569 at 2448c4a: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #665 at 5956412: 02n: Removes some redundant experimental options - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons
Sharpe49
force-pushed
the
dotnetsdk-project-files-upgrade
branch
from
2448c4a
to
efd9055
Compare
|
I prefer rebasing instead of merging when we are in a branch. It makes the history easier to understand. |
Removed AssemblyInfo files (integrated in the project file) Removed unused files (not referenced in the old project files) Removed resource files in ActivityEditor which were causing execution problems
Sharpe49
force-pushed
the
dotnetsdk-project-files-upgrade
branch
from
efd9055
to
e51497d
Compare
twpol
pushed a commit
that referenced
this pull request
Aug 7, 2022
- Pull request #569 at e51497d: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #665 at 5956412: 02n: Removes some redundant experimental options - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons
twpol
pushed a commit
that referenced
this pull request
Aug 7, 2022
- Pull request #569 at e51497d: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #665 at 5956412: 02n: Removes some redundant experimental options - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons - Pull request #675 at 9664141: Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible
twpol
pushed a commit
that referenced
this pull request
Aug 7, 2022
- Pull request #569 at e51497d: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #665 at 5956412: 02n: Removes some redundant experimental options - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons - Pull request #675 at 9664141: Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible - Pull request #676 at 7687cb8: adds content hosted on GitHub.com
twpol
pushed a commit
that referenced
this pull request
Aug 7, 2022
- Pull request #569 at e51497d: Upgraded project files to .Net SDK project file format - Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) - Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version - Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #665 at 5956412: 02n: Removes some redundant experimental options - Pull request #671 at c5dcc73: Updates manual for Release 1.5 - Pull request #673 at 3080e85: hu locales update - Pull request #674 at e160e26: Mark particle drawer texture for wagons - Pull request #675 at 9664141: Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible - Pull request #676 at 3ee0822: adds content hosted on GitHub.com
cjakeman
approved these changes
Aug 7, 2022
This was referenced Aug 10, 2022
Csantucci
added a commit
to Csantucci/openrails
that referenced
this pull request
Aug 14, 2022
…ject file format
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removed AssemblyInfo files (integrated in the project file)
Removed unused files (not referenced in the old project files)
Removed resource files in ActivityEditor which were causing execution problems
1st step of https://blueprints.launchpad.net/or/+spec/dependencies-update
http://www.elvastower.com/forums/index.php?/topic/32819-upgrading-net-c/page__view__findpost__p__278324