diff options
| author | James Finlay <jtfinlay@ualberta.ca> | 2016-03-05 10:10:35 -0800 |
|---|---|---|
| committer | James Finlay <jtfinlay@ualberta.ca> | 2016-03-05 10:10:35 -0800 |
| commit | bae7878ecd4ec1e414b4104f82dd68699725a7ab (patch) | |
| tree | 2ac6ae65d7619c27ebb33600188896da5651f87f /StardewModdingAPI | |
| parent | 14b59117a7e7f14597cc45e9dd10a5e91403ddb6 (diff) | |
| parent | 64a0552aeadaf1b22b546c0675e4d070b8b30291 (diff) | |
| download | SMAPI-bae7878ecd4ec1e414b4104f82dd68699725a7ab.tar.gz SMAPI-bae7878ecd4ec1e414b4104f82dd68699725a7ab.tar.bz2 SMAPI-bae7878ecd4ec1e414b4104f82dd68699725a7ab.zip | |
Merge branch 'master' into release
Diffstat (limited to 'StardewModdingAPI')
| -rw-r--r-- | StardewModdingAPI/App.config | 18 | ||||
| -rw-r--r-- | StardewModdingAPI/StardewModdingAPI.csproj | 5 |
2 files changed, 14 insertions, 9 deletions
diff --git a/StardewModdingAPI/App.config b/StardewModdingAPI/App.config index d08d307f..697c237b 100644 --- a/StardewModdingAPI/App.config +++ b/StardewModdingAPI/App.config @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?> -<configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> - </startup> - <runtime> - <loadFromRemoteSources enabled="true"/> - </runtime> -</configuration>
\ No newline at end of file +<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ </startup>
+ <runtime>
+ <loadFromRemoteSources enabled="true"/>
+ </runtime>
+</configuration>
diff --git a/StardewModdingAPI/StardewModdingAPI.csproj b/StardewModdingAPI/StardewModdingAPI.csproj index 5cc37c84..dde32d41 100644 --- a/StardewModdingAPI/StardewModdingAPI.csproj +++ b/StardewModdingAPI/StardewModdingAPI.csproj @@ -34,6 +34,7 @@ <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
@@ -44,6 +45,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -53,14 +55,17 @@ <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Release\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>icon.ico</ApplicationIcon>
|