diff --git a/DICUI.Check/App.config b/DICUI.Check/App.config
index 731f6de6..8d234373 100644
--- a/DICUI.Check/App.config
+++ b/DICUI.Check/App.config
@@ -1,6 +1,6 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/DICUI.Check/DICUI.Check.csproj b/DICUI.Check/DICUI.Check.csproj
index 594669ea..9d678f0c 100644
--- a/DICUI.Check/DICUI.Check.csproj
+++ b/DICUI.Check/DICUI.Check.csproj
@@ -1,59 +1,20 @@
-
-
-
+
+
- Debug
- AnyCPU
- {8CFDE289-E171-4D49-A40D-5293265C1253}
+ net462;net472;netcoreapp3.0
+ false
Exe
- DICUI.Check
- DICUI.Check
- v4.6.1
- 512
- true
- true
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
{51ab0928-13f9-44bf-a407-b6957a43a056}
DICUI.Library
-
+
\ No newline at end of file
diff --git a/DICUI.Library/DICUI.Library.csproj b/DICUI.Library/DICUI.Library.csproj
index 8211d00d..be852955 100644
--- a/DICUI.Library/DICUI.Library.csproj
+++ b/DICUI.Library/DICUI.Library.csproj
@@ -1,89 +1,17 @@
-
-
-
+
+
- Debug
- AnyCPU
- {51AB0928-13F9-44BF-A407-B6957A43A056}
- Library
- Properties
- DICUI
- DICUI.Library
- v4.6.1
- 512
- true
+ net462;net472;netcoreapp3.0
+ false
+ true
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\packages\BurnOutSharp.1.3.7.1\lib\net461\BurnOutSharp.dll
-
-
- ..\packages\LessIO.0.5.0\lib\net40\LessIO.dll
-
-
- ..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll
-
-
- ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll
-
-
- ..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Component
-
-
-
+
Always
+
{2735412F-7F64-5B0F-8F00-5D77AFBE261E}
@@ -104,8 +32,19 @@
True
+
-
+
+
+
+
+
+
+
-
-
\ No newline at end of file
+
+
+
+
+
+
diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs
index 48cd37b7..8e9bdd02 100644
--- a/DICUI.Library/Utilities/DumpEnvironment.cs
+++ b/DICUI.Library/Utilities/DumpEnvironment.cs
@@ -245,15 +245,17 @@ namespace DICUI.Utilities
bool endedWithDirectorySeparator = OutputDirectory.EndsWith(Path.DirectorySeparatorChar.ToString());
bool endedWithSpace = OutputDirectory.EndsWith(" ");
- // Normalize the path so the below filters work better
+ // Combine the path to make things separate easier
string combinedPath = Path.Combine(OutputDirectory, OutputFilename);
- OutputDirectory = Path.GetDirectoryName(combinedPath);
- OutputFilename = Path.GetFileName(combinedPath);
- // If we have either a blank filename or path, just exit
- if (String.IsNullOrWhiteSpace(OutputFilename) || String.IsNullOrWhiteSpace(OutputDirectory))
+ // If we have have a blank path, just return
+ if (string.IsNullOrWhiteSpace(combinedPath))
return;
+ // Now get the normalized paths
+ OutputDirectory = Path.GetDirectoryName(combinedPath);
+ OutputFilename = Path.GetFileName(combinedPath);
+
// Take care of extra path characters
OutputDirectory = new StringBuilder(OutputDirectory.Replace('.', '_').Replace('&', '_'))
.Replace(':', '_', 0, OutputDirectory.LastIndexOf(':') == -1 ? 0 : OutputDirectory.LastIndexOf(':')).ToString();
diff --git a/DICUI.Library/packages.config b/DICUI.Library/packages.config
deleted file mode 100644
index 651ffcdd..00000000
--- a/DICUI.Library/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DICUI.Test/DICUI.Test.csproj b/DICUI.Test/DICUI.Test.csproj
index fbd46649..c1869271 100644
--- a/DICUI.Test/DICUI.Test.csproj
+++ b/DICUI.Test/DICUI.Test.csproj
@@ -1,83 +1,10 @@
-
-
-
-
-
-
-
+
+
- Debug
- AnyCPU
- {7CC064D2-38AB-4A05-8519-28660DE4562A}
- Library
- Properties
- DICUI.Test
- DICUI.Test
- v4.6.1
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 15.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
-
-
+ net462;net472;netcoreapp3.0
+ false
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\packages\Microsoft.CodeCoverage.15.8.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll
-
-
-
-
- ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
-
-
- ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll
-
-
- ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll
-
-
- ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
{51ab0928-13f9-44bf-a407-b6957a43a056}
@@ -88,22 +15,19 @@
DICUI
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DICUI.Test/Properties/AssemblyInfo.cs b/DICUI.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index 48edce3a..00000000
--- a/DICUI.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("DICUI.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI.Test")]
-[assembly: AssemblyCopyright("Copyright © 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("7cc064d2-38ab-4a05-8519-28660de4562a")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/DICUI.Test/packages.config b/DICUI.Test/packages.config
deleted file mode 100644
index 0377e7e5..00000000
--- a/DICUI.Test/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DICUI.sln b/DICUI.sln
index 9e762718..cf1f727e 100644
--- a/DICUI.sln
+++ b/DICUI.sln
@@ -11,6 +11,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Library", "DICUI.Libr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Check", "DICUI.Check\DICUI.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D1DCF5A-F0B0-4E81-A05B-F1A7D37C9D9D}"
+ ProjectSection(SolutionItems) = preProject
+ appveyor.yml = appveyor.yml
+ CHANGELIST.md = CHANGELIST.md
+ README.md = README.md
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/DICUI/App.config b/DICUI/App.config
index 98b342fd..8737b39e 100644
--- a/DICUI/App.config
+++ b/DICUI/App.config
@@ -1,4 +1,4 @@
-
+
@@ -19,4 +19,4 @@
-
+
diff --git a/DICUI/DICUI.csproj b/DICUI/DICUI.csproj
index d57e1d49..5de8f6f8 100644
--- a/DICUI/DICUI.csproj
+++ b/DICUI/DICUI.csproj
@@ -1,163 +1,27 @@
-
-
-
+
+
- Debug
- AnyCPU
- {7B1B75EB-8940-466F-BD51-76471A57F9BE}
+ net462;net472;netcoreapp3.0
+ false
WinExe
- DICUI
- DICUI
- v4.6.1
- 512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
- true
- false
- C:\Users\admin\Desktop\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 1
- 1.0.0.%2a
- false
- true
- true
-
-
- x86
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- true
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
+ true
+ true
Icon.ico
-
- 654CEE5FEAF46C8C1C369D7ED34DA157828A8D2F
-
-
- WpfApp1_TemporaryKey.pfx
-
-
- true
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
- 4.0
-
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
-
-
-
-
-
-
-
- LogWindow.xaml
-
-
- DiscInformationWindow.xaml
-
-
- OptionsWindow.xaml
-
-
-
-
- Designer
- MSBuild:Compile
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
- MainWindow.xaml
- Code
-
-
- MSBuild:Compile
- Designer
-
-
- Designer
- MSBuild:Compile
-
-
-
-
- Code
-
-
+
+
-
- False
- Microsoft .NET Framework 4.6.1 %28x86 and x64%29
- true
-
-
- False
- .NET Framework 3.5 SP1
- false
-
-
-
-
+
+
{51ab0928-13f9-44bf-a407-b6957a43a056}
DICUI.Library
-
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 4b220383..33f9723c 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This project relies on two open-source code ports to help perform copy protectio
Even though this is written in C#, this program can only be used on Windows systems due to the base program, DiscImageCreator, being Windows-only. There is some preliminary support for Linux underway, and we will try to integrate with that when the time comes.
- Windows 7 (newest version of Windows recommended)
-- .NET Framework 4.6.1 Runtimes
+- .NET Framework 4.6.2, .NET Framework 4.7.2, or .NET Core 3.0 Runtimes
- 128 MB of free RAM
- As much hard drive space as amount of discs you will be dumping (20+ GB recommended)
diff --git a/appveyor.yml b/appveyor.yml
index 560e4e5b..f9e77416 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ pull_requests:
do_not_increment_build_number: true
# vm template
-image: Visual Studio 2017
+image: Visual Studio 2019
# environment variables
environment:
@@ -34,9 +34,15 @@ build:
after_build:
- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/3341769/DiscImageCreator_20190627.zip
- ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip
-- 7z e DiscImageCreator_20190627.zip -oDICUI\bin\Debug\Programs Release_ANSI\*
-- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug *
-- mv DICUI\bin\Debug\subdump_fua_0x28.exe DICUI\bin\Debug\subdump.exe
+- 7z e DiscImageCreator_20190627.zip -oDICUI\bin\Debug\net462\Programs Release_ANSI\*
+- 7z e DiscImageCreator_20190627.zip -oDICUI\bin\Debug\net472\Programs Release_ANSI\*
+- 7z e DiscImageCreator_20190627.zip -oDICUI\bin\Debug\netcoreapp3.0\Programs Release_ANSI\*
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net462 *
+- mv DICUI\bin\Debug\net462\subdump_fua_0x28.exe DICUI\bin\Debug\net462\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net472 *
+- mv DICUI\bin\Debug\net472\subdump_fua_0x28.exe DICUI\bin\Debug\net472\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\netcoreapp3.0 *
+- mv DICUI\bin\Debug\netcoreapp3.0\subdump_fua_0x28.exe DICUI\bin\Debug\netcoreapp3.0\subdump.exe
- 7z a DICUI.zip DICUI\bin\Debug\*
- 7z a DICUI-Check.zip DICUI.Check\bin\Debug\*