changed target framework version to .Net v4.6

This commit is contained in:
morkt
2018-01-02 06:56:32 +04:00
parent 1a8b0d8b4a
commit 47769f4112
14 changed files with 80 additions and 48 deletions

View File

@@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GameRes.Formats</RootNamespace>
<AssemblyName>ArcFormats</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -51,7 +52,7 @@
<Reference Include="NAudio">
<HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
</Reference>
<Reference Include="NVorbis, Version=0.8.5.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NVorbis">
<HintPath>..\packages\NVorbis.0.8.5.0\lib\NVorbis.dll</HintPath>
<Private>True</Private>
</Reference>
@@ -117,6 +118,9 @@
<Compile Include="DirectDraw\DxtDecoder.cs" />
<Compile Include="elf\ArcAi5DAT.cs" />
<Compile Include="elf\ImageRMT.cs" />
<Compile Include="HuffmanCompression.cs" />
<Compile Include="Lambda\ArcLAX.cs" />
<Compile Include="Nexas\ArcTPF.cs" />
<Compile Include="LiveMaker\ImageGALX.cs" />
<Compile Include="Otemoto\ArcTLZ.cs" />
<Compile Include="Otemoto\ImageMAG.cs" />
@@ -1007,6 +1011,13 @@ exit 0</PreBuildEvent>
<PostBuildEvent>if not exist "$(TargetDir)\GameData" mkdir "$(TargetDir)\GameData"
xcopy "$(ProjectDir)\Resources\Formats.dat" "$(TargetDir)\GameData\" /D /Y &gt;NUL</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- 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

@@ -171,4 +171,4 @@
</setting>
</GameRes.Formats.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NVorbis" version="0.8.5.0" targetFramework="net45" />
<package id="NVorbis" version="0.8.5.0" targetFramework="net46" />
</packages>