Skip to content

Upgraded to MonoGame 3.8.0 (+ small update for other libraries) #719

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
Merged
cjakeman merged 5 commits into from
Jan 21, 2023
Merged

Upgraded to MonoGame 3.8.0 (+ small update for other libraries) #719

cjakeman merged 5 commits into from
Jan 21, 2023

Conversation

@Sharpe49
Copy link
Contributor

@Sharpe49 Sharpe49 commented Oct 3, 2022 •
edited
Loading

NB : Switching to MonoGame 3.8.0 has an impact on effects compilation (which is currently done at runtime).
It can no longer be executed from the MonoGame.Framework.Content.Pipeline assembly because it needs to have mgfxc installed as a dotnet tool locally and the tool can't be added to the Program folder since it's dependencies are compiled for .Net Core.

Effects compilation is now done during Open Rails build. That's why effects files in the Program\Content folder are now .mgfx files after build.

And we can't update to MonoGame 3.8.1 because it is .Net 6 only.

@Sharpe49 Sharpe49 added the enhancement New feature or request label Oct 3, 2022
@Sharpe49 Sharpe49 self-assigned this Oct 3, 2022
@Sharpe49 Sharpe49 closed this Oct 3, 2022
@Sharpe49 Sharpe49 deleted the upgrade-monogame branch October 3, 2022 03:01
@Sharpe49 Sharpe49 restored the upgrade-monogame branch October 3, 2022 03:02
@Sharpe49 Sharpe49 reopened this Oct 3, 2022
twpol pushed a commit that referenced this pull request Oct 24, 2022
@openrails-bot
Automatic merge of T1.5-rc2-76-g41442f9ab and 9 pull requests
d88ec6e 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 0488826: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at 085d738: Improvements for air brakes
twpol pushed a commit that referenced this pull request Oct 24, 2022
@openrails-bot
Automatic merge of T1.5-rc2-76-g41442f9ab and 11 pull requests
cc5bc16 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 0488826: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at 085d738: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
twpol pushed a commit that referenced this pull request Oct 24, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 12 pull requests
659a1ec 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 0488826: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at 085d738: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
twpol pushed a commit that referenced this pull request Oct 24, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 12 pull requests
3120002 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at 085d738: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
twpol pushed a commit that referenced this pull request Oct 24, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 12 pull requests
a85a0a7 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at ce99b03: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
twpol pushed a commit that referenced this pull request Oct 25, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 13 pull requests
2653410 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at ce99b03: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #737 at 96d12f1: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 25, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 13 pull requests
d7639c0 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #731 at f1348a4: fix: Log first error during Viewer mark-sweep clean-up
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #737 at 96d12f1: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 26, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 12 pull requests
a052f9a 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #737 at 96d12f1: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 26, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 11 pull requests
8c75bf9 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
twpol pushed a commit that referenced this pull request Oct 26, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 12 pull requests
db96a03 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at 66095ac: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
twpol pushed a commit that referenced this pull request Oct 26, 2022
@openrails-bot
Automatic merge of T1.5-rc2-82-g5a8a93652 and 13 pull requests
cb7f8dd 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at 66095ac: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 26, 2022
@openrails-bot
Automatic merge of T1.5-rc2-85-gcf1e833bc and 13 pull requests
39cc55e 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 65741c7: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 26, 2022
@openrails-bot
Automatic merge of T1.5-rc3-78-gcf1e833bc and 13 pull requests
b6ad6c4 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 49c4ce8: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 28, 2022
@openrails-bot
Automatic merge of T1.5-rc3-78-gcf1e833bc and 13 pull requests
47675e7 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at f9c7507: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at fd9e47a: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
@cesarBLG
Copy link
Contributor

cesarBLG commented Oct 29, 2022

The CI builds are failing, and the log reports a failure in effects compilation

@Sharpe49
Copy link
Contributor Author

Sharpe49 commented Oct 29, 2022

AppVeyor does report a success just above. Where do you see this failure ?

@cesarBLG
Copy link
Contributor

cesarBLG commented Oct 29, 2022

It's from the bot that generates the Unstable builds: https://james-ross.co.uk/projects/or/ci_log.txt
The log can be accessed from the main page of the repository (it shows Builds | Failing)

@Sharpe49
Copy link
Contributor Author

