lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
This commit is contained in:
Sebastien Ros 2015-09-30 15:57:34 -07:00
commit d0b364c28e
178 changed files with 1531 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Orchard.proj
View File

@ -157,7 +157,7 @@
<Output TaskParameter="Include" ItemName="TestAssemblies" /> <Output TaskParameter="Include" ItemName="TestAssemblies" />
</CreateItem> </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>
<Target Name ="Spec" DependsOnTargets="Package-Stage"> <Target Name ="Spec" DependsOnTargets="Package-Stage">

9
lib/msdeploy/createlogin.sql Normal file
View File

@ -0,0 +1,9 @@
/**********************************************************************/
/* Install.SQL */
/* Creates a login and makes the user a member of db roles */
/* */
/* Modifications for SQL AZURE - ON MASTER */
/**********************************************************************/
CREATE LOGIN PlaceHolderForUser WITH PASSWORD = 'PlaceHolderForPassword'

15
lib/msdeploy/createuser.sql Normal file
View File

@ -0,0 +1,15 @@
/**********************************************************************/
/* CreateUser.SQL */
/* Creates a user and makes the user a member of db roles */
/* This script runs against the User database and requires connection string */
/* Supports SQL Server and SQL AZURE */
/**********************************************************************/
-- Create database user and map to login
-- and add user to the datareader, datawriter, ddladmin and securityadmin roles
--
CREATE USER PlaceHolderForUser FOR LOGIN PlaceHolderForUser;
GO
EXEC sp_addrolemember 'db_owner', PlaceHolderForUser;
GO

45
lib/msdeploy/install.sql
View File

@ -1,45 +0,0 @@
/**********************************************************************/
/* Install.SQL */
/* Creates a login and makes the user a member of db roles */
/* */
/**********************************************************************/
-- Declare variables for database name, username and password
DECLARE @dbName sysname,
@dbUser sysname,
@dbPwd nvarchar(max);
-- Set variables for database name, username and password
SET @dbName = 'PlaceHolderForDb';
SET @dbUser = 'PlaceHolderForUser';
SET @dbPwd = 'PlaceHolderForPassword';
DECLARE @cmd nvarchar(max)
-- Create login
IF( SUSER_SID(@dbUser) is null )
BEGIN
print '-- Creating login '
SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N''''
EXEC(@cmd)
END
-- Create database user and map to login
-- and add user to the datareader, datawriter, ddladmin and securityadmin roles
--
SET @cmd = N'USE ' + quotename(@DBName) + N';
IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N'''))
BEGIN
print ''-- Creating user'';
CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N';
print ''-- Adding user'';
EXEC sp_addrolemember ''db_ddladmin'', ''' + replace(@dbUser, '''', '''''') + N''';
print ''-- Adding user'';
EXEC sp_addrolemember ''db_securityadmin'', ''' + replace(@dbUser, '''', '''''') + N''';
print ''-- Adding user'';
EXEC sp_addrolemember ''db_datareader'', ''' + replace(@dbUser, '''', '''''') + N''';
print ''-- Adding user'';
EXEC sp_addrolemember ''db_datawriter'', ''' + replace(@dbUser, '''', '''''') + N''';
END'
EXEC(@cmd)
GO

12
lib/msdeploy/manifest.xml
View File

@ -1,7 +1,13 @@
<MSDeploy.iisApp> <MSDeploy.iisApp>
<iisapp path="Orchard" managedRuntimeVersion="v4.0" /> <iisapp path="Orchard" managedRuntimeVersion="v4.0" />
<setAcl path="Orchard/App_Data" setAclAccess="Modify" /> <setAcl path="Orchard/App_Data" setAclAccess="Modify" />
<setAcl path="Orchard/Media" setAclAccess="Modify" /> <setAcl path="Orchard/Media" setAclAccess="Modify" />
<setAcl path="Orchard/bin/HostRestart" setAclAccess="Modify" /> <setAcl path="Orchard/bin/HostRestart" setAclAccess="Modify" />
<dbFullSql path="install.sql" />
</MSDeploy.iisApp> <!-- Runs SQL script to create login and assign permissions, requires transacted="false"
This script runs as the database administrator provided in parameters.xml
-->
<dbfullsql path="createlogin.sql" transacted="false" />
<dbfullsql path="createuser.sql" transacted="false" />
</MSDeploy.iisApp>

