update to .NET 4.0

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<Turreted> Turret;
-		Lazy<IBodyOrientation> Coords;
-		Lazy<LimitedAmmo> limitedAmmo;
+		OpenRA.FileFormats.Lazy<Turreted> Turret;
+		OpenRA.FileFormats.Lazy<IBodyOrientation> Coords;
+		OpenRA.FileFormats.Lazy<LimitedAmmo> limitedAmmo;
 		List<Pair<int, Action>> delayedActions = new List<Pair<int, Action>>();
 
 		public WRange Recoil;

OpenRA.Mods.RA/Attack/AttackBase.cs

@@ -33,8 +33,8 @@ namespace OpenRA.Mods.RA
 	{
 		[Sync] public bool IsAttacking { get; internal set; }
 		public IEnumerable<Armament> Armaments { get { return GetArmaments(); } }
-		protected Lazy<IFacing> facing;
-		protected Lazy<Building> building;
+		protected OpenRA.FileFormats.Lazy<IFacing> facing;
+		protected OpenRA.FileFormats.Lazy<Building> building;
 		protected Func<IEnumerable<Armament>> GetArmaments;
 
 		readonly Actor self;

OpenRA.Mods.RA/Attack/AttackGarrisoned.cs

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA
 		public readonly FirePort[] Ports;
 
 		AttackGarrisonedInfo info;
-		Lazy<IBodyOrientation> coords;
+		OpenRA.FileFormats.Lazy<IBodyOrientation> coords;
 		List<Armament> armaments;
 		List<AnimationWithOffset> muzzles;
 		Dictionary<Actor, IFacing> paxFacing;

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/Widgets/ResourceBarWidget.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Widgets
 	{
 		public readonly string TooltipTemplate;
 		public readonly string TooltipContainer;
-		Lazy<TooltipContainerWidget> tooltipContainer;
+		OpenRA.FileFormats.Lazy<TooltipContainerWidget> tooltipContainer;
 
 		public string TooltipFormat = "";
 		public ResourceBarOrientation Orientation = ResourceBarOrientation.Vertical;