From 1a04c9578b0df9c07ce85110c2ea9cad1732591c Mon Sep 17 00:00:00 2001 From: erri120 Date: Mon, 7 Oct 2019 12:53:51 +0200 Subject: [PATCH 1/2] Removed OMOD-Framework as a project and added as a NuGet package --- .gitmodules | 3 --- OMOD-Framework | 1 - Wabbajack.Common/Wabbajack.Common.csproj | 14 ++++++++------ Wabbajack.Common/packages.config | 5 +++-- Wabbajack.sln | 14 -------------- 5 files changed, 11 insertions(+), 26 deletions(-) delete mode 160000 OMOD-Framework diff --git a/.gitmodules b/.gitmodules index d43d025a..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "OMOD-Framework"] - path = OMOD-Framework - url = https://github.com/erri120/OMOD-Framework.git diff --git a/OMOD-Framework b/OMOD-Framework deleted file mode 160000 index 91009782..00000000 --- a/OMOD-Framework +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91009782d5bfe909558bde9a946bbf3c9844faec diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj index 5a10e202..335221d8 100644 --- a/Wabbajack.Common/Wabbajack.Common.csproj +++ b/Wabbajack.Common/Wabbajack.Common.csproj @@ -53,8 +53,11 @@ ..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll - - ..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\erri120.OMODFramework.1.0.0\lib\net472\erri120.OMODFramework.dll + + + ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll @@ -71,6 +74,9 @@ ..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll + + ..\packages\SevenZip.19.0.0\lib\net20\SevenZip.dll + @@ -107,10 +113,6 @@ {ff5d892f-8ff4-44fc-8f7f-cd58f307ad1b} Compression.BSA - - {1b2576a1-0208-485f-8e79-38551e4593b4} - OMOD-Framework - diff --git a/Wabbajack.Common/packages.config b/Wabbajack.Common/packages.config index ae47d570..1a9d10a9 100644 --- a/Wabbajack.Common/packages.config +++ b/Wabbajack.Common/packages.config @@ -1,12 +1,13 @@  - + - + + \ No newline at end of file diff --git a/Wabbajack.sln b/Wabbajack.sln index ceef0377..cf13737f 100644 --- a/Wabbajack.sln +++ b/Wabbajack.sln @@ -30,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wabbajack.WebAutomation.Tes EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wabbajack.Test", "Wabbajack.Test\Wabbajack.Test.csproj", "{A47FFF32-782B-4D9F-8704-C98FB32FA8CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OMOD-Framework", "OMOD-Framework\OMOD-Framework\OMOD-Framework.csproj", "{1B2576A1-0208-485F-8E79-38551E4593B4}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug (no commandargs)|Any CPU = Debug (no commandargs)|Any CPU @@ -150,18 +148,6 @@ Global {A47FFF32-782B-4D9F-8704-C98FB32FA8CC}.Release|Any CPU.Build.0 = Release|Any CPU {A47FFF32-782B-4D9F-8704-C98FB32FA8CC}.Release|x64.ActiveCfg = Release|Any CPU {A47FFF32-782B-4D9F-8704-C98FB32FA8CC}.Release|x64.Build.0 = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|Any CPU.ActiveCfg = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|Any CPU.Build.0 = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|x64.ActiveCfg = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|x64.Build.0 = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|Any CPU.Build.0 = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|x64.ActiveCfg = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|x64.Build.0 = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Release|Any CPU.Build.0 = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Release|x64.ActiveCfg = Release|Any CPU - {1B2576A1-0208-485F-8E79-38551E4593B4}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From c7d9332b632901458967757af3cf373e703816c5 Mon Sep 17 00:00:00 2001 From: erri120 Date: Mon, 7 Oct 2019 12:55:08 +0200 Subject: [PATCH 2/2] Removed git submodule initialization from CONTRIBUTING.md --- CONTRIBUTING.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e507ec71..56d03c2b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,9 +42,8 @@ The installer may have selected other options as well but these are the most imp ### Starting development 1) **Fork and clone the project:** go to the Github repo page, click the fork button, copy the url from the forked repo, navigate to your project folder, open Git Bash or normal command prompt and type `git clone url name` and replace url with the copied url and name with the folder name -2) **Initialize the submodules** using `git submodule init` and `git submodule update` -3) **Open Wabbajack.sln** in Visual Studio 2019 -4) **Download NuGet Packages** by selecting the solution and *Right Click*->*Restore NuGet Packages* +2) **Open Wabbajack.sln** in Visual Studio 2019 +3) **Download NuGet Packages** by selecting the solution and *Right Click*->*Restore NuGet Packages* It may take a while for Visual Studio to download all packages and update all References so be patience. Once all packages are downloaded go and try building Wabbajack. If the build is successful than good job, if not head over to the *#wabbajack-development* channel on the discord and talk about your build error.