epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to .NET 4.0

Browse Source
This commit is contained in:
Matthias Mailänder
2014-02-15 20:34:59 +01:00
committed by Paul Chote
parent 4d08093d1d
commit 67cd0645a4
30 changed files with 55 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -34,7 +34,7 @@
############################## TOOLCHAIN ############################### ############################## TOOLCHAIN ###############################
# #
CSC = gmcs CSC = dmcs
CSFLAGS = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror CSFLAGS = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
DEFINE = DEBUG;TRACE 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 COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll

7
OpenRA.Editor/OpenRA.Editor.csproj
View File

@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.Editor</RootNamespace> <RootNamespace>OpenRA.Editor</RootNamespace>
<AssemblyName>OpenRA.Editor</AssemblyName> <AssemblyName>OpenRA.Editor</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon> <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
<FileUpgradeFlags> <FileUpgradeFlags>
@@ -60,13 +59,13 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Xml.Linq"> <Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />

3
OpenRA.FileFormats/OpenRA.FileFormats.csproj
View File

@@ -15,7 +15,6 @@
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
@@ -58,7 +57,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />

2
OpenRA.FileFormats/Platform.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA
{ {
public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } } public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
static Lazy<PlatformType> currentPlatform = Lazy.New((Func<PlatformType>)GetCurrentPlatform); static OpenRA.FileFormats.Lazy<PlatformType> currentPlatform = Lazy.New((Func<PlatformType>)GetCurrentPlatform);
static PlatformType GetCurrentPlatform() static PlatformType GetCurrentPlatform()
{ {

10
OpenRA.Game/Actor.cs
View File

@@ -24,12 +24,12 @@ namespace OpenRA
public readonly World World; public readonly World World;
public readonly uint ActorID; public readonly uint ActorID;
public Lazy<Rectangle> Bounds; public OpenRA.FileFormats.Lazy<Rectangle> Bounds;
Lazy<IOccupySpace> occupySpace; OpenRA.FileFormats.Lazy<IOccupySpace> occupySpace;
Lazy<IFacing> facing; OpenRA.FileFormats.Lazy<IFacing> facing;
Lazy<Health> health; OpenRA.FileFormats.Lazy<Health> health;
Lazy<IEffectiveOwner> effectiveOwner; OpenRA.FileFormats.Lazy<IEffectiveOwner> effectiveOwner;
public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } } public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } } public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }

