diff --git a/.gitignore b/.gitignore index 81d4c76..8f87d36 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ -/.vs -/bin -/obj -/*.user -/*/.vs -/*/bin -/*/obj -/*/*.user \ No newline at end of file +bin +obj +packages +*~ +/.github +/.vs \ No newline at end of file diff --git a/RandomFileRunner.slnx b/RandomFileRunner.slnx new file mode 100644 index 0000000..debe135 --- /dev/null +++ b/RandomFileRunner.slnx @@ -0,0 +1,3 @@ + + + diff --git a/References/RyzStudio.8.1.2.249.nupkg b/References/RyzStudio.8.1.2.249.nupkg deleted file mode 100644 index 0778768..0000000 Binary files a/References/RyzStudio.8.1.2.249.nupkg and /dev/null differ diff --git a/References/RyzStudio.Windows.Forms.8.1.3.614.nupkg b/References/RyzStudio.Windows.Forms.8.1.3.614.nupkg deleted file mode 100644 index 0a6516d..0000000 Binary files a/References/RyzStudio.Windows.Forms.8.1.3.614.nupkg and /dev/null differ diff --git a/build.bat b/build.bat index ecf6655..4b59c29 100644 --- a/build.bat +++ b/build.bat @@ -1,17 +1,11 @@ -RMDIR /s /q "bin\" -RMDIR /s /q "obj\" +rmdir /s /q "bin\" +rmdir /s /q "source\bin\" +rmdir /s /q "source\obj\" -MKDIR bin +dotnet restore RandomFileRunner.slnx +dotnet publish RandomFileRunner.slnx -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="..\bin\" -dotnet restore skye.sln -dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\" +rmdir /s /q "source\bin\" +rmdir /s /q "source\obj\" -REM "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss" - -"C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\randomfilerunner.7z" ".\bin\randomfilerunner.exe" -mx9 - -RMDIR /s /q "bin\debug" -RMDIR /s /q "bin\release" -RMDIR /s /q "obj\" - -PAUSE \ No newline at end of file +REM PAUSE \ No newline at end of file diff --git a/skye.sln b/skye.sln deleted file mode 100644 index ac0e32f..0000000 --- a/skye.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.10.35004.147 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RandomFileRunner", "RandomFileRunner.csproj", "{5F301DDB-6E01-4492-BABC-E134722EF0AC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5F301DDB-6E01-4492-BABC-E134722EF0AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F301DDB-6E01-4492-BABC-E134722EF0AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F301DDB-6E01-4492-BABC-E134722EF0AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F301DDB-6E01-4492-BABC-E134722EF0AC}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {07C35049-4E29-477E-84DD-ED9E52F0F257} - EndGlobalSection -EndGlobal diff --git a/source/.gitignore b/source/.gitignore new file mode 100644 index 0000000..81d4c76 --- /dev/null +++ b/source/.gitignore @@ -0,0 +1,8 @@ +/.vs +/bin +/obj +/*.user +/*/.vs +/*/bin +/*/obj +/*/*.user \ No newline at end of file diff --git a/AppResource.Designer.cs b/source/AppResource.Designer.cs similarity index 100% rename from AppResource.Designer.cs rename to source/AppResource.Designer.cs diff --git a/AppResource.resx b/source/AppResource.resx similarity index 100% rename from AppResource.resx rename to source/AppResource.resx diff --git a/Models/AppSession.cs b/source/Dtos/AppSession.cs similarity index 100% rename from Models/AppSession.cs rename to source/Dtos/AppSession.cs diff --git a/MainForm.Designer.cs b/source/MainForm.Designer.cs similarity index 100% rename from MainForm.Designer.cs rename to source/MainForm.Designer.cs diff --git a/MainForm.cs b/source/MainForm.cs similarity index 100% rename from MainForm.cs rename to source/MainForm.cs diff --git a/MainForm.resx b/source/MainForm.resx similarity index 100% rename from MainForm.resx rename to source/MainForm.resx diff --git a/MemoBoxForm.cs b/source/MemoBoxForm.cs similarity index 100% rename from MemoBoxForm.cs rename to source/MemoBoxForm.cs diff --git a/MemoBoxForm.resx b/source/MemoBoxForm.resx similarity index 100% rename from MemoBoxForm.resx rename to source/MemoBoxForm.resx diff --git a/OptionsForm.cs b/source/OptionsForm.cs similarity index 100% rename from OptionsForm.cs rename to source/OptionsForm.cs diff --git a/OptionsForm.resx b/source/OptionsForm.resx similarity index 100% rename from OptionsForm.resx rename to source/OptionsForm.resx diff --git a/Program.cs b/source/Program.cs similarity index 100% rename from Program.cs rename to source/Program.cs diff --git a/RandomFileRunner.csproj b/source/RandomFileRunner.csproj similarity index 98% rename from RandomFileRunner.csproj rename to source/RandomFileRunner.csproj index 06de98d..1f7b1b9 100644 --- a/RandomFileRunner.csproj +++ b/source/RandomFileRunner.csproj @@ -11,7 +11,7 @@ Ray Lam favicon.ico true - 1.1.1.031 + 1.2.0.050 diff --git a/Resources/folder-minus.png b/source/Resources/folder-minus.png similarity index 100% rename from Resources/folder-minus.png rename to source/Resources/folder-minus.png diff --git a/Resources/help-circle.png b/source/Resources/help-circle.png similarity index 100% rename from Resources/help-circle.png rename to source/Resources/help-circle.png diff --git a/Resources/icon-64.png b/source/Resources/icon-64.png similarity index 100% rename from Resources/icon-64.png rename to source/Resources/icon-64.png diff --git a/Resources/save.png b/source/Resources/save.png similarity index 100% rename from Resources/save.png rename to source/Resources/save.png diff --git a/Resources/settings.png b/source/Resources/settings.png similarity index 100% rename from Resources/settings.png rename to source/Resources/settings.png diff --git a/source/build.bat b/source/build.bat new file mode 100644 index 0000000..ecf6655 --- /dev/null +++ b/source/build.bat @@ -0,0 +1,17 @@ +RMDIR /s /q "bin\" +RMDIR /s /q "obj\" + +MKDIR bin + +dotnet restore skye.sln +dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\" + +REM "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss" + +"C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\randomfilerunner.7z" ".\bin\randomfilerunner.exe" -mx9 + +RMDIR /s /q "bin\debug" +RMDIR /s /q "bin\release" +RMDIR /s /q "obj\" + +PAUSE \ No newline at end of file diff --git a/favicon.ico b/source/favicon.ico similarity index 100% rename from favicon.ico rename to source/favicon.ico