/Vassal/Vassal/Properties/Resources.Designer.cs |
@@ -8,8 +8,8 @@ |
// </auto-generated> |
//------------------------------------------------------------------------------ |
|
namespace Vassal.Properties |
{ |
namespace Vassal.Properties { |
using System; |
|
|
/// <summary> |
@@ -22,8 +22,7 @@ |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] |
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
internal class Resources |
{ |
internal class Resources { |
|
private static global::System.Resources.ResourceManager resourceMan; |
|
@@ -30,8 +29,7 @@ |
private static global::System.Globalization.CultureInfo resourceCulture; |
|
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] |
internal Resources() |
{ |
internal Resources() { |
} |
|
/// <summary> |
@@ -38,12 +36,9 @@ |
/// Returns the cached ResourceManager instance used by this class. |
/// </summary> |
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
internal static global::System.Resources.ResourceManager ResourceManager |
{ |
get |
{ |
if ((resourceMan == null)) |
{ |
internal static global::System.Resources.ResourceManager ResourceManager { |
get { |
if (object.ReferenceEquals(resourceMan, null)) { |
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Vassal.Properties.Resources", typeof(Resources).Assembly); |
resourceMan = temp; |
} |
@@ -56,14 +51,11 @@ |
/// resource lookups using this strongly typed resource class. |
/// </summary> |
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
internal static global::System.Globalization.CultureInfo Culture |
{ |
get |
{ |
internal static global::System.Globalization.CultureInfo Culture { |
get { |
return resourceCulture; |
} |
set |
{ |
set { |
resourceCulture = value; |
} |
} |
/Vassal/Vassal/SettingsForm.cs |
@@ -89,9 +89,7 @@ |
mediaType = @"text/plain"; |
break; |
} |
// Create HTTP Client |
Vassal.HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal", |
Vassal.VASSAL_VERSION), new CookieContainer(), mediaType, 60000); |
Vassal.HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal", Vassal.VASSAL_VERSION), mediaType, 60000); |
}; |
|
private readonly Action SetUserConfiguration = () => |
@@ -143,7 +141,7 @@ |
} |
// Create HTTP Client |
Vassal.HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal", |
Vassal.VASSAL_VERSION), new CookieContainer(), mediaType, 60000); |
Vassal.VASSAL_VERSION), mediaType, 60000); |
}; |
|
public SettingsForm() |
@@ -241,7 +239,7 @@ |
ActiveInputFilters.Items.Add(new ListViewItem |
{ |
Text = InputDecode.Text, |
Tag = Reflection.GetEnumValueFromDescription<Filter>(InputDecode.Text) |
Tag = Reflection.GetEnumValueFromName<Filter>(InputDecode.Text) |
}); |
})); |
} |
@@ -259,7 +257,7 @@ |
ActiveInputFilters.Items.Add(new ListViewItem |
{ |
Text = InputDecryption.Text, |
Tag = Reflection.GetEnumValueFromDescription<Filter>(InputDecryption.Text) |
Tag = Reflection.GetEnumValueFromName<Filter>(InputDecryption.Text) |
}); |
})); |
} |
@@ -277,7 +275,7 @@ |
ActiveOutputFilters.Items.Add(new ListViewItem |
{ |
Text = OutputEncrypt.Text, |
Tag = Reflection.GetEnumValueFromDescription<Filter>(OutputEncrypt.Text) |
Tag = Reflection.GetEnumValueFromName<Filter>(OutputEncrypt.Text) |
}); |
})); |
} |
@@ -295,7 +293,7 @@ |
ActiveOutputFilters.Items.Add(new ListViewItem |
{ |
Text = OutputEncode.Text, |
Tag = Reflection.GetEnumValueFromDescription<Filter>(OutputEncode.Text) |
Tag = Reflection.GetEnumValueFromName<Filter>(OutputEncode.Text) |
}); |
})); |
} |
/Vassal/Vassal/Vassal.csproj |
@@ -9,7 +9,7 @@ |
<AppDesignerFolder>Properties</AppDesignerFolder> |
<RootNamespace>Vassal</RootNamespace> |
<AssemblyName>Vassal</AssemblyName> |
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> |
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> |
<FileAlignment>512</FileAlignment> |
<PublishUrl>publish\</PublishUrl> |
<Install>true</Install> |
@@ -26,6 +26,7 @@ |
<IsWebBootstrapper>false</IsWebBootstrapper> |
<UseApplicationTrust>false</UseApplicationTrust> |
<BootstrapperEnabled>true</BootstrapperEnabled> |
<TargetFrameworkProfile /> |
</PropertyGroup> |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
<PlatformTarget>AnyCPU</PlatformTarget> |
@@ -77,9 +78,6 @@ |
<Reference Include="System.Net.Http" /> |
<Reference Include="System.Windows.Forms" /> |
<Reference Include="System.Xml" /> |
<Reference Include="wasSharp"> |
<HintPath>..\..\wasSharp\bin\Release\wasSharp.dll</HintPath> |
</Reference> |
</ItemGroup> |
<ItemGroup> |
<Compile Include="RegionEditForm.cs"> |
@@ -120,6 +118,7 @@ |
<Compile Include="Properties\Resources.Designer.cs"> |
<AutoGen>True</AutoGen> |
<DependentUpon>Resources.resx</DependentUpon> |
<DesignTime>True</DesignTime> |
</Compile> |
<None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so"> |
<Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so</Link> |
@@ -181,6 +180,12 @@ |
<Install>false</Install> |
</BootstrapperPackage> |
</ItemGroup> |
<ItemGroup> |
<ProjectReference Include="..\..\wasSharp\wasSharp.csproj"> |
<Project>{a971e1c9-776c-4cd2-88ac-71197c7b955e}</Project> |
<Name>wasSharp</Name> |
</ProjectReference> |
</ItemGroup> |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
<!-- 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. |