Sharpe49 commented Oct 29, 2022

Ok, James is using Jenkins and its config file is not in the repository. I will move the dotnet tool restore command from the AppVeyor CI file to the Build.cmd file.

@Sharpe49
Copy link
Contributor Author

Sharpe49 commented Oct 29, 2022

Or better, to the PostBuildActions.bat file

twpol pushed a commit that referenced this pull request Oct 29, 2022
@openrails-bot
Automatic merge of T1.5-rc3-78-gcf1e833bc and 13 pull requests
6192b46 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at f9c7507: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at 56d183c: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
@Sharpe49
Copy link
Contributor Author

Sharpe49 commented Oct 29, 2022

Ok, waiting for a new Jenkins build.

@Sharpe49
Copy link
Contributor Author

Sharpe49 commented Oct 29, 2022

Yep, it worked.

twpol pushed a commit that referenced this pull request Oct 30, 2022
@openrails-bot
Automatic merge of T1.5-rc3-78-gcf1e833bc and 13 pull requests
e0f6572 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 0aa8c34: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at 56d183c: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Oct 30, 2022
@openrails-bot
Automatic merge of T1.5-rc3-78-gcf1e833bc and 13 pull requests
af59f7e 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #713 at 4c52f58: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at 56d183c: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at efbc397: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
twpol pushed a commit that referenced this pull request Jan 7, 2023
@openrails-bot
Automatic merge of T1.5.1-164-g084d23230 and 15 pull requests
10a7488 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111
- Pull request #749 at db5764c: OpenRailway Map
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at b87e473: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 8, 2023
@openrails-bot
Automatic merge of T1.5.1-164-g084d23230 and 16 pull requests
0c8a4c7 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111
- Pull request #749 at db5764c: OpenRailway Map
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at b87e473: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 9, 2023
@openrails-bot
Automatic merge of T1.5.1-164-g084d23230 and 16 pull requests
d49f897 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111
- Pull request #749 at db5764c: OpenRailway Map
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at ee55d7a: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 10, 2023
@openrails-bot
Automatic merge of T1.5.1-174-gd2e682132 and 14 pull requests
d0009d6 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at a9e9512: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 11, 2023
@openrails-bot
Automatic merge of T1.5.1-174-gd2e682132 and 13 pull requests
247ca72 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 11, 2023
@openrails-bot
Automatic merge of T1.5.1-174-gd2e682132 and 14 pull requests
429252e 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at a9e9512: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 11, 2023
@openrails-bot
Automatic merge of T1.5.1-174-gd2e682132 and 14 pull requests
cbafe3c 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at f10eda9: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at a9e9512: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 12, 2023
@openrails-bot
Automatic merge of T1.5.1-174-gd2e682132 and 14 pull requests
b1712ea 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 8abe61f: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at a9e9512: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
twpol pushed a commit that referenced this pull request Jan 12, 2023
@openrails-bot
Automatic merge of T1.5.1-174-gd2e682132 and 13 pull requests
6702583 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 8abe61f: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at a9e9512: Steam wheel slip#1
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
@cjakeman cjakeman added the not-for-unstable Special label to exclude a pull request from the Unstable Version label Jan 12, 2023
@cjakeman
Copy link
Contributor

cjakeman commented Jan 12, 2023

Hi Cedric,

I've added the not-for-unstable label again as this PR was again passing through the Appveyor, but the build was failing with:

C:\Jenkins\jobs\Open Rails Unstable\workspace\Source\Orts.Parsers.OR\Orts.Parsers.OR.csproj(21,5): error MSB4025: The project file could not be loaded. The 'PackageReference' start tag on line 17 position 6 does not match the end tag of 'ItemGroup'. Line 21, position 5.

This may be something to do with the git operation that merges *.csproj files as James mentioned that it uses merge=union. I will ask him to change it so that the XML tags in *.csproj are not so easily broken.

Best wishes,
Chris

@cjakeman cjakeman removed the not-for-unstable Special label to exclude a pull request from the Unstable Version label Jan 18, 2023
twpol pushed a commit that referenced this pull request Jan 18, 2023
@openrails-bot
Automatic merge of T1.5.1-223-g0db4bb3e8 and 12 pull requests
afd7c96 
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 83002d7: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
- Pull request #766 at f143fcc: Control Car additional functionality
- Pull request #767 at 9317f8c: Refine sunrise and sunset
- Pull request #768 at a0eae37: OpenRailway Map enhancements
@cjakeman cjakeman added the not-for-unstable Special label to exclude a pull request from the Unstable Version label Jan 18, 2023
@cjakeman
Copy link
Contributor

