Skip to content

Commit cecb9e5

Browse files
ITHitBuildITHitBuild
committed
v15.0.13942-Beta
1 parent c99d86e commit cecb9e5

File tree

259 files changed

+2556
-868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+2556
-868
lines changed

‎CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDAVServer.FileSystemStorage.AspNetCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<VersionPrefix>14.1.13942</VersionPrefix>
4+
<VersionPrefix>15.0.13942-Beta</VersionPrefix>
55
<AssemblyName>CalDAVServer.FileSystemStorage.AspNetCore</AssemblyName>
66
<TargetFramework>net8.0</TargetFramework>
77
<LangVersion>9.0</LangVersion>
@@ -16,9 +16,9 @@
1616
</Content>
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="ITHit.Server" Version="14.1.13942" />
20-
<PackageReference Include="ITHit.Server.Core" Version="14.1.13942" />
21-
<PackageReference Include="ITHit.WebDAV.Server" Version="14.1.13942" />
19+
<PackageReference Include="ITHit.Server" Version="15.0.13942-Beta" />
20+
<PackageReference Include="ITHit.Server.Core" Version="15.0.13942-Beta" />
21+
<PackageReference Include="ITHit.WebDAV.Server" Version="15.0.13942-Beta" />
2222
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
2323
</ItemGroup>
2424
<ItemGroup>

‎CS/CalDAVServer.SqlStorage.AspNetCore/CalDAVServer.SqlStorage.AspNetCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<VersionPrefix>14.1.13942</VersionPrefix>
4+
<VersionPrefix>15.0.13942-Beta</VersionPrefix>
55
<AssemblyName>CalDAVServer.SqlStorage.AspNetCore</AssemblyName>
66
<TargetFramework>net8.0</TargetFramework>
77
<LangVersion>9.0</LangVersion>
@@ -19,9 +19,9 @@
1919
</Content>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="ITHit.Server" Version="14.1.13942" />
23-
<PackageReference Include="ITHit.Server.Core" Version="14.1.13942" />
24-
<PackageReference Include="ITHit.WebDAV.Server" Version="14.1.13942" />
22+
<PackageReference Include="ITHit.Server" Version="15.0.13942-Beta" />
23+
<PackageReference Include="ITHit.Server.Core" Version="15.0.13942-Beta" />
24+
<PackageReference Include="ITHit.WebDAV.Server" Version="15.0.13942-Beta" />
2525
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
2626
</ItemGroup>
2727
<ItemGroup>

‎CS/CardDAVServer.FileSystemStorage.AspNetCore/CardDAVServer.FileSystemStorage.AspNetCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<VersionPrefix>14.1.13942</VersionPrefix>
4+
<VersionPrefix>15.0.13942-Beta</VersionPrefix>
55
<AssemblyName>CardDAVServer.FileSystemStorage.AspNetCore</AssemblyName>
66
<TargetFramework>net8.0</TargetFramework>
77
<LangVersion>9.0</LangVersion>
@@ -16,9 +16,9 @@
1616
</Content>
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="ITHit.Server" Version="14.1.13942" />
20-
<PackageReference Include="ITHit.Server.Core" Version="14.1.13942" />
21-
<PackageReference Include="ITHit.WebDAV.Server" Version="14.1.13942" />
19+
<PackageReference Include="ITHit.Server" Version="15.0.13942-Beta" />
20+
<PackageReference Include="ITHit.Server.Core" Version="15.0.13942-Beta" />
21+
<PackageReference Include="ITHit.WebDAV.Server" Version="15.0.13942-Beta" />
2222
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
2323
</ItemGroup>
2424
<ItemGroup>

