Skip to content

Commit

Permalink
v9.1.5311-Beta
Browse files Browse the repository at this point in the history
  • Loading branch information
ITHitBuild committed Sep 19, 2019
1 parent a366b2a commit e557e23
Show file tree
Hide file tree
Showing 193 changed files with 5,512 additions and 1,878 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>35720A30-758F-4BD2-9A65-3F8254BABF6A</ProjectGuid>
<ProjectGuid>2CF8069A-3EC6-468B-9958-5E289E193706</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
Expand Down Expand Up @@ -124,13 +124,13 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ITHit.WebDAV.Server">
<HintPath>..\packages\ITHit.WebDAV.Server.9.0.1208-Beta\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
<HintPath>..\packages\ITHit.WebDAV.Server.9.1.5311-Beta\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
</Reference>
<Reference Include="ITHit.Server">
<HintPath>..\packages\ITHit.Server.9.0.1208-Beta\lib\net451\ITHit.Server.dll</HintPath>
<HintPath>..\packages\ITHit.Server.9.1.5311-Beta\lib\net451\ITHit.Server.dll</HintPath>
</Reference>
<Reference Include="ITHit.WebDAV.Server.Web">
<HintPath>..\packages\ITHit.WebDAV.Server.Web.9.0.1208-Beta\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
<Reference Include="ITHit.Server.Web">
<HintPath>..\packages\ITHit.Server.Web.9.1.5311-Beta\lib\net451\ITHit.Server.Web.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup>
Expand All @@ -148,7 +148,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>9658</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:15573/</IISUrl>
<IISUrl>http://localhost:15517/</IISUrl>
<NTLMAuthentication>True</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
Expand Down
4 changes: 2 additions & 2 deletions CS/CalDAVServer.FileSystemStorage.AspNet/DavContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace CalDAVServer.FileSystemStorage.AspNet
/// Resolves hierarchy items by paths.
/// </summary>
public class DavContext :
DavContextWebBaseAsync, IDisposable
ContextWebAsync<IHierarchyItemAsync>, IDisposable
{

/// <summary>
Expand Down Expand Up @@ -215,7 +215,7 @@ public DavContext(HttpContext httpContext) : base(httpContext)
/// </summary>
/// <param name="path">Item relative path including query string.</param>
/// <returns>Instance of corresponding <see cref="IHierarchyItemAsync"/> or null if item is not found.</returns>
public override async Task<IHierarchyItemBaseAsync> GetHierarchyItemAsync(string path)
public override async Task<IHierarchyItemAsync> GetHierarchyItemAsync(string path)
{
path = path.Trim(new[] { ' ', '/' });

Expand Down
2 changes: 1 addition & 1 deletion CS/CalDAVServer.FileSystemStorage.AspNet/DavFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public override async Task CopyToAsync(IItemCollectionAsync destFolder, string d
// If an item with the same name exists - remove it.
try
{
IHierarchyItemAsync item = await context.GetHierarchyItemAsync(targetPath) as IHierarchyItemAsync;
IHierarchyItemAsync item = await context.GetHierarchyItemAsync(targetPath);
if (item != null)
await item.DeleteAsync(multistatus);
}
Expand Down
4 changes: 2 additions & 2 deletions CS/CalDAVServer.FileSystemStorage.AspNet/DavFolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public virtual async Task<PageResults> GetChildrenAsync(IList<PropertyName> prop
foreach (FileSystemInfo fileInfo in fileInfos)
{
string childPath = Path + EncodeUtil.EncodeUrlPart(fileInfo.Name);
IHierarchyItemAsync child = await context.GetHierarchyItemAsync(childPath) as IHierarchyItemAsync;
IHierarchyItemAsync child = await context.GetHierarchyItemAsync(childPath);
if (child != null)
{
children.Add(child);
Expand Down Expand Up @@ -213,7 +213,7 @@ public override async Task MoveToAsync(IItemCollectionAsync destFolder, string d
try
{
// Remove item with the same name at destination if it exists.
IHierarchyItemAsync item = await context.GetHierarchyItemAsync(targetPath) as IHierarchyItemAsync;
IHierarchyItemAsync item = await context.GetHierarchyItemAsync(targetPath);
if (item != null)
await item.DeleteAsync(multistatus);

Expand Down
22 changes: 11 additions & 11 deletions CS/CalDAVServer.FileSystemStorage.AspNet/MyCustomGetHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ namespace CalDAVServer.FileSystemStorage.AspNet
/// <summary>
/// This handler processes GET and HEAD requests to folders returning custom HTML page.
/// </summary>
internal class MyCustomGetHandler : IMethodHandlerAsync
internal class MyCustomGetHandler : IMethodHandlerAsync<IHierarchyItemAsync>
{
/// <summary>
/// Handler for GET and HEAD request registered with the engine before registering this one.
/// We call this default handler to handle GET and HEAD for files, because this handler
/// only handles GET and HEAD for folders.
/// </summary>
public IMethodHandlerAsync OriginalHandler { get; set; }
public IMethodHandlerAsync<IHierarchyItemAsync> OriginalHandler { get; set; }

/// <summary>
/// Gets a value indicating whether output shall be buffered to calculate content length.
Expand Down Expand Up @@ -72,10 +72,10 @@ public MyCustomGetHandler(string contentRootPathFolder)
/// <summary>
/// Handles GET and HEAD request.
/// </summary>
/// <param name="context">Instace of <see cref="ContextBaseAsync"/>.</param>
/// <param name="context">Instace of <see cref="ContextAsync{IHierarchyItemAsync}"/>.</param>
/// <param name="item">Instance of <see cref="IHierarchyItemAsync"/> which was returned by
/// <see cref="ContextBaseAsync.GetHierarchyItemAsync"/> for this request.</param>
public async Task ProcessRequestAsync(ContextBaseAsync context, IHierarchyItemBaseAsync item)
/// <see cref="ContextAsync{IHierarchyItemAsync}.GetHierarchyItemAsync"/> for this request.</param>
public async Task ProcessRequestAsync(ContextAsync<IHierarchyItemAsync> context, IHierarchyItemAsync item)
{
string urlPath = context.Request.RawUrl.Substring(context.Request.ApplicationPath.TrimEnd('/').Length);

Expand Down Expand Up @@ -119,20 +119,20 @@ public async Task ProcessRequestAsync(ContextBaseAsync context, IHierarchyItemBa
/// this handler substitutes) shall be called for the item.
/// </summary>
/// <param name="item">Instance of <see cref="IHierarchyItemAsync"/> which was returned by
/// <see cref="ContextBaseAsync.GetHierarchyItemAsync"/> for this request.</param>
/// <see cref="ContextAsync{IHierarchyItemAsync}.GetHierarchyItemAsync"/> for this request.</param>
/// <returns>Returns <c>true</c> if this handler can handler this item.</returns>
public bool AppliesTo(IHierarchyItemBaseAsync item)
public bool AppliesTo(IHierarchyItemAsync item)
{
return item is IFolderAsync || OriginalHandler.AppliesTo(item);
}

/// <summary>
/// Writes iOS / OS X CalDAV/CardDAV profile.
/// </summary>
/// <param name="context">Instace of <see cref="ContextBaseAsync"/>.</param>
/// <param name="context">Instace of <see cref="ContextAsync{IHierarchyItemAsync}"/>.</param>
/// <param name="item">ICalendarFolderAsync or IAddressbookFolderAsync item.</param>
/// <returns></returns>
private async Task WriteProfileAsync(ContextBaseAsync context, IHierarchyItemBaseAsync item, string htmlPath)
private async Task WriteProfileAsync(ContextAsync<IHierarchyItemAsync> context, IHierarchyItemBaseAsync item, string htmlPath)
{
string mobileconfigFileName = null;
string decription = null;
Expand Down Expand Up @@ -180,10 +180,10 @@ private async Task WriteProfileAsync(ContextBaseAsync context, IHierarchyItemBas
/// <summary>
/// Signs iOS / OS X payload profile with SSL certificate.
/// </summary>
/// <param name="context">Instace of <see cref="ContextBaseAsync"/>.</param>
/// <param name="context">Instace of <see cref="ContextAsync{IHierarchyItemAsync}"/>.</param>
/// <param name="profile">Profile to sign.</param>
/// <returns>Signed profile.</returns>
private byte[] SignProfile(ContextBaseAsync context, string profile)
private byte[] SignProfile(ContextAsync<IHierarchyItemAsync> context, string profile)
{
// Here you will sign your profile with SSL certificate to avoid "Unsigned" warning on iOS and OS X.
// For demo purposes we just return the profile content unmodified.
Expand Down
6 changes: 3 additions & 3 deletions CS/CalDAVServer.FileSystemStorage.AspNet/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ITHit.Server" version="9.0.1208-Beta" targetFramework="net451" />
<package id="ITHit.WebDAV.Server" version="9.0.1208-Beta" targetFramework="net451" />
<package id="ITHit.WebDAV.Server.Web" version="9.0.1208-Beta" targetFramework="net451" />
<package id="ITHit.Server" version="9.1.5311-Beta" targetFramework="net451" />
<package id="ITHit.Server.Web" version="9.1.5311-Beta" targetFramework="net451" />
<package id="ITHit.WebDAV.Server" version="9.1.5311-Beta" targetFramework="net451" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
<package id="ITHit.Collab" version="1.0.0.732" targetFramework="net45" />
</packages>
Binary file modified CS/CalDAVServer.SqlStorage.AspNet/App_Data/WebDav/DB/WebDav.mdf
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>6E97A5B9-BB49-46F1-9CBD-89FDF0B1706E</ProjectGuid>
<ProjectGuid>D0DF5B52-9FF6-44EF-BD57-137F3831EECE</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
Expand Down Expand Up @@ -111,13 +111,13 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ITHit.WebDAV.Server">
<HintPath>..\packages\ITHit.WebDAV.Server.9.0.1208-Beta\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
<HintPath>..\packages\ITHit.WebDAV.Server.9.1.5311-Beta\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
</Reference>
<Reference Include="ITHit.Server">
<HintPath>..\packages\ITHit.Server.9.0.1208-Beta\lib\net451\ITHit.Server.dll</HintPath>
<HintPath>..\packages\ITHit.Server.9.1.5311-Beta\lib\net451\ITHit.Server.dll</HintPath>
</Reference>
<Reference Include="ITHit.WebDAV.Server.Web">
<HintPath>..\packages\ITHit.WebDAV.Server.Web.9.0.1208-Beta\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
<Reference Include="ITHit.Server.Web">
<HintPath>..\packages\ITHit.Server.Web.9.1.5311-Beta\lib\net451\ITHit.Server.Web.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup>
Expand All @@ -135,7 +135,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>9658</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:1980/</IISUrl>
<IISUrl>http://localhost:41652/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
Expand Down
4 changes: 2 additions & 2 deletions CS/CalDAVServer.SqlStorage.AspNet/DavContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace CalDAVServer.SqlStorage.AspNet
/// varios items from database.
/// </summary>
public class DavContext :
DavContextWebBaseAsync
ContextWebAsync<IHierarchyItemAsync>
, IDisposable
{
/// <summary>
Expand Down Expand Up @@ -72,7 +72,7 @@ public DavContext(HttpContext context) : base(context)
/// </summary>
/// <param name="path">Relative path to the item including query string.</param>
/// <returns><see cref="IHierarchyItem"/> instance if item is found, <c>null</c> otherwise.</returns>
public override async Task<IHierarchyItemBaseAsync> GetHierarchyItemAsync(string path)
public override async Task<IHierarchyItemAsync> GetHierarchyItemAsync(string path)
{
path = path.Trim(new[] { ' ', '/' });

Expand Down
22 changes: 11 additions & 11 deletions CS/CalDAVServer.SqlStorage.AspNet/MyCustomGetHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ namespace CalDAVServer.SqlStorage.AspNet
/// <summary>
/// This handler processes GET and HEAD requests to folders returning custom HTML page.
/// </summary>
internal class MyCustomGetHandler : IMethodHandlerAsync
internal class MyCustomGetHandler : IMethodHandlerAsync<IHierarchyItemAsync>
{
/// <summary>
/// Handler for GET and HEAD request registered with the engine before registering this one.
/// We call this default handler to handle GET and HEAD for files, because this handler
/// only handles GET and HEAD for folders.
/// </summary>
public IMethodHandlerAsync OriginalHandler { get; set; }
public IMethodHandlerAsync<IHierarchyItemAsync> OriginalHandler { get; set; }

/// <summary>
/// Gets a value indicating whether output shall be buffered to calculate content length.
Expand Down Expand Up @@ -72,10 +72,10 @@ public MyCustomGetHandler(string contentRootPathFolder)
/// <summary>
/// Handles GET and HEAD request.
/// </summary>
/// <param name="context">Instace of <see cref="ContextBaseAsync"/>.</param>
/// <param name="context">Instace of <see cref="ContextAsync{IHierarchyItemAsync}"/>.</param>
/// <param name="item">Instance of <see cref="IHierarchyItemAsync"/> which was returned by
/// <see cref="ContextBaseAsync.GetHierarchyItemAsync"/> for this request.</param>
public async Task ProcessRequestAsync(ContextBaseAsync context, IHierarchyItemBaseAsync item)
/// <see cref="ContextAsync{IHierarchyItemAsync}.GetHierarchyItemAsync"/> for this request.</param>
public async Task ProcessRequestAsync(ContextAsync<IHierarchyItemAsync> context, IHierarchyItemAsync item)
{
string urlPath = context.Request.RawUrl.Substring(context.Request.ApplicationPath.TrimEnd('/').Length);

Expand Down Expand Up @@ -119,20 +119,20 @@ public async Task ProcessRequestAsync(ContextBaseAsync context, IHierarchyItemBa
/// this handler substitutes) shall be called for the item.
/// </summary>
/// <param name="item">Instance of <see cref="IHierarchyItemAsync"/> which was returned by
/// <see cref="ContextBaseAsync.GetHierarchyItemAsync"/> for this request.</param>
/// <see cref="ContextAsync{IHierarchyItemAsync}.GetHierarchyItemAsync"/> for this request.</param>
/// <returns>Returns <c>true</c> if this handler can handler this item.</returns>
public bool AppliesTo(IHierarchyItemBaseAsync item)
public bool AppliesTo(IHierarchyItemAsync item)
{
return item is IFolderAsync || OriginalHandler.AppliesTo(item);
}

/// <summary>
/// Writes iOS / OS X CalDAV/CardDAV profile.
/// </summary>
/// <param name="context">Instace of <see cref="ContextBaseAsync"/>.</param>
/// <param name="context">Instace of <see cref="ContextAsync{IHierarchyItemAsync}"/>.</param>
/// <param name="item">ICalendarFolderAsync or IAddressbookFolderAsync item.</param>
/// <returns></returns>
private async Task WriteProfileAsync(ContextBaseAsync context, IHierarchyItemBaseAsync item, string htmlPath)
private async Task WriteProfileAsync(ContextAsync<IHierarchyItemAsync> context, IHierarchyItemBaseAsync item, string htmlPath)
{
string mobileconfigFileName = null;
string decription = null;
Expand Down Expand Up @@ -180,10 +180,10 @@ private async Task WriteProfileAsync(ContextBaseAsync context, IHierarchyItemBas
/// <summary>
/// Signs iOS / OS X payload profile with SSL certificate.
/// </summary>
/// <param name="context">Instace of <see cref="ContextBaseAsync"/>.</param>
/// <param name="context">Instace of <see cref="ContextAsync{IHierarchyItemAsync}"/>.</param>
/// <param name="profile">Profile to sign.</param>
/// <returns>Signed profile.</returns>
private byte[] SignProfile(ContextBaseAsync context, string profile)
private byte[] SignProfile(ContextAsync<IHierarchyItemAsync> context, string profile)
{
// Here you will sign your profile with SSL certificate to avoid "Unsigned" warning on iOS and OS X.
// For demo purposes we just return the profile content unmodified.
Expand Down
6 changes: 3 additions & 3 deletions CS/CalDAVServer.SqlStorage.AspNet/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ITHit.Server" version="9.0.1208-Beta" targetFramework="net451" />
<package id="ITHit.WebDAV.Server" version="9.0.1208-Beta" targetFramework="net451" />
<package id="ITHit.WebDAV.Server.Web" version="9.0.1208-Beta" targetFramework="net451" />
<package id="ITHit.Server" version="9.1.5311-Beta" targetFramework="net451" />
<package id="ITHit.Server.Web" version="9.1.5311-Beta" targetFramework="net451" />
<package id="ITHit.WebDAV.Server" version="9.1.5311-Beta" targetFramework="net451" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
<package id="ITHit.Collab" version="1.0.0.732" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>1DB9602A-E8E1-4F2F-864E-429A6B8FC5B0</ProjectGuid>
<ProjectGuid>1E9D7E99-F862-4174-BEB3-44F210645826</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
Expand Down Expand Up @@ -121,13 +121,13 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ITHit.WebDAV.Server">
<HintPath>..\packages\ITHit.WebDAV.Server.9.0.1208-Beta\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
<HintPath>..\packages\ITHit.WebDAV.Server.9.1.5311-Beta\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
</Reference>
<Reference Include="ITHit.Server">
<HintPath>..\packages\ITHit.Server.9.0.1208-Beta\lib\net451\ITHit.Server.dll</HintPath>
<HintPath>..\packages\ITHit.Server.9.1.5311-Beta\lib\net451\ITHit.Server.dll</HintPath>
</Reference>
<Reference Include="ITHit.WebDAV.Server.Web">
<HintPath>..\packages\ITHit.WebDAV.Server.Web.9.0.1208-Beta\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
<Reference Include="ITHit.Server.Web">
<HintPath>..\packages\ITHit.Server.Web.9.1.5311-Beta\lib\net451\ITHit.Server.Web.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup>
Expand All @@ -145,7 +145,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>9658</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:48636/</IISUrl>
<IISUrl>http://localhost:39187/</IISUrl>
<NTLMAuthentication>True</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
Expand Down
4 changes: 2 additions & 2 deletions CS/CardDAVServer.FileSystemStorage.AspNet/DavContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace CardDAVServer.FileSystemStorage.AspNet
/// Resolves hierarchy items by paths.
/// </summary>
public class DavContext :
DavContextWebBaseAsync, IDisposable
ContextWebAsync<IHierarchyItemAsync>, IDisposable
{

/// <summary>
Expand Down Expand Up @@ -215,7 +215,7 @@ public DavContext(HttpContext httpContext) : base(httpContext)
/// </summary>
/// <param name="path">Item relative path including query string.</param>
/// <returns>Instance of corresponding <see cref="IHierarchyItemAsync"/> or null if item is not found.</returns>
public override async Task<IHierarchyItemBaseAsync> GetHierarchyItemAsync(string path)
public override async Task<IHierarchyItemAsync> GetHierarchyItemAsync(string path)
{
path = path.Trim(new[] { ' ', '/' });

Expand Down
Loading

0 comments on commit e557e23

Please sign in to comment.