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

Cleanup solution and build wip

Browse Source
This commit is contained in:
Stephan
2018-05-16 15:19:46 +02:00
parent fc56126820
commit 6bedc1020b
9 changed files with 69 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NuGet.Config
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="umbracocore" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
<add key="examineAppVeyor" value="https://ci.appveyor.com/nuget/examine-f73l6qv0oqfh/" />
</packageSources>
</configuration>

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

@@ -62,7 +62,7 @@
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="ClientDependency" Version="1.9.6" />
<PackageReference Include="HtmlAgilityPack" Version="1.7.2" />
<PackageReference Include="ImageProcessor" Version="2.6.0" />
<PackageReference Include="ImageProcessor" Version="2.6.1.19" />
<PackageReference Include="LightInject" Version="5.1.2" />
<PackageReference Include="LightInject.Annotation" Version="1.1.0" />
<PackageReference Include="LightInject.Web" Version="2.0.0" />

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

@@ -91,8 +91,8 @@
<PackageReference Include="ClientDependency" Version="1.9.6" />
<PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
<PackageReference Include="Examine" Version="1.0.0-beta025" />
<PackageReference Include="ImageProcessor.Web" Version="4.9.1.2" />
<PackageReference Include="ImageProcessor.Web.Config" Version="2.4.0" />
<PackageReference Include="ImageProcessor.Web" Version="4.9.2.19" />
<PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Log4Net.Async" Version="2.0.4" />
<PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />

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

@@ -83,9 +83,7 @@
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NPoco" Version="3.9.3" />
<PackageReference Include="Semver" Version="2.0.4" />
<PackageReference Include="System.Threading.Tasks.Dataflow">
<Version>4.8.0</Version>
</PackageReference>
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ItemGroup>
@@ -1573,7 +1571,7 @@
copied from Microsoft.CSharp.targets
because we have webservices, we need to SGEN
but it's getting confused by us referencing System.ValueTuple which it cannot load
Name="UmbGenerateSerializationAssemblies"
Condition="'$(_SGenGenerateSerializationAssembliesConfig)' == 'On' or ('@(WebReferenceUrl)'!='' and '$(_SGenGenerateSerializationAssembliesConfig)' == 'Auto')"
-->
@@ -1593,4 +1591,4 @@
<Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
</SGen>
</Target>
</Project>
</Project>

13
src/umbraco.sln
View File

@@ -6,9 +6,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.W
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}"
ProjectSection(SolutionItems) = preProject
..\build\build-bootstrap.ps1 = ..\build\build-bootstrap.ps1
..\build\build.ps1 = ..\build\build.ps1
..\build\BuildDocs.ps1 = ..\build\BuildDocs.ps1
NuGet.Config = NuGet.Config
..\NuGet.Config = ..\NuGet.Config
..\build\RevertToCleanInstall.bat = ..\build\RevertToCleanInstall.bat
..\build\RevertToEmptyInstall.bat = ..\build\RevertToEmptyInstall.bat
SolutionInfo.cs = SolutionInfo.cs
@@ -16,13 +18,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}"
ProjectSection(SolutionItems) = preProject
..\BUILD.md = ..\BUILD.md
..\apidocs\docfx.filter.yml = ..\apidocs\docfx.filter.yml
..\apidocs\docfx.json = ..\apidocs\docfx.json
..\apidocs\index.md = ..\apidocs\index.md
..\LICENSE.md = ..\LICENSE.md
..\README.md = ..\README.md
..\apidocs\toc.yml = ..\apidocs\toc.yml
ApiDocs\docfx.filter.yml = ApiDocs\docfx.filter.yml
ApiDocs\docfx.json = ApiDocs\docfx.json
ApiDocs\index.md = ApiDocs\index.md
ApiDocs\toc.yml = ApiDocs\toc.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B5BD12C1-A454-435E-8A46-FF4A364C0382}"