Change target .NET version, other misc. changes

The ookii dll has been changed to the one actually in the project
(rather than just on my desktop :P).
Assembly info has been updated, useless includes have been removed.
The window title now includes "BrawlBuidler".
The Resources folder has been renamed back to resources, and should now
be copied automatically at build.
This commit is contained in:
mogzol 2016-02-06 12:37:56 -08:00
parent 54070b6e27
commit 85644f908a
17 changed files with 29 additions and 36 deletions

View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Resources" />
<probing privatePath="Resources"/>
</assemblyBinding>
</runtime>
</configuration>
</configuration>

View File

@ -332,7 +332,7 @@
this.Opacity = 0D;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "The Ultimate Brawl ISO Builder";
this.Text = "BrawlBuilder - The Ultimate Brawl ISO Builder";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BrawlBuilder_FormClosing);
this.Shown += new System.EventHandler(this.Form1_Shown);
this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Form1_MouseDown);

View File

@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BrawlBuilder</RootNamespace>
<AssemblyName>BrawlBuilder</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -37,19 +38,12 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Ookii.Dialogs">
<HintPath>..\..\..\..\..\Desktop\Ookii.Dialogs\Ookii.Dialogs.dll</HintPath>
<HintPath>..\Resources\Ookii.Dialogs.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BrawlBuilder.cs">
@ -99,6 +93,9 @@
<Content Include="icon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(SolutionDir)Resources" "$(TargetDir)Resources" /s/h/e/k/q/i/y</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

View File

@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("BrawlBuilder")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("The Ultimate Super Smash Bros. Brawl ISO Builder")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("BrawlBuilder")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyCopyright("Copyright Mogzol © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@ -8,23 +8,19 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace BrawlBuilder.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
namespace BrawlBuilder.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
}
}

View File

@ -17,7 +17,7 @@ Project M 3.6 support is achieved by through slightly modifying the given GCT. I
## Other notes
If you are experiencing issues when playing the output ISO, make sure that you either don't have an SD card inserted, or your SD card doesn't have any mod files on it, as mods will still try to read from the SD before reading from the disc (unless you are on P:M 3.6 and told the builder to fix problem codes, and even then, some files are still loaded from SD).
If you are building this from source, remember to copy the Resources folder from the base directory into the same directory as the exe file, or else nothing will work.
If you are building this from source, make sure the Resources folder from the base directory is getting copied into the same directory as the exe file, or else nothing will work. This should happen automatically on build, but if it doesn't, just copy it manually.
## Credits
First of all thanks to Wiimm for his amazing wit tool, which is used to extract, patch, and build the game images.