2
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Graphics
internal readonly TerrainRenderer terrainRenderer; internal readonly TerrainRenderer terrainRenderer;
internal readonly HardwarePalette palette; internal readonly HardwarePalette palette;
internal Cache<string, PaletteReference> palettes; internal Cache<string, PaletteReference> palettes;
Lazy<DeveloperMode> devTrait; OpenRA.FileFormats.Lazy<DeveloperMode> devTrait;
internal WorldRenderer(World world) internal WorldRenderer(World world)
{ {

8
OpenRA.Game/Map.cs
View File

@@ -84,7 +84,7 @@ namespace OpenRA
return options; return options;
} }
[FieldLoader.Ignore] public Lazy<Dictionary<string, ActorReference>> Actors; [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy<Dictionary<string, ActorReference>> Actors;
public int PlayerCount { get { return Players.Count(p => p.Value.Playable); } } public int PlayerCount { get { return Players.Count(p => p.Value.Playable); } }
@@ -92,7 +92,7 @@ namespace OpenRA
// Yaml map data // Yaml map data
[FieldLoader.Ignore] public Dictionary<string, PlayerReference> Players = new Dictionary<string, PlayerReference>(); [FieldLoader.Ignore] public Dictionary<string, PlayerReference> Players = new Dictionary<string, PlayerReference>();
[FieldLoader.Ignore] public Lazy<List<SmudgeReference>> Smudges; [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy<List<SmudgeReference>> Smudges;
[FieldLoader.Ignore] public List<MiniYamlNode> Rules = new List<MiniYamlNode>(); [FieldLoader.Ignore] public List<MiniYamlNode> Rules = new List<MiniYamlNode>();
[FieldLoader.Ignore] public List<MiniYamlNode> Sequences = new List<MiniYamlNode>(); [FieldLoader.Ignore] public List<MiniYamlNode> Sequences = new List<MiniYamlNode>();
@@ -106,8 +106,8 @@ namespace OpenRA
[FieldLoader.Ignore] public byte TileFormat = 1; [FieldLoader.Ignore] public byte TileFormat = 1;
public int2 MapSize; public int2 MapSize;
[FieldLoader.Ignore] public Lazy<TileReference<ushort, byte>[,]> MapTiles; [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy<TileReference<ushort, byte>[,]> MapTiles;
[FieldLoader.Ignore] public Lazy<TileReference<byte, byte>[,]> MapResources; [FieldLoader.Ignore] public OpenRA.FileFormats.Lazy<TileReference<byte, byte>[,]> MapResources;
[FieldLoader.Ignore] public string[,] CustomTerrain; [FieldLoader.Ignore] public string[,] CustomTerrain;
public static Map FromTileset(TileSet tileset) public static Map FromTileset(TileSet tileset)

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -16,7 +16,6 @@
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ApplicationIcon>OpenRA.ico</ApplicationIcon> <ApplicationIcon>OpenRA.ico</ApplicationIcon>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>

2
OpenRA.Game/Widgets/ButtonWidget.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Widgets
public Action<MouseInput> OnMouseDown = _ => {}; public Action<MouseInput> OnMouseDown = _ => {};
public Action<MouseInput> OnMouseUp = _ => {}; public Action<MouseInput> OnMouseUp = _ => {};
Lazy<TooltipContainerWidget> tooltipContainer; OpenRA.FileFormats.Lazy<TooltipContainerWidget> tooltipContainer;
public readonly string TooltipContainer; public readonly string TooltipContainer;
public readonly string TooltipTemplate = "BUTTON_TOOLTIP"; public readonly string TooltipTemplate = "BUTTON_TOOLTIP";
public string TooltipText; public string TooltipText;

2
OpenRA.Game/Widgets/MapPreviewWidget.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Widgets
public readonly string TooltipContainer; public readonly string TooltipContainer;
public readonly string TooltipTemplate = "SPAWN_TOOLTIP"; public readonly string TooltipTemplate = "SPAWN_TOOLTIP";
Lazy<TooltipContainerWidget> tooltipContainer; OpenRA.FileFormats.Lazy<TooltipContainerWidget> tooltipContainer;
public int TooltipSpawnIndex = -1; public int TooltipSpawnIndex = -1;
Rectangle MapRect; Rectangle MapRect;

2
OpenRA.Game/Widgets/ViewportControllerWidget.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Widgets
{ {
public readonly string TooltipTemplate = "WORLD_TOOLTIP"; public readonly string TooltipTemplate = "WORLD_TOOLTIP";
public readonly string TooltipContainer; public readonly string TooltipContainer;
Lazy<TooltipContainerWidget> tooltipContainer; OpenRA.FileFormats.Lazy<TooltipContainerWidget> tooltipContainer;
public WorldTooltipType TooltipType { get; private set; } public WorldTooltipType TooltipType { get; private set; }
public IToolTip ActorTooltip { get; private set; } public IToolTip ActorTooltip { get; private set; }

7
OpenRA.Irc/OpenRA.Irc.csproj
View File

@@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.Irc</RootNamespace> <RootNamespace>OpenRA.Irc</RootNamespace>
<AssemblyName>OpenRA.Irc</AssemblyName> <AssemblyName>OpenRA.Irc</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -47,11 +48,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj"> <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
<Project>{bdaeab25-991e-46a7-af1e-4f0e03358daa}</Project> <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
<Name>OpenRA.FileFormats</Name> <Name>OpenRA.FileFormats</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj"> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
<Project>{0dfb103f-2962-400f-8c6d-e2c28ccba633}</Project> <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
<Name>OpenRA.Game</Name> <Name>OpenRA.Game</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

7
OpenRA.Lint/OpenRA.Lint.csproj
View File

@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA</RootNamespace> <RootNamespace>OpenRA</RootNamespace>
<AssemblyName>OpenRA.Lint</AssemblyName> <AssemblyName>OpenRA.Lint</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@@ -57,14 +56,14 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq"> <Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

7
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.Mods.Cnc</RootNamespace> <RootNamespace>OpenRA.Mods.Cnc</RootNamespace>
<AssemblyName>OpenRA.Mods.Cnc</AssemblyName> <AssemblyName>OpenRA.Mods.Cnc</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@@ -59,13 +58,13 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Xml.Linq"> <Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

2
OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
View File

@@ -74,7 +74,7 @@ namespace OpenRA.Mods.Cnc.Widgets
bool rightPressed = false; bool rightPressed = false;
Rectangle leftButtonRect; Rectangle leftButtonRect;
Rectangle rightButtonRect; Rectangle rightButtonRect;
Lazy<ProductionPaletteWidget> paletteWidget; OpenRA.FileFormats.Lazy<ProductionPaletteWidget> paletteWidget;
string queueGroup; string queueGroup;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]

7
OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
View File

@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.Mods.D2k</RootNamespace> <RootNamespace>OpenRA.Mods.D2k</RootNamespace>
<AssemblyName>OpenRA.Mods.D2k</AssemblyName> <AssemblyName>OpenRA.Mods.D2k</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@@ -63,13 +62,13 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Xml.Linq"> <Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

7
OpenRA.Mods.RA/Armament.cs
View File

@@ -58,10 +58,11 @@ namespace OpenRA.Mods.RA
public readonly ArmamentInfo Info; public readonly ArmamentInfo Info;
public readonly WeaponInfo Weapon; public readonly WeaponInfo Weapon;
public readonly Barrel[] Barrels; public readonly Barrel[] Barrels;
public readonly Actor self; public readonly Actor self;
Lazy<Turreted> Turret; OpenRA.FileFormats.Lazy<Turreted> Turret;
Lazy<IBodyOrientation> Coords; OpenRA.FileFormats.Lazy<IBodyOrientation> Coords;
Lazy<LimitedAmmo> limitedAmmo; OpenRA.FileFormats.Lazy<LimitedAmmo> limitedAmmo;
List<Pair<int, Action>> delayedActions = new List<Pair<int, Action>>(); List<Pair<int, Action>> delayedActions = new List<Pair<int, Action>>();
public WRange Recoil; public WRange Recoil;

4
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

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

2
OpenRA.Mods.RA/Attack/AttackGarrisoned.cs
View File

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

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

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

2
OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs
View File

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

5
OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
View File

@@ -9,7 +9,6 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>OpenRA.Mods.TS</RootNamespace> <RootNamespace>OpenRA.Mods.TS</RootNamespace>
<AssemblyName>OpenRA.Mods.TS</AssemblyName> <AssemblyName>OpenRA.Mods.TS</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -64,8 +63,8 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>mkdir "$(SolutionDir)mods/ts/" <PostBuildEvent>mkdir "$(SolutionDir)mods/ts/"
copy "$(TargetPath)" "$(SolutionDir)mods/ts/" copy "$(TargetPath)" "$(SolutionDir)mods/ts/"
cd "$(SolutionDir)"</PostBuildEvent> cd "$(SolutionDir)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj
View File

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

1
OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj
View File

@@ -9,7 +9,6 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>OpenRA.Renderer.Glsl</RootNamespace> <RootNamespace>OpenRA.Renderer.Glsl</RootNamespace>
<AssemblyName>OpenRA.Renderer.Gl</AssemblyName> <AssemblyName>OpenRA.Renderer.Gl</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

1
OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj
View File

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

1
OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj
View File

@@ -9,7 +9,6 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>OpenRA.Renderer.Sdl2</RootNamespace> <RootNamespace>OpenRA.Renderer.Sdl2</RootNamespace>
<AssemblyName>OpenRA.Renderer.Sdl2</AssemblyName> <AssemblyName>OpenRA.Renderer.Sdl2</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>

2
OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj
View File

@@ -9,7 +9,6 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>OpenRA.Renderer.SdlCommon</RootNamespace> <RootNamespace>OpenRA.Renderer.SdlCommon</RootNamespace>
<AssemblyName>OpenRA.Renderer.SdlCommon</AssemblyName> <AssemblyName>OpenRA.Renderer.SdlCommon</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
@@ -50,6 +49,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />

7
OpenRA.TilesetBuilder/OpenRA.TilesetBuilder.csproj
View File

@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.TilesetBuilder</RootNamespace> <RootNamespace>OpenRA.TilesetBuilder</RootNamespace>
<AssemblyName>OpenRA.TilesetBuilder</AssemblyName> <AssemblyName>OpenRA.TilesetBuilder</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ApplicationIcon>tilesetbuilder_icon copy.ico</ApplicationIcon> <ApplicationIcon>tilesetbuilder_icon copy.ico</ApplicationIcon>
<FileUpgradeFlags> <FileUpgradeFlags>
@@ -60,13 +59,13 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Xml.Linq"> <Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />

7
OpenRA.Utility/OpenRA.Utility.csproj
View File

@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.Utility</RootNamespace> <RootNamespace>OpenRA.Utility</RootNamespace>
<AssemblyName>OpenRA.Utility</AssemblyName> <AssemblyName>OpenRA.Utility</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@@ -56,15 +55,15 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq"> <Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions"> <Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

10
packaging/windows/OpenRA.nsi
View File

@@ -138,18 +138,18 @@ Section "-DotNet" DotNet
IfErrors error 0 IfErrors error 0
IntCmp $0 1 0 error 0 IntCmp $0 1 0 error 0
ClearErrors 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 IfErrors error 0
IntCmp $0 1 done error done IntCmp $0 1 done error done
error: error:
MessageBox MB_YESNO ".NET Framework v3.5 SP1 or later is required to run OpenRA. $\n \ 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?" \ Do you wish for the installer to launch your web browser in order to download and install it?" \
IDYES download IDNO error2 IDYES download IDNO error2
download: 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 Goto done
error2: 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." or later is installed."
done: done:
SectionEnd SectionEnd