icedream
/
gmadsharp
mirror of https://github.com/icedream/gmadsharp.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade to .NET Framework 4.5 and update dependencies.

master
Icedream 2015-04-18 23:08:07 +02:00
parent d4e06174b8
commit 7b59629c93
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/addoncreator/Addon/MinifiedMediaAddonFileInfo.cs
View File

@ -74,7 +74,8 @@ namespace GarrysMod.AddonCreator.Addon
} }
} }
using (var tags = TagLib.File.Create(_tempFile)) using (var s = new FileStream(_tempFile, FileMode.Open, FileAccess.Read))
using (var tags = TagLib.File.Create(new StreamFileAbstraction(_tempFile, s, s)))
{ {
if (tags.PossiblyCorrupt && !IgnoreCorrupted) if (tags.PossiblyCorrupt && !IgnoreCorrupted)
{ {

21
src/addoncreator/GarrysMod.AddonCreator.csproj
View File

@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GarrysMod.AddonCreator</RootNamespace> <RootNamespace>GarrysMod.AddonCreator</RootNamespace>
<AssemblyName>gmadsharp</AssemblyName> <AssemblyName>gmadsharp</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -41,20 +42,21 @@
<OutputPath>$(SolutionDir)\bin\$(Configuration)\$(Platform)\</OutputPath> <OutputPath>$(SolutionDir)\bin\$(Configuration)\$(Platform)\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>GarrysMod.AddonCreator.Program</StartupObject> <StartupObject>
</StartupObject>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>$(SolutionDir)\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath> <Private>True</Private>
</Reference>
<Reference Include="policy.2.0.taglib-sharp">
<HintPath>$(SolutionDir)\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="taglib-sharp"> <Reference Include="System.IO" />
<HintPath>$(SolutionDir)\packages\taglib.2.1.0.0\lib\taglib-sharp.dll</HintPath> <Reference Include="System.Runtime" />
<Reference Include="TagLib.Portable, Version=2.1.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\TagLib.Portable.1.0.2\lib\portable-net45+win8+wpa81\TagLib.Portable.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -73,6 +75,7 @@
<Compile Include="Addon\SegmentedAddonFileInfo.cs" /> <Compile Include="Addon\SegmentedAddonFileInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
src/addoncreator/app.config Normal file
View File

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

4
src/addoncreator/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="taglib" version="2.1.0.0" targetFramework="net40" /> <package id="TagLib.Portable" version="1.0.2" targetFramework="net45" />
</packages> </packages>