diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-08 15:36:30 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-08 15:36:30 -0500 |
| commit | e57fa3bb8262a9a71a17c6d3086022e9d6a2000d (patch) | |
| tree | db4f53b138ff17c329e4b7f2b7006bb6bc08f876 | |
| parent | fb62e300d7d294b97740b04e6e7b8e866d3a9a29 (diff) | |
| parent | 810d6d5dc4003d4154f3be045923a0ccce61affe (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.sln | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index a67d61bfd..81e105185 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -368,6 +368,7 @@ <PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y if $(ConfigurationName) == Release ( +rmdir "$(SolutionDir)..\Deploy\Server\System" /s /q mkdir "$(SolutionDir)..\Deploy\Server\System" xcopy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstaller.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y diff --git a/MediaBrowser.sln b/MediaBrowser.sln index c13ad6f81..16caa617d 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -237,7 +237,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal |