diff --git a/.gitignore b/.gitignore
index 948c3710a0..113b207285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,6 +136,8 @@ src/Umbraco.Web.UI/js/*
src/Umbraco.Tests/media
tools/docfx/*
apidocs/_site/*
+src/*/project.lock.json
+
apidocs/api/*
build/docs.zip
build/ui-docs.zip
diff --git a/build/Build.bat b/build/Build.bat
index 2489c08f91..995cef6a48 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -15,11 +15,6 @@ IF [%1] NEQ [] (SET release=%1)
IF [%2] NEQ [] (SET comment=%2) ELSE (IF [%1] NEQ [] (SET "comment="))
SET version=%release%
-
-REM SET MSBUILD="%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
-SET MSBUILD="C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"
-SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-
IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
ECHO Building Umbraco %version%
@@ -39,7 +34,13 @@ DEL /F /Q webpihash.txt
ECHO Making sure Git is in the path so that the build can succeed
CALL InstallGit.cmd
ECHO Performing MSBuild and producing Umbraco binaries zip files
-%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment% /verbosity:minimal
+
+SET nuGetFolder=%CD%\..\src\packages\
+..\src\.nuget\NuGet.exe restore ..\src\Umbraco.Core\project.json -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe restore ..\src\umbraco.datalayer\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe restore ..\src\Umbraco.Web\project.json -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe restore ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment% /verbosity:minimal
ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
diff --git a/build/Build.proj b/build/Build.proj
index d3730d2b2b..0da79322c4 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -264,7 +264,7 @@
-
+
diff --git a/build/RevertToEmptyInstall.bat b/build/RevertToEmptyInstall.bat
index b8abe4e64e..aeb0cdac72 100644
--- a/build/RevertToEmptyInstall.bat
+++ b/build/RevertToEmptyInstall.bat
@@ -22,7 +22,7 @@ echo Removing bin files
del ..\src\Umbraco.Web.UI\bin\*.*
echo Building solution
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe ..\src\umbraco.sln /t:Clean,Build
echo Resetting installedPackages.config
echo ^^^ >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
@@ -86,7 +86,7 @@ echo Removing bin files
FOR %%A IN (..\src\Umbraco.Web.UI\bin\*.*) DO DEL %%A
echo Building solution
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe ..\src\umbraco.sln /t:Clean,Build
echo Resetting installedPackages.config
echo ^^^ >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe
index 9ca66594f9..31fc9885e4 100644
Binary files a/src/.nuget/NuGet.exe and b/src/.nuget/NuGet.exe differ
diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
deleted file mode 100644
index 6ff51f6e83..0000000000
--- a/src/.nuget/NuGet.targets
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
- $(MSBuildProjectDirectory)\..\
-
-
- false
-
-
- false
-
-
- true
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
- $([System.IO.Path]::Combine($(SolutionDir), ".nuget"))
- $([System.IO.Path]::Combine($(ProjectDir), "packages.config"))
-
-
-
-
- $(SolutionDir).nuget
- packages.config
-
-
-
-
- $(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;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
index 216fa74a67..604cbd2592 100644
--- a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
+++ b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
@@ -95,7 +95,6 @@
-
-
\ No newline at end of file
+
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a9146e1324..cc804e8036 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1,5 +1,7 @@
+
+
9.0.30729
@@ -49,6 +51,8 @@
true
true
+
+
bin\
@@ -200,6 +204,10 @@
..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll
True
+
+ ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
+ True
+
..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll
@@ -1030,7 +1038,6 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
-
@@ -1051,4 +1058,11 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
+
+
+ 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/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index c71c7d3d75..be5c82d0e4 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -21,6 +21,8 @@
+
+
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7336db361f..22a5fdd2c4 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,5 +1,5 @@
-
+
9.0.30729
@@ -40,6 +40,7 @@
..\
true
+ AnyCPU
bin\Debug\
@@ -97,161 +98,7 @@
{07fbc26b-2927-4a22-8d96-d644c667fecc}
UmbracoExamine
-
- ..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll
- True
-
-
- ..\packages\ClientDependency.1.8.4\lib\net45\ClientDependency.Core.dll
- False
- True
-
-
- False
- ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll
-
-
- ..\packages\dotless.1.4.1.0\lib\dotless.Core.dll
-
-
- ..\packages\Examine.2.0.0-Beta2\lib\net45\Examine.dll
- True
-
-
- False
- ..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll
-
-
- ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
- True
-
-
- ..\packages\LightInject.4.0.9\lib\net46\LightInject.dll
- True
-
-
- ..\packages\LightInject.Annotation.1.0.0.4\lib\net45\LightInject.Annotation.dll
- True
-
-
- ..\packages\LightInject.Mvc.1.0.0.4\lib\net45\LightInject.Mvc.dll
- True
-
-
- ..\packages\LightInject.Web.1.0.0.7\lib\net45\LightInject.Web.dll
- True
-
-
- ..\packages\LightInject.WebApi.1.0.0.4\lib\net45\LightInject.WebApi.dll
- True
-
-
- ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll
- True
-
-
- ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll
- True
-
-
- ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll
- True
-
-
- ..\packages\Markdown.1.14.4\lib\net45\MarkdownSharp.dll
- False
- True
-
-
- False
- ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll
-
-
- False
- ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll
-
-
- False
- ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll
-
-
- False
- ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll
-
-
- False
- ..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll
-
-
- False
- ..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll
-
-
- False
- ..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll
-
-
- ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
- False
- True
-
-
- ..\packages\MiniProfiler.3.2.0.157\lib\net40\MiniProfiler.dll
- True
-
-
- ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll
- True
-
-
- ..\packages\NPoco.3.3.3\lib\net45\NPoco.dll
- True
-
-
- False
- ..\packages\Owin.1.0\lib\net40\Owin.dll
-
-
- ..\packages\semver.1.1.2\lib\net451\Semver.dll
- True
-
System
@@ -268,10 +115,6 @@
-
- False
- ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
-
@@ -284,55 +127,14 @@
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll
- False
- True
-
-
- ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll
- True
-
-
- False
- ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll
-
-
- ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll
- True
-
-
- ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll
- False
- True
-
System.Web.Services
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll
- False
- True
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll
- False
- True
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll
- False
- True
-
System.XML
-
- {5BA5425F-27A7-4677-865E-82246498AA2E}
- SqlCE4Umbraco
-
{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}
Umbraco.Core
@@ -349,11 +151,6 @@
{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}
umbraco.datalayer
-
- ..\packages\UrlRewritingNet.UrlRewriter.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll
- False
- False
-
@@ -1747,9 +1544,6 @@
ASPXCodeBehind
-
- Designer
-
Reference.map
@@ -1830,6 +1624,7 @@
Resources.Designer.cs
Designer
+
@@ -1877,5 +1672,4 @@
-
\ No newline at end of file
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
deleted file mode 100644
index 0d05151382..0000000000
--- a/src/Umbraco.Web/packages.config
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web/project.json b/src/Umbraco.Web/project.json
new file mode 100644
index 0000000000..8912a26d41
--- /dev/null
+++ b/src/Umbraco.Web/project.json
@@ -0,0 +1,47 @@
+{
+ "dependencies": {
+ "AutoMapper": "4.2.*",
+ "ClientDependency": "1.8.*",
+ "dotless": "1.4.1.0",
+ "Examine": "2.0.0-beta2",
+ "HtmlAgilityPack": "1.4.*",
+ "LightInject": "4.0.*",
+ "LightInject.Annotation": "1.0.*",
+ "LightInject.Mvc": "1.0.*",
+ "LightInject.Web": "1.0.*",
+ "LightInject.WebApi": "1.0.*",
+ "log4net": "2.0.*",
+ "Lucene.Net": "3.0.3",
+ "Markdown": "1.*",
+ "Microsoft.AspNet.Identity.Core": "2.2.1",
+ "Microsoft.AspNet.Identity.Owin": "2.2.1",
+ "Microsoft.AspNet.Mvc": "5.2.3",
+ "Microsoft.AspNet.Razor": "3.2.3",
+ "Microsoft.AspNet.WebApi": "5.2.3",
+ "Microsoft.AspNet.WebApi.Client": "5.2.3",
+ "Microsoft.AspNet.WebApi.Core": "5.2.3",
+ "Microsoft.AspNet.WebApi.WebHost": "5.2.3",
+ "Microsoft.AspNet.WebPages": "3.2.3",
+ "Microsoft.Owin": "3.0.*",
+ "Microsoft.Owin.Host.SystemWeb": "3.0.*",
+ "Microsoft.Owin.Security": "3.0.*",
+ "Microsoft.Owin.Security.Cookies": "3.0.*",
+ "Microsoft.Owin.Security.OAuth": "3.0.*",
+ "Microsoft.Web.Infrastructure": "1.0.0.0",
+ "MiniProfiler": "3.2.*",
+ "Newtonsoft.Json": "8.0.*",
+ "NPoco": "3.3.3",
+ "Owin": "1.0.*",
+ "semver": "1.*",
+ "SharpZipLib": "0.86.0",
+ "UrlRewritingNet.UrlRewriter": "2.0.7",
+ "xmlrpcnet": "2.5.0"
+ },
+ "frameworks": {
+ "net461": { }
+ },
+ "runtimes": {
+ "win-anycpu": { },
+ "win": { }
+ }
+}
\ No newline at end of file
diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj
index 149bcb11c5..749faaf27c 100644
--- a/src/UmbracoExamine/UmbracoExamine.csproj
+++ b/src/UmbracoExamine/UmbracoExamine.csproj
@@ -225,7 +225,6 @@
-