Skip to content

Commit

Permalink
fixed dependency bug
Browse files Browse the repository at this point in the history
  • Loading branch information
jymden committed May 8, 2016
1 parent 3f1a1c0 commit 299c559
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 80 deletions.
1 change: 1 addition & 0 deletions TADST/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ static class Program
[STAThread]
static void Main()
{

Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new MainForm());
Expand Down
4 changes: 2 additions & 2 deletions TADST/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.9.5.0")]
[assembly: AssemblyFileVersion("2.9.5.0")]
[assembly: AssemblyVersion("2.9.6.0")]
[assembly: AssemblyFileVersion("2.9.6.0")]
13 changes: 5 additions & 8 deletions TADST/TADST.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand All @@ -65,19 +66,15 @@
<PropertyGroup>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<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.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="forms\AsIsInfoForm.cs">
Expand Down
2 changes: 1 addition & 1 deletion TADST/forms/InformationForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 1 addition & 38 deletions TADST/forms/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions TADST/forms/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ private void GetDifficultyItems(IEnumerable<DifficultyItem> diffItems)
{
clbDifficultyItems.Items.Add(item.ToString(), item.IsChecked);
}

}

private void btnProfileNew_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -2191,6 +2190,5 @@ private void chkAutoinit_CheckedChanged(object sender, EventArgs e)
_activeProfile.AutoInit = chkAutoinit.Checked;
UpdateGuiStartupParameters();
}

}
}
43 changes: 14 additions & 29 deletions TADST/forms/MainForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="chkLoopback.ToolTip" xml:space="preserve">
<value>While using the Dev version of Arma III, adding this option will force server into LAN mode.
This will allow multiple local instances of the game to connect to the server for testing purposes.
At the same time it will prevent all non-local instances from connecting.

Default is disabled.</value>
</data>
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>114, 17</value>
</metadata>
Expand All @@ -135,7 +125,7 @@ Default is disabled.</value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADy
HwAAAk1TRnQBSQFMAgEBFQEAAaABAQGgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
HwAAAk1TRnQBSQFMAgEBFQEAAagBAQGoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAWADAAEBAQABCAYAARgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Expand Down Expand Up @@ -273,6 +263,19 @@ Default is disabled.</value>
AQMBwAEDAcABAwHwAUcBAAEDAcABAwHAAQMB8AEHAQABBwHAAQMB4AEDAfgBDwEAAQcBwAEDAfgBHwH8
AR8BwQGPAcABAwH+AT8B/gE/Af8Bzws=
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="chkLoopback.ToolTip" xml:space="preserve">
<value>While using the Dev version of Arma III, adding this option will force server into LAN mode.
This will allow multiple local instances of the game to connect to the server for testing purposes.
At the same time it will prevent all non-local instances from connecting.

Default is disabled.</value>
</data>
<data name="btnRotateNetLog.ToolTip" xml:space="preserve">
<value>Rotate netlog file.
Expand Down Expand Up @@ -317,24 +320,6 @@ Then TADST will open the RTP file connected to the chosen server file.

</value>
</data>
<metadata name="autoInitShape2.Bounds" type="System.Drawing.Rectangle, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>389, 129, 8, 0</value>
</metadata>
<metadata name="autoInitShape2.Location" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>389, 129</value>
</metadata>
<metadata name="autoInitShape2.Size" type="System.Drawing.Size, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>8, 0</value>
</metadata>
<metadata name="autoInitShape1.Bounds" type="System.Drawing.Rectangle, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>388, 117, 0, 12</value>
</metadata>
<metadata name="autoInitShape1.Location" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>388, 117</value>
</metadata>
<metadata name="autoInitShape1.Size" type="System.Drawing.Size, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 12</value>
</metadata>
<data name="cmbRequiredSecureId.ToolTip" xml:space="preserve">
<value>requiredSecureId = 1,
all playes are requested to provide a validated ID.
Expand Down

0 comments on commit 299c559

Please sign in to comment.