Added reference to SkyEditor.Core

DotNet3dsToolkit/Converter.vb

@@ -1,9 +1,11 @@
 Imports System.IO
 Imports System.Text.RegularExpressions
 Imports DotNet3dsToolkit.Misc
+Imports SkyEditor.Core.Utilities
 
 Public Class Converter
     Implements IDisposable
+    Implements IReportProgress
 
     Public Event ConsoleOutputReceived(sender As Object, e As DataReceivedEventArgs)
 
@@ -53,7 +55,8 @@ Public Class Converter
         End If
     End Sub
 
-    Public Event UnpackProgressed(sender As Object, e As UnpackProgressEventArgs)
+    Public Event UnpackProgressed(sender As Object, e As ProgressReportedEventArgs) Implements IReportProgress.ProgressChanged
+    Public Event Completed As IReportProgress.CompletedEventHandler Implements IReportProgress.Completed
 
 #Region "Tool Management"
     Private Property ToolDirectory As String
@@ -63,6 +66,30 @@ Public Class Converter
     Private Property Path_ctrtool As String
     Private Property Path_ndstool As String
 
+    Public ReadOnly Property Progress As Single Implements IReportProgress.Progress
+        Get
+            Throw New NotImplementedException()
+        End Get
+    End Property
+
+    Public ReadOnly Property Message As String Implements IReportProgress.Message
+        Get
+            Throw New NotImplementedException()
+        End Get
+    End Property
+
+    Public ReadOnly Property IsIndeterminate As Boolean Implements IReportProgress.IsIndeterminate
+        Get
+            Throw New NotImplementedException()
+        End Get
+    End Property
+
+    Public ReadOnly Property IsCompleted As Boolean Implements IReportProgress.IsCompleted
+        Get
+            Throw New NotImplementedException()
+        End Get
+    End Property
+
     Private Sub ResetToolDirectory()
         ToolDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DotNet3DSToolkit-" & Guid.NewGuid.ToString)
         If Directory.Exists(ToolDirectory) Then
@@ -501,7 +528,7 @@ Public Class Converter
         'CopyNDSTool()
         'Await RunProgram(Path_ndstool, String.Format("-v -x ""{0}"" -9 ""{1}/arm9.bin"" -7 ""{1}/arm7.bin"" -y9 ""{1}/y9.bin"" -y7 ""{1}/y7.bin"" -d ""{1}/data"" -y ""{1}/overlay"" -t ""{1}/banner.bin"" -h ""{1}/header.bin""", filename, outputDirectory))
 
-        Dim reportProgress = Sub(sender As Object, e As UnpackProgressEventArgs)
+        Dim reportProgress = Sub(sender As Object, e As ProgressReportedEventArgs)
                                  RaiseEvent UnpackProgressed(Me, e)
                              End Sub
 

DotNet3dsToolkit/DotNet3dsToolkit.vbproj

@@ -43,6 +43,18 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SkyEditor.Core, Version=4.0.7.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkyEditor.Core.4.0.7\lib\portable45-net45+win8+wpa81\SkyEditor.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -72,12 +84,7 @@
       <DependentUpon>Language.resx</DependentUpon>
     </Compile>
     <Compile Include="MetadataReader.vb" />
-    <Compile Include="Misc\AsyncFor.vb" />
-    <Compile Include="Misc\GenericFile.vb" />
     <Compile Include="Misc\GenericNDSRom.vb" />
-    <Compile Include="Misc\IOProvider.vb" />
-    <Compile Include="Misc\LoadingStatusChangedEventArgs.vb" />
-    <Compile Include="Misc\UnpackProgressEventArgs.vb" />
     <Compile Include="Misc\WindowsIOProvider.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
@@ -122,6 +129,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\3dstool.exe" />
   </ItemGroup>
   <ItemGroup>

DotNet3dsToolkit/MetadataReader.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports System.Text
 Imports DotNet3dsToolkit.Misc
+Imports SkyEditor.Core.IO
 
 ''' <summary>
 ''' Reads metadata from packed or unpacked ROMs.