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

Changes to build script & references etc with Stephan

Browse Source
This commit is contained in:
Warren
2018-04-11 18:06:33 +02:00
parent fd75a59e13
commit d8459bf4b4
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -18,9 +18,9 @@
<dependency id="Microsoft.AspNet.Mvc" version="[5.2.4,6.0.0)" />
<dependency id="Microsoft.AspNet.WebApi" version="[5.2.4,6.0.0)" />
<dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
<dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0, 4.0.0)" />
<dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0, 4.0.0)" />
<dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0, 4.0.0)" />
<dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0, 5.0.0)" />
<dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0, 5.0.0)" />
<dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0, 5.0.0)" />
<dependency id="MiniProfiler" version="[3.2.0.157, 4.0.0)" />
<dependency id="HtmlAgilityPack" version="[1.7.2, 2.0.0)" />
<dependency id="Lucene.Net" version="[3.0.3, 4.0.0.0)" />

5
build/build.ps1
View File

@@ -317,9 +317,10 @@
# copy libs
Write-Host "Copy SqlCE libraries"
$this.CopyFiles("$src\packages\SqlServerCE.4.0.0.1", "*.*", "$tmp\bin", `
$nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
$this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\bin", `
{ -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
$this.CopyFiles("$src\packages\SqlServerCE.4.0.0.1", "*.*", "$tmp\WebApp\bin", `
$this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\WebApp\bin", `
{ -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
# copy Belle

12
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -334,17 +334,6 @@
<Content Include="Config\Lang\ru-RU.user.xml" />
<Content Include="Config\Lang\sv-SE.user.xml" />
<Content Include="Config\Lang\zh-CN.user.xml" />
<Content Include="docs\MySqlCommand.xml" />
<Content Include="docs\MySqlCommandBuilder.xml" />
<Content Include="docs\MySqlConnection.xml" />
<Content Include="docs\MySqlConnectionStringBuilder.xml" />
<Content Include="docs\MySqlDataAdapter.xml" />
<Content Include="docs\MySqlDataReader.xml" />
<Content Include="docs\MySqlException.xml" />
<Content Include="docs\MySqlHelper.xml" />
<Content Include="docs\MySqlParameter.xml" />
<Content Include="docs\MySqlParameterCollection.xml" />
<Content Include="docs\MySqlTransaction.xml" />
<Content Include="Umbraco\Config\Lang\cs.xml" />
<Content Include="Umbraco\ClientRedirect.aspx" />
<Content Include="Umbraco\Config\Lang\tr.xml" />
@@ -738,6 +727,7 @@
<Content Include="Config\log4net.config" />
<Content Include="Config\FileSystemProviders.config" />
<Content Include="Config\EmbeddedMedia.config" />
<Content Include="Config\BackOfficeTours\getting-started.json" />
</ItemGroup>
<!-- determine VSToolsPath -->
<PropertyGroup>

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

@@ -73,9 +73,6 @@
<PackageReference Include="Examine" Version="1.0.0-beta025" />
<PackageReference Include="HtmlAgilityPack" Version="1.7.2" />
<PackageReference Include="LightInject" Version="5.1.2" />
<PackageReference Include="Examine" Version="1.0.0-beta025" />
<PackageReference Include="HtmlAgilityPack" Version="1.5.1" />
<PackageReference Include="LightInject" Version="5.0.3" />
<PackageReference Include="LightInject.Annotation" Version="1.1.0" />
<PackageReference Include="LightInject.Mvc" Version="2.0.0" />
<PackageReference Include="LightInject.Web" Version="2.0.0" />