diff --git a/WatchFolderService/App.config b/WatchFolderService/App.config index 33dc527..2f95a90 100644 --- a/WatchFolderService/App.config +++ b/WatchFolderService/App.config @@ -1,20 +1,20 @@ - + - + - - - - - - - - - - - - + + + + + + + + + + + + - \ No newline at end of file + diff --git a/WatchFolderService/Common.cs b/WatchFolderService/Common.cs index da7a687..73b8b73 100644 --- a/WatchFolderService/Common.cs +++ b/WatchFolderService/Common.cs @@ -309,11 +309,14 @@ public static AmazonS3Client CreateS3Client( Uri serviceUri = new Uri(GetServiceUrlFromUploadTarget(uploadTarget)); + // Panopto server supports signature version 2 at this time. + Amazon.AWSConfigsS3.UseSignatureVersion4 = false; AmazonS3Config s3Config = new AmazonS3Config() { // Amazon SDK will append uploadBucketName ("Upload") to the path and hence hit the actual service endpoint ServiceURL = serviceUri.AbsoluteUri, - UseHttp = serviceUri.Scheme == "http" + UseHttp = serviceUri.Scheme == "http", + SignatureVersion = "2", }; AmazonS3Client s3Client = new AmazonS3Client( diff --git a/WatchFolderService/Properties/AssemblyInfo.cs b/WatchFolderService/Properties/AssemblyInfo.cs index c39b8fe..441840d 100644 --- a/WatchFolderService/Properties/AssemblyInfo.cs +++ b/WatchFolderService/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("PanoptoWatchFolderService")] -[assembly: AssemblyCopyright("Copyright © 2017 Panopto")] +[assembly: AssemblyCopyright("Copyright © 2020 Panopto")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] +[assembly: AssemblyVersion("1.3.0.0")] +[assembly: AssemblyFileVersion("1.3.0.0")] diff --git a/WatchFolderService/WatchFolderService.csproj b/WatchFolderService/WatchFolderService.csproj index d0d1081..687b514 100644 --- a/WatchFolderService/WatchFolderService.csproj +++ b/WatchFolderService/WatchFolderService.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,8 +9,24 @@ Properties WatchFolderService WatchFolderService - v4.5 + v4.7.2 512 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -36,9 +52,11 @@ - - ..\packages\AWSSDK.2.3.55.2\lib\net45\AWSSDK.dll - True + + ..\packages\AWSSDK.Core.3.5.1.2\lib\net45\AWSSDK.Core.dll + + + ..\packages\AWSSDK.S3.3.5.0.4\lib\net45\AWSSDK.S3.dll @@ -90,6 +108,21 @@ WatchFolderService.cs + + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + @@ -21,7 +21,7 @@ - + - - - - - - + + + + - - + + diff --git a/WatchFolderServiceInstaller/WatchFolderServiceInstaller.wixproj b/WatchFolderServiceInstaller/WatchFolderServiceInstaller.wixproj index f1cbf0c..6ff401c 100644 --- a/WatchFolderServiceInstaller/WatchFolderServiceInstaller.wixproj +++ b/WatchFolderServiceInstaller/WatchFolderServiceInstaller.wixproj @@ -1,5 +1,6 @@  + Debug x86 @@ -10,6 +11,8 @@ Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + bin\$(Configuration)\ @@ -40,7 +43,16 @@ WixUIExtension + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +