Merge pull request #5082 from pchote/dotnetfour

Upgrade to .NET 4.0

OpenRA.Mods.RA/Armament.cs

@@ -58,6 +58,7 @@ namespace OpenRA.Mods.RA
 		public readonly ArmamentInfo Info;
 		public readonly WeaponInfo Weapon;
 		public readonly Barrel[] Barrels;
+
 		public readonly Actor self;
 		Lazy<Turreted> Turret;
 		Lazy<IBodyOrientation> Coords;
@@ -74,9 +75,9 @@ namespace OpenRA.Mods.RA
 			Info = info;
 
 			// We can't resolve these until runtime
-			Turret = Lazy.New(() => self.TraitsImplementing<Turreted>().FirstOrDefault(t => t.Name == info.Turret));
-			Coords = Lazy.New(() => self.Trait<IBodyOrientation>());
-			limitedAmmo = Lazy.New(() => self.TraitOrDefault<LimitedAmmo>());
+			Turret = Exts.Lazy(() => self.TraitsImplementing<Turreted>().FirstOrDefault(t => t.Name == info.Turret));
+			Coords = Exts.Lazy(() => self.Trait<IBodyOrientation>());
+			limitedAmmo = Exts.Lazy(() => self.TraitOrDefault<LimitedAmmo>());
 
 			Weapon = Rules.Weapons[info.Weapon.ToLowerInvariant()];
 			Burst = Weapon.Burst;

OpenRA.Mods.RA/Attack/AttackBase.cs

@@ -45,13 +45,13 @@ namespace OpenRA.Mods.RA
 			this.self = self;
 			this.info = info;
 
-			var armaments = Lazy.New(() => self.TraitsImplementing<Armament>()
+			var armaments = Exts.Lazy(() => self.TraitsImplementing<Armament>()
 				.Where(a => info.Armaments.Contains(a.Info.Name)));
 
 			GetArmaments = () => armaments.Value;
 
-			facing = Lazy.New(() => self.TraitOrDefault<IFacing>());
-			building = Lazy.New(() => self.TraitOrDefault<Building>());
+			facing = Exts.Lazy(() => self.TraitOrDefault<IFacing>());
+			building = Exts.Lazy(() => self.TraitOrDefault<Building>());
 		}
 
 		protected virtual bool CanAttack(Actor self, Target target)

OpenRA.Mods.RA/Attack/AttackGarrisoned.cs

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA
 			: base(self, info)
 		{
 			this.info = info;
-			coords = Lazy.New(() => self.Trait<IBodyOrientation>());
+			coords = Exts.Lazy(() => self.Trait<IBodyOrientation>());
 			armaments = new List<Armament>();
 			muzzles = new List<AnimationWithOffset>();
 			paxFacing = new Dictionary<Actor, IFacing>();

OpenRA.Mods.RA/CombatDebugOverlay.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.FileFormats;
@@ -30,9 +31,9 @@ namespace OpenRA.Mods.RA
 
 		public CombatDebugOverlay(Actor self)
 		{
-			attack = Lazy.New(() => self.TraitOrDefault<AttackBase>());
-			coords = Lazy.New(() => self.Trait<IBodyOrientation>());
-			health = Lazy.New(() => self.TraitOrDefault<Health>());
+			attack = Exts.Lazy(() => self.TraitOrDefault<AttackBase>());
+			coords = Exts.Lazy(() => self.Trait<IBodyOrientation>());
+			health = Exts.Lazy(() => self.TraitOrDefault<Health>());
 
 			var localPlayer = self.World.LocalPlayer;
 			devMode = localPlayer != null ? localPlayer.PlayerActor.Trait<DeveloperMode>() : null;

OpenRA.Mods.RA/Effects/GpsDot.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
@@ -51,10 +52,10 @@ namespace OpenRA.Mods.RA.Effects
 
 			self.World.AddFrameEndTask(w => w.Add(this));
 
-			huf = Lazy.New(() => self.TraitOrDefault<HiddenUnderFog>());
-			fuf = Lazy.New(() => self.TraitOrDefault<FrozenUnderFog>());
-			disguise = Lazy.New(() => self.TraitOrDefault<Disguise>());
-			cloak = Lazy.New(() => self.TraitOrDefault<Cloak>());
+			huf = Exts.Lazy(() => self.TraitOrDefault<HiddenUnderFog>());
+			fuf = Exts.Lazy(() => self.TraitOrDefault<FrozenUnderFog>());
+			disguise = Exts.Lazy(() => self.TraitOrDefault<Disguise>());
+			cloak = Exts.Lazy(() => self.TraitOrDefault<Cloak>());
 
 			watcher = new Cache<Player, GpsWatcher>(p => p.PlayerActor.Trait<GpsWatcher>());
 			frozen = new Cache<Player, FrozenActorLayer>(p => p.PlayerActor.Trait<FrozenActorLayer>());

OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
@@ -41,9 +42,9 @@ namespace OpenRA.Mods.RA
 			// Spawned actors (e.g. building husks) shouldn't be revealed
 			startsRevealed = info.StartsRevealed && !init.Contains<ParentActorInit>();
 			footprint = FootprintUtils.Tiles(init.self);
-			tooltip = Lazy.New(() => init.self.TraitsImplementing<IToolTip>().FirstOrDefault());
-			tooltip = Lazy.New(() => init.self.TraitsImplementing<IToolTip>().FirstOrDefault());
-			health = Lazy.New(() => init.self.TraitOrDefault<Health>());
+			tooltip = Exts.Lazy(() => init.self.TraitsImplementing<IToolTip>().FirstOrDefault());
+			tooltip = Exts.Lazy(() => init.self.TraitsImplementing<IToolTip>().FirstOrDefault());
+			health = Exts.Lazy(() => init.self.TraitOrDefault<Health>());
 
 			frozen = new Dictionary<Player, FrozenActor>();
 			visible = init.world.Players.ToDictionary(p => p, p => false);

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -10,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OpenRA.Mods.RA</RootNamespace>
     <AssemblyName>OpenRA.Mods.RA</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
@@ -34,7 +35,7 @@ namespace OpenRA.Mods.RA
 		{
 			self = init.self;
 			DevMode = init.self.Trait<DeveloperMode>();
-			RadarPings = Lazy.New(() => init.world.WorldActor.TraitOrDefault<RadarPings>());
+			RadarPings = Exts.Lazy(() => init.world.WorldActor.TraitOrDefault<RadarPings>());
 
 			init.world.ActorAdded += ActorAdded;
 			init.world.ActorRemoved += ActorRemoved;

OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA.Widgets
 		[ObjectCreator.UseCtor]
 		public ResourceBarWidget(World world)
 		{
-			tooltipContainer = Lazy.New(() =>
+			tooltipContainer = Exts.Lazy(() =>
 				Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
 		}