14
lib/msdeploy/parameters.xml
View File

@ -47,19 +47,17 @@
<!-- Prompts for the admin password and uses it for the administrator connection string. <!-- Prompts for the admin password and uses it for the administrator connection string.
This is use to create a login and assign permissions. The SQL tag indicates it is a parameter required for SQL. This is use to create a login and assign permissions. The SQL tag indicates it is a parameter required for SQL.
The DbAdminPassword tag indicates it should be used when the user is creating a new database. If they're not, it can be filled in with the DbUserPassword value. --> The DbAdminPassword tag indicates it should be used when the user is creating a new database. If they're not, it can be filled in with the DbUserPassword value. -->
<parameter name="Database Administrator Password" description="Password for the database administrator account." tags="New, Password, SQL, dbAdminPassword"> <parameter name="Database Administrator Password" description="Password for the database administrator account." tags="Password, SQL, dbAdminPassword">
</parameter> </parameter>
<parameter name="Admin Connection String SqlServer" <parameter name="Admin Connection String SqlServer1" tags="SQLConnectionString, sql, Hidden" description="Automatically sets the connection string for the connection request." defaultValue="Data Source={Database Server};Initial Catalog=MASTER;User Id={Database Administrator};Password={Database Administrator Password}">
tags="SQLConnectionString, AdminConnectionString, Hidden, Validate" description="Automatically sets the connection string for the connection request." <parameterEntry type="ProviderPath" scope="dbfullsql" match="createlogin.sql" />
defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Administrator};Password={Database Administrator Password}">
<parameterEntry type="ProviderPath" scope="dbfullsql" match="install.sql" />
</parameter> </parameter>
<parameter name="Non-Admin Connection String SqlServer" <parameter name="Admin Connection String SqlServer2" tags="SQLConnectionString, SQL, Hidden" description="Automatically sets the connection string for the connection request." defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Administrator};Password={Database Administrator Password}">
tags="SQLConnectionString, UserConnectionString, Hidden" description="Automatically sets the connection string for the connection request." <parameterEntry type="ProviderPath" scope="dbfullsql" match="createuser.sql" />
defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Username};Password={Database Password}">
</parameter> </parameter>
<parameter name="Orchard Connection String" friendlyName="Orchard Connection String" description="Orchard SQL Data Connection String Setting" defaultValue="" tags="Sql, SqlCE, SingleLineConnectionString, Hidden"> <parameter name="Orchard Connection String" friendlyName="Orchard Connection String" description="Orchard SQL Data Connection String Setting" defaultValue="" tags="Sql, SqlCE, SingleLineConnectionString, Hidden">
<parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="(?&lt;=\s*DataConnectionString:\s+)[^\s].*[^\r\n]" /> <parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="(?&lt;=\s*DataConnectionString:\s+)[^\s].*[^\r\n]" />

1038
src/Orchard.Azure/.vs/config/applicationhost.config Normal file
View File

File diff suppressed because it is too large Load Diff

3
src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
View File

@ -35,8 +35,9 @@
</PropertyGroup> </PropertyGroup>
<!-- Items for the project --> <!-- Items for the project -->
<ItemGroup> <ItemGroup>
<ServiceConfiguration Include="ServiceConfiguration.Local.cscfg" />
<ServiceDefinition Include="ServiceDefinition.csdef" /> <ServiceDefinition Include="ServiceDefinition.csdef" />
<ServiceConfiguration Include="ServiceConfiguration.cscfg" /> <ServiceConfiguration Include="ServiceConfiguration.Cloud.cscfg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Orchard.Azure.Web\Orchard.Azure.Web.csproj"> <ProjectReference Include="..\Orchard.Azure.Web\Orchard.Azure.Web.csproj">

