1
0
Эх сурвалжийг харах

Merge branch 'master' into dev

Source commit: c6ee22ea3fe1303f9b678de310ba4a4a6a1ebaf8
Martin Prikryl 2 жил өмнө
parent
commit
92ae352f8f

+ 1 - 1
deployment/WinSCPnet.nuspec

@@ -19,7 +19,7 @@ The library is primarily intended for advanced automation tasks on Microsoft Win
 For documentation and examples of use, see project website.
 For documentation and examples of use, see project website.
 
 
 The NuGet package includes the assembly itself and a required WinSCP executable. When installed, it adds the assembly as reference to your project and sets up WinSCP executable to be copied to project output directory, so that it can be found on run-time.</description>
 The NuGet package includes the assembly itself and a required WinSCP executable. When installed, it adds the assembly as reference to your project and sets up WinSCP executable to be copied to project output directory, so that it can be found on run-time.</description>
-    <copyright>Copyright © 2012–2022 Martin Prikryl</copyright>
+    <copyright>Copyright © 2012–2023 Martin Prikryl</copyright>
     <tags>winscp sftp ftp ftps webdav s3 scp transfer</tags>
     <tags>winscp sftp ftp ftps webdav s3 scp transfer</tags>
     <dependencies>
     <dependencies>
       <group targetFramework=".NETStandard2.0"/>
       <group targetFramework=".NETStandard2.0"/>

+ 1 - 1
deployment/winscpsetup.iss

@@ -7,7 +7,7 @@
 #define WebForum WebRoot+"forum/"
 #define WebForum WebRoot+"forum/"
 #define WebDocumentation WebRoot+"eng/docs/"
 #define WebDocumentation WebRoot+"eng/docs/"
 #define WebReport "https://winscp.net/install.php"
 #define WebReport "https://winscp.net/install.php"
-#define Year 2022
+#define Year 2023
 #define EnglishLang "English"
 #define EnglishLang "English"
 #define SetupTypeData "SetupType"
 #define SetupTypeData "SetupType"
 #define InnoSetupReg "Software\Microsoft\Windows\CurrentVersion\Uninstall\" + AppId + "_is1"
 #define InnoSetupReg "Software\Microsoft\Windows\CurrentVersion\Uninstall\" + AppId + "_is1"

+ 1 - 1
source/Console.cbproj

@@ -43,7 +43,7 @@
 		<ProjectType>CppConsoleApplication</ProjectType>
 		<ProjectType>CppConsoleApplication</ProjectType>
 		<SanitizedProjectName>Console</SanitizedProjectName>
 		<SanitizedProjectName>Console</SanitizedProjectName>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Console interface for WinSCP;FileVersion=6.0.0.0;InternalName=console;LegalCopyright=(c) 2000-2022 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.com;ProductName=WinSCP;ProductVersion=6.0.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Console interface for WinSCP;FileVersion=6.0.0.0;InternalName=console;LegalCopyright=(c) 2000-2023 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.com;ProductName=WinSCP;ProductVersion=6.0.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_MajorVer>6</VerInfo_MajorVer>
 		<VerInfo_MajorVer>6</VerInfo_MajorVer>
 		<VerInfo_MinorVer>0</VerInfo_MinorVer>
 		<VerInfo_MinorVer>0</VerInfo_MinorVer>

+ 1 - 1
source/DragExt.cbproj

@@ -49,7 +49,7 @@
 		<SanitizedProjectName>DragExt</SanitizedProjectName>
 		<SanitizedProjectName>DragExt</SanitizedProjectName>
 		<VerInfo_DLL>true</VerInfo_DLL>
 		<VerInfo_DLL>true</VerInfo_DLL>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Drag&amp;Drop shell extension for WinSCP ($(Platform));FileVersion=2.0.0.0;InternalName=dragext;LegalCopyright=(c) 2000-2022 Martin Prikryl;LegalTrademarks=;OriginalFilename=dragext.dll;ProductName=WinSCP;ProductVersion=6.0.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Drag&amp;Drop shell extension for WinSCP ($(Platform));FileVersion=2.0.0.0;InternalName=dragext;LegalCopyright=(c) 2000-2023 Martin Prikryl;LegalTrademarks=;OriginalFilename=dragext.dll;ProductName=WinSCP;ProductVersion=6.0.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_MajorVer>2</VerInfo_MajorVer>
 		<VerInfo_MajorVer>2</VerInfo_MajorVer>
 	</PropertyGroup>
 	</PropertyGroup>

+ 1 - 1
source/WinSCP.cbproj

@@ -75,7 +75,7 @@
 		<SanitizedProjectName>WinSCP</SanitizedProjectName>
 		<SanitizedProjectName>WinSCP</SanitizedProjectName>
 		<UsingDelphiRTL>true</UsingDelphiRTL>
 		<UsingDelphiRTL>true</UsingDelphiRTL>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=WinSCP: SFTP, FTP, WebDAV, S3 and SCP client;FileVersion=6.0.0.0;InternalName=winscp;LegalCopyright=(c) 2000-2022 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.exe;ProductName=WinSCP;ProductVersion=6.0.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=WinSCP: SFTP, FTP, WebDAV, S3 and SCP client;FileVersion=6.0.0.0;InternalName=winscp;LegalCopyright=(c) 2000-2023 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.exe;ProductName=WinSCP;ProductVersion=6.0.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_MajorVer>6</VerInfo_MajorVer>
 		<VerInfo_MajorVer>6</VerInfo_MajorVer>
 		<VerInfo_MinorVer>0</VerInfo_MinorVer>
 		<VerInfo_MinorVer>0</VerInfo_MinorVer>

+ 1 - 1
source/resource/TextsWin1.rc

@@ -679,7 +679,7 @@ BEGIN
         LOGIN_KEY_WITH_CERTIFICATE, "**This key contains an OpenSSH certificate.**\nIt is not supposed to be added to OpenSSH authorized_keys file."
         LOGIN_KEY_WITH_CERTIFICATE, "**This key contains an OpenSSH certificate.**\nIt is not supposed to be added to OpenSSH authorized_keys file."
 
 
         WIN_VARIABLE_STRINGS, "WIN_VARIABLE"
         WIN_VARIABLE_STRINGS, "WIN_VARIABLE"
-        WINSCP_COPYRIGHT, "Copyright © 2000–2022 Martin Prikryl"
+        WINSCP_COPYRIGHT, "Copyright © 2000–2023 Martin Prikryl"
         HOMEPAGE_URL, "https://winscp.net/"
         HOMEPAGE_URL, "https://winscp.net/"
         HISTORY_URL, "https://winscp.net/eng/docs/history"
         HISTORY_URL, "https://winscp.net/eng/docs/history"
         FORUM_URL, "https://winscp.net/forum/"
         FORUM_URL, "https://winscp.net/forum/"