cjakeman commented Jan 18, 2023

Now that another PR which conflicted has been merged, I removed label not-for-unstable to see if the XML tags in this project file would survive the merge. It didn't - see below, so I have restored the label:

C:\projects\openrails\Source\Orts.Parsers.OR\Orts.Parsers.OR.csproj(28,5): error MSB4025: The project file could not be loaded. The 'PackageReference' start tag on line 22 position 6 does not match the end tag of 'ItemGroup'. Line 28, position 5.

@cjakeman cjakeman removed the not-for-unstable Special label to exclude a pull request from the Unstable Version label Jan 19, 2023
twpol pushed a commit that referenced this pull request Jan 19, 2023
@openrails-bot
Automatic merge of T1.5.1-225-g17af6ffa8 and 12 pull requests
95dc498 
- Pull request #717 at 98221c0: Allow unlimited number of TCS cabview controls
- Pull request #719 at 0f4d975: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 83002d7: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
- Pull request #766 at 3d5d238: Control Car additional functionality
- Pull request #767 at 9317f8c: Refine sunrise and sunset
- Pull request #768 at bc8aea4: OpenRailway Map enhancements
cjakeman
cjakeman approved these changes Jan 19, 2023
View reviewed changes
Copy link
Contributor

@cjakeman cjakeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Cedric,

I've removed the not-for-unstable label and see it's all working now.

Thanks for changing the .gitattributes

Chris

twpol pushed a commit that referenced this pull request Jan 19, 2023
@openrails-bot
Automatic merge of T1.5.1-228-g7047b8ce4 and 12 pull requests
e625aa2 
- Pull request #717 at 98221c0: Allow unlimited number of TCS cabview controls
- Pull request #719 at 0f4d975: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 83002d7: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
- Pull request #766 at 3d5d238: Control Car additional functionality
- Pull request #767 at 9317f8c: Refine sunrise and sunset
- Pull request #768 at bc8aea4: OpenRailway Map enhancements
twpol pushed a commit that referenced this pull request Jan 20, 2023
@openrails-bot
Automatic merge of T1.5.1-235-gd0b80edbf and 11 pull requests
750ce51 
- Pull request #719 at 0f4d975: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 83002d7: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
- Pull request #766 at c9657de: Control Car additional functionality
- Pull request #767 at 9317f8c: Refine sunrise and sunset
- Pull request #768 at bc8aea4: OpenRailway Map enhancements
twpol pushed a commit that referenced this pull request Jan 20, 2023
@openrails-bot
Automatic merge of T1.5.1-237-g5c9f646ff and 11 pull requests
1435554 
- Pull request #719 at 0f4d975: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 83002d7: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #751 at f947f29: Web interface to control cab controls with external hardware
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #766 at c9657de: Control Car additional functionality
- Pull request #767 at 9317f8c: Refine sunrise and sunset
- Pull request #768 at bc8aea4: OpenRailway Map enhancements
twpol pushed a commit that referenced this pull request Jan 21, 2023
@openrails-bot
Automatic merge of T1.5.1-243-g3ffb9bc10 and 10 pull requests
c05fe7f 
- Pull request #719 at 0f4d975: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 83002d7: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #751 at f947f29: Web interface to control cab controls with external hardware
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #766 at c9657de: Control Car additional functionality
- Pull request #767 at 9317f8c: Refine sunrise and sunset
- Pull request #768 at bc8aea4: OpenRailway Map enhancements
- Pull request #769 at 1a99f43: Partial turntables https://blueprints.launchpad.net/or/+spec/partial-turntable
@cjakeman cjakeman merged commit ad1c4e3 into openrails:master Jan 21, 2023
@Sharpe49 Sharpe49 deleted the upgrade-monogame branch January 30, 2023 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjakeman cjakeman cjakeman approved these changes

Assignees

@Sharpe49 Sharpe49

Labels

enhancement New feature or request

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Sharpe49 @cesarBLG @cjakeman