0
src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg → src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
View File

21
src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Local.cscfg Normal file
View File

@ -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="{&quot;caches&quot;:[{&quot;name&quot;:&quot;default&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:10,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;SessionStateCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:60,&quot;isExpirable&quot;:true,&quot;type&quot;:2},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;OutputCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;DatabaseCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;: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>

31
src/Orchard.Azure/Orchard.Azure.CloudService/ecf/Orchard.Azure.WebContent/diagnostics.wadcfgx Normal file
View File

@ -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>

176
src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config
View File

@ -1,98 +1,110 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<HostComponents> <HostComponents>
<Components> <Components>
<Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator"> <Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator">
<Properties> <Properties>
<!-- Set Value="true" to disable new extensions monitoring --> <!-- Set Value="true" to disable new extensions monitoring -->
<Property Name="Disabled" Value="true"/> <Property Name="Disabled" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser"> <Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser">
<Properties> <Properties>
<!-- Set Value="true" to disable Placement files monitoring (Placement.info) --> <!-- Set Value="true" to disable Placement files monitoring (Placement.info) -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy"> <Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy">
<Properties> <Properties>
<!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) --> <!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester"> <Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester">
<Properties> <Properties>
<!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) --> <!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser"> <Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser">
<Properties> <Properties>
<!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) --> <!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader"> <Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader">
<Properties> <Properties>
<!-- Set Value="true" to disable source files monitoring --> <!-- Set Value="true" to disable source files monitoring -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
<!-- Set Value="true" to completely disable the Dynamic Extension Loader --> <!-- Set Value="true" to completely disable the Dynamic Extension Loader -->
<Property Name="Disabled" Value="true"/> <Property Name="Disabled" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader"> <Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader">
<Properties> <Properties>
<!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) --> <!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) -->
<Property Name="DisableMonitoring" Value="false"/> <Property Name="DisableMonitoring" Value="false"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder"> <Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder">
<Properties> <Properties>
<!-- Set Value="true" to disable the dependencies folder monitoring --> <!-- Set Value="true" to disable the dependencies folder monitoring -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager"> <Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager">
<Properties> <Properties>
<!-- Set Value="true" to disable compiled dependencides files monitoring --> <!-- Set Value="true" to disable compiled dependencides files monitoring -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager"> <Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager">
<Properties> <Properties>
<!-- Set Value="true" to disable localization files monitoring (*.po) --> <!-- Set Value="true" to disable localization files monitoring (*.po) -->
<Property Name="DisableMonitoring" Value="true"/> <Property Name="DisableMonitoring" Value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Caching.DefaultParallelCacheContext"> <Component Type="Orchard.Caching.DefaultParallelCacheContext">
<Properties> <Properties>
<!-- Set Value="true" to disable parallel cache resolution --> <!-- Set Value="true" to disable parallel cache resolution -->
<Property Name="Disabled" Value="false"/> <Property Name="Disabled" Value="false"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Data.SessionConfigurationCache"> <Component Type="Orchard.Data.SessionConfigurationCache">
<Properties> <Properties>
<!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. --> <!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. -->
<Property Name="Disabled" Value="false"/> <Property Name="Disabled" Value="false"/>
</Properties> </Properties>
</Component> </Component>
<Component Type="Orchard.Alias.Implementation.Updater"> <Component Type="Orchard.Environment.Descriptor.ShellDescriptorCache">
<Properties> <Properties>
<Property Name="Disabled" Value="false"/> <!-- Set Value="true" to disable shell descriptors cache (cache.dat). Recommended when using multiple instances. -->
</Properties> <Property Name="Disabled" Value="true"/>
</Component> </Properties>
</Component>
</Components>
<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> </HostComponents>

61
src/Orchard.Azure/Orchard.Azure.Web/Config/Sites.config
View File

