Skip to content
This repository has been archived by the owner on Aug 7, 2022. It is now read-only.

Commit

Permalink
Ported OMODFramework to .NET Standard 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
erri120 committed Feb 14, 2020
1 parent f7b30fb commit 14b4172
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 116 deletions.
4 changes: 2 additions & 2 deletions OMODFramework/Classes/OMOD.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public static void CreateOMOD(OMODCreationOptions ops, string omodFileName)
private HashSet<string> GetPluginSet()
{
var tempStream = ExtractWholeFile("plugins.crc");
if(tempStream == null) return new HashSet<string>(0);
if(tempStream == null) return new HashSet<string>();

using (var br = new BinaryReader(tempStream))
{
Expand All @@ -334,7 +334,7 @@ private HashSet<string> GetPluginSet()
private HashSet<DataFileInfo> GetDataSet()
{
var tempStream = ExtractWholeFile("data.crc");
if(tempStream == null) return new HashSet<DataFileInfo>(0);
if(tempStream == null) return new HashSet<DataFileInfo>();

using (var br = new BinaryReader(tempStream))
{
Expand Down
91 changes: 17 additions & 74 deletions OMODFramework/OMODFramework.csproj
Original file line number Diff line number Diff line change
@@ -1,80 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{715A10C0-CAC4-49B2-8A1D-0D6DD2E31F45}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OMODFramework</RootNamespace>
<AssemblyName>OMODFramework</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>erri120</Authors>
<Company>erri120</Company>
<Version>2.0.0</Version>
<Copyright>® erri120</Copyright>
<PackageProjectUrl>https://github.com/erri120/OMODFramework</PackageProjectUrl>
<RepositoryUrl>https://github.com/erri120/OMODFramework</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Transactions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>

<ItemGroup>
<Compile Include="7zip\Common\CRC.cs" />
<Compile Include="7zip\Common\InBuffer.cs" />
<Compile Include="7zip\Common\OutBuffer.cs" />
<Compile Include="7zip\Compress\LZMA\LzmaBase.cs" />
<Compile Include="7zip\Compress\LZMA\LzmaDecoder.cs" />
<Compile Include="7zip\Compress\LZMA\LzmaEncoder.cs" />
<Compile Include="7zip\Compress\LZ\IMatchFinder.cs" />
<Compile Include="7zip\Compress\LZ\LzBinTree.cs" />
<Compile Include="7zip\Compress\LZ\LzInWindow.cs" />
<Compile Include="7zip\Compress\LZ\LzOutWindow.cs" />
<Compile Include="7zip\Compress\RangeCoder\RangeCoder.cs" />
<Compile Include="7zip\Compress\RangeCoder\RangeCoderBit.cs" />
<Compile Include="7zip\Compress\RangeCoder\RangeCoderBitTree.cs" />
<Compile Include="7zip\ICoder.cs" />
<Compile Include="Classes\BSA.cs" />
<Compile Include="Classes\CompressionHandler.cs" />
<Compile Include="Classes\Misc.cs" />
<Compile Include="Classes\Oblivion.cs" />
<Compile Include="Classes\OMOD.cs" />
<Compile Include="Framework.cs" />
<Compile Include="ICodeProgress.cs" />
<Compile Include="ILogger.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utils.cs" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="SharpZipLib">
<Version>1.2.0</Version>
</PackageReference>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
40 changes: 0 additions & 40 deletions OMODFramework/Properties/AssemblyInfo.cs

This file was deleted.

0 comments on commit 14b4172

Please sign in to comment.