‎CS/CardDAVServer.SqlStorage.AspNetCore/CardDAVServer.SqlStorage.AspNetCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<VersionPrefix>14.1.13942</VersionPrefix>
4+
<VersionPrefix>15.0.13942-Beta</VersionPrefix>
55
<AssemblyName>CardDAVServer.SqlStorage.AspNetCore</AssemblyName>
66
<TargetFramework>net8.0</TargetFramework>
77
<LangVersion>9.0</LangVersion>
@@ -19,9 +19,9 @@
1919
</Content>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="ITHit.Server" Version="14.1.13942" />
23-
<PackageReference Include="ITHit.Server.Core" Version="14.1.13942" />
24-
<PackageReference Include="ITHit.WebDAV.Server" Version="14.1.13942" />
22+
<PackageReference Include="ITHit.Server" Version="15.0.13942-Beta" />
23+
<PackageReference Include="ITHit.Server.Core" Version="15.0.13942-Beta" />
24+
<PackageReference Include="ITHit.WebDAV.Server" Version="15.0.13942-Beta" />
2525
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
2626
</ItemGroup>
2727
<ItemGroup>

‎CS/HttpListener/HttpListener.Android/HttpListener.Android.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
<BundleAssemblies>false</BundleAssemblies>
5353
</PropertyGroup>
5454
<ItemGroup>
55-
<Reference Include="ITHit.WebDAV.Server, Version=14.1.13942, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
56-
<HintPath>..\packages\ITHit.WebDAV.Server.14.1.13942\lib\netstandard1.6\ITHit.WebDAV.Server.dll</HintPath>
55+
<Reference Include="ITHit.WebDAV.Server, Version=15.0.13942-Beta, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
56+
<HintPath>..\packages\ITHit.WebDAV.Server.15.0.13942-Beta\lib\netstandard1.6\ITHit.WebDAV.Server.dll</HintPath>
5757
</Reference>
58-
<Reference Include="ITHit.WebDAV.Server.HttpListener, Version=14.1.13942, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
59-
<HintPath>..\packages\ITHit.WebDAV.Server.HttpListener.14.1.13942\lib\netstandard2.0\ITHit.WebDAV.Server.HttpListener.dll</HintPath>
58+
<Reference Include="ITHit.WebDAV.Server.HttpListener, Version=15.0.13942-Beta, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
59+
<HintPath>..\packages\ITHit.WebDAV.Server.HttpListener.15.0.13942-Beta\lib\netstandard2.0\ITHit.WebDAV.Server.HttpListener.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.AspNetCore.Hosting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
6262
<HintPath>..\packages\Microsoft.AspNetCore.Hosting.2.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>

‎CS/HttpListener/HttpListener.Android/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ITHit.WebDAV.Server" version="14.1.13942" targetFramework="monoandroid60" />
4-
<package id="ITHit.WebDAV.Server.HttpListener" version="14.1.13942" targetFramework="monoandroid60" />
3+
<package id="ITHit.WebDAV.Server" version="15.0.13942-Beta" targetFramework="monoandroid60" />
4+
<package id="ITHit.WebDAV.Server.HttpListener" version="15.0.13942-Beta" targetFramework="monoandroid60" />
55
<package id="Microsoft.AspNetCore.Hosting" version="2.0.0" targetFramework="monoandroid71" />
66
<package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.0.0" targetFramework="monoandroid71" />
77
<package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.0.0" targetFramework="monoandroid71" />

‎CS/HttpListener/HttpListener.iOS/HttpListener.iOS.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@
114114
</InterfaceDefinition>
115115
</ItemGroup>
116116
<ItemGroup>
117-
<Reference Include="ITHit.WebDAV.Server, Version=14.1.13942, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
118-
<HintPath>..\packages\ITHit.WebDAV.Server.14.1.13942\lib\netstandard1.6\ITHit.WebDAV.Server.dll</HintPath>
117+
<Reference Include="ITHit.WebDAV.Server, Version=15.0.13942-Beta, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
118+
<HintPath>..\packages\ITHit.WebDAV.Server.15.0.13942-Beta\lib\netstandard1.6\ITHit.WebDAV.Server.dll</HintPath>
119119
</Reference>
120-
<Reference Include="ITHit.WebDAV.Server.HttpListener, Version=14.1.13942, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
121-
<HintPath>..\packages\ITHit.WebDAV.Server.HttpListener.14.1.13942\lib\netstandard2.0\ITHit.WebDAV.Server.HttpListener.dll</HintPath>
120+
<Reference Include="ITHit.WebDAV.Server.HttpListener, Version=15.0.13942-Beta, Culture=neutral, PublicKeyToken=d057f7b1134051b5, processorArchitecture=MSIL">
121+
<HintPath>..\packages\ITHit.WebDAV.Server.HttpListener.15.0.13942-Beta\lib\netstandard2.0\ITHit.WebDAV.Server.HttpListener.dll</HintPath>
122122
</Reference>
123123
<Reference Include="Microsoft.AspNetCore.Hosting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
124124
<HintPath>..\packages\Microsoft.AspNetCore.Hosting.2.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>