@ -1,31 +1,50 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<configuration> <configuration>
<configSections> <configSections>
<section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/> <section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/>
</configSections> </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 where {tenant} is the technical name of the targetted tenant
Allowed scopes: per-dependency, single-instance or per-lifetime-scope
--> -->
<components> <components>
<!-- <!--
Uncomment to use ReadUncommitted as the default isolation level. Please not that Uncomment to use ReadUncommitted as the default isolation level. Please not that
Sql Server Ce doesn't support ReadUncommitted. 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>
</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>

6
src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
View File

@ -20,7 +20,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<UseGlobalApplicationHostFile>true</UseGlobalApplicationHostFile> <UseGlobalApplicationHostFile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -91,11 +91,11 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Configuration.dll</HintPath> <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.dll</HintPath> <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath> <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>

4
src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.Profile/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.Specs/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.Tests/Properties/AssemblyInfo.cs
View File

@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
View File

@ -32,8 +32,8 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]
// Enable web application to call this assembly in Full Trust // Enable web application to call this assembly in Full Trust
[assembly: AllowPartiallyTrustedCallers] [assembly: AllowPartiallyTrustedCallers]

4
src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
View File

@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Core/Common/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The common module introduces content parts that are going to be used by most content types (common, body, identity). Description: The common module introduces content parts that are going to be used by most content types (common, body, identity).
FeatureDescription: Core content parts. FeatureDescription: Core content parts.

2
src/Orchard.Web/Core/Containers/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The containers module introduces container and containable behaviors for content items. 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. FeatureDescription: Container and containable parts to enable parent-child relationships between content items.

2
src/Orchard.Web/Core/Contents/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The contents module enables the creation of custom content types. Description: The contents module enables the creation of custom content types.
Features: Features:

2
src/Orchard.Web/Core/Dashboard/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application. Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application.
FeatureDescription: Standard admin dashboard. FeatureDescription: Standard admin dashboard.

2
src/Orchard.Web/Core/Feeds/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The Feeds module is providing RSS feeds to content items. Description: The Feeds module is providing RSS feeds to content items.
FeatureDescription: RSS feeds for content items. FeatureDescription: RSS feeds for content items.

2
src/Orchard.Web/Core/Navigation/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 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. 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. FeatureDescription: Menu management.

4
src/Orchard.Web/Core/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Core/Reports/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The dashboard module is providing the reports screen of the application. Description: The dashboard module is providing the reports screen of the application.
FeatureDescription: Reports management. FeatureDescription: Reports management.

2
src/Orchard.Web/Core/Scheduling/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The scheduling module enables background task scheduling. Description: The scheduling module enables background task scheduling.
FeatureDescription: Scheduled background tasks. FeatureDescription: Scheduled background tasks.

2
src/Orchard.Web/Core/Settings/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The settings module creates site settings that other modules can contribute to. Description: The settings module creates site settings that other modules can contribute to.
FeatureDescription: Site settings. FeatureDescription: Site settings.

2
src/Orchard.Web/Core/Shapes/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The shapes module contains core shape templates and display hooks. Description: The shapes module contains core shape templates and display hooks.
FeatureDescription: Core shape templates and display hooks. FeatureDescription: Core shape templates and display hooks.

2
src/Orchard.Web/Core/Title/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The title module enables content items to have titles. Description: The title module enables content items to have titles.
FeatureDescription: Title content part. FeatureDescription: Title content part.

2
src/Orchard.Web/Core/XmlRpc/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter. Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter.
FeatureDescription: XML-RPC opt-in implementation. FeatureDescription: XML-RPC opt-in implementation.

2
src/Orchard.Web/Modules/Lucene/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 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. 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. FeatureDescription: Lucene indexing services.

4
src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Markdown/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The Markdown module enables rich text contents to be created using the Markdown syntax. Description: The Markdown module enables rich text contents to be created using the Markdown syntax.
FeatureDescription: Markdown editor. FeatureDescription: Markdown editor.

4
src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs
View File

@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Alias/Module.txt
View File

