Unify Windows and mono build systems.

The Makefile behaviour is recreated using the new and significantly
cleaner .NET Core csproj format.

fixheader.exe is promoted to OpenRA.PostProcess.exe and now runs
on all platforms.

.gitattributes

@@ -8,8 +8,3 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union

INSTALL.md

@@ -9,6 +9,7 @@ Windows
 Compiling OpenRA requires the following dependencies:
 * [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions)
 * [.NET Framework 4.6.1 (Developer Pack)](https://dotnet.microsoft.com/download/dotnet-framework/net461) (or via Visual Studio 2017)
+* [.NET Core 2.2 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) (or via Visual Studio 2017)
 
 Type `make dependencies` in a command terminal to download pre-compiled native libraries for:
 * [SDL 2](http://www.libsdl.org/download-2.0.php)

Makefile

@@ -33,18 +33,11 @@
 # to start the game, run:
 #   openra
 
-
-
 ############################## TOOLCHAIN ###############################
 #
-CSC         = csc
-CSFLAGS     = -nologo -warn:4 -langversion:5 -unsafe -warnaserror
-DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Numerics.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll
-
 # List of .NET assemblies that we can guarantee exist
 # OpenRA.Game.dll is a harmless false positive that we can ignore
-WHITELISTED_OPENRA_ASSEMBLIES = $(game_TARGET) $(utility_TARGET) $(pdefault_TARGET) $(mod_common_TARGET) $(mod_cnc_TARGET) $(mod_d2k_TARGET) OpenRA.Game.dll
+WHITELISTED_OPENRA_ASSEMBLIES = OpenRA.Game.exe OpenRA.Utility.exe OpenRA.Platforms.Default.dll OpenRA.Mods.Common.dll OpenRA.Mods.Cnc.dll OpenRA.Mods.D2k.dll OpenRA.Game.dll
 
 # These are explicitly shipped alongside our core files by the packaging script
 WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll MaxMind.Db.dll Eluant.dll rix0rrr.BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.dll 
@@ -56,16 +49,6 @@ WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll S
 NUNIT_LIBS_PATH :=
 NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
 
-DEBUG = false
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-CSFLAGS   += -debug:pdbonly -optimize+
-else
-CSFLAGS   += -debug:full -optimize-
-DEFINE    := DEBUG;$(DEFINE)
-endif
-
-
-
 ######################### UTILITIES/SETTINGS ###########################
 #
 # install locations
@@ -92,6 +75,9 @@ INSTALL_DIR = $(INSTALL) -d
 INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
+# Toolchain
+MSBUILD = msbuild -verbosity:m -nologo
+
 # program targets
 CORE = pdefault game utility server
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
@@ -104,77 +90,13 @@ else
 os-dependencies = linux-dependencies
 endif
 
-
-
-######################## PROGRAM TARGET RULES ##########################
-#
-# Core binaries
-
-game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
-game_TARGET = OpenRA.Game.exe
-game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/Open.Nat.dll
-PROGRAMS += game
-game: $(game_TARGET)
-
-# Platform dlls
-pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
-pdefault_TARGET = OpenRA.Platforms.Default.dll
-pdefault_KIND = library
-pdefault_DEPS = $(game_TARGET)
-pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll $(pdefault_DEPS)
-PROGRAMS += pdefault
-platforms: $(pdefault_TARGET)
-
-# Mods Common
-mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
-mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
-mod_common_KIND = library
-mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS)
-PROGRAMS += mod_common
-mod_common: $(mod_common_TARGET)
-
-# NUnit testing
-test_dll_SRCS := $(shell find OpenRA.Test/ -iname '*.cs')
-test_dll_TARGET = OpenRA.Test.dll
-test_dll_KIND = library
-test_dll_DEPS = $(game_TARGET) $(mod_common_TARGET)
-test_dll_FLAGS = -warn:1
-test_dll_LIBS = $(COMMON_LIBS) $(game_TARGET) $(mod_common_TARGET) $(NUNIT_LIBS)
-PROGRAMS += test_dll
-test_dll: $(test_dll_TARGET)
-
-##### Official Mods #####
-
-STD_MOD_LIBS	= $(game_TARGET)
-STD_MOD_DEPS	= $(STD_MOD_LIBS)
-
-# Command and Conquer
-mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET = mods/common/OpenRA.Mods.Cnc.dll
-mod_cnc_KIND = library
-mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_cnc
-mod_cnc: $(mod_cnc_TARGET)
-
-# Dune 2000
-mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
-mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
-mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_d2k
-mod_d2k: $(mod_d2k_TARGET)
-
 check-scripts:
 	@echo
 	@echo "Checking for Lua syntax errors..."
 	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
 	@luac -p $(shell find lua/* -iname '*.lua')
 
-check: utility stylecheck mods
+check: core
 	@echo
 	@echo "Checking runtime assemblies..."
 	@mono --debug OpenRA.Utility.exe all --check-runtime-assemblies $(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES) $(WHITELISTED_CORE_ASSEMBLIES)
@@ -208,7 +130,7 @@ check: utility stylecheck mods
 
 NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit3-console.exe && echo mono thirdparty/download/nunit3-console.exe || \
 	which nunit3-console 2>/dev/null || which nunit2-console 2>/dev/null || which nunit-console 2>/dev/null)
-nunit: test_dll
+nunit: core
 	@echo
 	@echo "Checking unit tests..."
 	@if [ "$(NUNIT_CONSOLE)" = "" ] ; then \
@@ -225,7 +147,7 @@ nunit: test_dll
 	fi
 	@$(NUNIT_CONSOLE) --noresult OpenRA.Test.nunit
 
-test: utility mods
+test: core
 	@echo
 	@echo "Testing Tiberian Sun mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ts --check-yaml
@@ -239,72 +161,18 @@ test: utility mods
 	@echo "Testing Red Alert mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
-
-##### Launchers / Utilities #####
-
-utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
-utility_TARGET = OpenRA.Utility.exe
-utility_KIND = exe
-utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
-PROGRAMS += utility
-utility: $(utility_TARGET)
-
-stylecheck_SRCS := $(shell find OpenRA.StyleCheck/ -iname '*.cs')
-stylecheck_TARGET = OpenRA.StyleCheck.exe
-stylecheck_KIND = exe
-stylecheck_LIBS = thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
-PROGRAMS += stylecheck
-stylecheck: $(stylecheck_TARGET)
-
-# Dedicated server
-server_SRCS := $(shell find OpenRA.Server/ -iname '*.cs')
-server_TARGET = OpenRA.Server.exe
-server_KIND = exe
-server_DEPS = $(game_TARGET)
-server_LIBS = $(COMMON_LIBS) $(server_DEPS)
-PROGRAMS += server
-server: $(server_TARGET)
-
-# Patches binary headers to work around a mono bug
-fixheader.exe: packaging/fixheader.cs
-	@command -v $(CSC) >/dev/null || (echo "Mono is not installed. Please install Mono from http://www.mono-project.com/download/ before building OpenRA."; exit 1)
-	@echo CSC fixheader.exe
-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
-
-# Generate build rules for each target defined above in PROGRAMS
-define BUILD_ASSEMBLY
-
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
-	@echo CSC $$(@)
-	@$(CSC) $$($(1)_LIBS:%=-r:%) \
-		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
-		-define:"$(DEFINE)" \
-		-t:"$$($(1)_KIND)" \
-		$$($(1)_EXTRA) \
-		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@) > /dev/null
-	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
-	@$$($(1)_EXTRA_CMDS)
-endef
-
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: dependencies core
+all: dependencies core
 
-core: game platforms mods utility server
+core:
-
+	@command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1)
-mods: mod_common mod_cnc mod_d2k
+	@$(MSBUILD) -t:build -p:Configuration=Release
-
-all: dependencies core stylecheck
 
 clean:
-	@-$(RM_F) $(shell find . -maxdepth 1 -iname '*.dll.config' -a ! -iname 'OpenRA.Platforms.Default.dll.config')
+	@ $(MSBUILD) -t:clean
-	@-$(RM_F) *.exe *.dll *.dylib ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_F) *.config
+	@-$(RM_F) *.exe *.dll *.dylib ./OpenRA*/*.dll *.pdb mods/**/*.dll mods/**/*.pdb *.resources
 	@-$(RM_RF) ./*/bin ./*/obj
 	@-$(RM_RF) ./thirdparty/download
 
@@ -314,6 +182,7 @@ cli-dependencies:
 	@./thirdparty/fetch-thirdparty-deps.sh
 	@ $(CP_R) thirdparty/download/*.dll .
 	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ test -f OpenRA.Game/obj/project.assets.json || $(MSBUILD) -t:restore
 
 linux-dependencies: cli-dependencies geoip-dependencies linux-native-dependencies
 
@@ -347,16 +216,19 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
 man-page: utility mods
 	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
 
-install: default install-core
+install: dependencies core install-core
 
 install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
 install-engine:
 	@-echo "Installing OpenRA engine to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Game.exe "$(DATA_INSTALL_DIR)"
-	@$(CP) OpenRA.Platforms.Default.dll.config "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Server.exe "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Utility.exe "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Platforms.Default.dll "$(DATA_INSTALL_DIR)"
 
+	@$(INSTALL_DATA) OpenRA.Platforms.Default.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
 	@$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
@@ -369,7 +241,6 @@ install-engine:
 	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
-	@$(CP) OpenRA.Platforms.Default.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) rix0rrr.BeaconLib.dll "$(DATA_INSTALL_DIR)"
@@ -378,8 +249,8 @@ install-common-mod-files:
 	@-echo "Installing OpenRA common mod files to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
 	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_PROGRAM) mods/common/OpenRA.Mods.Common.dll "$(DATA_INSTALL_DIR)/mods/common"
-	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_PROGRAM) mods/common/OpenRA.Mods.Cnc.dll "$(DATA_INSTALL_DIR)/mods/common"
 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
 
 install-default-mods:
@@ -388,7 +259,7 @@ install-default-mods:
 	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
 	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
 	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
+	@$(INSTALL_PROGRAM) mods/d2k/OpenRA.Mods.D2k.dll "$(DATA_INSTALL_DIR)/mods/d2k"
 	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
 
 install-core: install-engine install-common-mod-files install-default-mods
@@ -518,13 +389,10 @@ help:
 	@echo 'to start the game, run:'
 	@echo '  openra'
 
-
-
-
 ########################### MAKEFILE SETTINGS ##########################
 #
-.DEFAULT_GOAL := default
+.DEFAULT_GOAL := all
 
 .SUFFIXES:
 
-.PHONY: core package all mods clean distclean dependencies version $(PROGRAMS) nunit
+.PHONY: core package all mods clean distclean dependencies version nunit

OpenRA.Game/OpenRA.Game.csproj

@@ -1,61 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <OutputType>Exe</OutputType>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <TargetFramework>net461</TargetFramework>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA</RootNamespace>
-    <AssemblyName>OpenRA.Game</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <OutputPath>..</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <StartArguments>Game.Mod=ra</StartArguments>
-    <Commandlineparameters>Game.Mod=ra</Commandlineparameters>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
     <Optimize>true</Optimize>
-    <StartArguments>Game.Mod=ra</StartArguments>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <Commandlineparameters>Game.Mod=ra</Commandlineparameters>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <RootNamespace>OpenRA</RootNamespace>
+    <OutputPath>..</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+    <ExternalConsole>false</ExternalConsole>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <StartAction>Project</StartAction>
@@ -74,8 +37,6 @@
     <StartArguments>Game.Mod=ts</StartArguments>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="Open.Nat">
       <HintPath>..\thirdparty\download\Open.Nat.dll</HintPath>
     </Reference>
@@ -91,247 +52,13 @@
       <HintPath>..\thirdparty\download\MaxMind.Db.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Numerics" />
+    <ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
+  <Target Name="PostProcess" AfterTargets="Build" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)\$(TargetFileName).processed">
-    <Compile Include="Activities\Activity.cs" />
+    <Exec Command="$(TargetDir)/OpenRA.PostProcess.exe $(TargetPath) -LAA" />
-    <Compile Include="Activities\CallFunc.cs" />
+    <Touch Files="$(IntermediateOutputPath)\$(TargetFileName).processed" AlwaysCreate="true" />
-    <Compile Include="Actor.cs" />
+  </Target>
-    <Compile Include="CacheStorage.cs" />
-    <Compile Include="FileFormats\Png.cs" />
-    <Compile Include="FileSystem\IPackage.cs" />
-    <Compile Include="Network\GameSave.cs" />
-    <Compile Include="Primitives\Color.cs" />
-    <Compile Include="Primitives\Int32Matrix4x4.cs" />
-    <Compile Include="LogProxy.cs" />
-    <Compile Include="Map\MapGrid.cs" />
-    <Compile Include="Map\MapPlayers.cs" />
-    <Compile Include="MPos.cs" />
-    <Compile Include="Download.cs" />
-    <Compile Include="Effects\AsyncAction.cs" />
-    <Compile Include="Effects\DelayedAction.cs" />
-    <Compile Include="Effects\DelayedImpact.cs" />
-    <Compile Include="Effects\IEffect.cs" />
-    <Compile Include="Game.cs" />
-    <Compile Include="GameRules\ActorInfo.cs" />
-    <Compile Include="GameRules\MusicInfo.cs" />
-    <Compile Include="GameRules\SoundInfo.cs" />
-    <Compile Include="GameRules\WeaponInfo.cs" />
-    <Compile Include="Graphics\Animation.cs" />
-    <Compile Include="Graphics\AnimationWithOffset.cs" />
-    <Compile Include="Graphics\ChromeProvider.cs" />
-    <Compile Include="Graphics\CursorProvider.cs" />
-    <Compile Include="Graphics\CursorSequence.cs" />
-    <Compile Include="Graphics\HardwarePalette.cs" />
-    <Compile Include="Graphics\MappedImage.cs" />
-    <Compile Include="Graphics\SequenceProvider.cs" />
-    <Compile Include="Graphics\Sheet.cs" />
-    <Compile Include="Graphics\SheetBuilder.cs" />
-    <Compile Include="Graphics\Sprite.cs" />
-    <Compile Include="Graphics\SpriteFont.cs" />
-    <Compile Include="Graphics\SpriteLoader.cs" />
-    <Compile Include="Graphics\SpriteRenderer.cs" />
-    <Compile Include="Graphics\Util.cs" />
-    <Compile Include="Graphics\Viewport.cs" />
-    <Compile Include="Graphics\WorldRenderer.cs" />
-    <Compile Include="IUtilityCommand.cs" />
-    <Compile Include="ModData.cs" />
-    <Compile Include="Network\Connection.cs" />
-    <Compile Include="Network\FrameData.cs" />
-    <Compile Include="Network\GameServer.cs" />
-    <Compile Include="Network\GeoIP.cs" />
-    <Compile Include="Network\Handshake.cs" />
-    <Compile Include="Network\Order.cs" />
-    <Compile Include="Network\OrderIO.cs" />
-    <Compile Include="Network\OrderManager.cs" />
-    <Compile Include="Network\ReplayConnection.cs" />
-    <Compile Include="Network\Session.cs" />
-    <Compile Include="Network\SyncReport.cs" />
-    <Compile Include="Network\UnitOrders.cs" />
-    <Compile Include="ObjectCreator.cs" />
-    <Compile Include="Orders\GenericSelectTarget.cs" />
-    <Compile Include="Orders\IOrderGenerator.cs" />
-    <Compile Include="Orders\UnitOrderGenerator.cs" />
-    <Compile Include="Player.cs" />
-    <Compile Include="Primitives\MergedStream.cs" />
-    <Compile Include="Primitives\PlayerDictionary.cs" />
-    <Compile Include="Primitives\ReadOnlyAdapterStream.cs" />
-    <Compile Include="Primitives\Rectangle.cs" />
-    <Compile Include="Primitives\SegmentStream.cs" />
-    <Compile Include="Primitives\Size.cs" />
-    <Compile Include="Primitives\SpatiallyPartitioned.cs" />
-    <Compile Include="Primitives\ConcurrentCache.cs" />
-    <Compile Include="SelectableExts.cs" />
-    <Compile Include="Selection.cs" />
-    <Compile Include="Server\Connection.cs" />
-    <Compile Include="Server\Exts.cs" />
-    <Compile Include="Server\ProtocolVersion.cs" />
-    <Compile Include="Server\Server.cs" />
-    <Compile Include="Server\ServerOrder.cs" />
-    <Compile Include="Server\TraitInterfaces.cs" />
-    <Compile Include="Support\Arguments.cs" />
-    <Compile Include="Support\ExceptionHandler.cs" />
-    <Compile Include="Support\LaunchArguments.cs" />
-    <Compile Include="Support\PerfHistory.cs" />
-    <Compile Include="Support\Program.cs" />
-    <Compile Include="Sync.cs" />
-    <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\LintAttributes.cs" />
-    <Compile Include="Traits\Player\Shroud.cs" />
-    <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\Target.cs" />
-    <Compile Include="Traits\TraitsInterfaces.cs" />
-    <Compile Include="Traits\World\Faction.cs" />
-    <Compile Include="Traits\World\ScreenShaker.cs" />
-    <Compile Include="Traits\World\DebugVisualizations.cs" />
-    <Compile Include="World.cs" />
-    <Compile Include="WorldUtils.cs" />
-    <Compile Include="VoiceExts.cs" />
-    <Compile Include="Network\ReplayRecorder.cs" />
-    <Compile Include="Traits\DebugPauseState.cs" />
-    <Compile Include="Network\UPnP.cs" />
-    <Compile Include="Graphics\Renderable.cs" />
-    <Compile Include="Graphics\ModelRenderer.cs" />
-    <Compile Include="Graphics\ModelAnimation.cs" />
-    <Compile Include="Traits\Player\FrozenActorLayer.cs" />
-    <Compile Include="Graphics\Theater.cs" />
-    <Compile Include="Traits\Player\PlayerColorPalette.cs" />
-    <Compile Include="Traits\Player\PlayerHighlightPalette.cs" />
-    <Compile Include="Traits\World\ScreenMap.cs" />
-    <Compile Include="Scripting\ScriptContext.cs" />
-    <Compile Include="Scripting\ScriptActorInterface.cs" />
-    <Compile Include="Scripting\ScriptObjectWrapper.cs" />
-    <Compile Include="Scripting\ScriptTypes.cs" />
-    <Compile Include="Scripting\ScriptMemberWrapper.cs" />
-    <Compile Include="Scripting\ScriptMemberExts.cs" />
-    <Compile Include="Scripting\ScriptPlayerInterface.cs" />
-    <Compile Include="Traits\Player\FixedColorPalette.cs" />
-    <Compile Include="Primitives\ReadOnlyDictionary.cs" />
-    <Compile Include="Primitives\ReadOnlyList.cs" />
-    <Compile Include="GameRules\Ruleset.cs" />
-    <Compile Include="Support\MersenneTwister.cs" />
-    <Compile Include="GameInformation.cs" />
-    <Compile Include="Map\CellLayer.cs" />
-    <Compile Include="Map\CellRegion.cs" />
-    <Compile Include="Input\IInputHandler.cs" />
-    <Compile Include="Input\InputHandler.cs" />
-    <Compile Include="Input\Keycode.cs" />
-    <Compile Include="Input\Hotkey.cs" />
-    <Compile Include="Input\HotkeyReference.cs" />
-    <Compile Include="Graphics\PlatformInterfaces.cs" />
-    <Compile Include="Sound\Sound.cs" />
-    <Compile Include="Sound\SoundDevice.cs" />
-    <Compile Include="Graphics\TargetLineRenderable.cs" />
-    <Compile Include="Graphics\UISpriteRenderable.cs" />
-    <Compile Include="Graphics\SoftwareCursor.cs" />
-    <Compile Include="Graphics\HardwareCursor.cs" />
-    <Compile Include="Support\PerfItem.cs" />
-    <Compile Include="Support\PerfSample.cs" />
-    <Compile Include="Graphics\SpriteRenderable.cs" />
-    <Compile Include="Widgets\Widget.cs" />
-    <Compile Include="Widgets\WidgetLoader.cs" />
-    <Compile Include="Widgets\ChromeMetrics.cs" />
-    <Compile Include="Widgets\WidgetUtils.cs" />
-    <Compile Include="Graphics\PaletteReference.cs" />
-    <Compile Include="Graphics\TerrainSpriteLayer.cs" />
-    <Compile Include="Map\ProjectedCellRegion.cs" />
-    <Compile Include="Map\MapCoordsRegion.cs" />
-    <Compile Include="Renderer.cs" />
-    <Compile Include="Platform.cs" />
-    <Compile Include="GameSpeed.cs" />
-    <Compile Include="Primitives\ObservableList.cs" />
-    <Compile Include="Graphics\RgbaColorRenderer.cs" />
-    <Compile Include="Traits\Player\IndexedPlayerPalette.cs" />
-    <Compile Include="Traits\ActivityUtils.cs" />
-    <Compile Include="Primitives\float3.cs" />
-    <Compile Include="InstalledMods.cs" />
-    <Compile Include="CryptoUtil.cs" />
-    <Compile Include="Support\VariableExpression.cs" />
-    <Compile Include="ExternalMods.cs" />
-    <Compile Include="Graphics\Model.cs" />
-    <Compile Include="UtilityCommands\RegisterModCommand.cs" />
-    <Compile Include="UtilityCommands\UnregisterModCommand.cs" />
-    <Compile Include="UtilityCommands\ClearInvalidModRegistrationsCommand.cs" />
-    <Compile Include="HotkeyManager.cs" />
-    <Compile Include="HotkeyDefinition.cs" />
-    <Compile Include="Traits\Interactable.cs" />
-    <Compile Include="Graphics\RgbaSpriteRenderer.cs" />
-    <Compile Include="LocalPlayerProfile.cs" />
-    <Compile Include="PlayerProfile.cs" />
-    <Compile Include="PlayerDatabase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FileSystem\Folder.cs" />
-    <Compile Include="FileSystem\ZipFile.cs" />
-    <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="Map\TileReference.cs" />
-    <Compile Include="Map\TileSet.cs" />
-    <Compile Include="FieldLoader.cs" />
-    <Compile Include="FieldSaver.cs" />
-    <Compile Include="Manifest.cs" />
-    <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="Primitives\ActionQueue.cs" />
-    <Compile Include="Primitives\BitSet.cs" />
-    <Compile Include="Primitives\Cache.cs" />
-    <Compile Include="Primitives\DisposableAction.cs" />
-    <Compile Include="Primitives\float2.cs" />
-    <Compile Include="Primitives\int2.cs" />
-    <Compile Include="Primitives\IObservableCollection.cs" />
-    <Compile Include="Primitives\ObservableCollection.cs" />
-    <Compile Include="Primitives\ObservableDictionary.cs" />
-    <Compile Include="Primitives\Pair.cs" />
-    <Compile Include="Primitives\PriorityQueue.cs" />
-    <Compile Include="Support\Log.cs" />
-    <Compile Include="Support\PerfTimer.cs" />
-    <Compile Include="Exts.cs" />
-    <Compile Include="MiniYaml.cs" />
-    <Compile Include="StreamExts.cs" />
-    <Compile Include="Map\Map.cs" />
-    <Compile Include="Map\MapCache.cs" />
-    <Compile Include="Map\MapPreview.cs" />
-    <Compile Include="CPos.cs" />
-    <Compile Include="CVec.cs" />
-    <Compile Include="WAngle.cs" />
-    <Compile Include="WDist.cs" />
-    <Compile Include="WPos.cs" />
-    <Compile Include="WRot.cs" />
-    <Compile Include="WVec.cs" />
-    <Compile Include="Primitives\TypeDictionary.cs" />
-    <Compile Include="Map\ActorInitializer.cs" />
-    <Compile Include="Map\ActorReference.cs" />
-    <Compile Include="Support\Evaluator.cs" />
-    <Compile Include="Settings.cs" />
-    <Compile Include="Graphics\PlayerColorRemap.cs" />
-    <Compile Include="Graphics\Palette.cs" />
-    <Compile Include="FileSystem\FileSystem.cs" />
-    <Compile Include="FileFormats\ReplayMetadata.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -1,210 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net461</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2881135D-4D62-493E-8F83-5EEE92CCC6BE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Mods.Cnc</RootNamespace>
-    <AssemblyName>OpenRA.Mods.Cnc</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <OutputPath>bin\Debug\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <Optimize>true</Optimize>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <OutputPath>../mods/common</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="Eluant">
       <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Activities\LeapAttack.cs" />
-    <Compile Include="CncLoadScreen.cs" />
-    <Compile Include="Traits\EdibleByLeap.cs" />
-    <Compile Include="Traits\Attack\AttackPopupTurreted.cs" />
-    <Compile Include="Traits\Buildings\ProductionAirdrop.cs" />
-    <Compile Include="Traits\Infiltration\InfiltrateForTransform.cs" />
-    <Compile Include="Traits\Render\WithGunboatBody.cs" />
-    <Compile Include="Traits\Render\WithHarvesterSpriteBody.cs" />
-    <Compile Include="Traits\Render\WithEmbeddedTurretSpriteBody.cs" />
-    <Compile Include="Traits\Render\WithCargo.cs" />
-    <Compile Include="Traits\Render\WithDeliveryAnimation.cs" />
-    <Compile Include="Traits\Render\WithRoof.cs" />
-    <Compile Include="Traits\SupportPowers\IonCannonPower.cs" />
-    <Compile Include="UtilityCommands\ImportTiberianDawnLegacyMapCommand.cs" />
-    <Compile Include="Projectiles\IonCannon.cs" />
-    <Compile Include="Activities\VoxelHarvesterDockSequence.cs" />
-    <Compile Include="SpriteLoaders\TmpTSLoader.cs" />
-    <Compile Include="Traits\Buildings\TiberianSunRefinery.cs" />
-    <Compile Include="Traits\Render\WithBuildingBib.cs" />
-    <Compile Include="Traits\Render\WithDockingOverlay.cs" />
-    <Compile Include="Traits\Render\WithPermanentInjury.cs" />
-    <Compile Include="Traits\Render\WithVoxelWalkerBody.cs" />
-    <Compile Include="Traits\Render\WithVoxelUnloadBody.cs" />
-    <Compile Include="Traits\SupportPowers\AttackOrderPower.cs" />
-    <Compile Include="UtilityCommands\LegacyTilesetImporter.cs" />
-    <Compile Include="Traits\World\TSShroudPalette.cs" />
-    <Compile Include="UtilityCommands\ImportTSMapCommand.cs" />
-    <Compile Include="UtilityCommands\LegacyRulesImporter.cs" />
-    <Compile Include="UtilityCommands\LegacySequenceImporter.cs" />
-    <Compile Include="Widgets\Logic\PreReleaseWarningPrompt.cs" />
-    <Compile Include="Traits\Attack\AttackTesla.cs" />
-    <Compile Include="Traits\Render\WithTeslaChargeAnimation.cs" />
-    <Compile Include="Traits\Render\WithTeslaChargeOverlay.cs" />
-    <Compile Include="Activities\Infiltrate.cs" />
-    <Compile Include="Activities\LayMines.cs" />
-    <Compile Include="Activities\Leap.cs" />
-    <Compile Include="Activities\Teleport.cs" />
-    <Compile Include="Effects\GpsDotEffect.cs" />
-    <Compile Include="Effects\GpsSatellite.cs" />
-    <Compile Include="Effects\SatelliteLaunch.cs" />
-    <Compile Include="Projectiles\TeslaZap.cs" />
-    <Compile Include="Graphics\TeslaZapRenderable.cs" />
-    <Compile Include="Scripting\Properties\InfiltrateProperties.cs" />
-    <Compile Include="Scripting\Properties\DisguiseProperties.cs" />
-    <Compile Include="Traits\Attack\AttackLeap.cs" />
-    <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
-    <Compile Include="Traits\Chronoshiftable.cs" />
-    <Compile Include="Traits\Cloneable.cs" />
-    <Compile Include="Traits\Disguise.cs" />
-    <Compile Include="Traits\EnergyWall.cs" />
-    <Compile Include="Traits\FrozenUnderFogUpdatedByGps.cs" />
-    <Compile Include="Traits\HarvesterHuskModifier.cs" />
-    <Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
-    <Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />
-    <Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
-    <Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
-    <Compile Include="Traits\Infiltration\Infiltrates.cs" />
-    <Compile Include="Traits\MadTank.cs" />
-    <Compile Include="Traits\Mine.cs" />
-    <Compile Include="Traits\Minelayer.cs" />
-    <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
-    <Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" />
-    <Compile Include="Traits\PortableChrono.cs" />
-    <Compile Include="Traits\Render\RenderJammerCircle.cs" />
-    <Compile Include="Traits\Render\WithLandingCraftAnimation.cs" />
-    <Compile Include="Traits\Render\RenderShroudCircle.cs" />
-    <Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
-    <Compile Include="Traits\SupportPowers\GpsPower.cs" />
-    <Compile Include="Traits\GpsWatcher.cs" />
-    <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
-    <Compile Include="Scripting\Properties\IonCannonProperties.cs" />
-    <Compile Include="Traits\Render\WithDisguisingInfantryBody.cs" />
-    <Compile Include="UtilityCommands\ImportRedAlertLegacyMapCommand.cs" />
-    <Compile Include="Traits\Infiltration\InfiltrateForDecoration.cs" />
-    <Compile Include="TraitsInterfaces.cs" />
-    <Compile Include="FileSystem\BigFile.cs" />
-    <Compile Include="FileSystem\MixFile.cs" />
-    <Compile Include="FileSystem\PackageEntry.cs" />
-    <Compile Include="FileSystem\Pak.cs" />
-    <Compile Include="UtilityCommands\ListMixContentsCommand.cs" />
-    <Compile Include="FileFormats\Blowfish.cs" />
-    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
-    <Compile Include="FileFormats\IdxEntry.cs" />
-    <Compile Include="FileFormats\IdxReader.cs" />
-    <Compile Include="FileFormats\XccGlobalDatabase.cs" />
-    <Compile Include="FileFormats\XccLocalDatabase.cs" />
-    <Compile Include="FileFormats\CRC32.cs" />
-    <Compile Include="Graphics\VoxelModelSequenceLoader.cs" />
-    <Compile Include="Graphics\VoxelLoader.cs" />
-    <Compile Include="Graphics\Voxel.cs" />
-    <Compile Include="FileFormats\HvaReader.cs" />
-    <Compile Include="FileFormats\VxlReader.cs" />
-    <Compile Include="Traits\World\VoxelNormalsPalette.cs" />
-    <Compile Include="Traits\TDGunboat.cs" />
-    <Compile Include="Traits\Attack\AttackTDGunboatTurreted.cs" />
-    <Compile Include="Traits\GpsDot.cs" />
-    <Compile Include="Traits\ConyardChronoReturn.cs" />
-    <Compile Include="Traits\TransferTimedExternalConditionOnTransform.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
-      <Project>{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}</Project>
-      <Name>OpenRA.Mods.Common</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+</Project>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <MakeDir Directories="$(SolutionDir)mods/common/"/>
-    <Copy
-      SourceFiles="$(TargetPath)"
-      DestinationFolder="$(SolutionDir)mods/common/"/>
-    <Copy
-      SourceFiles="$(TargetDir)$(TargetName).pdb"
-      DestinationFolder="$(SolutionDir)mods/common/"
-      Condition="Exists('$(TargetDir)$(TargetName).pdb')"/>
-    <!-- Uncomment these lines when debugging or adding to this target
-    <Message Text="DEBUG OS:                     $(OS)"/>
-    <Message Text="DEBUG SolutionDir:            $(SolutionDir)"/>
-    <Message Text="DEBUG TargetPath:             $(TargetPath)"/>
-    <Message Text="DEBUG TargetDir:              $(TargetDir)"/>
-    <Message Text="DEBUG TargetName:             $(TargetName)"/>
-    -->
-  </Target>
-</Project>

OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj

@@ -1,133 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net461</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C0B0465C-6BE2-409C-8770-3A9BF64C4344}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Mods.D2k</RootNamespace>
-    <AssemblyName>OpenRA.Mods.D2k</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <Optimize>true</Optimize>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <OutputPath>../mods/d2k</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="Eluant">
       <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Activities\SwallowActor.cs" />
-    <Compile Include="SpriteLoaders\R8Loader.cs" />
-    <Compile Include="Traits\AttackSwallow.cs" />
-    <Compile Include="Traits\Buildings\LaysTerrain.cs" />
-    <Compile Include="Traits\Player\HarvesterInsurance.cs" />
-    <Compile Include="Traits\Render\WithCrumbleOverlay.cs" />
-    <Compile Include="Traits\Render\WithDeliveryOverlay.cs" />
-    <Compile Include="Traits\Sandworm.cs" />
-    <Compile Include="Traits\SpiceBloom.cs" />
-    <Compile Include="Traits\World\BuildableTerrainLayer.cs" />
-    <Compile Include="Traits\World\D2kResourceLayer.cs" />
-    <Compile Include="Traits\World\D2kFogPalette.cs" />
-    <Compile Include="Traits\World\PaletteFromScaledPalette.cs" />
-    <Compile Include="Traits\AttractsWorms.cs" />
-    <Compile Include="UtilityCommands\D2kMapImporter.cs" />
-    <Compile Include="UtilityCommands\ImportD2kMapCommand.cs" />
-    <Compile Include="Traits\World\D2kEditorResourceLayer.cs" />
-    <Compile Include="Lint\CheckImportActors.cs" />
-    <Compile Include="PackageLoaders\D2kSoundResources.cs" />
-    <Compile Include="Warheads\DamagesConcreteWarhead.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
-      <Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>
-      <Name>OpenRA.Mods.Common</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+</Project>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <MakeDir Directories="$(SolutionDir)mods/d2k/"/>
-    <Copy
-      SourceFiles="$(TargetPath)"
-      DestinationFolder="$(SolutionDir)mods/d2k/"/>
-    <Copy
-      SourceFiles="$(TargetDir)$(TargetName).pdb"
-      DestinationFolder="$(SolutionDir)mods/d2k/"
-      Condition="Exists('$(TargetDir)$(TargetName).pdb')"/>
-    <!-- Uncomment these lines when debugging or adding to this target
-    <Message Text="DEBUG OS:                     $(OS)"/>
-    <Message Text="DEBUG SolutionDir:            $(SolutionDir)"/>
-    <Message Text="DEBUG TargetPath:             $(TargetPath)"/>
-    <Message Text="DEBUG TargetDir:              $(TargetDir)"/>
-    <Message Text="DEBUG TargetName:             $(TargetName)"/>
-    -->
-  </Target>
-</Project>

OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj

@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+      <TargetFramework>net461</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ProductVersion>10.0.0</ProductVersion>
+      <Optimize>true</Optimize>
-    <SchemaVersion>2.0</SchemaVersion>
+      <LangVersion>5</LangVersion>
-    <ProjectGuid>{33D03738-C154-4028-8EA8-63A3C488A651}</ProjectGuid>
+      <DebugSymbols>true</DebugSymbols>
-    <OutputType>Library</OutputType>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <RootNamespace>OpenRA.Platforms.Default</RootNamespace>
+      <OutputPath>..</OutputPath>
-    <AssemblyName>OpenRA.Platforms.Default</AssemblyName>
+      <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+      <Platforms>x86</Platforms>
+      <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
     <Reference Include="Eluant">
       <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
     </Reference>
@@ -44,29 +27,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DefaultPlatform.cs" />
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
-    <Compile Include="FreeTypeFont.cs" />
-    <Compile Include="Sdl2PlatformWindow.cs" />
-    <Compile Include="ITextureInternal.cs" />
-    <Compile Include="Sdl2Input.cs" />
-    <Compile Include="Shader.cs" />
-    <Compile Include="FrameBuffer.cs" />
-    <Compile Include="MultiTapDetection.cs" />
-    <Compile Include="Texture.cs" />
-    <Compile Include="ThreadAffine.cs" />
-    <Compile Include="ThreadedGraphicsContext.cs" />
-    <Compile Include="VertexBuffer.cs" />
-    <Compile Include="OpenAlSoundEngine.cs" />
-    <Compile Include="OpenGL.cs" />
-    <Compile Include="Sdl2HardwareCursor.cs" />
-    <Compile Include="Sdl2GraphicsContext.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+    <Content Include="OpenRA.Platforms.Default.dll.config">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Name>OpenRA.Game</Name>
+    </Content>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
 </Project>

OpenRA.PostProcess/OpenRA.PostProcess.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net461</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <OutputPath>..</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+    <ExternalConsole>false</ExternalConsole>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+</Project>

OpenRA.PostProcess/Program.cs

@@ -0,0 +1,47 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.PostProcess
+{
+	class Program
+	{
+		static void Main(string[] args)
+		{
+			var assembly = args.First();
+			var flags = args.Skip(1).ToArray();
+
+			Console.WriteLine("Post-processing {0}", assembly);
+			var data = File.ReadAllBytes(assembly);
+			var peOffset = BitConverter.ToInt32(data, 0x3c);
+
+			foreach (var flag in flags)
+			{
+				if (flag == "-LAA")
+				{
+					// Set /LARGEADDRESSAWARE Flag (Application can handle large (>2GB) addresses)
+					Console.WriteLine(" - Enabling /LARGEADDRESSAWARE");
+					data[peOffset + 4 + 18] |= 0x20;
+				}
+				else
+					Console.WriteLine("error: Unknown flag '{0}'", flag);
+			}
+
+			if (flags.Length == 0)
+				Console.WriteLine("error: No flags were specified");
+
+			File.WriteAllBytes(args[0], data);
+		}
+	}
+}

OpenRA.Server/OpenRA.Server.csproj

@@ -1,96 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{76F621A1-3D8E-4A99-9F7E-B071EB657817}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net461</TargetFramework>
-    <RootNamespace>OpenRA.Server</RootNamespace>
-    <AssemblyName>OpenRA.Server</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
     <Optimize>true</Optimize>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <OutputPath>..</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+    <ExternalConsole>false</ExternalConsole>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
-    <Reference Include="System.Core" />
+    <ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj">
-  </ItemGroup>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <Target Name="PostProcess" AfterTargets="Build" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)\$(TargetFileName).processed">
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+    <Exec Command="$(TargetDir)/OpenRA.PostProcess.exe $(TargetPath) -LAA" />
-      <Visible>False</Visible>
+    <Touch Files="$(IntermediateOutputPath)\$(TargetFileName).processed" AlwaysCreate="true" />
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
   </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

OpenRA.StyleCheck/OpenRA.StyleCheck.csproj

@@ -1,42 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5FEAB6DC-4E81-4B63-958B-22FC3534C606}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>OpenRA.StyleCheck</RootNamespace>
+    <TargetFramework>net461</TargetFramework>
-    <AssemblyName>OpenRA.StyleCheck</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ExternalConsole>true</ExternalConsole>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <Optimize>true</Optimize>
-    <OutputPath>..\</OutputPath>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
+    <OutputPath>..</OutputPath>
-    <WarningLevel>4</WarningLevel>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <ExternalConsole>true</ExternalConsole>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Platforms>x86</Platforms>
     <PlatformTarget>x86</PlatformTarget>
+    <ExternalConsole>false</ExternalConsole>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
     <Reference Include="StyleCop">
       <HintPath>..\StyleCop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Program.cs" />
+    <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

OpenRA.Test/OpenRA.Test.csproj

@@ -1,85 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net461</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ProjectGuid>{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Test</RootNamespace>
-    <AssemblyName>OpenRA.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..</OutputPath>
-    <DebugType>pdbonly</DebugType>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Platforms>x86</Platforms>
     <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
-    <Optimize>true</Optimize>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Eluant, Version=1.0.5229.27703, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Eluant">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
       <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="nunit.framework">
       <HintPath>..\thirdparty\download\nunit.framework.dll</HintPath>
       <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OpenRA.Game\ActionQueueTest.cs" />
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
-    <Compile Include="OpenRA.Game\CPosTest.cs" />
-    <Compile Include="OpenRA.Game\MiniYamlTest.cs" />
-    <Compile Include="OpenRA.Game\ActorInfoTest.cs" />
-    <Compile Include="OpenRA.Game\CoordinateTest.cs" />
-    <Compile Include="OpenRA.Game\PriorityQueueTest.cs" />
-    <Compile Include="OpenRA.Game\SpatiallyPartitionedTest.cs" />
-    <Compile Include="OpenRA.Mods.Common\ShapeTest.cs" />
-    <Compile Include="OpenRA.Game\OrderTest.cs" />
-    <Compile Include="OpenRA.Game\PlatformTest.cs" />
-    <Compile Include="OpenRA.Game\VariableExpressionTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0dfb103f-2962-400f-8c6d-e2c28ccba633}</Project>
-      <Name>OpenRA.Game</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
-      <Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>
-      <Name>OpenRA.Mods.Common</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

OpenRA.Utility.exe.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

OpenRA.Utility/OpenRA.Utility.csproj

@@ -1,96 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F33337BE-CB69-4B24-850F-07D23E408DDF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net461</TargetFramework>
-    <RootNamespace>OpenRA.Utility</RootNamespace>
-    <AssemblyName>OpenRA.Utility</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
     <Optimize>true</Optimize>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <OutputPath>..</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <LangVersion>5</LangVersion>
+    <DebugSymbols>true</DebugSymbols>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+    <ExternalConsole>false</ExternalConsole>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
-    <Reference Include="System.Core" />
+    <ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj">
-  </ItemGroup>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <Target Name="PostProcess" AfterTargets="Build" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)\$(TargetFileName).processed">
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+    <Exec Command="$(TargetDir)/OpenRA.PostProcess.exe $(TargetPath) -LAA" />
-      <Visible>False</Visible>
+    <Touch Files="$(IntermediateOutputPath)\$(TargetFileName).processed" AlwaysCreate="true" />
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
   </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

OpenRA.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
@@ -178,6 +178,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tiberian Sun Lua scripts",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.StyleCheck", "OpenRA.StyleCheck\OpenRA.StyleCheck.csproj", "{5FEAB6DC-4E81-4B63-958B-22FC3534C606}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.PostProcess", "OpenRA.PostProcess\OpenRA.PostProcess.csproj", "{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -220,6 +222,10 @@ Global
 		{5FEAB6DC-4E81-4B63-958B-22FC3534C606}.Debug|x86.Build.0 = Debug|x86
 		{5FEAB6DC-4E81-4B63-958B-22FC3534C606}.Release|x86.ActiveCfg = Release|x86
 		{5FEAB6DC-4E81-4B63-958B-22FC3534C606}.Release|x86.Build.0 = Release|x86
+		{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|x86.ActiveCfg = Debug|x86
+		{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|x86.Build.0 = Debug|x86
+		{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|x86.ActiveCfg = Release|x86
+		{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -228,172 +234,7 @@ Global
 		StartupItem = OpenRA.Game\OpenRA.Game.csproj
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
-		$1.DirectoryNamespaceAssociation = None
-		$1.ResourceNamePolicy = FileFormatDefault
 		$0.TextStylePolicy = $7
-		$2.TabsToSpaces = False
-		$2.NoTabsAfterNonTabs = True
-		$2.inheritsSet = VisualStudio
-		$2.inheritsScope = text/plain
-		$2.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $3
-		$3.IndentSwitchBody = True
-		$3.AnonymousMethodBraceStyle = NextLine
-		$3.PropertyBraceStyle = NextLine
-		$3.PropertyGetBraceStyle = NextLine
-		$3.PropertySetBraceStyle = NextLine
-		$3.EventBraceStyle = NextLine
-		$3.EventAddBraceStyle = NextLine
-		$3.EventRemoveBraceStyle = NextLine
-		$3.StatementBraceStyle = NextLine
-		$3.ArrayInitializerBraceStyle = NextLine
-		$3.BeforeMethodDeclarationParentheses = False
-		$3.BeforeMethodCallParentheses = False
-		$3.BeforeConstructorDeclarationParentheses = False
-		$3.BeforeDelegateDeclarationParentheses = False
-		$3.NewParentheses = False
-		$3.inheritsSet = Mono
-		$3.inheritsScope = text/x-csharp
-		$3.scope = text/x-csharp
-		$4.TabsToSpaces = False
-		$4.NoTabsAfterNonTabs = True
-		$4.inheritsSet = VisualStudio
-		$4.inheritsScope = text/plain
-		$4.scope = text/plain
-		$5.NoTabsAfterNonTabs = True
-		$5.inheritsSet = Mono
-		$5.inheritsScope = text/plain
-		$5.scope = text/microsoft-resx
-		$0.XmlFormattingPolicy = $8
-		$6.inheritsSet = Mono
-		$6.inheritsScope = application/xml
-		$6.scope = text/microsoft-resx
-		$7.NoTabsAfterNonTabs = True
-		$7.inheritsSet = Mono
-		$7.inheritsScope = text/plain
-		$7.scope = application/xml
-		$8.inheritsSet = Mono
-		$8.inheritsScope = application/xml
-		$8.scope = application/xml
-		$0.StandardHeader = $9
-		$9.Text = @#region Copyright & License Information\n/*\n * Copyright 2007-${Year} The OpenRA Developers (see AUTHORS)\n * This file is part of OpenRA, which is free software. It is made\n * available to you under the terms of the GNU General Public License\n * as published by the Free Software Foundation. For more information,\n * see COPYING.\n */\n#endregion
-		$9.IncludeInNewFiles = True
-		$0.NameConventionPolicy = $10
-		$10.Rules = $11
-		$11.NamingRule = $31
-		$12.Name = Namespaces
-		$12.AffectedEntity = Namespace
-		$12.VisibilityMask = VisibilityMask
-		$12.NamingStyle = PascalCase
-		$12.IncludeInstanceMembers = True
-		$12.IncludeStaticEntities = True
-		$13.Name = Types
-		$13.AffectedEntity = Class, Struct, Enum, Delegate
-		$13.VisibilityMask = Public
-		$13.NamingStyle = PascalCase
-		$13.IncludeInstanceMembers = True
-		$13.IncludeStaticEntities = True
-		$14.Name = Interfaces
-		$14.RequiredPrefixes = $15
-		$15.String = I
-		$14.AffectedEntity = Interface
-		$14.VisibilityMask = Public
-		$14.NamingStyle = PascalCase
-		$14.IncludeInstanceMembers = True
-		$14.IncludeStaticEntities = True
-		$16.Name = Attributes
-		$16.RequiredSuffixes = $17
-		$17.String = Attribute
-		$16.AffectedEntity = CustomAttributes
-		$16.VisibilityMask = Public
-		$16.NamingStyle = PascalCase
-		$16.IncludeInstanceMembers = True
-		$16.IncludeStaticEntities = True
-		$18.Name = Event Arguments
-		$18.RequiredSuffixes = $19
-		$19.String = EventArgs
-		$18.AffectedEntity = CustomEventArgs
-		$18.VisibilityMask = Public
-		$18.NamingStyle = PascalCase
-		$18.IncludeInstanceMembers = True
-		$18.IncludeStaticEntities = True
-		$20.Name = Exceptions
-		$20.RequiredSuffixes = $21
-		$21.String = Exception
-		$20.AffectedEntity = CustomExceptions
-		$20.VisibilityMask = VisibilityMask
-		$20.NamingStyle = PascalCase
-		$20.IncludeInstanceMembers = True
-		$20.IncludeStaticEntities = True
-		$22.Name = Methods
-		$22.AffectedEntity = Methods
-		$22.VisibilityMask = Protected, Public
-		$22.NamingStyle = PascalCase
-		$22.IncludeInstanceMembers = True
-		$22.IncludeStaticEntities = True
-		$23.Name = Static Readonly Fields
-		$23.AffectedEntity = ReadonlyField
-		$23.VisibilityMask = Protected, Public
-		$23.NamingStyle = PascalCase
-		$23.IncludeInstanceMembers = False
-		$23.IncludeStaticEntities = True
-		$24.Name = Fields
-		$24.AffectedEntity = Field
-		$24.VisibilityMask = Protected, Public
-		$24.NamingStyle = PascalCase
-		$24.IncludeInstanceMembers = True
-		$24.IncludeStaticEntities = True
-		$25.Name = ReadOnly Fields
-		$25.AffectedEntity = ReadonlyField
-		$25.VisibilityMask = Protected, Public
-		$25.NamingStyle = PascalCase
-		$25.IncludeInstanceMembers = True
-		$25.IncludeStaticEntities = False
-		$26.Name = Constant Fields
-		$26.AffectedEntity = ConstantField
-		$26.VisibilityMask = Protected, Public
-		$26.NamingStyle = PascalCase
-		$26.IncludeInstanceMembers = True
-		$26.IncludeStaticEntities = True
-		$27.Name = Properties
-		$27.AffectedEntity = Property
-		$27.VisibilityMask = Protected, Public
-		$27.NamingStyle = PascalCase
-		$27.IncludeInstanceMembers = True
-		$27.IncludeStaticEntities = True
-		$28.Name = Events
-		$28.AffectedEntity = Event
-		$28.VisibilityMask = Protected, Public
-		$28.NamingStyle = PascalCase
-		$28.IncludeInstanceMembers = True
-		$28.IncludeStaticEntities = True
-		$29.Name = Enum Members
-		$29.AffectedEntity = EnumMember
-		$29.VisibilityMask = VisibilityMask
-		$29.NamingStyle = PascalCase
-		$29.IncludeInstanceMembers = True
-		$29.IncludeStaticEntities = True
-		$30.Name = Parameters
-		$30.AffectedEntity = Parameter
-		$30.VisibilityMask = VisibilityMask
-		$30.NamingStyle = CamelCase
-		$30.IncludeInstanceMembers = True
-		$30.IncludeStaticEntities = True
-		$31.Name = Type Parameters
-		$31.RequiredPrefixes = $32
-		$32.String = T
-		$31.AffectedEntity = TypeParameter
-		$31.VisibilityMask = VisibilityMask
-		$31.NamingStyle = PascalCase
-		$31.IncludeInstanceMembers = True
-		$31.IncludeStaticEntities = True
-		$0.VersionControlPolicy = $33
-		$33.inheritsSet = Mono
-		$0.ChangeLogPolicy = $34
-		$34.UpdateMode = None
-		$34.MessageStyle = $35
-		$35.LineAlign = 0
-		$34.inheritsSet = Mono
 		outputpath = .
 	EndGlobalSection
 EndGlobal

make.ps1

@@ -6,51 +6,45 @@
 function All-Command 
 {
 	Dependencies-Command 
-	$msBuild = FindMSBuild
+
-	$msBuildArguments = "/t:Rebuild /nr:false"
+	if (!(Test-Path "C:\Program Files\dotnet\dotnet.exe"))
-	if ($msBuild -eq $null)
 	{
-		echo "Unable to locate an appropriate version of MSBuild."
+		DotnetNotFound
+		return
+	}
+
+	$proc = Start-Process "C:\Program Files\dotnet\dotnet.exe" "build /nr:false" -NoNewWindow -PassThru -Wait
+	if ($proc.ExitCode -ne 0)
+	{
+		echo "Build failed. If just the development tools failed to build, try installing Visual Studio. You may also still be able to run the game."
 	}
 	else
 	{
-		$proc = Start-Process $msBuild $msBuildArguments -NoNewWindow -PassThru -Wait
+		echo "Build succeeded."
-		if ($proc.ExitCode -ne 0)
-		{
-			echo "Build failed. If just the development tools failed to build, try installing Visual Studio. You may also still be able to run the game."
-		}
-		else
-		{
-			echo "Build succeeded."
-		}
 	}
 }
 
 function Clean-Command 
 {
-	$msBuild = FindMSBuild
+	if (!(Test-Path "C:\Program Files\dotnet\dotnet.exe"))
-	$msBuildArguments = "/t:Clean /nr:false"
-	if ($msBuild -eq $null)
 	{
-		echo "Unable to locate an appropriate version of MSBuild."
+		DotnetNotFound
+		return
 	}
-	else
+	$proc = Start-Process "C:\Program Files\dotnet\dotnet.exe" "clean /nr:false" -NoNewWindow -PassThru -Wait
+	rm *.dll
+	rm mods/*/*.dll
+	rm *.config
+	rm *.pdb
+	rm mods/*/*.pdb
+	rm *.exe
+	rm ./*/bin -r
+	rm ./*/obj -r
+	if (Test-Path thirdparty/download/)
 	{
-		$proc = Start-Process $msBuild $msBuildArguments -NoNewWindow -PassThru -Wait
+		rmdir thirdparty/download -Recurse -Force
-		rm *.dll
-		rm mods/*/*.dll
-		Get-ChildItem *.dll.config -exclude OpenRA.Platforms.Default.dll.config | Remove-Item
-		rm *.pdb
-		rm mods/*/*.pdb
-		rm *.exe
-		rm ./*/bin -r
-		rm ./*/obj -r
-		if (Test-Path thirdparty/download/)
-		{
-			rmdir thirdparty/download -Recurse -Force
-		}
-		echo "Clean complete."
 	}
+	echo "Clean complete."
 }
 
 function Version-Command 
@@ -110,6 +104,18 @@ function Dependencies-Command
 	cp download/windows/*.dll ..
 	cd ..
 	echo "Dependencies copied."
+
+	if (!(Test-Path "C:\Program Files\dotnet\dotnet.exe"))
+	{
+		DotnetNotFound
+		return
+	}
+
+	$proc = Start-Process "C:\Program Files\dotnet\dotnet.exe" "restore /nr:false" -NoNewWindow -PassThru -Wait
+	if ($proc.ExitCode -ne 0)
+	{
+		echo "Project restoration failed."
+	}
 }
 
 function Test-Command
@@ -203,29 +209,16 @@ function Docs-Command
 	}
 }
 
-function FindMSBuild
-{
-	$key = "HKLM:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
-	$property = Get-ItemProperty $key -ErrorAction SilentlyContinue
-	if ($property -eq $null -or $property.MSBuildToolsPath -eq $null)
-	{
-		return $null
-	}
-
-	$path = Join-Path $property.MSBuildToolsPath -ChildPath "MSBuild.exe"
-	if (Test-Path $path)
-	{
-		return $path
-	}
-
-	return $null
-}
-
 function UtilityNotFound
 {
 	echo "OpenRA.Utility.exe could not be found. Build the project first using the `"all`" command."
 }
 
+function DotnetNotFound
+{
+	echo "The 'dotnet' tool is required to compile OpenRA. Please install the .NET Core SDK or Visual studio and try again."
+}
+
 function WaitForInput
 {
 	echo "Press enter to continue."

packaging/fixheader.cs

@@ -1,57 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-
-namespace fixheader
-{
-	class fixheader
-	{
-		static byte[] data;
-		static int peOffset;
-
-		static void Main(string[] args)
-		{
-			Console.WriteLine("fixheader {0}", args[0]);
-			data = File.ReadAllBytes(args[0]);
-			peOffset = BitConverter.ToInt32(data, 0x3c);
-			var corHeaderRva = BitConverter.ToInt32(data, peOffset + 20 + 100 + 14 * 8);
-			var corHeaderOffset = RvaToOffset(corHeaderRva);
-
-			data[corHeaderOffset + 16] |= 2;
-
-			// Set Flag "Application can handle large (>2GB) addresses (/LARGEADDRESSAWARE)"
-			data[peOffset + 4 + 18] |= 0x20;
-
-			File.WriteAllBytes(args[0], data);
-		}
-
-		static int RvaToOffset(int va)
-		{
-			var numSections = BitConverter.ToInt16(data, peOffset + 6);
-			var numDataDirectories = BitConverter.ToInt32(data, peOffset + 24 + 92);
-			var sectionTableStart = peOffset + 24 + 96 + 8 * numDataDirectories;
-
-			for (var i = 0; i < numSections; i++)
-			{
-				var virtualSize = BitConverter.ToInt32(data, sectionTableStart + 40 * i + 8);
-				var virtualAddr = BitConverter.ToInt32(data, sectionTableStart + 40 * i + 12);
-				var fileOffset = BitConverter.ToInt32(data, sectionTableStart + 40 * i + 20);
-
-				if (va >= virtualAddr && va < virtualAddr + virtualSize)
-					return va - virtualAddr + fileOffset;
-			}
-
-			return 0;
-		}
-	}
-}

packaging/windows/buildpackage.sh

@@ -30,9 +30,9 @@ fi
 function makelauncher()
 {
 	sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs
-	csc WindowsLauncher.cs -warn:4 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
+	csc WindowsLauncher.cs -warn:4 -warnaserror -platform:"x86" -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
 	rm WindowsLauncher.cs
-	mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null
+	mono "${SRCDIR}/OpenRA.PostProcess.exe" "$1" -LAA > /dev/null
 }
 
 echo "Building core files"