⚡ Upgraded to Net Core 3

Darkmet98 · Oct 11, 2019 · 152bc5c · 152bc5c
1 parent f567e72
commit 152bc5c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 137 deletions.
diff --git a/README.md b/README.md
@@ -2,8 +2,17 @@
 A simple Rpa extractor for Renpy games
 
 ## Usage
-[mono] RpaExtractor.exe "File.rpa"
+RpaExtractor "File.rpa"
+
+## Changelog
+
+### 1.0
+* Initial release.
+
+### 1.1
+* Upgraded to Net Core 3.
+* Fixed folder generation on Linux.
 
 ## Credits
 * Pleonex for Yarhl libraries
-* [Shizmob](https://github.com/Shizmob) for the [python release](https://github.com/Shizmob/rpatool) (Some of work is based from their sources)
+* [Shizmob](https://github.com/Shizmob) for the [python release](https://github.com/Shizmob/rpatool) (Some of work is based from their sources)
diff --git a/RpaExtractor/App.config b/RpaExtractor/App.config
diff --git a/RpaExtractor/Program.cs b/RpaExtractor/Program.cs
@@ -30,7 +30,7 @@ static void Main(string[] args)
             Disclaimer();
             if(args == null || args.Length == 0)
             {
-                Console.WriteLine("\nUsage: RpaExtractor.exe \"File.rpa\"");
+                Console.WriteLine("\nUsage: RpaExtractor \"File.rpa\"");
                 return;
 
             }
@@ -58,15 +58,15 @@ static void Main(string[] args)
                 {
                     if (child.Stream == null)
                         continue;
-                    string output = Path.Combine(foldername + "/" + child.Name);
+                    string output = Path.Combine(foldername + Path.DirectorySeparatorChar + child.Name.Replace('\\', Path.DirectorySeparatorChar));
                     child.Stream.WriteTo(output);
                 }
             }
         }
 
         private static void Disclaimer()
         {
-            Console.WriteLine("RpaExtractor — A rpa extractor for renpy games by Darkmet98.\nVersion: 1.0");
+            Console.WriteLine("RpaExtractor — A rpa extractor for renpy games by Darkmet98.\nVersion: 1.1");
             Console.WriteLine("Thanks to Pleonex for the Yarhl libraries and Shizmob for the python release (rpatool) (Some of work is based from their sources).");
             Console.WriteLine("This program is licensed with a GPL V3 license.");
         }

diff --git a/RpaExtractor/Properties/AssemblyInfo.cs b/RpaExtractor/Properties/AssemblyInfo.cs
diff --git a/RpaExtractor/RpaExtractor.csproj b/RpaExtractor/RpaExtractor.csproj
@@ -1,81 +1,13 @@
-<?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>{97036290-A220-4C44-915A-D58C849C5D71}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>RpaExtractor</RootNamespace>
-    <AssemblyName>RpaExtractor</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <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' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Composition.AttributedModel, Version=1.0.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Composition.AttributedModel.1.2.0\lib\netstandard2.0\System.Composition.AttributedModel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.Convention, Version=1.0.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Composition.Convention.1.2.0\lib\netstandard2.0\System.Composition.Convention.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.Hosting, Version=1.0.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Composition.Hosting.1.2.0\lib\netstandard2.0\System.Composition.Hosting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.Runtime, Version=1.0.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Composition.Runtime.1.2.0\lib\netstandard2.0\System.Composition.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Composition.TypedParts, Version=1.0.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Composition.TypedParts.1.2.0\lib\netstandard2.0\System.Composition.TypedParts.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core" />
-    <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" />
-    <Reference Include="Yarhl, Version=2.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Yarhl.2.0.0.1\lib\netstandard2.0\Yarhl.dll</HintPath>
-    </Reference>
-    <Reference Include="Yarhl.Media, Version=2.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Yarhl.Media.2.0.0.1\lib\netstandard2.0\Yarhl.Media.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="RPA\BinaryFormat2Rpa.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RPA\Rpa.cs" />
-    <Compile Include="RPA\Rpa2NodeContainer.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
+    <PackageReference Include="SharpZipLib" Version="1.2.0" />
+    <PackageReference Include="Yarhl" Version="2.0.0.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+
+</Project>
diff --git a/RpaExtractor/packages.config b/RpaExtractor/packages.config
diff --git a/build.bat b/build.bat
@@ -0,0 +1,4 @@
+@echo off
+dotnet publish -r win-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
+dotnet publish -r linux-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
+dotnet publish -r osx-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
diff --git a/build.sh b/build.sh
@@ -0,0 +1,4 @@
+ #!/bin/bash
+dotnet publish -r win-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
+dotnet publish -r linux-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
+dotnet publish -r osx-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true