‎CS/HttpListener/HttpListener.iOS/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ITHit.WebDAV.Server" version="14.1.13942" targetFramework="xamarinios10" />
4-
<package id="ITHit.WebDAV.Server.HttpListener" version="14.1.13942" targetFramework="xamarinios10" />
3+
<package id="ITHit.WebDAV.Server" version="15.0.13942-Beta" targetFramework="xamarinios10" />
4+
<package id="ITHit.WebDAV.Server.HttpListener" version="15.0.13942-Beta" targetFramework="xamarinios10" />
55
<package id="Microsoft.AspNetCore.Hosting" version="2.0.0" targetFramework="xamarinios10" />
66
<package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.0.0" targetFramework="xamarinios10" />
77
<package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.0.0" targetFramework="xamarinios10" />

‎CS/HttpListener/HttpListenerLibrary/HttpListenerLibrary.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="ITHit.WebDAV.Server.HttpListener" Version="14.1.13942" />
6+
<PackageReference Include="ITHit.WebDAV.Server.HttpListener" Version="15.0.13942-Beta" />
77
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
88
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
99
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />

‎CS/HttpListener/SharedMobile/SharedMobile.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="ITHit.WebDAV.Server" Version="14.1.13942" />
6+
<PackageReference Include="ITHit.WebDAV.Server" Version="15.0.13942-Beta" />
77
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
88
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
99
</ItemGroup>

