yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Stephan
2017-06-28 21:27:56 +02:00
parent 7126234e80
commit 95bfc89ec0
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/Modules/Umbraco.Build/Umbraco.Build.psm1
View File

@@ -239,6 +239,7 @@ function Compile-Tests
/t:Build `
/tv:$toolsVersion `
/p:UmbracoBuild=True `
/p:NugetPackages=$src\packages `
> $tmp\msbuild.tests.log
# /p:UmbracoBuild tells the csproj that we are building from PS

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -66,6 +66,7 @@
<PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.1" />
<PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.1.0" />
<PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.1.0" />
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
<PackageReference Include="MiniProfiler" Version="3.2.0.157" />
<PackageReference Include="MySql.Data" Version="6.9.9" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />

6
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -29,7 +29,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<NugetPackagesDirectory Condition="$(NugetPackagesDirectory) == '' Or $(NugetPackagesDirectory) == '*Undefined*'">$(SolutionDir)\packages</NugetPackagesDirectory>
<NugetPackages Condition="$(NugetPackages) == '' Or $(NugetPackages) == '*Undefined*'">$(SolutionDir)\packages</NugetPackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -672,8 +672,8 @@
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>xcopy "$(NugetPackagesDirectory)"\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
xcopy "$(NugetPackagesDirectory)"\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
<PreBuildEvent>xcopy "$(NugetPackages)\SqlServerCE.4.0.0.1\amd64\*.*" "$(TargetDir)amd64\" /Y /F /E /I /C /D
xcopy "$(NugetPackages)\SqlServerCE.4.0.0.1\x86\*.*" "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

1
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -92,6 +92,7 @@
<PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.1.0" />
<PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.1.0" />
<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
<PackageReference Include="MiniProfiler" Version="3.2.0.157" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="NPoco" Version="3.5.1" />