@ -2,7 +2,7 @@ Name: Alias
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Maps friendly urls to specific module actions. Description: Maps friendly urls to specific module actions.
FeatureDescription: Maps friendly urls to specific module actions. FeatureDescription: Maps friendly urls to specific module actions.

4
src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
View File

@ -2,7 +2,7 @@ Name: AntiSpam
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides anti-spam services to protect your content from malicious submissions. Description: Provides anti-spam services to protect your content from malicious submissions.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs
View File

@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
View File

@ -3,7 +3,7 @@ Path: ArchiveLater
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The ArchiveLater module introduces scheduled archiving functionality. Description: The ArchiveLater module introduces scheduled archiving functionality.
FeatureDescription: Scheduled archiving. FeatureDescription: Scheduled archiving.

4
src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides a log for recording and viewing back-end changes. Description: Provides a log for recording and viewing back-end changes.
Features: Features:

2
src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt
View File

@ -2,7 +2,7 @@ Name: Autoroute
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Description for the module Description: Description for the module
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: Microsoft Open Technologies, Inc Author: Microsoft Open Technologies, Inc
Website: http://msopentech.com Website: http://msopentech.com
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides integration of Microsoft Azure Media Services functionality into Orchard. Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
Features: Features:

1
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
View File

@ -89,7 +89,6 @@
<HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll</HintPath> <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.WindowsAzure.Storage"> <Reference Include="Microsoft.WindowsAzure.Storage">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Storage.dll</HintPath> <HintPath>..\..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Storage.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">

4
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs
View File

@ -32,6 +32,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

8
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
View File

@ -45,7 +45,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Spatial" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/> <assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
@ -57,15 +57,15 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>

2
src/Orchard.Web/Modules/Orchard.Azure/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides a set of Orchard service implementations targeting Microsoft Azure services. Description: Provides a set of Orchard service implementations targeting Microsoft Azure services.
Category: Hosting Category: Hosting

4
src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
View File

@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
View File

