Bump SAM.Game to .NET4.

This commit is contained in:
gibbed
2017-11-24 08:57:04 -06:00
parent ec28921bc7
commit 66213562f1
4 changed files with 38 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.1 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -60,6 +60,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Download { internal static System.Drawing.Bitmap Download {
get { get {
object obj = ResourceManager.GetObject("Download", resourceCulture); object obj = ResourceManager.GetObject("Download", resourceCulture);
@@ -67,6 +70,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Invert { internal static System.Drawing.Bitmap Invert {
get { get {
object obj = ResourceManager.GetObject("Invert", resourceCulture); object obj = ResourceManager.GetObject("Invert", resourceCulture);
@@ -74,6 +80,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Lock { internal static System.Drawing.Bitmap Lock {
get { get {
object obj = ResourceManager.GetObject("Lock", resourceCulture); object obj = ResourceManager.GetObject("Lock", resourceCulture);
@@ -81,6 +90,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Refresh { internal static System.Drawing.Bitmap Refresh {
get { get {
object obj = ResourceManager.GetObject("Refresh", resourceCulture); object obj = ResourceManager.GetObject("Refresh", resourceCulture);
@@ -88,6 +100,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Reset { internal static System.Drawing.Bitmap Reset {
get { get {
object obj = ResourceManager.GetObject("Reset", resourceCulture); object obj = ResourceManager.GetObject("Reset", resourceCulture);
@@ -95,6 +110,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Sad { internal static System.Drawing.Bitmap Sad {
get { get {
object obj = ResourceManager.GetObject("Sad", resourceCulture); object obj = ResourceManager.GetObject("Sad", resourceCulture);
@@ -102,6 +120,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Save { internal static System.Drawing.Bitmap Save {
get { get {
object obj = ResourceManager.GetObject("Save", resourceCulture); object obj = ResourceManager.GetObject("Save", resourceCulture);
@@ -109,6 +130,9 @@ namespace SAM.Game.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Unlock { internal static System.Drawing.Bitmap Unlock {
get { get {
object obj = ResourceManager.GetObject("Unlock", resourceCulture); object obj = ResourceManager.GetObject("Unlock", resourceCulture);

View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SAM.Game</RootNamespace> <RootNamespace>SAM.Game</RootNamespace>
<AssemblyName>SAM.Game</AssemblyName> <AssemblyName>SAM.Game</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ApplicationIcon>Blank.ico</ApplicationIcon> <ApplicationIcon>Blank.ico</ApplicationIcon>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
@@ -28,6 +28,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -143,7 +144,9 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -31,5 +31,10 @@ namespace SAM.Game.Stats
public string IconLocked; public string IconLocked;
public bool IsHidden; public bool IsHidden;
public int Permission; public int Permission;
public override string ToString()
{
return string.Format("{0}: {1}", this.Name ?? this.Id ?? base.ToString(), this.Permission);
}
} }
} }

3
SAM.Game/app.config Normal file
View File

@@ -0,0 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>