Merge pull request #94 from OlegBoulanov/develop

release
OlegBoulanov · May 18, 2022 · 2888eab · 2888eab
2 parents 7eebea5 + 368f976
commit 2888eab
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -34,3 +34,7 @@ Detailed desription can be found in [wiki](https://github.com/OlegBoulanov/s3i/w
 
 Latest version of `s3i.msi` can be installed from [Releases page](https://github.com/OlegBoulanov/s3i/releases/latest)
 
+## Project maintenance
+Integration with Github and AppVeyor: token change
+- git config --global credential.helper store
+- git clone https://OlegBoulanov:**github-token-for-appveyor**@github.com/OlegBoulanov/s3i
diff --git a/s3i/s3i.csproj b/s3i/s3i.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <TargetFramework>net6.0</TargetFramework>
     <SelContained>false</SelContained>
 <!--
     <PublishTrimmed>true</PublishTrimmed>

diff --git a/s3iSetup/Product.wxs b/s3iSetup/Product.wxs
@@ -45,6 +45,14 @@
       <Directory Id="ProgramFilesFolder">
         <Directory Id="INSTALLDIR" Name="$(var.Manufacturer)">
           <Directory Id="Product_Root" Name="$(var.ProductName)">
+            <!--runtimes\win\lib\netstandard2.0-->
+            <Directory Id="runtimes" Name="runtimes">
+              <Directory Id="runtimes.win" Name="win">
+                <Directory Id="runtimes.win.lib" Name="lib">
+                  <Directory Id="runtimes.win.lib.net6.0" Name="net6.0" />
+                </Directory>
+              </Directory>
+            </Directory>
           </Directory>
         </Directory>
       </Directory>
@@ -111,9 +119,18 @@
       </Component>
     </DirectoryRef>
 
+    <DirectoryRef Id="runtimes.win.lib.net6.0">
+      <Component Id="runtimes.net6.0" Guid="{A42FF591-8E16-40DB-8720-2D95490F63E7}">
+        <File Id="runtimes.net6.0.System.Diagnostics.EventLog.Messages.dll" Name="System.Diagnostics.EventLog.Messages.dll" Source="$(var.s3iWorker.TargetDir)runtimes\win\lib\net6.0\System.Diagnostics.EventLog.Messages.dll" Vital="yes" KeyPath="yes"/>
+        <File Id="runtimes.net6.0.System.Diagnostics.EventLog.dll" Name="System.Diagnostics.EventLog.dll" Source="$(var.s3iWorker.TargetDir)runtimes\win\lib\net6.0\System.Diagnostics.EventLog.dll" Vital="yes"/>
+        <File Id="runtimes.net6.0.System.ServiceProcess.ServiceController.dll" Name="System.ServiceProcess.ServiceController.dll" Source="$(var.s3iWorker.TargetDir)runtimes\win\lib\net6.0\System.ServiceProcess.ServiceController.dll" Vital="yes"/>
+      </Component>
+    </DirectoryRef>
+
     <Feature Id="ProductFeature" Title="s3i" Level="1">
       <ComponentRef Id="s3iCommandLine" />
       <ComponentRef Id="s3iWorker" />
+      <ComponentRef Id="runtimes.net6.0"/>
       <ComponentRef Id="AWSSDK" />
     </Feature>
 

diff --git a/s3iWorker/s3iWorker.csproj b/s3iWorker/s3iWorker.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <TargetFramework>net6.0</TargetFramework>
     <SelContained>false</SelContained>
     <!--for VSCode to follow error click-->
     <GenerateFullPaths>true</GenerateFullPaths>