@ -2,11 +2,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.Azure;
using Orchard.Azure.Services.FileSystems; using Orchard.Azure.Services.FileSystems;
using Orchard.Environment.Configuration; using Orchard.Environment.Configuration;
using Orchard.FileSystems.Media; using Orchard.FileSystems.Media;
using Orchard.Logging; using Orchard.Logging;
using Microsoft.Azure;
namespace Orchard.Azure.Services.Environment.Configuration namespace Orchard.Azure.Services.Environment.Configuration
{ {

4
src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
View File

@ -1,6 +1,6 @@
using Microsoft.Azure; using System.Configuration;
using System.Configuration;
using System; using System;
using Microsoft.Azure;
namespace Orchard.Azure.Services.Environment.Configuration { namespace Orchard.Azure.Services.Environment.Configuration {

8
src/Orchard.Web/Modules/Orchard.Azure/Web.config
View File

@ -41,7 +41,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Spatial" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/> <assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
@ -53,15 +53,15 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/> <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>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>

2
src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The Orchard Blogs module is implementing basic blogging features. Description: The Orchard Blogs module is implementing basic blogging features.
FeatureDescription: A simple web log. FeatureDescription: A simple web log.

4
src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
View File

@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Caching/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: Sébastien Ros Author: Sébastien Ros
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides an API to cache business data. Description: Provides an API to cache business data.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
View File

@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Tools to create Orchard components. Description: Tools to create Orchard components.
FeatureDescription: Tools to create Orchard components. FeatureDescription: Tools to create Orchard components.

4
src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Comments/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service. Description: The comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
View File

@ -2,7 +2,7 @@ Name: Orchard.ContentPermissions
AntiForgery: enabled AntiForgery: enabled
Author: Chris Pyle, Sébastien Ros Author: Chris Pyle, Sébastien Ros
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Allows item-level front end view permissions. Description: Allows item-level front end view permissions.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
View File

@ -2,7 +2,7 @@ Name: Orchard.ContentPicker
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardcontentpicker.codeplex.com Website: http://orchardcontentpicker.codeplex.com
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: UI for selecting Content Items. Description: UI for selecting Content Items.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
View File

@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: ContentTypes modules enables the creation and alteration of content types not based on code. Description: ContentTypes modules enables the creation and alteration of content types not based on code.
Dependencies: Contents Dependencies: Contents

4
src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
View File

@ -2,7 +2,7 @@ Name: Custom Forms
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardcustomforms.codeplex.com Website: http://orchardcustomforms.codeplex.com
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
LifecycleStatus: Deprecated LifecycleStatus: Deprecated
Description: Create custom forms like contact forms or content contributions. Description: Create custom forms like contact forms or content contributions.

4
src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Contains designer tools to ease the Themes development process Description: Contains designer tools to ease the Themes development process
FeatureName: Shape Tracing FeatureName: Shape Tracing

4
src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
View File

@ -2,7 +2,7 @@ Name: Dynamic Forms
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://www.orchardproject.net/ Website: http://www.orchardproject.net/
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Create custom forms like contact forms using layouts. Description: Create custom forms like contact forms using layouts.
Features: Features:

2
src/Orchard.Web/Modules/Orchard.Email/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The Email Messaging module adds Email sending functionalities. Description: The Email Messaging module adds Email sending functionalities.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Fields/Module.txt
View File

@ -2,7 +2,7 @@ Name: Fields
AntiForgery: enabled AntiForgery: enabled
Author: Antoine Griffard, Sébastien Ros Author: Antoine Griffard, Sébastien Ros
Website: http://orchardfields.codeplex.com Website: http://orchardfields.codeplex.com
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Some content fields Description: Some content fields
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Forms/Module.txt
View File

@ -2,7 +2,7 @@ Name: Forms
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardforms.codeplex.com Website: http://orchardforms.codeplex.com
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides a system to publish and alter html forms. Description: Provides a system to publish and alter html forms.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Forms/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.ImageEditor/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Adds a client side image editor for Media Library Description: Adds a client side image editor for Media Library
Features: Features:

4
src/Orchard.Web/Modules/Orchard.ImageEditor/Properties/AssemblyInfo.cs
View File

@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
View File

@ -3,7 +3,7 @@ Path: ImportExport
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Provides content item data import and export capability. Description: Provides content item data import and export capability.
Features: Features:
@ -11,4 +11,4 @@ Features:
Name: Import Export Name: Import Export
Description: Imports and exports content item data. Description: Imports and exports content item data.
Category: Content Category: Content
Dependencies: Orchard.jQuery, Orchard.Recipes, Orchard.Setup.Services Dependencies: Orchard.jQuery, Orchard.Recipes, Orchard.Setup.Services

4
src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Indexing/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The Indexing module enables the site to be indexed. 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. Description: The Indexing module enables the site to be indexed. 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: Indexing infrastructure. Requires an index implementation like the Lucene module. FeatureDescription: Indexing infrastructure. Requires an index implementation like the Lucene module.

4
src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: This module provides a jobs queue to process jobs asynchronously. Description: This module provides a jobs queue to process jobs asynchronously.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs
View File

@ -31,6 +31,6 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

10
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
View File

@ -92,7 +92,15 @@ namespace Orchard.Layouts.Drivers {
return ContentShape("Parts_Layout_Edit", () => { return ContentShape("Parts_Layout_Edit", () => {
if (part.Id == 0 && String.IsNullOrWhiteSpace(part.LayoutData)) { if (part.Id == 0 && String.IsNullOrWhiteSpace(part.LayoutData)) {
part.LayoutData = part.TypePartDefinition.Settings.GetModel<LayoutTypePartSettings>().DefaultLayoutData;
// If the default layout setting is left empty, use the one from the service
if (String.IsNullOrWhiteSpace(settings.DefaultLayoutData)) {
var defaultData = _serializer.Serialize(_layoutManager.CreateDefaultLayout());
part.LayoutData = defaultData;
}
else {
part.LayoutData = settings.DefaultLayoutData;
}
} }
var viewModel = new LayoutPartViewModel { var viewModel = new LayoutPartViewModel {

2
src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
View File

@ -21,7 +21,7 @@ namespace Orchard.Layouts.Elements {
} }
public int? Width { public int? Width {
get { return this.Retrieve<int?>("Width") ?? this.Retrieve<int?>("ColumnSpan") ?? 0; } // Falling back on "ColumnSpan" for backward compatibility. get { return this.Retrieve<int?>("Width") ?? this.Retrieve<int?>("ColumnSpan") ?? 12; } // Falling back on "ColumnSpan" for backward compatibility.
set { this.Store(x => x.Width, value); } set { this.Store(x => x.Width, value); }
} }

7
src/Orchard.Web/Modules/Orchard.Layouts/Models/ElementSessionState.cs
View File

@ -1,9 +1,12 @@
using System;
namespace Orchard.Layouts.Models { namespace Orchard.Layouts.Models {
public class ElementSessionState {  [Serializable]
public class ElementSessionState {
public string TypeName { get; set; } public string TypeName { get; set; }
public string ElementData { get; set; } public string ElementData { get; set; }
public string ElementEditorData { get; set; } public string ElementEditorData { get; set; }
public int? ContentId { get; set; } public int? ContentId { get; set; }
public string ContentType { get; set; } public string ContentType { get; set; }
} }
} }

2
src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
View File

@ -10,7 +10,7 @@ Features:
Orchard.Layouts: Orchard.Layouts:
Name: Layouts Name: Layouts
Description: Provides tools to create layouts. Description: Provides tools to create layouts.
Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, TinyMce, Orchard.Widgets Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, Orchard.Widgets
Category: Layout Category: Layout
Orchard.Layouts.Snippets: Orchard.Layouts.Snippets:
Name: Layout Snippets Name: Layout Snippets

7
src/Orchard.Web/Modules/Orchard.Layouts/Settings/LayoutSettingsHooks.cs
View File

@ -22,12 +22,7 @@ namespace Orchard.Layouts.Settings {
yield break; yield break;
var model = definition.Settings.GetModel<LayoutTypePartSettings>(); var model = definition.Settings.GetModel<LayoutTypePartSettings>();
if (String.IsNullOrWhiteSpace(model.DefaultLayoutData)) {
var defaultData = _serializer.Serialize(_layoutManager.CreateDefaultLayout());
model.DefaultLayoutData = defaultData;
}
yield return DefinitionTemplate(model); yield return DefinitionTemplate(model);
} }

1
src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
View File

@ -17,7 +17,6 @@
Script.Require("jQueryUI_Resizable"); Script.Require("jQueryUI_Resizable");
Script.Require("jQueryUI_Position"); Script.Require("jQueryUI_Position");
Script.Require("jQueryUI_Dialog"); Script.Require("jQueryUI_Dialog");
Script.Require("TinyMce");
Script.Require("Layouts.LayoutEditor"); Script.Require("Layouts.LayoutEditor");
Script.Include("jquery.deserialize.js"); Script.Include("jquery.deserialize.js");

2
src/Orchard.Web/Modules/Orchard.Lists/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: Introduces a preconfigured container-enabled content type. Description: Introduces a preconfigured container-enabled content type.
FeatureDescription: A basic container-enabled content type. FeatureDescription: A basic container-enabled content type.

4
src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

2
src/Orchard.Web/Modules/Orchard.Localization/Module.txt
View File

@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.9.1 Version: 1.9.2
OrchardVersion: 1.9 OrchardVersion: 1.9
Description: The localization module enables the localization of content items. Description: The localization module enables the localization of content items.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs
View File

@ -31,6 +31,6 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

4
src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
View File

@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.9.1")] [assembly: AssemblyVersion("1.9.2")]
[assembly: AssemblyFileVersion("1.9.1")] [assembly: AssemblyFileVersion("1.9.2")]

Some files were not shown because too many files have changed in this diff Show More