diff --git a/.gitignore b/.gitignore index 158fbc18..186ea09e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ *.user /build/deploy /build/*.log -/web/documentserver-example/csharp-mvc/packages /web/documentserver-example/nodejs/node_modules /web/documentserver-example/nodejs/public/files /web/documentserver-example/nodejs/config/local.json diff --git a/build/msbuild/zip.proj b/build/msbuild/zip.proj index 549952b1..4873757e 100644 --- a/build/msbuild/zip.proj +++ b/build/msbuild/zip.proj @@ -14,12 +14,12 @@ - + - + diff --git a/web/documentserver-example/csharp-mvc/.nuget/NuGet.Config b/web/documentserver-example/csharp-mvc/.nuget/NuGet.Config deleted file mode 100644 index 67f8ea04..00000000 --- a/web/documentserver-example/csharp-mvc/.nuget/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/.nuget/NuGet.exe b/web/documentserver-example/csharp-mvc/.nuget/NuGet.exe deleted file mode 100644 index 9f8781de..00000000 Binary files a/web/documentserver-example/csharp-mvc/.nuget/NuGet.exe and /dev/null differ diff --git a/web/documentserver-example/csharp-mvc/.nuget/NuGet.targets b/web/documentserver-example/csharp-mvc/.nuget/NuGet.targets deleted file mode 100644 index 3f8c37b2..00000000 --- a/web/documentserver-example/csharp-mvc/.nuget/NuGet.targets +++ /dev/null @@ -1,144 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - - - - - $(SolutionDir).nuget - - - - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config - - - - $(MSBuildProjectDirectory)\packages.config - $(PackagesProjectConfig) - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 "$(NuGetExePath)" - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj index ec889917..8279e2b6 100644 --- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj +++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj @@ -20,8 +20,6 @@ - .\ - true true @@ -61,59 +59,72 @@ - packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll + True + bin\EntityFramework.dll True - packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + bin\Microsoft.Web.Infrastructure.dll True - packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + bin\Microsoft.Web.Mvc.FixedDisplayModes.dll - packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + True + bin\Newtonsoft.Json.dll - packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll + True + bin\System.Net.Http.Formatting.dll - packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll + True + bin\System.Web.Http.dll - packages\Microsoft.AspNet.WebApi.WebHost.5.2.0\lib\net45\System.Web.Http.WebHost.dll + True + bin\System.Web.Http.WebHost.dll - packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll + True + bin\System.Web.Mvc.dll - packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + True + bin\System.Web.Optimization.dll - packages\Microsoft.AspNet.Providers.Core.1.2\lib\net40\System.Web.Providers.dll + True + bin\System.Web.Providers.dll - packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll + True + bin\System.Web.Razor.dll - packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll + True + bin\System.Web.Helpers.dll - packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll + True + bin\System.Web.WebPages.dll - packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll + True + bin\System.Web.WebPages.Deployment.dll - packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll + True + bin\System.Web.WebPages.Razor.dll True - packages\WebGrease.1.5.2\lib\WebGrease.dll + bin\WebGrease.dll @@ -170,8 +181,7 @@ - - + @@ -205,13 +215,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - -