Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tusmester
tusmester committed Jul 4, 2018
2 parents f73086c + 1b03bdc commit eed1e86
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 79 deletions.
2 changes: 1 addition & 1 deletion src/WebPages/Portlets/PortletState.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class PortletState

public PortletState()
{
throw new SenseNet.ContentRepository.Storage.SnNotSupportedException();
throw new SnNotSupportedException();
}

public PortletState(PortletBase portlet)
Expand Down
6 changes: 3 additions & 3 deletions src/WebPages/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
[assembly: AssemblyProduct("sensenet ECM")]
[assembly: AssemblyTrademark("Sense/Net Inc.")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("7.1.0.0")]
[assembly: AssemblyFileVersion("7.1.0.0")]
[assembly: AssemblyInformationalVersion("7.1.0")]
[assembly: AssemblyVersion("7.2.0.0")]
[assembly: AssemblyFileVersion("7.2.0.0")]
[assembly: AssemblyInformationalVersion("7.2.0")]

[assembly: ComVisible(false)]
[assembly: Guid("7c7cd205-75ad-4c99-b745-9b1a6b724be9")]
Expand Down
14 changes: 7 additions & 7 deletions src/WebPages/WebPages.Install.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<package >
<metadata>
<id>SenseNet.WebPages.Install</id>
<version>7.1.0</version>
<title>sensenet ECM WebPages Install package</title>
<authors>kavics,aniko,laci,borsi,lajos,tusmester</authors>
<version>7.2.0</version>
<title>sensenet WebPages Install package</title>
<authors>kavics,aniko,lajos,tusmester</authors>
<owners>Sense/Net</owners>
<licenseUrl>https://github.com/SenseNet/sn-webpages/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/SenseNet/sn-webpages</projectUrl>
<iconUrl>https://raw.githubusercontent.com/SenseNet/sn-resources/master/images/sn-icon/sensenet-icon-64.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>sensenet ECM WebPages Installer contains the install content for the UI layer built on well-known ASP.NET WebForms technologies like pages, webparts and ascx views. This package contains installation items and should be installed only in a single web project. All other projects should reference the SenseNet.WebPages dll-only package.</description>
<description>sensenet WebPages Installer contains the install content for the UI layer built on well-known ASP.NET WebForms technologies like pages, webparts and ascx views. This package contains installation items and should be installed only in a single web project. All other projects should reference the SenseNet.WebPages dll-only package.</description>
<copyright>Copyright © Sense/Net Inc.</copyright>
<tags>sensenet ecm ecms</tags>
<tags>sensenet ecm ecms web page</tags>
<dependencies>
<dependency id="SenseNet.Services.Install" version="7.1.0" />
<dependency id="SenseNet.WebPages" version="7.1.0" />
<dependency id="SenseNet.Services.Install" version="7.2.0" />
<dependency id="SenseNet.WebPages" version="7.2.0" />
<dependency id="SenseNet.SnAdmin" version="1.4.4" />
<dependency id="Microsoft.AspNet.SignalR.Client" version="2.2.2" />
<dependency id="Microsoft.AspNet.SignalR.Core" version="2.2.2" />
Expand Down
100 changes: 59 additions & 41 deletions src/WebPages/WebPages.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SenseNet.WebPages</RootNamespace>
<AssemblyName>SenseNet.WebPages</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -44,13 +44,13 @@
<Private>True</Private>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\ICSharpCode.SharpZipLib.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip, Version=1.8.4.28, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Ionic.Zip.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="itextsharp, Version=4.1.6.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\itextsharp.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\itextsharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Client.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
Expand All @@ -61,7 +61,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Exchange.WebServices, Version=14.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Exchange.WebServices.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Exchange.WebServices.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=1.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Logging.1.1.3\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
Expand All @@ -80,32 +80,31 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Common, Version=5.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.EnterpriseLibrary.Common.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.EnterpriseLibrary.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Data, Version=5.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.EnterpriseLibrary.Data.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.EnterpriseLibrary.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Logging, Version=5.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.EnterpriseLibrary.Logging.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.EnterpriseLibrary.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Logging.Database, Version=5.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.EnterpriseLibrary.Logging.Database.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.EnterpriseLibrary.Logging.Database.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.ServiceLocation.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.Unity.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.Unity.Configuration.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.Unity.Configuration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity.Interception, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\Microsoft.Practices.Unity.Interception.dll</HintPath>
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\Microsoft.Practices.Unity.Interception.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="OpenPop, Version=2.0.6.1120, Culture=neutral, PublicKeyToken=6bdb97f144b7efc8, processorArchitecture=MSIL">
<HintPath>..\packages\OpenPop.NET.2.0.6.1120\lib\net40\OpenPop.dll</HintPath>
Expand All @@ -114,60 +113,79 @@
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SenseNet.BlobStorage, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.BlobStorage.7.1.0\lib\net451\SenseNet.BlobStorage.dll</HintPath>
<Reference Include="SenseNet.BlobStorage, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.BlobStorage.7.2.0\lib\net461\SenseNet.BlobStorage.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Common.7.1.0\lib\net451\SenseNet.Common.dll</HintPath>
<Reference Include="SenseNet.Common, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Common.7.2.0\lib\netstandard2.0\SenseNet.Common.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Configuration, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\SenseNet.Configuration.dll</HintPath>
<Reference Include="SenseNet.Configuration, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\SenseNet.Configuration.dll</HintPath>
</Reference>
<Reference Include="SenseNet.ContentRepository, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\SenseNet.ContentRepository.dll</HintPath>
<Reference Include="SenseNet.ContentRepository, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\SenseNet.ContentRepository.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Preview, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Preview.7.0.0\lib\net451\SenseNet.Preview.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Search, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\SenseNet.Search.dll</HintPath>
<Reference Include="SenseNet.Search, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Search.2.0.0\lib\netstandard2.0\SenseNet.Search.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Security, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Security.2.3.0.0\lib\net45\SenseNet.Security.dll</HintPath>
<Private>True</Private>
<Reference Include="SenseNet.Security, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Security.3.0.0\lib\netstandard2.0\SenseNet.Security.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Security.EF6SecurityStore, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Security.EF6SecurityStore.2.3.0.0\lib\net45\SenseNet.Security.EF6SecurityStore.dll</HintPath>
<Private>True</Private>
<Reference Include="SenseNet.Security.EF6SecurityStore, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Security.EF6SecurityStore.3.0.0\lib\net461\SenseNet.Security.EF6SecurityStore.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Services, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\SenseNet.Services.dll</HintPath>
<Reference Include="SenseNet.Services, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\SenseNet.Services.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Storage, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\SenseNet.Storage.dll</HintPath>
<Reference Include="SenseNet.Storage, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\SenseNet.Storage.dll</HintPath>
</Reference>
<Reference Include="SenseNet.TaskManagement.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.TaskManagement.Core.1.1.0.0\lib\net45\SenseNet.TaskManagement.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SenseNet.TokenAuthentication, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.1.0\lib\net451\SenseNet.TokenAuthentication.dll</HintPath>
<Reference Include="SenseNet.TokenAuthentication, Version=7.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Services.7.2.0\lib\net461\SenseNet.TokenAuthentication.dll</HintPath>
</Reference>
<Reference Include="SenseNet.Tools, Version=2.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Tools.2.1.1\lib\net451\SenseNet.Tools.dll</HintPath>
<Private>True</Private>
<Reference Include="SenseNet.Tools, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SenseNet.Tools.3.0.0\lib\netstandard2.0\SenseNet.Tools.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.configuration" />
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.5.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Data.SqlClient, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SqlClient.4.5.1\lib\net461\System.Data.SqlClient.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.EventLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.EventLog.4.5.0\lib\net461\System.Diagnostics.EventLog.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.1.3\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Permissions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Ajax, Version=3.0.31106.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
22 changes: 11 additions & 11 deletions src/WebPages/WebPages.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<package >
<metadata>
<id>SenseNet.WebPages</id>
<version>7.1.0</version>
<title>sensenet ECM WebPages</title>
<authors>kavics,aniko,laci,borsi,lajos,tusmester</authors>
<version>7.2.0</version>
<title>sensenet WebPages</title>
<authors>kavics,aniko,lajos,tusmester</authors>
<owners>Sense/Net</owners>
<licenseUrl>https://github.com/SenseNet/sn-webpages/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/SenseNet/sn-webpages</projectUrl>
<iconUrl>https://raw.githubusercontent.com/SenseNet/sn-resources/master/images/sn-icon/sensenet-icon-64.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>sensenet ECM WebPages is the UI layer for sensenet ECM built using ASP.NET WebForms pages, webparts and controls.</description>
<description>sensenet WebPages is the UI layer for sensenet built using ASP.NET WebForms pages, webparts and controls.</description>
<copyright>Copyright © Sense/Net Inc.</copyright>
<tags>sensenet ecm ecms</tags>
<tags>sensenet ecm ecms web page</tags>
<dependencies>
<dependency id="SenseNet.Services" version="7.1.0" />
<dependency id="SenseNet.Tools" version="2.1.1" />
<dependency id="SenseNet.Services" version="7.2.0" />
<dependency id="SenseNet.Tools" version="3.0.0" />
<dependency id="Microsoft.AspNet.SignalR.Client" version="2.2.2" />
<dependency id="Microsoft.AspNet.SignalR.Core" version="2.2.2" />
<dependency id="Microsoft.Owin" version="2.1.0" />
Expand All @@ -24,9 +24,9 @@
</dependencies>
</metadata>
<files>
<file src="bin\Release\AjaxMin.*" target="lib\net451" />
<file src="bin\Release\System.Web.Ajax.*" target="lib\net451" />
<file src="bin\Release\SenseNet.WebPages.*" target="lib\net451" />
<file src="bin\Release\Microsoft.Web.Preview.*" target="lib\net451" />
<file src="bin\Release\AjaxMin.*" target="lib\net461" />
<file src="bin\Release\System.Web.Ajax.*" target="lib\net461" />
<file src="bin\Release\SenseNet.WebPages.*" target="lib\net461" />
<file src="bin\Release\Microsoft.Web.Preview.*" target="lib\net461" />
</files>
</package>
Loading

0 comments on commit eed1e86

Please sign in to comment.