Compare commits

...

9 Commits

10 changed files with 227 additions and 1 deletions

15
BuildNuGetPackages.ps1 Normal file
View File

@@ -0,0 +1,15 @@
$outputDirectory = "build/NuGet"
Set-Alias nuget src/.nuget/nuget
nuget update -self
If (Test-Path "$outputDirectory") {
rmdir "$outputDirectory" -Force -Recurse
}
mkdir "$outputDirectory"
# Orchard.Libraries
nuget pack lib/Orchard.Libraries.nuspec -OutputDirectory "$outputDirectory"
# Orchard.Framework
nuget pack src/Orchard/Orchard.Framework.csproj -IncludeReferencedProjects -Build -Prop Configuration=Release -OutputDirectory "$outputDirectory"

Binary file not shown.

View File

@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Orchard.Libraries</id>
<version>1.8.1.0</version>
<title>Orchard Libraries</title>
<authors>The Orchard Team</authors>
<owners>The Orchard Team</owners>
<projectUrl>http://orchardproject.net</projectUrl>
<iconUrl>http://orchardproject.net/themes/OrchardProject.Net/Images/favicon.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains all the libraries used by the Orchard CMS and thus the Orchard.Framework package.</description>
<copyright>Copyright © Outercurve Foundation 2009</copyright>
<tags>Orchard CMS framework web</tags>
<!-- Dummy reference so dlls from lib don't get referenced. -->
<references>
<reference file="jquery-1.4.1.js" />
</references>
</metadata>
<files>
<!-- When changing the framework folder here install/uninstall.ps1 inside Orchard.Framework should change too. -->
<file src="**\*" target="lib\net45" exclude="*.nuspec" />
</files>
</package>

BIN
src/.nuget/NuGet.exe Normal file

Binary file not shown.

View File

@@ -0,0 +1,60 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="App_Data/Dependencies" />
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" />
<bindingRedirect oldVersion="2.2.0.0-2.6.3.862" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
</dependentAssembly>
<!-- Only here because some assemblies might not be aware of log4net updated in Orchard. -->
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" />
<bindingRedirect oldVersion="0.0.0.0-1.2.13.0" newVersion="1.2.13.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -0,0 +1,60 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="App_Data/Dependencies" />
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" />
<bindingRedirect oldVersion="2.2.0.0-2.6.3.862" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
</dependentAssembly>
<!-- Only here because some assemblies might not be aware of log4net updated in Orchard. -->
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" />
<bindingRedirect oldVersion="0.0.0.0-1.2.13.0" newVersion="1.2.13.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -0,0 +1,22 @@
# Needed to add basic lib references without having to include them in the Orchard.Framework package too.
param($installPath, $toolsPath, $package, $project)
$pathProbe = Join-Path $installPath "..\Orchard.Libraries*"
$libPath = Join-Path (Get-Item $pathProbe).FullName "lib\net45"
Function AddReference($assemblySubPath) {
$project.Object.References.Add((Join-Path $libPath $assemblySubPath));
}
# When adding or removing base assemblies the changes should be reflected in uninstall.ps1 too.
AddReference("autofac\Autofac.dll");
AddReference("autofac\Autofac.Configuration.dll");
AddReference("castle-windsor\net45\Castle.Core.dll");
AddReference("nhibernate\FluentNHibernate.dll");
AddReference("nhibernate\NHibernate.dll");
AddReference("log4net\log4net.dll");
AddReference("newtonsoft.json\Newtonsoft.Json.dll");
AddReference("aspnetwebapi\System.Net.Http.Formatting.dll");
AddReference("aspnetwebapi\System.Web.Http.WebHost.dll");
AddReference("aspnetmvc\System.Web.Mvc.dll");

View File

@@ -0,0 +1,20 @@
param($installPath, $toolsPath, $package, $project)
$pathProbe = Join-Path $installPath "..\Orchard.Libraries*"
$libPath = Join-Path (Get-Item $pathProbe).FullName "lib\net45"
Function RemoveReference($assemblySubPath) {
$project.Object.References | Where-Object { $_.Path -eq (Join-Path $libPath $assemblySubPath) } | ForEach-Object { $_.Remove() }
}
# When adding or removing base assemblies the changes should be reflected in install.ps1 too.
RemoveReference("autofac\Autofac.dll");
RemoveReference("autofac\Autofac.Configuration.dll");
RemoveReference("castle-windsor\net45\Castle.Core.dll");
RemoveReference("nhibernate\FluentNHibernate.dll");
RemoveReference("nhibernate\NHibernate.dll");
RemoveReference("log4net\log4net.dll");
RemoveReference("newtonsoft.json\Newtonsoft.Json.dll");
RemoveReference("aspnetwebapi\System.Net.Http.Formatting.dll");
RemoveReference("aspnetwebapi\System.Web.Http.WebHost.dll");
RemoveReference("aspnetmvc\System.Web.Mvc.dll");

View File

@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>$author$</authors>
<owners>$author$</owners>
<licenseUrl>https://orchard.codeplex.com/license</licenseUrl>
<projectUrl>http://orchardproject.net</projectUrl>
<iconUrl>http://orchardproject.net/themes/OrchardProject.Net/Images/favicon.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<copyright>Copyright © Outercurve Foundation 2009</copyright>
<tags>Orchard CMS framework web</tags>
<dependencies>
<dependency id="Orchard.Libraries" version="$version$" />
</dependencies>
</metadata>
<files>
<file src="NuGet\content\*" target="content" />
<file src="NuGet\tools\*" target="tools" />
</files>
</package>

View File

@@ -7,12 +7,13 @@ using System.Security;
// associated with an assembly.
[assembly: AssemblyTitle("Orchard.Framework")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("The Orchard Framework is the core of Orchard CMS.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyCompany("The Orchard Team")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from