Skip to content

Commit 1b1313f

Browse files
committed
updated projects to .net 4.8
1 parent a971e22 commit 1b1313f

7 files changed

Lines changed: 34 additions & 22 deletions

File tree

Editor/Level Editor.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>LevelEditor</RootNamespace>
1212
<AssemblyName>Hi-OctaneLevelEditor</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
<PublishUrl>publish\</PublishUrl>
1718
<Install>true</Install>
@@ -38,6 +39,7 @@
3839
<DefineConstants>DEBUG;TRACE</DefineConstants>
3940
<ErrorReport>prompt</ErrorReport>
4041
<WarningLevel>4</WarningLevel>
42+
<Prefer32Bit>false</Prefer32Bit>
4143
</PropertyGroup>
4244
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
4345
<PlatformTarget>x86</PlatformTarget>
@@ -47,6 +49,7 @@
4749
<DefineConstants>TRACE</DefineConstants>
4850
<ErrorReport>prompt</ErrorReport>
4951
<WarningLevel>4</WarningLevel>
52+
<Prefer32Bit>false</Prefer32Bit>
5053
</PropertyGroup>
5154
<PropertyGroup>
5255
<StartupObject />

Editor/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

Inspector/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
66
</configuration>

Inspector/Level Inspector.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>LevelInspector</RootNamespace>
1111
<AssemblyName>Hi-OctaneLevelInspector</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -22,6 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2728
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
3132
<DefineConstants>TRACE</DefineConstants>
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3436
</PropertyGroup>
3537
<PropertyGroup>
3638
<ApplicationIcon>bullfrog.ico</ApplicationIcon>

Inspector/MainForm.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,14 @@ private void loadMapButton_Click(object sender, EventArgs e)
128128

129129
private void showMap(string filename)
130130
{
131-
byte[] bytes = File.ReadAllBytes(mapsDir + filename);
131+
string path = mapsDir + filename;
132+
if (!File.Exists(path))
133+
{
134+
MessageBox.Show("Make sure the data files are available in the output folder! Maybe you need to unpack data.zip to the Debug or Release folder.", "Data not found!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
135+
return;
136+
}
137+
138+
byte[] bytes = File.ReadAllBytes(path);
132139

133140
Atlas atlas = null;
134141

Inspector/Properties/Resources.Designer.cs

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Inspector/Properties/Settings.Designer.cs

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)