‎CS/WebDAVServer.FileSystemStorage.AspNet/ClientAppSrc/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CS/WebDAVServer.FileSystemStorage.AspNet/ClientAppSrc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"sass": "^1.44.0",
3333
"typescript": "^4.4.4",
3434
"web-vitals": "^1.1.2",
35-
"webdav.client": "^5.21.5974"
35+
"webdav.client": "^6.0.8745-beta"
3636
},
3737
"devDependencies": {
3838
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",

‎CS/WebDAVServer.FileSystemStorage.AspNet/ClientAppSrc/run.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ execSync("node -v", { stdio: "inherit" });
1414

1515
let currVersion;
1616
let newVersion;
17+
let newBetaVersion;
1718
if (fs.existsSync(".\\node_modules\\webdav.client")) {
1819
currVersion = require("webdav.client/package.json").version;
1920
newVersion = execSync("npm show webdav.client version").toString().trim();
21+
newBetaVersion = execSync("npm show webdav.client@beta version")
22+
.toString()
23+
.trim();
2024
}
2125

2226
if (newVersion == currVersion) {
@@ -26,12 +30,27 @@ if (newVersion == currVersion) {
2630
installAndBuild();
2731
}
2832

33+
if (!fs.existsSync("..\\wwwroot\\app.js")) {
34+
installAndBuild();
35+
}
36+
} else if (newBetaVersion == currVersion) {
37+
console.log("webdav.client version is up to date");
38+
if (currVersion == undefined) {
39+
execSync("npm install webdav.client@beta --save", { stdio: "inherit" });
40+
installAndBuild();
41+
}
42+
2943
if (!fs.existsSync("..\\wwwroot\\app.js")) {
3044
installAndBuild();
3145
}
3246
} else {
33-
console.log("Found new webdav.client version " + newVersion);
34-
execSync("npm install webdav.client --save", { stdio: "inherit" });
47+
let isBeta = currVersion.includes("beta");
48+
let newV = isBeta ? newBetaVersion : newVersion;
49+
let npmTag = isBeta ? "@beta" : "";
50+
console.log("Found new webdav.client version " + newV);
51+
execSync("npm install webdav.client" + npmTag + " --save", {
52+
stdio: "inherit",
53+
});
3554
buildApp();
3655
copyClient();
3756
}

‎CS/WebDAVServer.FileSystemStorage.AspNet/ClientAppSrc/src/features/Breadcrumb.tsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { UrlResolveService } from "../services/UrlResolveService";
44
import { useAppSelector } from "../app/hooks/common";
55
import { getCurrentUrl } from "./grid/gridSlice";
66
import { useTranslation } from "react-i18next";
7+
import { ProtocolService } from "../services/ProtocolService";
78
type Props = { itemUrl?: string; isSearchMode: boolean };
89
const Breadcrumb: React.FC<Props> = ({ itemUrl, isSearchMode }) => {
910
const { t } = useTranslation();
@@ -49,6 +50,10 @@ const Breadcrumb: React.FC<Props> = ({ itemUrl, isSearchMode }) => {
4950
}
5051
StoreWorker.refresh(homeUrl);
5152
};
53+
54+
const getInstallerFileUrl = () => {
55+
return ProtocolService.getInstallerFileUrl();
56+
};
5257

5358
const handleItemClick = useCallback(
5459
(index: number) => () => {
@@ -99,6 +104,16 @@ const Breadcrumb: React.FC<Props> = ({ itemUrl, isSearchMode }) => {
99104
);
100105
})}
101106
</ol>
107+
<a
108+
id="ithit-webdav-drive"
109+
href={getInstallerFileUrl()}
110+
className="btn btn-primary btn-sm btn-labeled"
111+
type="button"
112+
title="Download WebDAV Drive application."
113+
>
114+
<span className="btn-label"><i className="icon-webdav-drive"></i></span>
115+
<span className="d-none d-lg-inline-block">Download WebDAV Drive</span>
116+
</a>
102117
</div>
103118
</nav>
104119
);

‎CS/WebDAVServer.FileSystemStorage.AspNet/ClientAppSrc/src/features/modals/InstallProtocolModal.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,6 @@ const InstallProtocolModal: React.FC<Props> = () => {
154154
</ol>
155155
<br />
156156
{t("phrases.see")}{" "}
157-
<a
158-
href="https://www.webdavsystem.com/ajax/programming/open-doc-webpage/install/windows/"
159-
target="_blank"
160-
rel="noreferrer"
161-
>
162-
{t("phrases.downloadProtocol.howInstallProtocolApp")}
163-
</a>{" "}
164-
{t("phrases.and")}{" "}
165157
<a
166158
href="https://www.webdavsystem.com/ajax/programming/open-doc-webpage/install/web_browser_extensions/"
167159
target="_blank"

‎CS/WebDAVServer.FileSystemStorage.AspNet/ClientAppSrc/src/features/toolbar/BaseToolbarButton.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import { toolbarConfig, ButtonConfig } from "./settings";
44
type Props = {
55
config: ButtonConfig;
66
isDisabled: boolean;
7+
showing?: boolean;
78
handleClick: () => void;
89
};
910
const BaseToolbarButton: React.FC<Props> = ({
1011
config,
1112
isDisabled,
13+
showing = true,
1214
handleClick,
1315
}) => {
1416
const getInnerHtml = () => {
@@ -24,7 +26,7 @@ const BaseToolbarButton: React.FC<Props> = ({
2426
id={config.name}
2527
className={`btn-tool ${
2628
toolbarConfig.hideDisabledOnMobile ? "hide-disabled-md" : ""
27-
}`}
29+
} ${showing ? "" : "d-none"}`}
2830
title={config.title}
2931
>
3032
<i className={`icon ${config.iconClassName}`}></i>

0 commit comments

Comments
 (0)