mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Compare commits
74 Commits
feature/we
...
lucene48
| Author | SHA1 | Date | |
|---|---|---|---|
|
63be17f440 | ||
|
|
06ee7849c1 | ||
|
|
61c91ff858 | ||
|
|
92cbf8925b | ||
|
|
c8b7c64d93 | ||
|
|
9572ef9ad3 | ||
|
|
388932b41f | ||
|
|
829f69198c | ||
|
|
4648a252b9 | ||
|
|
219f29cd20 | ||
|
|
51003bf582 | ||
|
|
0d5cff66a9 | ||
|
|
7e66c98dd5 | ||
|
|
14c2ee7944 | ||
|
|
9ae372a920 | ||
|
|
eecb61a132 | ||
|
|
4574a9fb0b | ||
|
|
bec9a6d792 | ||
|
|
dbe89d0a82 | ||
|
|
255547288b | ||
|
|
a9abc294e3 | ||
|
|
101d61b808 | ||
|
|
054925c297 | ||
|
|
ff97d1e975 | ||
|
|
e26fee3d6c | ||
|
|
ec0ea5e321 | ||
|
|
dd9d67fe48 | ||
|
|
9105187f78 | ||
|
|
1da6066e83 | ||
|
|
52c6debc97 | ||
|
|
f3be4fa2c7 | ||
|
|
d64541d47a | ||
|
|
9714c2c5f0 | ||
|
|
855d183be3 | ||
|
|
a37e548b25 | ||
|
|
99695f07cc | ||
|
|
63ca6ee2d8 | ||
|
|
042c47cc3f | ||
|
|
49ab41d4dc | ||
|
|
7fb63fd9eb | ||
|
|
e853550bda | ||
|
|
24c68bebe4 | ||
|
|
0a82363187 | ||
|
|
1e87eee2e4 | ||
|
|
53244d702c | ||
|
|
07cc3a6bad | ||
|
|
6f4762a30c | ||
|
|
ce3179307d | ||
|
|
2620dc820d | ||
|
|
9c88c7fcd1 | ||
|
|
a01b7dde23 | ||
|
|
62136eb59f | ||
|
|
8ed39703e5 | ||
|
|
a3ded18eb6 | ||
|
|
5b0efdba58 | ||
|
|
8865041a8b | ||
|
|
d9e833ba58 | ||
|
|
9137414305 | ||
|
|
65ae99abd4 | ||
|
|
eb9bfa0d29 | ||
|
|
1724be5c72 | ||
|
|
7a289ca1ad | ||
|
|
b7a0b007e4 | ||
|
|
f2fb1d520d | ||
|
|
59d95f11ee | ||
|
|
c7fde5bc72 | ||
|
|
d080037af9 | ||
|
|
5a6ba5ddd6 | ||
|
|
658a5601a5 | ||
|
|
d958df3041 | ||
|
|
8690278bed | ||
|
|
a28b966685 | ||
|
|
3656e5e466 | ||
|
|
2b61e3368d |
@@ -156,7 +156,7 @@
|
||||
<Output TaskParameter="Include" ItemName="TestAssemblies" />
|
||||
</CreateItem>
|
||||
|
||||
<NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" OutputXmlFile="$(BuildFolder)\Orchard.Tests.xml" />
|
||||
<NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" OutputXmlFile="$(BuildFolder)\Orchard.Tests.xml" ExcludeCategory="longrunning" />
|
||||
</Target>
|
||||
|
||||
<Target Name ="Spec" DependsOnTargets="Package-Stage">
|
||||
|
||||
28
README.md
28
README.md
@@ -1,6 +1,13 @@
|
||||
# Orchard
|
||||
|
||||
Orchard is a free, open source, community-focused Content Management System built on the ASP.NET MVC platform.
|
||||
|
||||
[](https://gitter.im/OrchardCMS/Orchard?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
|
||||
You can try it for free on [DotNest.com](https://dotnest.com) or on Microsoft Azure by clicking on this button
|
||||
|
||||
[](https://ms.portal.azure.com/#create/OutercurveFoundation.OrchardCMS.0.5.9)
|
||||
|
||||
## About The Orchard Project
|
||||
|
||||
#### Please visit our website at http://orchardproject.net for the most current information about this project.
|
||||
@@ -13,26 +20,29 @@ Orchard is delivered under the [.NET Foundation](http://www.dotnetfoundation.org
|
||||
|
||||
Our mission is to empower our users and foster a dedicated and diverse community that builds the CMS that we all want to use.
|
||||
|
||||
There are many ways you can [contribute to Orchard](http://orchardproject.net/contribution): you can [fix bugs](https://github.com/OrchardCMS/Orchard/issues), contribute modules and themes to [our gallery](http://gallery.orchardproject.net/), [write documentation](https://github.com/OrchardCMS/OrchardDoc), [translate Orchard](http://orchardproject.net/localize), or answer questions [on our forums](http://orchard.codeplex.com/discussions) and [on Stack Overflow](http://stackoverflow.com/questions/tagged/orchardcms).
|
||||
|
||||
## Project Status
|
||||
Orchard is currently in version 1.9.1. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach.
|
||||
Our 1.9.1 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://www.orchardproject.net/docs/Installing-Orchard.ashx). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project.
|
||||
Orchard is currently in version 1.9.2. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach.
|
||||
Our 1.9.2 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://docs.orchardproject.net/Documentation/Installing-Orchard). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project.
|
||||
|
||||
* [Download the latest release](https://github.com/OrchardCMS/Orchard/releases)
|
||||
* [Feature roadmap](http://www.orchardproject.net/docs/feature-roadmap.ashx)
|
||||
* [Feature roadmap](http://docs.orchardproject.net/Documentation/feature-roadmap)
|
||||
* [Docs and designs/specs](http://www.orchardproject.net/docs)
|
||||
* [About us](http://www.orchardproject.net/about)
|
||||
* [Contact us](mailto:ofeedbk@microsoft.com)
|
||||
|
||||
## How To Get Involved
|
||||
We hope that by engaging with the community in the very early stages of the project that we will be able to shape Orchard into a valuable set of tools and applications for the community. The Orchard team is committed to open community participation and accepts code contributions today. We encourage community participation at all levels from general project feedback to bug fixes and patches.
|
||||
We hope that by engaging with the community we will continue to shape Orchard into a valuable set of tools and applications. The Orchard team is committed to open community participation and accepts code contributions. We encourage community participation at all levels from general project feedback to bug fixes and patches.
|
||||
|
||||
There are many ways you can [contribute to Orchard](http://orchardproject.net/contribution):
|
||||
|
||||
* [Check out the code](https://github.com/OrchardCMS/Orchard)
|
||||
* [Check out the docs](http://orchardproject.net/docs)
|
||||
* [Write documentation](https://github.com/OrchardCMS/OrchardDoc)
|
||||
* [Find and file a bug](https://github.com/OrchardCMS/Orchard/issues)
|
||||
* [Propose a feature idea](http://orchard.uservoice.com)
|
||||
* [Ask and answer questions](http://www.orchardproject.net/discussions)
|
||||
* [Ask and answer questions in our forums](http://www.orchardproject.net/discussions) and [on Stack Overflow](http://stackoverflow.com/questions/tagged/orchardcms)
|
||||
* [Participate in our gitter.im chatroom](https://gitter.im/OrchardCMS/Orchard)
|
||||
* [Participate in forum discussions](http://orchard.codeplex.com/discussions)
|
||||
* [Submit a patch](http://www.orchardproject.net/docs/Contributing-patches.ashx)
|
||||
* [Submit a pull request](http://docs.orchardproject.net/Documentation/Contributing-patches)
|
||||
* [Translate Orchard](http://orchardproject.net/localize)
|
||||
* [Contribute modules and themes to our gallery](http://gallery.orchardproject.net/)
|
||||
* [Send us feedback](mailto:ofeedbk@microsoft.com)
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -1 +0,0 @@
|
||||
This is a modified version including a [assembly: SecutiryTransparent] attribute in AssemblyInfo.cs
|
||||
@@ -23,19 +23,20 @@
|
||||
|
||||
<!-- Prompts for the database name and fills it into the database scripts -->
|
||||
<parameter name="Database Name" description="Name of the database for Orchard." defaultValue="orchard" tags="SQL, dbName">
|
||||
<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForDb" />
|
||||
|
||||
</parameter>
|
||||
|
||||
<!-- Prompts for the database username and fills it into the database scripts.
|
||||
The SQL tag indicates it is a parameter required for SQL, the DbUsername tag indicates this is a Db username -->
|
||||
<parameter name="Database Username" description="User name to access you application database." defaultValue="orcharduser" tags="SQL, DbUsername">
|
||||
<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForUser" />
|
||||
<parameterEntry type="TextFile" scope="createuser.sql" match="PlaceHolderForUser" />
|
||||
<parameterEntry type="TextFile" scope="createlogin.sql" match="PlaceHolderForUser" />
|
||||
</parameter>
|
||||
|
||||
<!-- Prompts for the database password and fills it into the database scripts.
|
||||
The SQL tag indicates it is a parameter required for SQL, the DbUserPassword tag indicates this is a Db password -->
|
||||
<parameter name="Database Password" description="Password for the Database Username." tags="New, Password, SQL, DbUserPassword">
|
||||
<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForPassword" />
|
||||
<parameterEntry type="TextFile" scope="createlogin.sql" match="PlaceHolderForPassword" />
|
||||
</parameter>
|
||||
|
||||
<!-- Prompts for the admin creds and uses it for the administrator connection string. This is used to create a login and assign permissions.
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -161,6 +161,237 @@
|
||||
asynchronous request failed.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.ResourceBase">
|
||||
<summary>
|
||||
Resource information.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceBase.#ctor">
|
||||
<summary>
|
||||
Initializes a new instance of the ResourceBase class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceBase.#ctor(System.String)">
|
||||
<summary>
|
||||
Initializes a new instance of the ResourceBase class with required
|
||||
arguments.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceBase.Location">
|
||||
<summary>
|
||||
Required. Gets or sets the location of the resource.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceBase.Tags">
|
||||
<summary>
|
||||
Optional. Gets or sets the tags attached to the resource.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.ResourceBaseExtended">
|
||||
<summary>
|
||||
Resource information with extended details.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceBaseExtended.#ctor">
|
||||
<summary>
|
||||
Initializes a new instance of the ResourceBaseExtended class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceBaseExtended.#ctor(System.String)">
|
||||
<summary>
|
||||
Initializes a new instance of the ResourceBaseExtended class with
|
||||
required arguments.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceBaseExtended.Id">
|
||||
<summary>
|
||||
Optional. Gets or sets the ID of the resource.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceBaseExtended.Name">
|
||||
<summary>
|
||||
Optional. Gets or sets the name of the resource.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceBaseExtended.Type">
|
||||
<summary>
|
||||
Optional. Gets or sets the type of the resource.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.ResourceIdentity">
|
||||
<summary>
|
||||
Resource identity.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceIdentity.#ctor">
|
||||
<summary>
|
||||
Initializes a new instance of the ResourceIdentity class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceIdentity.#ctor(System.String,System.String,System.String)">
|
||||
<summary>
|
||||
Initializes a new instance of the ResourceIdentity class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceIdentity.GetProviderFromResourceType(System.String)">
|
||||
<summary>
|
||||
Returns provider string from resource type.
|
||||
</summary>
|
||||
<param name="resourceType">Resource type.</param>
|
||||
<returns>Provider</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.ResourceIdentity.GetTypeFromResourceType(System.String)">
|
||||
<summary>
|
||||
Returns type string from resource type.
|
||||
</summary>
|
||||
<param name="resourceType">Resource type.</param>
|
||||
<returns>Type</returns>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceIdentity.ParentResourcePath">
|
||||
<summary>
|
||||
Optional. Gets or sets parent resource path (optional).
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceIdentity.ResourceName">
|
||||
<summary>
|
||||
Required. Gets or sets resource name.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceIdentity.ResourceProviderApiVersion">
|
||||
<summary>
|
||||
Required. Gets or sets API version of the resource provider.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceIdentity.ResourceProviderNamespace">
|
||||
<summary>
|
||||
Required. Gets or sets namespace of the resource provider.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.ResourceIdentity.ResourceType">
|
||||
<summary>
|
||||
Required. Gets or sets resource type.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.Common.OData.FilterParameterAttribute">
|
||||
<summary>
|
||||
Parameter attribute used with OData filters.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.FilterParameterAttribute.#ctor(System.String)">
|
||||
<summary>
|
||||
Initializes a new instance of the <see cref="T:Microsoft.Azure.Common.OData.FilterParameterAttribute"/> class.
|
||||
</summary>
|
||||
<param name="name">Property name to use in the filter.</param>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.FilterParameterAttribute.#ctor(System.String,System.String)">
|
||||
<summary>
|
||||
Initializes a new instance of the <see cref="T:Microsoft.Azure.Common.OData.FilterParameterAttribute"/> class.
|
||||
</summary>
|
||||
<param name="name">Property name to use in the filter.</param>
|
||||
<param name="format">Format of the value.</param>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.Common.OData.FilterParameterAttribute.Name">
|
||||
<summary>
|
||||
Property name to use in the filter.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.Common.OData.FilterParameterAttribute.Format">
|
||||
<summary>
|
||||
Format of the value.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.Common.OData.FilterString">
|
||||
<summary>
|
||||
Handles OData filter generation.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.FilterString.Generate``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
|
||||
<summary>
|
||||
Generates an OData filter from a specified Linq expression.
|
||||
</summary>
|
||||
<typeparam name="T">Filter type</typeparam>
|
||||
<param name="filter">Entity to use for filter generation</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.Common.OData.UrlExpressionVisitor">
|
||||
<summary>
|
||||
Expression visitor class that generates OData style $filter parameter.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitBinary(System.Linq.Expressions.BinaryExpression)">
|
||||
<summary>
|
||||
Visits binary expression like ==, &&, >, etc.
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Original node.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitUnary(System.Linq.Expressions.UnaryExpression)">
|
||||
<summary>
|
||||
Visits binary expression !foo.
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Original node.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitConditional(System.Linq.Expressions.ConditionalExpression)">
|
||||
<summary>
|
||||
Visits conditional expression foo == true ? bar : fee. Throws NotSupportedException.
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Throws NotSupportedException.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitNew(System.Linq.Expressions.NewExpression)">
|
||||
<summary>
|
||||
Visits new object expression like new DateTime().
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Original node.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitConstant(System.Linq.Expressions.ConstantExpression)">
|
||||
<summary>
|
||||
Visits constants like 'a' or 123.
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Original node.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitMember(System.Linq.Expressions.MemberExpression)">
|
||||
<summary>
|
||||
Visits object members like p.Foo or dateTime.Hour.
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Original node.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitMethodCall(System.Linq.Expressions.MethodCallExpression)">
|
||||
<summary>
|
||||
Visits method calls like Contains, StartsWith, etc. Methods that are not supported will throw an exception.
|
||||
</summary>
|
||||
<param name="node">Node to visit.</param>
|
||||
<returns>Original node.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.closeUnaryBooleanOperator">
|
||||
<summary>
|
||||
Appends 'eq true' to Boolean unary operators.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.PrintConstant(System.Object)">
|
||||
<summary>
|
||||
Helper method to print constant.
|
||||
</summary>
|
||||
<param name="val">Object to print.</param>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.GetPropertyName(System.Reflection.PropertyInfo)">
|
||||
<summary>
|
||||
Helper method to generate property name.
|
||||
</summary>
|
||||
<param name="property">Property to examine.</param>
|
||||
<returns>Property name or value specified in the FilterParameterAttribute.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.GetPropertyFormat(System.Reflection.PropertyInfo)">
|
||||
<summary>
|
||||
Helper method to retrieve format from the FilterParameterAttribute.
|
||||
</summary>
|
||||
<param name="property">Property to examine.</param>
|
||||
<returns>Format from FilterParameterAttribute or null.</returns>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.Common.Properties.Resources">
|
||||
<summary>
|
||||
A strongly-typed resource class, for looking up localized strings, etc.
|
||||
|
||||
BIN
lib/windowsazure/Microsoft.Azure.KeyVault.Core.dll
Normal file
BIN
lib/windowsazure/Microsoft.Azure.KeyVault.Core.dll
Normal file
Binary file not shown.
114
lib/windowsazure/Microsoft.Azure.KeyVault.Core.xml
Normal file
114
lib/windowsazure/Microsoft.Azure.KeyVault.Core.xml
Normal file
@@ -0,0 +1,114 @@
|
||||
<?xml version="1.0"?>
|
||||
<doc>
|
||||
<assembly>
|
||||
<name>Microsoft.Azure.KeyVault.Core</name>
|
||||
</assembly>
|
||||
<members>
|
||||
<member name="T:Microsoft.Azure.KeyVault.Core.IKey">
|
||||
<summary>
|
||||
Interface for Keys
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKey.DecryptAsync(System.Byte[],System.Byte[],System.Byte[],System.Byte[],System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Decrypts the specified cipher text.
|
||||
</summary>
|
||||
<param name="ciphertext">The cipher text to decrypt</param>
|
||||
<param name="iv">The initialization vector</param>
|
||||
<param name="authenticationData">The authentication data</param>
|
||||
<param name="algorithm">The algorithm to use</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>The plain text</returns>
|
||||
<remarks>If algorithm is not specified, an implementation should use its default algorithm.
|
||||
Not all algorithms require, or support, all parameters.</remarks>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKey.EncryptAsync(System.Byte[],System.Byte[],System.Byte[],System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Encrypts the specified plain text.
|
||||
</summary>
|
||||
<param name="plaintext">The plain text to encrypt</param>
|
||||
<param name="iv">The initialization vector</param>
|
||||
<param name="authenticationData">The authentication data</param>
|
||||
<param name="algorithm">The algorithm to use</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>A Tuple consisting of the cipher text, the authentication tag (if applicable), the algorithm used</returns>
|
||||
<remarks>If the algorithm is not specified, an implementation should use its default algorithm.
|
||||
Not all algorithyms require, or support, all parameters.</remarks>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKey.WrapKeyAsync(System.Byte[],System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Encrypts the specified key material.
|
||||
</summary>
|
||||
<param name="key">The key material to encrypt</param>
|
||||
<param name="algorithm">The algorithm to use</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>A Tuple consisting of the encrypted key and the algorithm used</returns>
|
||||
<remarks>If the algorithm is not specified, an implementation should use its default algorithm</remarks>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKey.UnwrapKeyAsync(System.Byte[],System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Decrypts the specified key material.
|
||||
</summary>
|
||||
<param name="encryptedKey">The encrypted key material</param>
|
||||
<param name="algorithm">The algorithm to use</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>The decrypted key material</returns>
|
||||
<remarks>If the algorithm is not specified, an implementation should use its default algorithm</remarks>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKey.SignAsync(System.Byte[],System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Signs the specified digest.
|
||||
</summary>
|
||||
<param name="digest">The digest to sign</param>
|
||||
<param name="algorithm">The algorithm to use</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>A Tuple consisting of the signature and the algorithm used</returns>
|
||||
<remarks>If the algorithm is not specified, an implementation should use its default algorithm</remarks>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKey.VerifyAsync(System.Byte[],System.Byte[],System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Verifies the specified signature value
|
||||
</summary>
|
||||
<param name="digest">The digest</param>
|
||||
<param name="signature">The signature value</param>
|
||||
<param name="algorithm">The algorithm to use</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>A bool indicating whether the signature was successfully verified</returns>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.KeyVault.Core.IKey.DefaultEncryptionAlgorithm">
|
||||
<summary>
|
||||
The default encryption algorithm for this key
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.KeyVault.Core.IKey.DefaultKeyWrapAlgorithm">
|
||||
<summary>
|
||||
The default key wrap algorithm for this key
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.KeyVault.Core.IKey.DefaultSignatureAlgorithm">
|
||||
<summary>
|
||||
The default signature algorithm for this key
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Microsoft.Azure.KeyVault.Core.IKey.Kid">
|
||||
<summary>
|
||||
The key identifier
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.Azure.KeyVault.Core.IKeyResolver">
|
||||
<summary>
|
||||
Interface for key resolvers.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.Azure.KeyVault.Core.IKeyResolver.ResolveKeyAsync(System.String,System.Threading.CancellationToken)">
|
||||
<summary>
|
||||
Provides an IKey implementation for the specified key identifier.
|
||||
</summary>
|
||||
<param name="kid">The key identifier to resolve</param>
|
||||
<param name="token">Cancellation token</param>
|
||||
<returns>The resolved IKey implementation or null</returns>
|
||||
<remarks>Implementations should check the format of the kid to ensure that it is recognized. Null, rather than
|
||||
an exception, should be returned for unrecognized key identifiers to enable chaining of key resolvers.</remarks>
|
||||
</member>
|
||||
</members>
|
||||
</doc>
|
||||
Binary file not shown.
Binary file not shown.
@@ -40443,7 +40443,7 @@
|
||||
<param name="model">The model to use.</param>
|
||||
<param name="messageReaderSettings">The message reader settings to use.</param>
|
||||
<param name="version">The version of the payload being read.</param>
|
||||
<param name="typeKindFromPayloadFunc">A func to compute the type kind from the payload shape if it could not be determined from the expected type or the payload type.</param>
|
||||
<param name="typeKindPeekedFromPayloadFunc">A func to compute the type kind from the payload shape if it could not be determined from the expected type or the payload type.</param>
|
||||
<param name="targetTypeKind">The target type kind to be used to read the payload.</param>
|
||||
<param name="serializationTypeNameAnnotation">Potentially non-null instance of an annotation to put on the value reported from the reader.</param>
|
||||
<returns>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -4,19 +4,19 @@
|
||||
<name>Microsoft.WindowsAzure.Configuration</name>
|
||||
</assembly>
|
||||
<members>
|
||||
<member name="T:Microsoft.WindowsAzure.CloudConfigurationManager">
|
||||
<member name="T:Microsoft.Azure.CloudConfigurationManager">
|
||||
<summary>
|
||||
Configuration manager for accessing Windows Azure settings.
|
||||
Configuration manager for accessing Microsoft Azure settings.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.CloudConfigurationManager.GetSetting(System.String)">
|
||||
<member name="M:Microsoft.Azure.CloudConfigurationManager.GetSetting(System.String)">
|
||||
<summary>
|
||||
Gets a setting with the given name.
|
||||
</summary>
|
||||
<param name="name">Setting name.</param>
|
||||
<returns>Setting value or null if not found.</returns>
|
||||
</member>
|
||||
<member name="P:Microsoft.WindowsAzure.CloudConfigurationManager.AppSettings">
|
||||
<member name="P:Microsoft.Azure.CloudConfigurationManager.AppSettings">
|
||||
<summary>
|
||||
Gets application settings.
|
||||
</summary>
|
||||
@@ -42,17 +42,17 @@
|
||||
Looks up a localized string similar to Argument "{0}" cannot be an empty string..
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Microsoft.WindowsAzure.AzureApplicationSettings">
|
||||
<member name="T:Microsoft.Azure.AzureApplicationSettings">
|
||||
<summary>
|
||||
Windows Azure settings.
|
||||
Microsoft Azure settings.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.#ctor">
|
||||
<member name="M:Microsoft.Azure.AzureApplicationSettings.#ctor">
|
||||
<summary>
|
||||
Initializes the settings.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.IsMissingSettingException(System.Exception)">
|
||||
<member name="M:Microsoft.Azure.AzureApplicationSettings.IsMissingSettingException(System.Exception)">
|
||||
<summary>
|
||||
Checks whether the given exception represents an exception throws
|
||||
for a missing setting.
|
||||
@@ -60,14 +60,14 @@
|
||||
<param name="e">Exception</param>
|
||||
<returns>True for the missing setting exception.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetSetting(System.String)">
|
||||
<member name="M:Microsoft.Azure.AzureApplicationSettings.GetSetting(System.String)">
|
||||
<summary>
|
||||
Gets a setting with the given name.
|
||||
</summary>
|
||||
<param name="name">Setting name.</param>
|
||||
<returns>Setting value or null if such setting does not exist.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetValue(System.String,System.String,System.Func{System.String,System.String})">
|
||||
<member name="M:Microsoft.Azure.AzureApplicationSettings.GetValue(System.String,System.String,System.Func{System.String,System.String})">
|
||||
<summary>
|
||||
Gets setting's value from the given provider.
|
||||
</summary>
|
||||
@@ -76,21 +76,21 @@
|
||||
<param name="getValue">Method to obtain given setting.</param>
|
||||
<returns>Setting value, or null if not found.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetServiceRuntimeSetting(System.String)">
|
||||
<member name="M:Microsoft.Azure.AzureApplicationSettings.GetServiceRuntimeSetting(System.String)">
|
||||
<summary>
|
||||
Gets a configuration setting from the service runtime.
|
||||
</summary>
|
||||
<param name="name">Setting name.</param>
|
||||
<returns>Setting value or null if not found.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetServiceRuntimeAssembly">
|
||||
<member name="M:Microsoft.Azure.AzureApplicationSettings.GetServiceRuntimeAssembly">
|
||||
<summary>
|
||||
Loads and returns the latest available version of the service
|
||||
runtime assembly.
|
||||
</summary>
|
||||
<returns>Loaded assembly, if any.</returns>
|
||||
</member>
|
||||
<member name="M:Microsoft.WindowsAzure.NativeMethods.GetAssemblyPath(System.String)">
|
||||
<member name="M:Microsoft.Azure.NativeMethods.GetAssemblyPath(System.String)">
|
||||
<summary>
|
||||
Gets an assembly path from the GAC given a partial name.
|
||||
</summary>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/windowsazure/System.IdentityModel.Tokens.Jwt.dll
Normal file
BIN
lib/windowsazure/System.IdentityModel.Tokens.Jwt.dll
Normal file
Binary file not shown.
2502
lib/windowsazure/System.IdentityModel.Tokens.Jwt.xml
Normal file
2502
lib/windowsazure/System.IdentityModel.Tokens.Jwt.xml
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
1038
src/Orchard.Azure/.vs/config/applicationhost.config
Normal file
1038
src/Orchard.Azure/.vs/config/applicationhost.config
Normal file
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>2.5</ProductVersion>
|
||||
<ProductVersion>2.7</ProductVersion>
|
||||
<ProjectGuid>{03c5327d-4e8e-45a7-acd1-e18e7caa3c4a}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
@@ -35,8 +35,9 @@
|
||||
</PropertyGroup>
|
||||
<!-- Items for the project -->
|
||||
<ItemGroup>
|
||||
<ServiceConfiguration Include="ServiceConfiguration.Local.cscfg" />
|
||||
<ServiceDefinition Include="ServiceDefinition.csdef" />
|
||||
<ServiceConfiguration Include="ServiceConfiguration.cscfg" />
|
||||
<ServiceConfiguration Include="ServiceConfiguration.Cloud.cscfg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Orchard.Azure.Web\Orchard.Azure.Web.csproj">
|
||||
@@ -65,7 +66,7 @@
|
||||
<!-- Import the target files for this project template -->
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
<CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.5\</CloudExtensionsDir>
|
||||
<CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.7\</CloudExtensionsDir>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
|
||||
<!-- The BeforeAddRoleContent override ensures that content in themes and modules get added
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ServiceConfiguration serviceName="OrchardCloudService" osFamily="4" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" schemaVersion="2014-06.2.4">
|
||||
<Role name="Orchard.Azure.Web">
|
||||
<Instances count="1" />
|
||||
<ConfigurationSettings>
|
||||
<Setting name="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Orchard.Azure.OutputCache.HostIdentifier" value="Orchard.Azure.Web" />
|
||||
<Setting name="Orchard.Azure.OutputCache.CacheName" value="OutputCache" />
|
||||
<Setting name="Orchard.Azure.OutputCache.AuthorizationToken" value="" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" value="Orchard.Azure.Web" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.CacheName" value="DatabaseCache" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" value="" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{"caches":[{"name":"default","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":10,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"SessionStateCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":60,"isExpirable":true,"type":2},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"OutputCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":5,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"DatabaseCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":5,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0}]}" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="30" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="UseDevelopmentStorage=true" />
|
||||
</ConfigurationSettings>
|
||||
</Role>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ServiceConfiguration serviceName="OrchardCloudService" osFamily="4" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" schemaVersion="2015-04.2.6">
|
||||
<Role name="Orchard.Azure.Web">
|
||||
<Instances count="1" />
|
||||
<ConfigurationSettings>
|
||||
<Setting name="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Orchard.Azure.OutputCache.HostIdentifier" value="Orchard.Azure.Web" />
|
||||
<Setting name="Orchard.Azure.OutputCache.CacheName" value="OutputCache" />
|
||||
<Setting name="Orchard.Azure.OutputCache.AuthorizationToken" value="" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" value="Orchard.Azure.Web" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.CacheName" value="DatabaseCache" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" value="" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{"caches":[{"name":"default","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":10,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"SessionStateCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":60,"isExpirable":true,"type":2},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"OutputCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":5,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"DatabaseCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":5,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0}]}" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="30" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
|
||||
</ConfigurationSettings>
|
||||
</Role>
|
||||
</ServiceConfiguration>
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ServiceConfiguration serviceName="OrchardCloudService" osFamily="4" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" schemaVersion="2015-04.2.6">
|
||||
<Role name="Orchard.Azure.Web">
|
||||
<Instances count="1" />
|
||||
<ConfigurationSettings>
|
||||
<Setting name="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Orchard.Azure.OutputCache.HostIdentifier" value="Orchard.Azure.Web" />
|
||||
<Setting name="Orchard.Azure.OutputCache.CacheName" value="OutputCache" />
|
||||
<Setting name="Orchard.Azure.OutputCache.AuthorizationToken" value="" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" value="Orchard.Azure.Web" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.CacheName" value="DatabaseCache" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" value="" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{"caches":[{"name":"default","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":10,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"SessionStateCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":60,"isExpirable":true,"type":2},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"OutputCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":5,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0},{"name":"DatabaseCache","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":5,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0}]}" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="30" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="UseDevelopmentStorage=true" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
|
||||
</ConfigurationSettings>
|
||||
</Role>
|
||||
</ServiceConfiguration>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2014-06.2.4">
|
||||
<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2015-04.2.6">
|
||||
<WebRole name="Orchard.Azure.Web">
|
||||
<Sites>
|
||||
<Site name="Web">
|
||||
@@ -20,6 +20,7 @@
|
||||
<Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.CacheName" />
|
||||
<Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" />
|
||||
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
|
||||
</ConfigurationSettings>
|
||||
<Endpoints>
|
||||
<InputEndpoint name="HttpIn" protocol="http" port="80" />
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<DiagnosticsConfiguration xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
|
||||
<PublicConfig xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
|
||||
<WadCfg>
|
||||
<DiagnosticMonitorConfiguration overallQuotaInMB="4096">
|
||||
<DiagnosticInfrastructureLogs scheduledTransferPeriod="PT1M" scheduledTransferLogLevelFilter="Warning" />
|
||||
<Directories scheduledTransferPeriod="PT1M">
|
||||
<IISLogs containerName="wad-iis-logfiles" />
|
||||
</Directories>
|
||||
<PerformanceCounters>
|
||||
<PerformanceCounterConfiguration counterSpecifier="\Memory\Available MBytes" sampleRate="PT3M" />
|
||||
<PerformanceCounterConfiguration counterSpecifier="\Web Service(_Total)\ISAPI Extension Requests/sec" sampleRate="PT3M" />
|
||||
<PerformanceCounterConfiguration counterSpecifier="\Web Service(_Total)\Bytes Total/Sec" sampleRate="PT3M" />
|
||||
<PerformanceCounterConfiguration counterSpecifier="\ASP.NET Applications(__Total__)\Requests/Sec" sampleRate="PT3M" />
|
||||
<PerformanceCounterConfiguration counterSpecifier="\ASP.NET Applications(__Total__)\Errors Total/Sec" sampleRate="PT3M" />
|
||||
<PerformanceCounterConfiguration counterSpecifier="\ASP.NET\Requests Queued" sampleRate="PT3M" />
|
||||
<PerformanceCounterConfiguration counterSpecifier="\ASP.NET\Requests Rejected" sampleRate="PT3M" />
|
||||
</PerformanceCounters>
|
||||
<WindowsEventLog scheduledTransferPeriod="PT1M">
|
||||
<DataSource name="Application!*" />
|
||||
</WindowsEventLog>
|
||||
<Logs scheduledTransferPeriod="PT1M" scheduledTransferLogLevelFilter="Warning" />
|
||||
</DiagnosticMonitorConfiguration>
|
||||
</WadCfg>
|
||||
<StorageAccount>devstoreaccount1</StorageAccount>
|
||||
</PublicConfig>
|
||||
<PrivateConfig xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
|
||||
<StorageAccount name="devstoreaccount1" key="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" />
|
||||
</PrivateConfig>
|
||||
<IsEnabled>true</IsEnabled>
|
||||
</DiagnosticsConfiguration>
|
||||
@@ -1,98 +1,110 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<HostComponents>
|
||||
<Components>
|
||||
<Components>
|
||||
|
||||
<Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable new extensions monitoring -->
|
||||
<Property Name="Disabled" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable new extensions monitoring -->
|
||||
<Property Name="Disabled" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable Placement files monitoring (Placement.info) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable Placement files monitoring (Placement.info) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable source files monitoring -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
<!-- Set Value="true" to completely disable the Dynamic Extension Loader -->
|
||||
<Property Name="Disabled" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable source files monitoring -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
<!-- Set Value="true" to completely disable the Dynamic Extension Loader -->
|
||||
<Property Name="Disabled" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) -->
|
||||
<Property Name="DisableMonitoring" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) -->
|
||||
<Property Name="DisableMonitoring" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable the dependencies folder monitoring -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable the dependencies folder monitoring -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable compiled dependencides files monitoring -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable compiled dependencides files monitoring -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable localization files monitoring (*.po) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable localization files monitoring (*.po) -->
|
||||
<Property Name="DisableMonitoring" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Caching.DefaultParallelCacheContext">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable parallel cache resolution -->
|
||||
<Property Name="Disabled" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Caching.DefaultParallelCacheContext">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable parallel cache resolution -->
|
||||
<Property Name="Disabled" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Data.SessionConfigurationCache">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. -->
|
||||
<Property Name="Disabled" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component Type="Orchard.Data.SessionConfigurationCache">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. -->
|
||||
<Property Name="Disabled" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Alias.Implementation.Updater">
|
||||
<Properties>
|
||||
<Property Name="Disabled" Value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
</Components>
|
||||
<Component Type="Orchard.Environment.Descriptor.ShellDescriptorCache">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to disable shell descriptors cache (cache.dat). Recommended when using multiple instances. -->
|
||||
<Property Name="Disabled" Value="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
<Component Type="Orchard.Services.ClientAddressAccessor">
|
||||
<Properties>
|
||||
<!-- Set Value="true" to read the client host address from the specified HTTP header. -->
|
||||
<Property Name="EnableClientHostAddressHeader" Value="false"/>
|
||||
|
||||
<!-- Set Value to the HTTP header name from which to read the client host address. Only used when EnableClientHostAddressHeader="true".
|
||||
If the specified header was not found, the system will fall back to the client host address as provided by the Request object.-->
|
||||
<Property Name="ClientHostAddressHeaderName" Value="X-Forwarded-For"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
|
||||
</Components>
|
||||
</HostComponents>
|
||||
|
||||
@@ -1,31 +1,50 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
|
||||
<configSections>
|
||||
<section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/>
|
||||
</configSections>
|
||||
<configSections>
|
||||
<section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<autofac defaultAssembly="Orchard.Framework">
|
||||
|
||||
<autofac defaultAssembly="Orchard.Framework">
|
||||
|
||||
<!--
|
||||
To create tenant specific configurations, copy this file to ~/Congig/Sites.{tenant}.config
|
||||
To create tenant specific configurations, copy this file to ~/Config/Sites.{tenant}.config
|
||||
where {tenant} is the technical name of the targetted tenant
|
||||
|
||||
Allowed scopes: per-dependency, single-instance or per-lifetime-scope
|
||||
|
||||
-->
|
||||
|
||||
|
||||
<components>
|
||||
<!--
|
||||
Uncomment to use ReadUncommitted as the default isolation level. Please not that
|
||||
Sql Server Ce doesn't support ReadUncommitted.
|
||||
-->
|
||||
<!--
|
||||
<component instance-scope="per-lifetime-scope"
|
||||
type="Orchard.Data.SessionLocator, Orchard.Framework"
|
||||
service="Orchard.Data.ISessionLocator">
|
||||
<properties>
|
||||
<property name="IsolationLevel" value="ReadUncommitted" />
|
||||
</properties>
|
||||
</component>
|
||||
-->
|
||||
</components>
|
||||
</autofac>
|
||||
Uncomment to use ReadUncommitted as the default isolation level. Please not that
|
||||
Sql Server Ce doesn't support ReadUncommitted.
|
||||
|
||||
</configuration>
|
||||
Isolation level for all database transaction.
|
||||
See http://msdn.microsoft.com/en-us/library/system.transactions.isolationlevel.aspx
|
||||
-->
|
||||
<!--
|
||||
<component instance-scope="per-lifetime-scope"
|
||||
type="Orchard.Data.SessionLocator, Orchard.Framework"
|
||||
service="Orchard.Data.ISessionLocator">
|
||||
<properties>
|
||||
<property name="IsolationLevel" value="ReadUncommitted" />
|
||||
</properties>
|
||||
</component>
|
||||
-->
|
||||
|
||||
<!--
|
||||
Delay between background services executions
|
||||
<component instance-scope="single-instance"
|
||||
type="Orchard.Tasks.SweepGenerator"
|
||||
service="Orchard.Tasks.ISweepGenerator">
|
||||
<properties>
|
||||
<property name="Interval" value="00:01:00" />
|
||||
</properties>
|
||||
</component>
|
||||
-->
|
||||
</components>
|
||||
</autofac>
|
||||
|
||||
</configuration>
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<TargetFrameworkProfile />
|
||||
<UseGlobalApplicationHostFile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -90,13 +91,13 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.WindowsAzure.Diagnostics">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
|
||||
<HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
|
||||
<HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.WindowsAzure.Storage">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@@ -181,10 +182,6 @@
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="WebMatrix.Data">
|
||||
<HintPath>..\..\..\lib\aspnetmvc\WebMatrix.Data.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Global.asax.cs">
|
||||
@@ -564,6 +561,23 @@
|
||||
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
|
||||
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
|
||||
</Target>
|
||||
<Target Name="DeleteDebugFiles" AfterTargets="AfterBuild">
|
||||
<RemoveDir Directories="Themes;Core;Modules" />
|
||||
</Target>
|
||||
<Target Name="CopyDebugFiles" AfterTargets="DeleteDebugFiles" Condition="'$(Configuration)' == 'Debug'">
|
||||
<PropertyGroup>
|
||||
<SrcFolder>..\..</SrcFolder>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Excluded Include="$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;$(SrcFolder)\**\*.user;$(SrcFolder)\**\*.cs;$(SrcFolder)\**\*.csproj;$(SrcFolder)\**\.hg\**\*" />
|
||||
<Src-Themes Include="$(SrcFolder)\Orchard.Web\Themes\**\*" Exclude="@(Excluded)" />
|
||||
<Src-Core Include="$(SrcFolder)\Orchard.Web\Core\**\*" Exclude="@(Excluded)" />
|
||||
<Src-Modules Include="$(SrcFolder)\Orchard.Web\Modules\**\*" Exclude="@(Excluded)" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(Src-Themes)" DestinationFolder="Themes\%(RecursiveDir)" />
|
||||
<Copy SourceFiles="@(Src-Core)" DestinationFolder="Core\%(RecursiveDir)" />
|
||||
<Copy SourceFiles="@(Src-Modules)" DestinationFolder="Modules\%(RecursiveDir)" />
|
||||
</Target>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
@@ -583,6 +597,11 @@
|
||||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>del "$(TargetDir)\Modules"
|
||||
del "$(TargetDir)\Themes"
|
||||
del "$(TargetDir)\Media"</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.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
@@ -42,8 +42,9 @@
|
||||
<system.diagnostics>
|
||||
<trace>
|
||||
<listeners>
|
||||
<add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics">
|
||||
<filter type=""/>
|
||||
<add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
|
||||
name="AzureDiagnostics">
|
||||
<filter type="" />
|
||||
</add>
|
||||
</listeners>
|
||||
</trace>
|
||||
@@ -191,19 +192,19 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.31101.0
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.23107.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}"
|
||||
EndProject
|
||||
|
||||
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
|
||||
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
@@ -32,8 +32,8 @@ using System.Security;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
// Enable web application to call this assembly in Full Trust
|
||||
[assembly: AllowPartiallyTrustedCallers]
|
||||
|
||||
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The common module introduces content parts that are going to be used by most content types (common, body, identity).
|
||||
FeatureDescription: Core content parts.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The containers module introduces container and containable behaviors for content items.
|
||||
FeatureDescription: Container and containable parts to enable parent-child relationships between content items.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The contents module enables the creation of custom content types.
|
||||
Features:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application.
|
||||
FeatureDescription: Standard admin dashboard.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The Feeds module is providing RSS feeds to content items.
|
||||
FeatureDescription: RSS feeds for content items.
|
||||
|
||||
@@ -34,7 +34,6 @@ namespace Orchard.Core.Navigation.Controllers {
|
||||
_menuService = menuService;
|
||||
_menuManager = menuManager;
|
||||
_navigationManager = navigationManager;
|
||||
|
||||
Services = orchardServices;
|
||||
T = NullLocalizer.Instance;
|
||||
Logger = NullLogger.Instance;
|
||||
@@ -155,7 +154,7 @@ namespace Orchard.Core.Navigation.Controllers {
|
||||
ModelState.AddModelError(key, errorMessage.ToString());
|
||||
}
|
||||
|
||||
public ActionResult CreateMenuItem(string id, int menuId, string returnUrl) {
|
||||
public ActionResult CreateMenuItem(string id, int menuId, string returnUrl, string parentMenuItemPosition = null) {
|
||||
if (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
|
||||
return new HttpUnauthorizedResult();
|
||||
|
||||
@@ -164,25 +163,31 @@ namespace Orchard.Core.Navigation.Controllers {
|
||||
|
||||
if (menuPart == null)
|
||||
return HttpNotFound();
|
||||
|
||||
|
||||
// load the menu
|
||||
var menu = Services.ContentManager.Get(menuId);
|
||||
|
||||
if (menu == null)
|
||||
return HttpNotFound();
|
||||
|
||||
try {
|
||||
// filter the content items for this specific menu
|
||||
menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
|
||||
|
||||
|
||||
try {
|
||||
if (!String.IsNullOrEmpty(parentMenuItemPosition)) {
|
||||
var menuEntries = _menuService.GetMenuParts(menuId).Select(CreateMenuItemEntries);
|
||||
menuPart.MenuPosition = GetNextChildPosition(menuEntries, parentMenuItemPosition);
|
||||
}
|
||||
else {
|
||||
// filter the content items for this specific menu
|
||||
menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
|
||||
}
|
||||
|
||||
var model = Services.ContentManager.BuildEditor(menuPart);
|
||||
|
||||
|
||||
return View(model);
|
||||
}
|
||||
catch (Exception exception) {
|
||||
if (exception.IsFatal()) {
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
Logger.Error(T("Creating menu item failed: {0}", exception.Message).Text);
|
||||
Services.Notifier.Error(T("Creating menu item failed: {0}", exception.Message));
|
||||
@@ -191,7 +196,7 @@ namespace Orchard.Core.Navigation.Controllers {
|
||||
}
|
||||
|
||||
[HttpPost, ActionName("CreateMenuItem")]
|
||||
public ActionResult CreateMenuItemPost(string id, int menuId, string returnUrl) {
|
||||
public ActionResult CreateMenuItemPost(string id, int menuId, string returnUrl, string parentMenuItemPosition = null) {
|
||||
if (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
|
||||
return new HttpUnauthorizedResult();
|
||||
|
||||
@@ -205,12 +210,18 @@ namespace Orchard.Core.Navigation.Controllers {
|
||||
|
||||
if (menu == null)
|
||||
return HttpNotFound();
|
||||
|
||||
|
||||
var model = Services.ContentManager.UpdateEditor(menuPart, this);
|
||||
|
||||
menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
|
||||
if (!String.IsNullOrEmpty(parentMenuItemPosition)) {
|
||||
var menuEntries = _menuService.GetMenuParts(menuId).Select(CreateMenuItemEntries);
|
||||
menuPart.MenuPosition = GetNextChildPosition(menuEntries, parentMenuItemPosition);
|
||||
}
|
||||
else {
|
||||
menuPart.MenuPosition = Position.GetNext( _navigationManager.BuildMenu(menu));
|
||||
}
|
||||
|
||||
menuPart.Menu = menu;
|
||||
|
||||
Services.ContentManager.Create(menuPart);
|
||||
|
||||
if (!ModelState.IsValid) {
|
||||
@@ -222,5 +233,23 @@ namespace Orchard.Core.Navigation.Controllers {
|
||||
|
||||
return this.RedirectLocal(returnUrl, () => RedirectToAction("Index"));
|
||||
}
|
||||
|
||||
private static string GetNextChildPosition(IEnumerable<MenuItemEntry> menuItems, string parentMenuItemPosition) {
|
||||
var parentMenuItemPositionPlusDot = parentMenuItemPosition + ".";
|
||||
var childElements = menuItems.Where(childElement => childElement.Position.StartsWith(parentMenuItemPositionPlusDot));
|
||||
if (childElements.Any()) {
|
||||
var result = childElements
|
||||
.Select(childElement => {
|
||||
var positionParts = childElement.Position.Substring(parentMenuItemPositionPlusDot.Length).Split(new[] { '.' }, 2, StringSplitOptions.RemoveEmptyEntries);
|
||||
|
||||
return positionParts.Any() ? int.Parse(positionParts[0]) : 0;
|
||||
})
|
||||
.Max();
|
||||
|
||||
return parentMenuItemPositionPlusDot + (result + 1);
|
||||
}
|
||||
|
||||
return parentMenuItemPositionPlusDot + "1";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The navigation module creates and manages a simple navigation menu for the front-end of the application and allows you to add content items to the admin menu.
|
||||
FeatureDescription: Menu management.
|
||||
|
||||
@@ -52,6 +52,27 @@
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$(function () {
|
||||
$(".navigation-menu-item > div").on("click", function () {
|
||||
if ($(".navigation-menu-item > div.menu-item-selected").length) {
|
||||
if ($(this).hasClass("menu-item-selected")) {
|
||||
$(this).removeClass("menu-item-selected");
|
||||
}
|
||||
else {
|
||||
$(".navigation-menu-item > div").removeClass("menu-item-selected");
|
||||
$(this).addClass("menu-item-selected")
|
||||
}
|
||||
}
|
||||
else {
|
||||
$(this).addClass("menu-item-selected");
|
||||
}
|
||||
});
|
||||
|
||||
$(".menu-item-actions > .button").on("click", function (e) {
|
||||
if ($(".navigation-menu-item > div.menu-item-selected").length) {
|
||||
e.originalEvent.currentTarget.href = $(this).attr("href") + "&parentMenuItemPosition=" + $(".navigation-menu-item > div.menu-item-selected > .navigation-position > input").val();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
})(jQuery);
|
||||
|
||||
@@ -172,4 +172,13 @@
|
||||
.dir-rtl div.menu-item-actions {
|
||||
left:10px;
|
||||
right: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
.navigation-menu li div.menu-item-selected {
|
||||
background-color: #6a7b42;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.navigation-menu li div.menu-item-selected a {
|
||||
color: #edf9f5;
|
||||
}
|
||||
@@ -46,6 +46,8 @@
|
||||
<div class="container">
|
||||
<div class="navigation-menu">
|
||||
@if (Model.MenuItemEntries.Any()) {
|
||||
@Html.Hint(T("If you'd like to add a new menu item under another one directly then select the parent by clicking on it."))
|
||||
|
||||
@RenderMenuItems(Model.MenuItemEntries, 0)
|
||||
}
|
||||
else {
|
||||
@@ -77,8 +79,8 @@
|
||||
}
|
||||
|
||||
|
||||
@helper RenderMenuItems(IList<MenuItemEntry> menuItems, int index) {
|
||||
|
||||
@helper RenderMenuItems(IList<MenuItemEntry> menuItems, int index) {
|
||||
|
||||
@:<ol>
|
||||
|
||||
// store current level to detect lowerb or upper level
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The dashboard module is providing the reports screen of the application.
|
||||
FeatureDescription: Reports management.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The scheduling module enables background task scheduling.
|
||||
FeatureDescription: Scheduled background tasks.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The settings module creates site settings that other modules can contribute to.
|
||||
FeatureDescription: Site settings.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The shapes module contains core shape templates and display hooks.
|
||||
FeatureDescription: Core shape templates and display hooks.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The title module enables content items to have titles.
|
||||
FeatureDescription: Title content part.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter.
|
||||
FeatureDescription: XML-RPC opt-in implementation.
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace Lucene.Models {
|
||||
|
||||
public class LuceneDocumentIndex : IDocumentIndex {
|
||||
|
||||
public List<AbstractField> Fields { get; private set; }
|
||||
public List<Field> Fields { get; private set; }
|
||||
|
||||
private string _name;
|
||||
private string _stringValue;
|
||||
@@ -24,7 +24,7 @@ namespace Lucene.Models {
|
||||
public int ContentItemId { get; private set; }
|
||||
|
||||
public LuceneDocumentIndex(int documentId, Localizer t) {
|
||||
Fields = new List<AbstractField>();
|
||||
Fields = new List<Field>();
|
||||
SetContentItemId(documentId);
|
||||
IsDirty = false;
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace Lucene.Models {
|
||||
|
||||
public IDocumentIndex SetContentItemId(int contentItemId) {
|
||||
ContentItemId = contentItemId;
|
||||
Fields.Add(new Field("id", contentItemId.ToString(), Field.Store.YES, Field.Index.NOT_ANALYZED));
|
||||
Fields.Add(new StringField("id", contentItemId.ToString(), Field.Store.YES));
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -102,19 +102,26 @@ namespace Lucene.Models {
|
||||
if(_removeTags) {
|
||||
_stringValue = _stringValue.RemoveTags(true);
|
||||
}
|
||||
Fields.Add(new Field(_name, _stringValue ?? String.Empty,
|
||||
_store ? Field.Store.YES : Field.Store.NO,
|
||||
_analyze ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED));
|
||||
Fields.Add(new TextField(
|
||||
_name,
|
||||
_stringValue ?? String.Empty,
|
||||
_store ? Field.Store.YES : Field.Store.NO
|
||||
//,_analyze ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED
|
||||
));
|
||||
break;
|
||||
case TypeCode.Int32:
|
||||
Fields.Add(new NumericField(_name,
|
||||
_store ? Field.Store.YES : Field.Store.NO,
|
||||
true).SetIntValue(_intValue));
|
||||
Fields.Add(new DoubleField(
|
||||
_name,
|
||||
_intValue,
|
||||
_store ? Field.Store.YES : Field.Store.NO
|
||||
));
|
||||
break;
|
||||
case TypeCode.Single:
|
||||
Fields.Add(new NumericField(_name,
|
||||
_store ? Field.Store.YES : Field.Store.NO,
|
||||
true).SetDoubleValue(_doubleValue));
|
||||
Fields.Add(new DoubleField(
|
||||
_name,
|
||||
_doubleValue,
|
||||
_store ? Field.Store.YES : Field.Store.NO
|
||||
));
|
||||
break;
|
||||
case TypeCode.Empty:
|
||||
break;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The Lucene module enables the site to be indexed using Lucene.NET. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site.
|
||||
FeatureDescription: Lucene indexing services.
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ using Lucene.Net.Util;
|
||||
using Orchard.Indexing;
|
||||
using Orchard.Logging;
|
||||
using Lucene.Net.Documents;
|
||||
using Lucene.Net.QueryParsers;
|
||||
using Lucene.Net.Search.QueryParsers;
|
||||
using Lucene.Net.Analysis.Tokenattributes;
|
||||
|
||||
namespace Lucene.Services {
|
||||
@@ -33,7 +33,7 @@ namespace Lucene.Services {
|
||||
private bool _asFilter;
|
||||
|
||||
// pending clause attributes
|
||||
private Occur _occur;
|
||||
private BooleanClause.Occur _occur;
|
||||
private bool _exactMatch;
|
||||
private bool _notAnalyzed;
|
||||
private float _boost;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System.Linq;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Markdown.Models;
|
||||
using Orchard.ContentManagement;
|
||||
using Orchard.ContentManagement.Handlers;
|
||||
using Orchard.ContentManagement.MetaData;
|
||||
using Orchard.ContentManagement.MetaData.Builders;
|
||||
using Orchard.Localization;
|
||||
|
||||
namespace Markdown.Handlers {
|
||||
@@ -18,24 +18,6 @@ namespace Markdown.Handlers {
|
||||
part.UseMarkdownForBlogs = false;
|
||||
});
|
||||
|
||||
OnUpdated<MarkdownSiteSettingsPart>((context, part) => {
|
||||
var blogPost = _contentDefinitionManager.GetTypeDefinition("BlogPost");
|
||||
if (blogPost == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var bodyPart = blogPost.Parts.FirstOrDefault(x => x.PartDefinition.Name == "BodyPart");
|
||||
if (bodyPart == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
_contentDefinitionManager.AlterTypeDefinition("BlogPost", build => build
|
||||
.WithPart("BodyPart", cfg => cfg
|
||||
.WithSetting("BodyTypePartSettings.Flavor", part.UseMarkdownForBlogs ? "markdown" : "html")
|
||||
)
|
||||
);
|
||||
});
|
||||
|
||||
T = NullLocalizer.Instance;
|
||||
}
|
||||
|
||||
@@ -46,5 +28,33 @@ namespace Markdown.Handlers {
|
||||
base.GetItemMetadata(context);
|
||||
context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Markdown")));
|
||||
}
|
||||
|
||||
protected override void UpdateEditorShape(UpdateEditorContext context) {
|
||||
if (!string.Equals("markdown", context.GroupId, StringComparison.OrdinalIgnoreCase))
|
||||
return;
|
||||
|
||||
var part = context.ContentItem.As<MarkdownSiteSettingsPart>();
|
||||
if (part == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
base.UpdateEditorShape(context);
|
||||
|
||||
var blogPost = _contentDefinitionManager.GetTypeDefinition("BlogPost");
|
||||
if (blogPost == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var bodyPart = blogPost.Parts.FirstOrDefault(x => x.PartDefinition.Name == "BodyPart");
|
||||
if (bodyPart == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
_contentDefinitionManager.AlterTypeDefinition("BlogPost", build => build
|
||||
.WithPart("BodyPart", cfg => cfg
|
||||
.WithSetting("BodyTypePartSettings.Flavor", part.UseMarkdownForBlogs ? "markdown" : "html")
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The Markdown module enables rich text contents to be created using the Markdown syntax.
|
||||
FeatureDescription: Markdown editor.
|
||||
|
||||
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ Name: Alias
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: Maps friendly urls to specific module actions.
|
||||
FeatureDescription: Maps friendly urls to specific module actions.
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ Name: AntiSpam
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: Provides anti-spam services to protect your content from malicious submissions.
|
||||
Features:
|
||||
|
||||
@@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Path: ArchiveLater
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: The ArchiveLater module introduces scheduled archiving functionality.
|
||||
FeatureDescription: Scheduled archiving.
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: Provides a log for recording and viewing back-end changes.
|
||||
Features:
|
||||
|
||||
@@ -2,7 +2,7 @@ Name: Autoroute
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: Description for the module
|
||||
Features:
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: Microsoft Open Technologies, Inc
|
||||
Website: http://msopentech.com
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
|
||||
Features:
|
||||
|
||||
@@ -85,8 +85,10 @@
|
||||
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client">
|
||||
<HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer">
|
||||
<HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.WindowsAzure.Storage">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Storage.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json">
|
||||
|
||||
@@ -32,6 +32,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Spatial" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
|
||||
@@ -57,15 +57,15 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
|
||||
@@ -73,7 +73,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
+ <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 1.9.1
|
||||
Version: 1.9.2
|
||||
OrchardVersion: 1.9
|
||||
Description: Provides a set of Orchard service implementations targeting Microsoft Azure services.
|
||||
Category: Hosting
|
||||
|
||||
@@ -31,6 +31,6 @@ using System.Security;
|
||||
//
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
[assembly: AssemblyVersion("1.9.2")]
|
||||
[assembly: AssemblyFileVersion("1.9.2")]
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user