diff --git a/Bonobo.Git.Server.sln b/Bonobo.Git.Server.sln
index bf06ec7ef..79d05f672 100644
--- a/Bonobo.Git.Server.sln
+++ b/Bonobo.Git.Server.sln
@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2009
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bonobo.Git.Server", "Bonobo.Git.Server\Bonobo.Git.Server.csproj", "{6129B3FE-B282-4F6F-8836-8AF66602F8DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonobo.Git.Server", "Bonobo.Git.Server\Bonobo.Git.Server.csproj", "{6129B3FE-B282-4F6F-8836-8AF66602F8DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bonobo.Git.Server.Test", "Bonobo.Git.Server.Test\Bonobo.Git.Server.Test.csproj", "{0B124D88-5C2B-47AD-B660-434B709A0DFF}"
EndProject
@@ -30,11 +30,12 @@ Global
{6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Release|x86.ActiveCfg = Release|Any CPU
- {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Any CPU.ActiveCfg = Test|Any CPU
- {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Any CPU.Build.0 = Test|Any CPU
- {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Mixed Platforms.ActiveCfg = Test|Any CPU
- {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Mixed Platforms.Build.0 = Test|Any CPU
- {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|x86.ActiveCfg = Test|Any CPU
+ {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Any CPU.ActiveCfg = Release|Any CPU
+ {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Any CPU.Build.0 = Release|Any CPU
+ {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|Mixed Platforms.Build.0 = Release|Any CPU
+ {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|x86.ActiveCfg = Release|Any CPU
+ {6129B3FE-B282-4F6F-8836-8AF66602F8DA}.Test|x86.Build.0 = Release|Any CPU
{0B124D88-5C2B-47AD-B660-434B709A0DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B124D88-5C2B-47AD-B660-434B709A0DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B124D88-5C2B-47AD-B660-434B709A0DFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -55,6 +56,7 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {451ECF4B-DC19-4E9A-9D02-DA13796309D7}
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35
EndGlobalSection
EndGlobal
diff --git a/Bonobo.Git.Server/.bowerrc b/Bonobo.Git.Server/.bowerrc
index b18ceec8a..6406626ab 100644
--- a/Bonobo.Git.Server/.bowerrc
+++ b/Bonobo.Git.Server/.bowerrc
@@ -1,3 +1,3 @@
{
- "directory" : "Content/components"
-}
\ No newline at end of file
+ "directory": "wwwroot/lib"
+}
diff --git a/Bonobo.Git.Server/App_Data/Repositories/note.txt b/Bonobo.Git.Server/App_Data/Repositories/note.txt
deleted file mode 100644
index 98c8d7064..000000000
--- a/Bonobo.Git.Server/App_Data/Repositories/note.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the default for git repositories.
\ No newline at end of file
diff --git a/Bonobo.Git.Server/App_Data/Web.config b/Bonobo.Git.Server/App_Data/Web.config
deleted file mode 100644
index 6291e1800..000000000
--- a/Bonobo.Git.Server/App_Data/Web.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Bonobo.Git.Server/App_GlobalResources/Resources.it-IT.designer.cs b/Bonobo.Git.Server/App_GlobalResources/Resources.it-IT.designer.cs
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Bonobo.Git.Server/App_GlobalResources/Resources.resx b/Bonobo.Git.Server/App_GlobalResources/Resources.resx
index 4fc18d6f0..b7c6ab32e 100644
--- a/Bonobo.Git.Server/App_GlobalResources/Resources.resx
+++ b/Bonobo.Git.Server/App_GlobalResources/Resources.resx
@@ -1,4 +1,4 @@
-
+
-
-
-
-
-
-
-
- True
-
-
-
-
-
-
-
-
-
-
- if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
-if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
-xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.21.0.176\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86\"
-if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
-xcopy/s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.21.0.176\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64\"
-
-
-
-
-
- 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/Bonobo.Git.Server/Bonobo.Git.Server.csproj.DotSettings b/Bonobo.Git.Server/Bonobo.Git.Server.csproj.DotSettings
deleted file mode 100644
index 73e96563f..000000000
--- a/Bonobo.Git.Server/Bonobo.Git.Server.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-
- CSharp60
\ No newline at end of file
diff --git a/Bonobo.Git.Server/Configuration/ActiveDirectorySettings.cs b/Bonobo.Git.Server/Configuration/ActiveDirectorySettings.cs
index 81f473473..00e4824df 100644
--- a/Bonobo.Git.Server/Configuration/ActiveDirectorySettings.cs
+++ b/Bonobo.Git.Server/Configuration/ActiveDirectorySettings.cs
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Web;
namespace Bonobo.Git.Server.Configuration
{
@@ -44,11 +41,12 @@ static ActiveDirectorySettings()
public static void LoadSettings()
{
- MemberGroupName = ConfigurationManager.AppSettings["ActiveDirectoryMemberGroupName"];
- BackendPath = ConfigurationManager.AppSettings["ActiveDirectoryBackendPath"];
+ System.Diagnostics.Debugger.Break();
+ //MemberGroupName = ConfigurationManager.AppSettings["ActiveDirectoryMemberGroupName"];
+ //BackendPath = ConfigurationManager.AppSettings["ActiveDirectoryBackendPath"];
- RoleNameToGroupNameMapping = CreateMapping(ConfigurationManager.AppSettings["ActiveDirectoryRoleMapping"]);
- TeamNameToGroupNameMapping = CreateMapping(ConfigurationManager.AppSettings["ActiveDirectoryTeamMapping"]);
+ //RoleNameToGroupNameMapping = CreateMapping(ConfigurationManager.AppSettings["ActiveDirectoryRoleMapping"]);
+ //TeamNameToGroupNameMapping = CreateMapping(ConfigurationManager.AppSettings["ActiveDirectoryTeamMapping"]);
}
}
}
\ No newline at end of file
diff --git a/Bonobo.Git.Server/Configuration/AppSettings.cs b/Bonobo.Git.Server/Configuration/AppSettings.cs
index b0ab7da4a..fdca7535a 100644
--- a/Bonobo.Git.Server/Configuration/AppSettings.cs
+++ b/Bonobo.Git.Server/Configuration/AppSettings.cs
@@ -1,19 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Web;
-
-namespace Bonobo.Git.Server.Configuration
+namespace Bonobo.Git.Server.Configuration
{
- public static class AppSettings
+ public class AppSettings
{
- public static bool IsPushAuditEnabled
- {
- get
- {
- return bool.Parse(ConfigurationManager.AppSettings["IsPushAuditEnabled"] ?? "false");
- }
- }
+ public bool IsPushAuditEnabled { get; set; }
+ public string LogDirectory { get; set; }
+ public string RecoveryDataPath { get; set; }
+ public string GitPath { get; set; }
+ public string GitHomePath { get; set; }
+ public string GitServerPath { get; set; }
+ public bool AllowDBReset { get; set; }
+ public string DefaultRepositoriesDirectory { get; set; }
+ public string ActiveDirectoryDefaultDomain { get; set; }
}
}
\ No newline at end of file
diff --git a/Bonobo.Git.Server/Configuration/AuthenticationSettings.cs b/Bonobo.Git.Server/Configuration/AuthenticationSettings.cs
index e20347367..725ce5496 100644
--- a/Bonobo.Git.Server/Configuration/AuthenticationSettings.cs
+++ b/Bonobo.Git.Server/Configuration/AuthenticationSettings.cs
@@ -1,21 +1,10 @@
-using System;
-using System.Configuration;
-
-namespace Bonobo.Git.Server.Configuration
+namespace Bonobo.Git.Server.Configuration
{
- public static class AuthenticationSettings
+ public class AuthenticationSettings
{
- public static string MembershipService { get; private set; }
- public static string AuthenticationProvider { get; private set; }
- public static bool ImportWindowsAuthUsersAsAdmin { get; private set; }
- public static bool DemoModeActive { get; private set; }
-
- static AuthenticationSettings()
- {
- MembershipService = ConfigurationManager.AppSettings["MembershipService"];
- AuthenticationProvider = ConfigurationManager.AppSettings["AuthenticationProvider"];
- ImportWindowsAuthUsersAsAdmin = Convert.ToBoolean(ConfigurationManager.AppSettings["ImportWindowsAuthUsersAsAdmin"]);
- DemoModeActive = Convert.ToBoolean(ConfigurationManager.AppSettings["demoModeActive"]);
- }
+ public string MembershipService { get; set; }
+ public string AuthenticationProvider { get; set; }
+ public bool ImportWindowsAuthUsersAsAdmin { get; set; }
+ public bool DemoModeActive { get; set; }
}
}
\ No newline at end of file
diff --git a/Bonobo.Git.Server/Configuration/ConfigurationEntry.cs b/Bonobo.Git.Server/Configuration/ConfigurationEntry.cs
index e8843e324..94bf1edc7 100644
--- a/Bonobo.Git.Server/Configuration/ConfigurationEntry.cs
+++ b/Bonobo.Git.Server/Configuration/ConfigurationEntry.cs
@@ -1,7 +1,4 @@
-using System.Configuration;
-using System.IO;
-using System.Web;
-using System.Web.Hosting;
+using System.IO;
using System.Xml.Serialization;
namespace Bonobo.Git.Server.Configuration
@@ -11,10 +8,10 @@ namespace Bonobo.Git.Server.Configuration
private static Entry _current = null;
private static readonly object _sync = new object();
private static readonly XmlSerializer _serializer = new XmlSerializer(typeof(Entry));
- private static readonly string _configPath = Path.IsPathRooted(ConfigurationManager.AppSettings["UserConfiguration"])
+ private static readonly string _configPath = @"E:\Users\kalten\Documents\GitHub\Bonobo-Git-Server\Bonobo.Git.Server\App_Data\config.xml";/* Path.IsPathRooted(ConfigurationManager.AppSettings["UserConfiguration"])
? ConfigurationManager.AppSettings["UserConfiguration"]
: HostingEnvironment.MapPath(ConfigurationManager.AppSettings["UserConfiguration"]);
-
+ */
public static Entry Current { get { return _current ?? Load(); } }
diff --git a/Bonobo.Git.Server/Configuration/DiagnosticReporter.cs b/Bonobo.Git.Server/Configuration/DiagnosticReporter.cs
index 706d7f8aa..222a6c83f 100644
--- a/Bonobo.Git.Server/Configuration/DiagnosticReporter.cs
+++ b/Bonobo.Git.Server/Configuration/DiagnosticReporter.cs
@@ -1,12 +1,9 @@
using System;
-using System.Configuration;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
-using System.Web.Hosting;
-using Bonobo.Git.Server.Data;
-using Bonobo.Git.Server.Security;
+using Microsoft.Extensions.Configuration;
namespace Bonobo.Git.Server.Configuration
{
@@ -20,6 +17,12 @@ public class DiagnosticReporter
{
private readonly StringBuilder _report = new StringBuilder();
private readonly UserConfiguration _userConfig = UserConfiguration.Current;
+ private readonly IConfiguration _configuration;
+
+ public DiagnosticReporter(IConfiguration configuration)
+ {
+ _configuration = configuration;
+ }
public string GetVerificationReport()
{
@@ -39,13 +42,13 @@ private void RunReport()
ExceptionLog();
}
-
+
private void DumpAppSettings()
{
_report.AppendLine("Web.Config AppSettings");
- foreach (string key in ConfigurationManager.AppSettings)
+ foreach (var kv in _configuration.AsEnumerable())
{
- QuotedReport("AppSettings."+key, ConfigurationManager.AppSettings[key]);
+ QuotedReport("AppSettings." + kv.Key, kv.Value);
}
}
@@ -108,27 +111,27 @@ private void CheckADMembership()
SafelyReport("Backend folder exists", () => Directory.Exists(MapPath(AppSetting("ActiveDirectoryBackendPath"))));
ReportDirectoryStatus("Backend folder", MapPath(AppSetting("ActiveDirectoryBackendPath")));
- var ad = ADBackend.Instance;
- SafelyReport("User count", () => ad.Users.Count());
+ //var ad = ADBackend.Instance;
+ //SafelyReport("User count", () => ad.Users.Count());
_report.AppendLine("AD Teams");
- SafelyRun(() =>
- {
- foreach (var item in ad.Teams)
- {
- var thisTeam = item;
- SafelyReport(item.Name, () => thisTeam.Members.Length + " members");
- }
- });
+ //SafelyRun(() =>
+ //{
+ // foreach (var item in ad.Teams)
+ // {
+ // var thisTeam = item;
+ // SafelyReport(item.Name, () => thisTeam.Members.Length + " members");
+ // }
+ //});
_report.AppendLine("AD Roles");
- SafelyRun(() =>
- {
- foreach (var item in ad.Roles)
- {
- var thisRole = item;
- SafelyReport(item.Name, () => thisRole.Members.Length + " members");
- }
- });
+ //SafelyRun(() =>
+ //{
+ // foreach (var item in ad.Roles)
+ // {
+ // var thisRole = item;
+ // SafelyReport(item.Name, () => thisRole.Members.Length + " members");
+ // }
+ //});
}
else
{
@@ -141,7 +144,7 @@ private void ReportDirectoryStatus(string text, string directory)
var sb = new StringBuilder();
if (Directory.Exists(directory))
{
- sb.AppendFormat("Exists, {0} files, {1} entries, ",
+ sb.AppendFormat("Exists, {0} files, {1} entries, ",
Directory.GetFiles(directory).Length,
Directory.GetFileSystemEntries(directory).Length
);
@@ -186,7 +189,7 @@ private void CheckInternalMembership()
if (AppSetting("MembershipService") == "Internal")
{
- SafelyReport("User count", () => new EFMembershipService { CreateContext = () => new BonoboGitServerContext() }.GetAllUsers().Count);
+ //SafelyReport("User count", () => new EFMembershipService { CreateContext = () => new BonoboGitServerContext() }.GetAllUsers().Count);
}
else
{
@@ -203,22 +206,23 @@ private void ExceptionLog()
_report.AppendLine("Exception Log");
SafelyRun(() =>
{
- var nameFormat = MvcApplication.GetLogFileNameFormat();
- var todayLogFileName = nameFormat.Replace("{Date}", DateTime.Now.ToString("yyyyMMdd"));
- SafelyReport("LogFileName: ", () => todayLogFileName);
- var chunkSize = 10000;
- var length = new FileInfo(todayLogFileName).Length;
- Report("Log File total length", length);
+ throw new NotImplementedException();
+ //var nameFormat = MvcApplication.GetLogFileNameFormat();
+ //var todayLogFileName = nameFormat.Replace("{Date}", DateTime.Now.ToString("yyyyMMdd"));
+ //SafelyReport("LogFileName: ", () => todayLogFileName);
+ //var chunkSize = 10000;
+ //var length = new FileInfo(todayLogFileName).Length;
+ //Report("Log File total length", length);
- var startingPoint = Math.Max(0, length - chunkSize);
- Report("Starting log dump from ", startingPoint);
+ //var startingPoint = Math.Max(0, length - chunkSize);
+ //Report("Starting log dump from ", startingPoint);
- using (var logText = File.Open(todayLogFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
- {
- logText.Seek(startingPoint, SeekOrigin.Begin);
- var reader = new StreamReader(logText);
- _report.AppendLine(reader.ReadToEnd());
- }
+ //using (var logText = File.Open(todayLogFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+ //{
+ // logText.Seek(startingPoint, SeekOrigin.Begin);
+ // var reader = new StreamReader(logText);
+ // _report.AppendLine(reader.ReadToEnd());
+ //}
});
}
@@ -263,12 +267,13 @@ private void SafelyReport(string tag, Func