Updated for the new dependency installer structure

meruune · meruune · commit 61aa24db4ff5 · 2023-07-14T01:30:13.000+09:00
diff --git a/plugin_KinectOne/RuntimeInstaller.cs b/plugin_KinectOne/RuntimeInstaller.cs
@@ -22,6 +22,11 @@ internal class RuntimeInstaller : IDependencyInstaller
 
     private string TemporaryFolderName { get; } = Guid.NewGuid().ToString().ToUpper();
 
+    public Task<bool> InstallTools(IProgress<InstallationProgress> progress)
+    {
+        return Task.FromResult(false); // Not supported (yet?)
+    }
+
     public bool IsInstalled
     {
         get
@@ -57,6 +62,9 @@ public string InstallerEula
         }
     }
 
+    public bool ProvidesTools => false;
+    public bool ToolsInstalled => false;
+
     public async Task<bool> Install(IProgress<InstallationProgress> progress)
     {
         return
@@ -287,7 +295,8 @@ private bool InstallFiles(IEnumerable<string> files, IProgress<InstallationProgr
 
                 var msiExecutableStart = new ProcessStartInfo
                 {
-                    FileName = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\msiexec.exe"),
+                    FileName = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.Windows),
+                        @"System32\msiexec.exe"),
                     WorkingDirectory = Directory.GetParent(installFile)!.FullName,
                     Arguments = $"/i {installFile} /quiet /qn /norestart ALLUSERS=1",
                     CreateNoWindow = true,
diff --git a/plugin_KinectOne/plugin_KinectOne.csproj b/plugin_KinectOne/plugin_KinectOne.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amethyst.Plugins.Contract" Version="0.2.15" />
+    <PackageReference Include="Amethyst.Plugins.Contract" Version="0.2.16" />
     <PackageReference Include="Microsoft.Kinect" Version="2.0.1410.19000" />
     <PackageReference Include="RestSharp" Version="108.0.3" />
     <PackageReference Include="System.ComponentModel.Composition" Version="8.0.0-preview.3.23174.8" />

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,11 @@ internal class RuntimeInstaller : IDependencyInstaller`
`22`	`22`
`23`	`23`	`private string TemporaryFolderName { get; } = Guid.NewGuid().ToString().ToUpper();`
`24`	`24`
	`25`	`+ public Task<bool> InstallTools(IProgress<InstallationProgress> progress)`
	`26`	`+ {`
	`27`	`+ return Task.FromResult(false); // Not supported (yet?)`
	`28`	`+ }`
	`29`	`+`
`25`	`30`	`public bool IsInstalled`
`26`	`31`	`{`
`27`	`32`	`get`
`@@ -57,6 +62,9 @@ public string InstallerEula`
`57`	`62`	`}`
`58`	`63`	`}`
`59`	`64`
	`65`	`+ public bool ProvidesTools => false;`
	`66`	`+ public bool ToolsInstalled => false;`
	`67`	`+`
`60`	`68`	`public async Task<bool> Install(IProgress<InstallationProgress> progress)`
`61`	`69`	`{`
`62`	`70`	`return`
`@@ -287,7 +295,8 @@ private bool InstallFiles(IEnumerable<string> files, IProgress<InstallationProgr`
`287`	`295`
`288`	`296`	`var msiExecutableStart = new ProcessStartInfo`
`289`	`297`	`{`
`290`		`- FileName = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\msiexec.exe"),`
	`298`	`+ FileName = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.Windows),`
	`299`	`+ @"System32\msiexec.exe"),`
`291`	`300`	`WorkingDirectory = Directory.GetParent(installFile)!.FullName,`
`292`	`301`	`Arguments = $"/i {installFile} /quiet /qn /norestart ALLUSERS=1",`
`293`	`302`	`CreateNoWindow = true,`