diff --git a/Makefile b/Makefile index d9538aeafb..edae366d1e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ ############################## TOOLCHAIN ############################### # -CSC = gmcs +CSC = dmcs CSFLAGS = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror DEFINE = DEBUG;TRACE COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj index 2b4313d66a..bfc8defc90 100644 --- a/OpenRA.Editor/OpenRA.Editor.csproj +++ b/OpenRA.Editor/OpenRA.Editor.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Editor OpenRA.Editor - v3.5 512 OpenRA.Editor.Icon.ico @@ -60,13 +59,13 @@ - 3.5 + 4.0 - 3.5 + 4.0 - 3.5 + 4.0 diff --git a/OpenRA.FileFormats/OpenRA.FileFormats.csproj b/OpenRA.FileFormats/OpenRA.FileFormats.csproj index ce1a3bbf70..180ff26069 100644 --- a/OpenRA.FileFormats/OpenRA.FileFormats.csproj +++ b/OpenRA.FileFormats/OpenRA.FileFormats.csproj @@ -15,7 +15,6 @@ 3.5 - v3.5 publish\ true Disk @@ -58,7 +57,7 @@ - 3.5 + 4.0 diff --git a/OpenRA.FileFormats/Platform.cs b/OpenRA.FileFormats/Platform.cs index 93ce4479bb..16c7952df1 100644 --- a/OpenRA.FileFormats/Platform.cs +++ b/OpenRA.FileFormats/Platform.cs @@ -22,7 +22,7 @@ namespace OpenRA { public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } } - static Lazy currentPlatform = Lazy.New((Func)GetCurrentPlatform); + static OpenRA.FileFormats.Lazy currentPlatform = Lazy.New((Func)GetCurrentPlatform); static PlatformType GetCurrentPlatform() { diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 5e3a65c928..b1ef111b33 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -24,12 +24,12 @@ namespace OpenRA public readonly World World; public readonly uint ActorID; - public Lazy Bounds; + public OpenRA.FileFormats.Lazy Bounds; - Lazy occupySpace; - Lazy facing; - Lazy health; - Lazy effectiveOwner; + OpenRA.FileFormats.Lazy occupySpace; + OpenRA.FileFormats.Lazy facing; + OpenRA.FileFormats.Lazy health; + OpenRA.FileFormats.Lazy effectiveOwner; public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } } public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } } diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs index 22cbf4f597..dbbf6389ab 100644 --- a/OpenRA.Game/Graphics/WorldRenderer.cs +++ b/OpenRA.Game/Graphics/WorldRenderer.cs @@ -39,7 +39,7 @@ namespace OpenRA.Graphics internal readonly TerrainRenderer terrainRenderer; internal readonly HardwarePalette palette; internal Cache palettes; - Lazy devTrait; + OpenRA.FileFormats.Lazy devTrait; internal WorldRenderer(World world) { diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs index bf1f26d78a..c1e5c76ac8 100644 --- a/OpenRA.Game/Map.cs +++ b/OpenRA.Game/Map.cs @@ -84,7 +84,7 @@ namespace OpenRA return options; } - [FieldLoader.Ignore] public Lazy> Actors; + [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy> Actors; public int PlayerCount { get { return Players.Count(p => p.Value.Playable); } } @@ -92,7 +92,7 @@ namespace OpenRA // Yaml map data [FieldLoader.Ignore] public Dictionary Players = new Dictionary(); - [FieldLoader.Ignore] public Lazy> Smudges; + [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy> Smudges; [FieldLoader.Ignore] public List Rules = new List(); [FieldLoader.Ignore] public List Sequences = new List(); @@ -106,8 +106,8 @@ namespace OpenRA [FieldLoader.Ignore] public byte TileFormat = 1; public int2 MapSize; - [FieldLoader.Ignore] public Lazy[,]> MapTiles; - [FieldLoader.Ignore] public Lazy[,]> MapResources; + [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy[,]> MapTiles; + [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy[,]> MapResources; [FieldLoader.Ignore] public string[,] CustomTerrain; public static Map FromTileset(TileSet tileset) diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index f3e8158449..f0f1f03a64 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -16,7 +16,6 @@ false - v3.5 OpenRA.ico publish\ true diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs index 4e182d62f5..e0a4bda47a 100644 --- a/OpenRA.Game/Widgets/ButtonWidget.cs +++ b/OpenRA.Game/Widgets/ButtonWidget.cs @@ -43,7 +43,7 @@ namespace OpenRA.Widgets public Action OnMouseDown = _ => {}; public Action OnMouseUp = _ => {}; - Lazy tooltipContainer; + OpenRA.FileFormats.Lazy tooltipContainer; public readonly string TooltipContainer; public readonly string TooltipTemplate = "BUTTON_TOOLTIP"; public string TooltipText; diff --git a/OpenRA.Game/Widgets/MapPreviewWidget.cs b/OpenRA.Game/Widgets/MapPreviewWidget.cs index dd4eb9e876..eef100e9f8 100644 --- a/OpenRA.Game/Widgets/MapPreviewWidget.cs +++ b/OpenRA.Game/Widgets/MapPreviewWidget.cs @@ -29,7 +29,7 @@ namespace OpenRA.Widgets public readonly string TooltipContainer; public readonly string TooltipTemplate = "SPAWN_TOOLTIP"; - Lazy tooltipContainer; + OpenRA.FileFormats.Lazy tooltipContainer; public int TooltipSpawnIndex = -1; Rectangle MapRect; diff --git a/OpenRA.Game/Widgets/ViewportControllerWidget.cs b/OpenRA.Game/Widgets/ViewportControllerWidget.cs index 06b63e7da0..9831ab6536 100644 --- a/OpenRA.Game/Widgets/ViewportControllerWidget.cs +++ b/OpenRA.Game/Widgets/ViewportControllerWidget.cs @@ -25,7 +25,7 @@ namespace OpenRA.Widgets { public readonly string TooltipTemplate = "WORLD_TOOLTIP"; public readonly string TooltipContainer; - Lazy tooltipContainer; + OpenRA.FileFormats.Lazy tooltipContainer; public WorldTooltipType TooltipType { get; private set; } public IToolTip ActorTooltip { get; private set; } diff --git a/OpenRA.Irc/OpenRA.Irc.csproj b/OpenRA.Irc/OpenRA.Irc.csproj index afdc1fca9c..1db8cd5f44 100644 --- a/OpenRA.Irc/OpenRA.Irc.csproj +++ b/OpenRA.Irc/OpenRA.Irc.csproj @@ -9,10 +9,11 @@ Properties OpenRA.Irc OpenRA.Irc - v3.5 512 + 12.0.0 + 2.0 true @@ -47,11 +48,11 @@ - {bdaeab25-991e-46a7-af1e-4f0e03358daa} + {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA} OpenRA.FileFormats - {0dfb103f-2962-400f-8c6d-e2c28ccba633} + {0DFB103F-2962-400F-8C6D-E2C28CCBA633} OpenRA.Game diff --git a/OpenRA.Lint/OpenRA.Lint.csproj b/OpenRA.Lint/OpenRA.Lint.csproj index cff0dbe68b..b02f098c63 100644 --- a/OpenRA.Lint/OpenRA.Lint.csproj +++ b/OpenRA.Lint/OpenRA.Lint.csproj @@ -10,7 +10,6 @@ Properties OpenRA OpenRA.Lint - v3.5 512 @@ -57,14 +56,14 @@ - 3.5 + 4.0 - 3.5 + 4.0 - 3.5 + 4.0 diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index ff0533880f..eabb73cd5d 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Mods.Cnc OpenRA.Mods.Cnc - v3.5 512 @@ -59,13 +58,13 @@ - 3.5 + 4.0 - 3.5 + 4.0 - 3.5 + 4.0 diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs index d5ea98871d..fd30767a51 100644 --- a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs @@ -74,7 +74,7 @@ namespace OpenRA.Mods.Cnc.Widgets bool rightPressed = false; Rectangle leftButtonRect; Rectangle rightButtonRect; - Lazy paletteWidget; + OpenRA.FileFormats.Lazy paletteWidget; string queueGroup; [ObjectCreator.UseCtor] diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index 8a730f4322..ce2a82b10f 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Mods.D2k OpenRA.Mods.D2k - v3.5 512 @@ -63,13 +62,13 @@ - 3.5 + 4.0 - 3.5 + 4.0 - 3.5 + 4.0 diff --git a/OpenRA.Mods.RA/Armament.cs b/OpenRA.Mods.RA/Armament.cs index 9d669e4a26..001542af36 100644 --- a/OpenRA.Mods.RA/Armament.cs +++ b/OpenRA.Mods.RA/Armament.cs @@ -58,10 +58,11 @@ namespace OpenRA.Mods.RA public readonly ArmamentInfo Info; public readonly WeaponInfo Weapon; public readonly Barrel[] Barrels; + public readonly Actor self; - Lazy Turret; - Lazy Coords; - Lazy limitedAmmo; + OpenRA.FileFormats.Lazy Turret; + OpenRA.FileFormats.Lazy Coords; + OpenRA.FileFormats.Lazy limitedAmmo; List> delayedActions = new List>(); public WRange Recoil; diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs index 4c8661058d..0bc18b7cd7 100644 --- a/OpenRA.Mods.RA/Attack/AttackBase.cs +++ b/OpenRA.Mods.RA/Attack/AttackBase.cs @@ -33,8 +33,8 @@ namespace OpenRA.Mods.RA { [Sync] public bool IsAttacking { get; internal set; } public IEnumerable Armaments { get { return GetArmaments(); } } - protected Lazy facing; - protected Lazy building; + protected OpenRA.FileFormats.Lazy facing; + protected OpenRA.FileFormats.Lazy building; protected Func> GetArmaments; readonly Actor self; diff --git a/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs b/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs index 254e5391a6..aba46d4c99 100644 --- a/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs +++ b/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA public readonly FirePort[] Ports; AttackGarrisonedInfo info; - Lazy coords; + OpenRA.FileFormats.Lazy coords; List armaments; List muzzles; Dictionary paxFacing; diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 91ed4ab7b0..663be2fdd8 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Mods.RA OpenRA.Mods.RA - v3.5 512 diff --git a/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs b/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs index 84ec4f1693..741f8552f8 100755 --- a/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs +++ b/OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Widgets { public readonly string TooltipTemplate; public readonly string TooltipContainer; - Lazy tooltipContainer; + OpenRA.FileFormats.Lazy tooltipContainer; public string TooltipFormat = ""; public ResourceBarOrientation Orientation = ResourceBarOrientation.Vertical; diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj index 86528ddc37..0b96fc4947 100644 --- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj +++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj @@ -9,7 +9,6 @@ Library OpenRA.Mods.TS OpenRA.Mods.TS - v3.5 true @@ -64,8 +63,8 @@ --> - mkdir "$(SolutionDir)mods/ts/" -copy "$(TargetPath)" "$(SolutionDir)mods/ts/" + mkdir "$(SolutionDir)mods/ts/" +copy "$(TargetPath)" "$(SolutionDir)mods/ts/" cd "$(SolutionDir)" \ No newline at end of file diff --git a/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj b/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj index fd95732782..83873fd597 100644 --- a/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj +++ b/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Renderer.Cg OpenRA.Renderer.Cg - v3.5 512 diff --git a/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj b/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj index 5c2079d64c..7c70a811ee 100644 --- a/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj +++ b/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj @@ -9,7 +9,6 @@ Library OpenRA.Renderer.Glsl OpenRA.Renderer.Gl - v3.5 3.5 diff --git a/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj b/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj index 7383d4c86e..484ae28e5b 100644 --- a/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj +++ b/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Renderer.Null OpenRA.Renderer.Null - v3.5 512 diff --git a/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj b/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj index 4a36941eed..7c5036b38e 100644 --- a/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj +++ b/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj @@ -9,7 +9,6 @@ Library OpenRA.Renderer.Sdl2 OpenRA.Renderer.Sdl2 - v3.5 True diff --git a/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj b/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj index 659ddfe69a..2f6e4fa41b 100644 --- a/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj +++ b/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj @@ -9,7 +9,6 @@ Library OpenRA.Renderer.SdlCommon OpenRA.Renderer.SdlCommon - v3.5 3.5 @@ -50,6 +49,7 @@ 4 false AllRules.ruleset + true diff --git a/OpenRA.TilesetBuilder/OpenRA.TilesetBuilder.csproj b/OpenRA.TilesetBuilder/OpenRA.TilesetBuilder.csproj index 8315d2841b..49a647393e 100644 --- a/OpenRA.TilesetBuilder/OpenRA.TilesetBuilder.csproj +++ b/OpenRA.TilesetBuilder/OpenRA.TilesetBuilder.csproj @@ -10,7 +10,6 @@ Properties OpenRA.TilesetBuilder OpenRA.TilesetBuilder - v3.5 512 tilesetbuilder_icon copy.ico @@ -60,13 +59,13 @@ - 3.5 + 4.0 - 3.5 + 4.0 - 3.5 + 4.0 diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj index 3fa93c808b..2b88792ff5 100644 --- a/OpenRA.Utility/OpenRA.Utility.csproj +++ b/OpenRA.Utility/OpenRA.Utility.csproj @@ -10,7 +10,6 @@ Properties OpenRA.Utility OpenRA.Utility - v3.5 512 @@ -56,15 +55,15 @@ - 3.5 + 4.0 - 3.5 + 4.0 - 3.5 + 4.0 diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 225b556ddf..d944541afb 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -138,18 +138,18 @@ Section "-DotNet" DotNet IfErrors error 0 IntCmp $0 1 0 error 0 ClearErrors - ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" "SP" + ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.0" "SP" IfErrors error 0 IntCmp $0 1 done error done - error: - MessageBox MB_YESNO ".NET Framework v3.5 SP1 or later is required to run OpenRA. $\n \ + error: + MessageBox MB_YESNO ".NET Framework v4.0 or later is required to run OpenRA. $\n \ Do you wish for the installer to launch your web browser in order to download and install it?" \ IDYES download IDNO error2 download: - ExecShell "open" "http://www.microsoft.com/downloads/en/details.aspx?familyid=ab99342f-5d1a-413d-8319-81da479ab0d7" + ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=17113" Goto done error2: - MessageBox MB_OK "Installation will continue but be aware that OpenRA will not run unless .NET v3.5 SP1 \ + MessageBox MB_OK "Installation will continue, but be aware that OpenRA will not run unless .NET v4.0 \ or later is installed." done: SectionEnd