luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upd

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-04-28 13:49:41 +02:00
parent d84bdf03f9
commit f27ed26b20
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SetupProject1/Product.wxs
View file

@ -141,10 +141,10 @@
<Fragment>
<CustomAction Id="CreateScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand="&quot;[SystemFolder]SCHTASKS.EXE&quot; /CREATE /TN &quot;EDos Sync&quot; /RU &quot;eDosStation&quot;/RP &quot;Infopla+8&quot; /XML &quot;[#edossync.xml]&quot;" />
<CustomAction Id="DeleteScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand="&quot;[SystemFolder]SCHTASKS.EXE&quot; /DELETE /TN &quot;EDos Sync&quot; /F" />
<CustomAction Id="DeleteScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand="&quot;[SystemFolder]SCHTASKS.EXE&quot; /DELETE /TN &quot;EDos Sync&quot; /F" />
<InstallExecuteSequence>
<Custom Action="CreateScheduledTask" After='InstallFinalize'>NOT Installed</Custom>
<Custom Action="CreateScheduledTask" After='InstallFinalize' >NOT Installed</Custom>
<Custom Action="DeleteScheduledTask" Before="RemoveFiles" >Installed</Custom>
</InstallExecuteSequence>

24
eDosStation/eDosStation.csproj
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props')" />
<Import Project="..\packages\LSWLib.1.0.8\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.1.0.8\build\LSWLib.props')" />
<Import Project="..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -262,12 +263,6 @@
<TransformOnBuild>true</TransformOnBuild>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EpdBaseClr\EpdBaseClr.vcxproj">
<Project>{f1f47b79-9930-48b0-8dde-56e2c4bed2a2}</Project>
<Name>EpdBaseClr</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\EPD-MK2.png" />
<Resource Include="Images\EPD-N2.png" />
@ -293,6 +288,12 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EpdBaseClr\EpdBaseClr.vcxproj">
<Project>{f1f47b79-9930-48b0-8dde-56e2c4bed2a2}</Project>
<Name>EpdBaseClr</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@ -300,11 +301,14 @@
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.props'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.targets'))" />
<Error Condition="!Exists('..\packages\LSWLib.1.0.8\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.1.0.8\build\LSWLib.props'))" />
<Error Condition="!Exists('..\packages\LSWLib.1.0.8\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.1.0.8\build\LSWLib.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /sha1 857150b64ef7d3e679c8cbde425d2a0b5e58ffaa /fd sha256 /d "Integrity &amp; Authenticity" /tr "http://timestamp.digicert.com" $(TargetPath)</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets')" />
<Import Project="..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.4\build\LSWDesfirePublic.targets')" />
<Import Project="..\packages\LSWLib.1.0.8\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.1.0.8\build\LSWLib.targets')" />
</Project>

3
eDosStation/packages.config
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LSWDesfirePublic" version="1.3.3" targetFramework="net48" />
<package id="LSWDesfirePublic" version="1.3.4" targetFramework="net48" />
<package id="LSWLib" version="1.0.8" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net472" developmentDependency="true" />
<package id="SharpDX" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" />