diff --git a/RFiDGear.sln b/RFiDGear.sln index e845673..8d859eb 100644 --- a/RFiDGear.sln +++ b/RFiDGear.sln @@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginSystem", "..\PluginSy EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVMDialogs", "..\MVVMDialogs\MVVMDialogs.csproj", "{EF56252E-257F-41D1-974B-C9015071CE7E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elatec.NET", "..\Elatec.NET\Elatec.NET.csproj", "{360F9AF9-6717-45B6-9707-5974575FE96A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projektmappenelemente", "Projektmappenelemente", "{A50839AB-9B8F-49C6-AB4A-7BD1BC9FA9DB}" ProjectSection(SolutionItems) = preProject debugParam.txt = debugParam.txt @@ -24,6 +22,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projektmappenelemente", "Pr EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (without default Proj.)|Any CPU = Debug (without default Proj.)|Any CPU + Debug (without default Proj.)|x64 = Debug (without default Proj.)|x64 + Debug (without default Proj.)|x86 = Debug (without default Proj.)|x86 + Debug(without args)|Any CPU = Debug(without args)|Any CPU + Debug(without args)|x64 = Debug(without args)|x64 + Debug(without args)|x86 = Debug(without args)|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -32,6 +36,18 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug (without default Proj.)|Any CPU.ActiveCfg = Debug (without default Proj.)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug (without default Proj.)|Any CPU.Build.0 = Debug (without default Proj.)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug (without default Proj.)|x64.ActiveCfg = Debug (without default Proj.)|x64 + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug (without default Proj.)|x64.Build.0 = Debug (without default Proj.)|x64 + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug (without default Proj.)|x86.ActiveCfg = Debug (without default Proj.)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug (without default Proj.)|x86.Build.0 = Debug (without default Proj.)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug(without args)|Any CPU.ActiveCfg = Debug(without args)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug(without args)|Any CPU.Build.0 = Debug(without args)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug(without args)|x64.ActiveCfg = Debug(without args)|x64 + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug(without args)|x64.Build.0 = Debug(without args)|x64 + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug(without args)|x86.ActiveCfg = Debug(without args)|Any CPU + {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug(without args)|x86.Build.0 = Debug(without args)|Any CPU {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug|Any CPU.Build.0 = Debug|Any CPU {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Debug|x64.ActiveCfg = Debug|x64 @@ -44,6 +60,16 @@ Global {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Release|x64.Build.0 = Release|x64 {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Release|x86.ActiveCfg = Release|Any CPU {D49B605A-7B08-4B82-B4D2-7DA7D0236B13}.Release|x86.Build.0 = Release|Any CPU + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug (without default Proj.)|Any CPU.ActiveCfg = Debug(without args)|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug (without default Proj.)|Any CPU.Build.0 = Debug(without args)|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug (without default Proj.)|x64.ActiveCfg = Debug(without args)|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug (without default Proj.)|x86.ActiveCfg = Debug(without args)|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug (without default Proj.)|x86.Build.0 = Debug(without args)|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug(without args)|Any CPU.ActiveCfg = Debug|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug(without args)|Any CPU.Build.0 = Debug|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug(without args)|x64.ActiveCfg = Debug|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug(without args)|x86.ActiveCfg = Debug|x86 + {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug(without args)|x86.Build.0 = Debug|x86 {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug|Any CPU.ActiveCfg = Debug|x86 {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug|x64.ActiveCfg = Debug|x86 {856CA06C-0B4C-46C6-AD71-873317F1C763}.Debug|x86.ActiveCfg = Debug|x86 @@ -52,6 +78,16 @@ Global {856CA06C-0B4C-46C6-AD71-873317F1C763}.Release|x64.ActiveCfg = Release|x86 {856CA06C-0B4C-46C6-AD71-873317F1C763}.Release|x86.ActiveCfg = Release|x86 {856CA06C-0B4C-46C6-AD71-873317F1C763}.Release|x86.Build.0 = Release|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug (without default Proj.)|Any CPU.ActiveCfg = Debug(without args)|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug (without default Proj.)|Any CPU.Build.0 = Debug(without args)|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug (without default Proj.)|x64.ActiveCfg = Debug(without args)|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug (without default Proj.)|x86.ActiveCfg = Debug(without args)|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug (without default Proj.)|x86.Build.0 = Debug(without args)|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug(without args)|Any CPU.ActiveCfg = Debug|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug(without args)|Any CPU.Build.0 = Debug|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug(without args)|x64.ActiveCfg = Debug|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug(without args)|x86.ActiveCfg = Debug|x86 + {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug(without args)|x86.Build.0 = Debug|x86 {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug|Any CPU.ActiveCfg = Debug|x86 {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug|x64.ActiveCfg = Debug|x86 {5A7DF993-C696-4958-B7C9-9396122DFF21}.Debug|x86.ActiveCfg = Debug|x86 @@ -60,6 +96,18 @@ Global {5A7DF993-C696-4958-B7C9-9396122DFF21}.Release|x64.ActiveCfg = Release|x86 {5A7DF993-C696-4958-B7C9-9396122DFF21}.Release|x86.ActiveCfg = Release|x86 {5A7DF993-C696-4958-B7C9-9396122DFF21}.Release|x86.Build.0 = Release|x86 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug (without default Proj.)|Any CPU.ActiveCfg = Debug (without default Proj.)|Any CPU + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug (without default Proj.)|Any CPU.Build.0 = Debug (without default Proj.)|Any CPU + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug (without default Proj.)|x64.ActiveCfg = Debug (without default Proj.)|x64 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug (without default Proj.)|x64.Build.0 = Debug (without default Proj.)|x64 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug (without default Proj.)|x86.ActiveCfg = Debug (without default Proj.)|x86 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug (without default Proj.)|x86.Build.0 = Debug (without default Proj.)|x86 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug(without args)|Any CPU.ActiveCfg = Debug(without args)|Any CPU + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug(without args)|Any CPU.Build.0 = Debug(without args)|Any CPU + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug(without args)|x64.ActiveCfg = Debug(without args)|x64 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug(without args)|x64.Build.0 = Debug(without args)|x64 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug(without args)|x86.ActiveCfg = Debug(without args)|x86 + {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug(without args)|x86.Build.0 = Debug(without args)|x86 {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Debug|x64.ActiveCfg = Debug|x64 @@ -72,6 +120,18 @@ Global {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Release|x64.Build.0 = Release|x64 {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Release|x86.ActiveCfg = Release|Any CPU {BDD5DF8C-6FC1-4882-8151-924820FDBC05}.Release|x86.Build.0 = Release|Any CPU + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug (without default Proj.)|Any CPU.ActiveCfg = Debug (without default Proj.)|Any CPU + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug (without default Proj.)|Any CPU.Build.0 = Debug (without default Proj.)|Any CPU + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug (without default Proj.)|x64.ActiveCfg = Debug (without default Proj.)|x64 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug (without default Proj.)|x64.Build.0 = Debug (without default Proj.)|x64 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug (without default Proj.)|x86.ActiveCfg = Debug (without default Proj.)|x86 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug (without default Proj.)|x86.Build.0 = Debug (without default Proj.)|x86 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug(without args)|Any CPU.ActiveCfg = Debug(without args)|Any CPU + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug(without args)|Any CPU.Build.0 = Debug(without args)|Any CPU + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug(without args)|x64.ActiveCfg = Debug(without args)|x64 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug(without args)|x64.Build.0 = Debug(without args)|x64 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug(without args)|x86.ActiveCfg = Debug(without args)|x86 + {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug(without args)|x86.Build.0 = Debug(without args)|x86 {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug|Any CPU.Build.0 = Debug|Any CPU {E99B606A-25B8-4113-9E75-5016CCFDB410}.Debug|x64.ActiveCfg = Debug|x64 @@ -84,6 +144,18 @@ Global {E99B606A-25B8-4113-9E75-5016CCFDB410}.Release|x64.Build.0 = Release|x64 {E99B606A-25B8-4113-9E75-5016CCFDB410}.Release|x86.ActiveCfg = Release|Any CPU {E99B606A-25B8-4113-9E75-5016CCFDB410}.Release|x86.Build.0 = Release|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug (without default Proj.)|Any CPU.ActiveCfg = Debug (without default Proj.)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug (without default Proj.)|Any CPU.Build.0 = Debug (without default Proj.)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug (without default Proj.)|x64.ActiveCfg = Debug (without default Proj.)|x64 + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug (without default Proj.)|x64.Build.0 = Debug (without default Proj.)|x64 + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug (without default Proj.)|x86.ActiveCfg = Debug (without default Proj.)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug (without default Proj.)|x86.Build.0 = Debug (without default Proj.)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug(without args)|Any CPU.ActiveCfg = Debug(without args)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug(without args)|Any CPU.Build.0 = Debug(without args)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug(without args)|x64.ActiveCfg = Debug(without args)|x64 + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug(without args)|x64.Build.0 = Debug(without args)|x64 + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug(without args)|x86.ActiveCfg = Debug(without args)|Any CPU + {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug(without args)|x86.Build.0 = Debug(without args)|Any CPU {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF56252E-257F-41D1-974B-C9015071CE7E}.Debug|x64.ActiveCfg = Debug|x64 @@ -96,18 +168,6 @@ Global {EF56252E-257F-41D1-974B-C9015071CE7E}.Release|x64.Build.0 = Release|x64 {EF56252E-257F-41D1-974B-C9015071CE7E}.Release|x86.ActiveCfg = Release|Any CPU {EF56252E-257F-41D1-974B-C9015071CE7E}.Release|x86.Build.0 = Release|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Debug|x64.ActiveCfg = Debug|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Debug|x64.Build.0 = Debug|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Debug|x86.ActiveCfg = Debug|x86 - {360F9AF9-6717-45B6-9707-5974575FE96A}.Debug|x86.Build.0 = Debug|x86 - {360F9AF9-6717-45B6-9707-5974575FE96A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Release|Any CPU.Build.0 = Release|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Release|x64.ActiveCfg = Release|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Release|x64.Build.0 = Release|Any CPU - {360F9AF9-6717-45B6-9707-5974575FE96A}.Release|x86.ActiveCfg = Release|x86 - {360F9AF9-6717-45B6-9707-5974575FE96A}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RFiDGear/Properties/AssemblyInfo.cs b/RFiDGear/Properties/AssemblyInfo.cs index e944f0e..85bf7d4 100644 --- a/RFiDGear/Properties/AssemblyInfo.cs +++ b/RFiDGear/Properties/AssemblyInfo.cs @@ -25,6 +25,6 @@ // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.9.*")] +[assembly: AssemblyVersion("1.10.*")] [assembly: Guid("a34bc413-e349-4fd1-8b90-2eb95a333436")] [assembly: NeutralResourcesLanguage("")] diff --git a/RFiDGear/Properties/app.manifest b/RFiDGear/Properties/app.manifest new file mode 100644 index 0000000..e29a158 --- /dev/null +++ b/RFiDGear/Properties/app.manifest @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RFiDGear/RFiDGear.csproj b/RFiDGear/RFiDGear.csproj index ad59e97..c729afd 100644 --- a/RFiDGear/RFiDGear.csproj +++ b/RFiDGear/RFiDGear.csproj @@ -37,7 +37,7 @@ false true 0 - 1.1.0.%2a + 1.10.0.%2a false true @@ -99,11 +99,62 @@ RFiDGear.snk + - true + MessgeraetetechnikHansen.pfx + + + true + bin\Debug%28without args%29\ + DEBUG;TRACE + true + 4096 + Full + AnyCPU + 7.3 + true + + + true + bin\x64\Debug%28without args%29\ + DEBUG;TRACE + true + 4096 + Full + x64 + 7.3 + true + + + true + bin\Debug %28without default Proj.%29\ + DEBUG;TRACE + true + 4096 + Full + AnyCPU + 7.3 + true + + + true + bin\x64\Debug %28without default Proj.%29\ + DEBUG;TRACE + true + 4096 + Full + x64 + 7.3 + true - MessgeraetetechnikHansen.pfx + LocalIntranet + + + true + + + Properties\app.manifest @@ -292,6 +343,7 @@ + @@ -368,10 +420,6 @@ {bdd5df8c-6fc1-4882-8151-924820fdbc05} ByteArray - - {360f9af9-6717-45b6-9707-5974575fe96a} - Elatec.NET - {ef56252e-257f-41d1-974b-c9015071ce7e} MVVMDialogs @@ -403,6 +451,9 @@ 8.0.0 + + 0.4.1 + 17.0.1565 diff --git a/RFiDGear/RFiDGear.csproj.user b/RFiDGear/RFiDGear.csproj.user index 13c5b32..c24b40f 100644 --- a/RFiDGear/RFiDGear.csproj.user +++ b/RFiDGear/RFiDGear.csproj.user @@ -22,4 +22,24 @@ REPORTTARGETPATH="D:\CardCheck_data\KP-000005-5_final.pdf" REPORTTEMPLATEFILE="D:\CardCheck_data\KP-000005-5_.pdf" CUSTOMPROJECTFILE="D:\CardCheck_data\KPruefung_Vorlagen\00_RFID_Gear_Vorlage\CardCheckAssistant_FreeMem.rfPrj" %24JOBNUMBER="KP-000005" %24CHIPNUMBER="5" AUTORUN=1 D:\CardCheck_Data + + D:\CardCheck_Data + REPORTTARGETPATH="D:\CardCheck_data\KP-000005-5_final.pdf" REPORTTEMPLATEFILE="D:\CardCheck_data\KP-000005-5_.pdf" CUSTOMPROJECTFILE="D:\CardCheck_data\KPruefung_Vorlagen\00_RFID_Gear_Vorlage\CardCheckAssistant_FreeMemDesfireOnly.rfPrj" %24JOBNUMBER="KP-000005" %24CHIPNUMBER="5" AUTORUN=0 + + + D:\CardCheck_data + + + + + D:\CardCheck_Data + REPORTTARGETPATH="D:\CardCheck_data\KP-000005-5_final.pdf" REPORTTEMPLATEFILE="D:\CardCheck_data\KP-000005-5_.pdf" CUSTOMPROJECTFILE="D:\CardCheck_data\KPruefung_Vorlagen\00_RFID_Gear_Vorlage\CardCheckAssistant_FreeMemDesfireOnly.rfPrj" %24JOBNUMBER="KP-000005" %24CHIPNUMBER="5" AUTORUN=0 + + + D:\CardCheck_data + REPORTTARGETPATH="D:\CardCheck_data\KP-000222\KP-000222-3_final.pdf" REPORTTEMPLATEFILE="D:\CardCheck_data\KP-000222\KP-000222-3_.pdf" %24JOBNUMBER="KP-000222" %24CHIPNUMBER="3" AUTORUN=0 + + + false + \ No newline at end of file diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs index 8d24d42..5c461a9 100644 --- a/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs +++ b/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs @@ -37,7 +37,7 @@ public class CommonTaskViewModel : ObservableObject, IUserDialogViewModel, IGene { #region Fields private static int IterCounter = 1; //Initial Value of Counter: How often have "this" been called (+1 per "run all tasks") - private readonly EventLog eventLog = new EventLog(Assembly.GetEntryAssembly().GetName().Name,"localhost", Assembly.GetEntryAssembly().GetName().Name); + private readonly EventLog eventLog = new EventLog("Application", ".", Assembly.GetEntryAssembly().GetName().Name); // The Counter could be replaced in an pdf by %n; %nn or %nnn. increased once per run all tasks: %n -> 1 on first execution private protected ReportReaderWriter reportReaderWriter; @@ -1587,14 +1587,29 @@ private async Task OnNewExecuteProgramCommand() //InitOnFirstRun Program from RFiDGear Argument if (ProgramToExecute.Contains("$")) { + var argArr = ProgramToExecute.Split('\"'); + info = new ProcessStartInfo() { - FileName = Args[ProgramToExecute], + FileName = argArr[1], UseShellExecute = ProgramToExecute.Contains("bat") || ProgramToExecute.Contains("exe") || ProgramToExecute.Contains("msi") ? false : true }; + + argArr = argArr.Where(arg => !string.IsNullOrWhiteSpace(arg)) + .Skip(1) // Skip the first argument (position of the running executable) + .ToArray(); + + var joinedArgs = string.Join(" ", argArr); + + foreach(KeyValuePair argToReplace in Args.Where(arg => arg.Key.Contains("$"))) + { + joinedArgs = joinedArgs.Replace(argToReplace.Key, argToReplace.Value); + } + + info.Arguments = joinedArgs; } else if (ProgramToExecute.ToLower() == @"%exit") diff --git a/RFiDGearBundleSetup/RFiDGearBundleSetup.wixproj b/RFiDGearBundleSetup/RFiDGearBundleSetup.wixproj index f36c4fd..7c5ea79 100644 --- a/RFiDGearBundleSetup/RFiDGearBundleSetup.wixproj +++ b/RFiDGearBundleSetup/RFiDGearBundleSetup.wixproj @@ -18,6 +18,19 @@ bin\$(Configuration)\ obj\$(Configuration)\ + + Debug + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj index da13f2a..7ab64de 100644 --- a/Setup/Setup.wixproj +++ b/Setup/Setup.wixproj @@ -18,6 +18,19 @@ bin\$(Configuration)\ obj\$(Configuration)\ + + Debug + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ +