44c5fc3250
Fix merge conflicts and add missing lines to framework version of the DotNet compiler example module. Test output to come in PR #5393