Skip to content

Commit 21b77ff

Browse files
tylerkrontylerkron
authored
Merge pull request #9 from daqifi/new-release
upgraded installer and bumped version to 1.0.10
2 parents d61dd8c + 9cfa05c commit 21b77ff

File tree

16 files changed

+414
-235
lines changed

16 files changed

+414
-235
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ AnalysisReport.sarif
2222
debug.log
2323
upgrade-assistant.clef
2424
.vs/
25+
.idea/

‎Daqifi.Desktop.Setup/DAQifi Desktop Setup.sln‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2010
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.3.32811.315
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daqifi.Desktop", "..\Daqifi.Desktop\Daqifi.Desktop.csproj", "{757CB4D9-9B2E-4E6C-A6AA-50F113589C12}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daqifi.Desktop", "..\Daqifi.Desktop\Daqifi.Desktop.csproj", "{757CB4D9-9B2E-4E6C-A6AA-50F113589C12}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daqifi.Desktop.Bootloader", "..\Daqifi.Desktop.Bootloader\Daqifi.Desktop.Bootloader.csproj", "{E1B7FA13-2AD8-4B9F-983E-0EA88C3A1062}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daqifi.Desktop.Bootloader", "..\Daqifi.Desktop.Bootloader\Daqifi.Desktop.Bootloader.csproj", "{E1B7FA13-2AD8-4B9F-983E-0EA88C3A1062}"
99
EndProject
10-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DAQifiDesktop_Setup", "DAQifiDesktopSetup\DAQifiDesktop_Setup.wixproj", "{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daqifi.Desktop.DataModel", "..\Daqifi.Desktop.DataModel\Daqifi.Desktop.DataModel.csproj", "{8E553D17-C0B1-447F-B4A2-0F11903CAA49}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daqifi.Desktop.DataModel", "..\Daqifi.Desktop.DataModel\Daqifi.Desktop.DataModel.csproj", "{8E553D17-C0B1-447F-B4A2-0F11903CAA49}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daqifi.Desktop.Common", "..\Daqifi.Desktop.Common\Daqifi.Desktop.Common.csproj", "{70415FC8-2F9F-4DA1-9DC5-93F6392381C3}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daqifi.Desktop.Common", "..\Daqifi.Desktop.Common\Daqifi.Desktop.Common.csproj", "{70415FC8-2F9F-4DA1-9DC5-93F6392381C3}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daqifi.Desktop.IO", "..\Daqifi.Desktop.IO\Daqifi.Desktop.IO.csproj", "{EC3CD2DE-4816-4568-98B8-9CC258DF7CA1}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daqifi.Desktop.IO", "..\Daqifi.Desktop.IO\Daqifi.Desktop.IO.csproj", "{EC3CD2DE-4816-4568-98B8-9CC258DF7CA1}"
16+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DAQifiDesktop_Setup", "DAQifiDesktopSetup\DAQifiDesktop_Setup.wixproj", "{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}"
1717
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,16 +49,6 @@ Global
4949
{E1B7FA13-2AD8-4B9F-983E-0EA88C3A1062}.Release|Mixed Platforms.Build.0 = Release|Any CPU
5050
{E1B7FA13-2AD8-4B9F-983E-0EA88C3A1062}.Release|x86.ActiveCfg = Release|Any CPU
5151
{E1B7FA13-2AD8-4B9F-983E-0EA88C3A1062}.Release|x86.Build.0 = Release|Any CPU
52-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Any CPU.ActiveCfg = Debug|x86
53-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
54-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Mixed Platforms.Build.0 = Debug|x86
55-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|x86.ActiveCfg = Debug|x86
56-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|x86.Build.0 = Debug|x86
57-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Any CPU.ActiveCfg = Release|x86
58-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Mixed Platforms.ActiveCfg = Release|x86
59-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Mixed Platforms.Build.0 = Release|x86
60-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|x86.ActiveCfg = Release|x86
61-
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|x86.Build.0 = Release|x86
6252
{8E553D17-C0B1-447F-B4A2-0F11903CAA49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6353
{8E553D17-C0B1-447F-B4A2-0F11903CAA49}.Debug|Any CPU.Build.0 = Debug|Any CPU
6454
{8E553D17-C0B1-447F-B4A2-0F11903CAA49}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -95,6 +85,18 @@ Global
9585
{EC3CD2DE-4816-4568-98B8-9CC258DF7CA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
9686
{EC3CD2DE-4816-4568-98B8-9CC258DF7CA1}.Release|x86.ActiveCfg = Release|Any CPU
9787
{EC3CD2DE-4816-4568-98B8-9CC258DF7CA1}.Release|x86.Build.0 = Release|Any CPU
88+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Any CPU.ActiveCfg = Debug|x86
89+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Any CPU.Build.0 = Debug|x86
90+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
91+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|Mixed Platforms.Build.0 = Debug|x86
92+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|x86.ActiveCfg = Debug|x86
93+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Debug|x86.Build.0 = Debug|x86
94+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Any CPU.ActiveCfg = Release|x86
95+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Any CPU.Build.0 = Release|x86
96+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Mixed Platforms.ActiveCfg = Release|x86
97+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|Mixed Platforms.Build.0 = Release|x86
98+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|x86.ActiveCfg = Release|x86
99+
{CD91730F-E4A6-4BB1-9D13-8F2E67F69D7C}.Release|x86.Build.0 = Release|x86
98100
EndGlobalSection
99101
GlobalSection(SolutionProperties) = preSolution
100102
HideSolutionNode = FALSE

‎Daqifi.Desktop.Setup/DAQifiDesktopSetup/Product.wxs‎

Lines changed: 127 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Manufacturer="DAQifi"
66
UpgradeCode="ACA4F4E1-6DBB-47C0-A829-84AA1536C147"
77
Language="1033"
8-
Version="1.0.9.0">
8+
Version="1.0.10.0">
99

1010
<Package Id="*"
1111
Description="DAQifi Installer"
@@ -33,6 +33,8 @@
3333
<Feature Id="ProductFeature" Title="DAQifiDesktop_Setup" Level="1" Display="expand">
3434
<ComponentRef Id="UninstallProgramMenuItems"/>
3535
<ComponentGroupRef Id="ProductComponents" />
36+
<ComponentGroupRef Id="X86Components" />
37+
<ComponentGroupRef Id="amd64Components" />
3638
</Feature>
3739

3840
<!-- GUI Parameters -->
@@ -72,7 +74,11 @@
7274
<!-- Install Folder -->
7375
<Directory Id="ProgramFilesFolder">
7476
<Directory Id="DAQifiFolder" Name="DAQifi">
75-
<Directory Id="INSTALLFOLDER" Name="DAQifi Desktop" />
77+
<Directory Id="INSTALLFOLDER" Name="DAQifi Desktop" >
78+
<Directory Id="AMD64FOLDER" Name="amd64" />
79+
<Directory Id="X86FOLDER" Name="x86" />
80+
<Directory Id="DATABASEFOLDER" Name="Database" />
81+
</Directory>
7682
</Directory>
7783
</Directory>
7884
</Directory>
@@ -171,6 +177,33 @@
171177
<Component Id="MahApps" Guid="D2955D07-F5C2-499E-A2B3-280746E1F4EF">
172178
<File Source="$(var.Daqifi.Desktop.TargetDir)\MahApps.Metro.dll"/>
173179
</Component>
180+
<Component Id="MahAppsIconPacksCore" Guid="50BA5D68-4824-493C-9C65-66DC33A2BF57">
181+
<File Source="$(var.Daqifi.Desktop.TargetDir)\MahApps.Metro.IconPacks.Core.dll"/>
182+
</Component>
183+
<Component Id="MahAppsIconPacksMaterial" Guid="F3E73214-AB5D-40A0-9EB4-10E5A46774FE">
184+
<File Source="$(var.Daqifi.Desktop.TargetDir)\MahApps.Metro.IconPacks.Material.dll"/>
185+
</Component>
186+
<Component Id="MicrosoftExtensionsObjectPool" Guid="55928926-96EA-4648-AD81-048DE42273B9">
187+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.Extensions.ObjectPool.dll"/>
188+
</Component>
189+
<Component Id="MicrosoftIdentityModelLogging" Guid="51E1C8FA-6357-4892-8B69-FB415FBB41C6">
190+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.IdentityModel.Logging.dll"/>
191+
</Component>
192+
<Component Id="MicrosoftIdentityModelProtocolsWsTrust" Guid="182A7037-5506-4F36-80CF-38A144D68534">
193+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.IdentityModel.Protocols.WsTrust.dll"/>
194+
</Component>
195+
<Component Id="MicrosoftIdentityModelTokens" Guid="1F07722A-99DD-4AE9-BA2E-50F7D13F8BDE">
196+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.IdentityModel.Tokens.dll"/>
197+
</Component>
198+
<Component Id="MicrosoftIdentityModelTokensSaml" Guid="4361D2AB-9390-4895-A8F2-3591D8EA0EEE">
199+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.IdentityModel.Tokens.Saml.dll"/>
200+
</Component>
201+
<Component Id="MicrosoftIdentityModelXml" Guid="5F75FFBE-728D-4D23-94B3-6C36B999E4C5">
202+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.IdentityModel.Xml.dll"/>
203+
</Component>
204+
<Component Id="MicrosoftXamlBehaviors" Guid="29C5C050-CD4A-4B7D-9444-8F4A8C933160">
205+
<File Source="$(var.Daqifi.Desktop.TargetDir)\Microsoft.Xaml.Behaviors.dll"/>
206+
</Component>
174207
<Component Id="MoreLinq" Guid="DF6EF103-114E-4FAA-84F1-9B7627F917EB">
175208
<File Source="$(var.Daqifi.Desktop.TargetDir)\MoreLinq.dll"/>
176209
</Component>
@@ -186,35 +219,71 @@
186219
<Component Id="OxyPlotWPF" Guid="C6336DE5-711C-43A0-A581-39505E66CD9A">
187220
<File Source="$(var.Daqifi.Desktop.TargetDir)\OxyPlot.WPF.dll"/>
188221
</Component>
189-
<Component Id="OxyPlotXps" Guid="BB45351B-02CB-4082-A202-3F0A63E75AC4">
190-
<File Source="$(var.Daqifi.Desktop.TargetDir)\OxyPlot.Xps.dll"/>
222+
<Component Id="OxyPlotWPFShared" Guid="7A238EA5-FA9E-4A62-BF7F-E21C50C61190">
223+
<File Source="$(var.Daqifi.Desktop.TargetDir)\OxyPlot.Wpf.Shared.dll"/>
191224
</Component>
192225
<Component Id="ProtobufNet" Guid="29C75437-029D-4EBD-BE76-D6256744F17A">
193226
<File Source="$(var.Daqifi.Desktop.TargetDir)\protobuf-net.dll"/>
194227
</Component>
195-
<Component Id="sqlceca40" Guid="8CA53811-0B5F-467B-BA22-91E882F63414">
196-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceca40.dll"/>
228+
<Component Id="ProtobufNetCore" Guid="99D4EE67-91D1-478B-B493-C58031C1BC69">
229+
<File Source="$(var.Daqifi.Desktop.TargetDir)\protobuf-net.Core.dll"/>
197230
</Component>
198-
<Component Id="sqlcecompact40" Guid="681F8E06-FBCE-48B8-9FB1-E6C49CE483DA">
199-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlcecompact40.dll"/>
231+
<Component Id="SystemBuffers" Guid="65ED384D-770B-4750-B5AF-180055E78CDE">
232+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Buffers.dll"/>
200233
</Component>
201-
<Component Id="sqlceer40EN" Guid="FC7935C7-83F8-4409-A435-D72B9BE57BEB">
202-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceer40EN.dll"/>
234+
<Component Id="SystemCodeDom" Guid="2F3609C0-E737-4DD6-888D-AC36D3BE7475">
235+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.CodeDom.dll"/>
203236
</Component>
204-
<Component Id="sqlceme40" Guid="E6EC4E89-5DA9-48E1-A7E1-421EDA404672">
205-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceme40.dll"/>
237+
<Component Id="SystemCollectionsImmutable" Guid="BB979B12-AA1F-4F95-A924-C4952200F48A">
238+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Collections.Immutable.dll"/>
206239
</Component>
207-
<Component Id="sqlceqp40" Guid="68F42531-63E8-4D2A-8047-E77C553F6F47">
208-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceqp40.dll"/>
240+
<Component Id="SystemComponentModelAnnotations" Guid="FD295A80-9216-428D-AF38-42775AE7B115">
241+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ComponentModel.Annotations.dll"/>
209242
</Component>
210-
<Component Id="sqlcese40" Guid="3073A38C-C8AC-4B83-A917-B4270CBB63AE">
211-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlcese40.dll"/>
243+
<Component Id="SystemConfigurationManager" Guid="DAD854A3-C421-42F6-A273-F988C7422219">
244+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Configuration.ConfigurationManager.dll"/>
212245
</Component>
213246
<Component Id="SystemDataSQLServerCe" Guid="CEA751DC-66CF-4193-888F-F85C3F3E12E5">
214-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\System.Data.SqlServerCe.dll"/>
247+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Data.SqlServerCe.dll"/>
215248
</Component>
216249
<Component Id="SystemDataSQLServerCeEntity" Guid="41704D1B-9562-4DCB-A295-C844869B2A58">
217-
<File Source="$(var.Daqifi.Desktop.TargetDir)\Database\System.Data.SqlServerCe.Entity.dll"/>
250+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Data.SqlServerCe.Entity.dll"/>
251+
</Component>
252+
<Component Id="SystemMemory" Guid="D3B409C0-27D7-41FF-82A4-499ABD914A8B">
253+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Memory.dll"/>
254+
</Component>
255+
<Component Id="SystemNumericsVectors" Guid="93C3A1A0-2A44-4305-BF66-FD1D31146B6E">
256+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Numerics.Vectors.dll"/>
257+
</Component>
258+
<Component Id="SystemRuntimeCompilerServicesUnsafe" Guid="A6FF7B17-58E4-4206-887C-5FFD3D7AD8B4">
259+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Runtime.CompilerServices.Unsafe.dll"/>
260+
</Component>
261+
<Component Id="SystemSecurityAccessControll" Guid="6CF80349-8859-4654-BEAD-B01F72B928A9">
262+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Security.AccessControl.dll"/>
263+
</Component>
264+
<Component Id="SystemSecurityPermissions" Guid="7A1A9D96-123D-4007-A9B4-5A7D6F109E17">
265+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Security.Permissions.dll"/>
266+
</Component>
267+
<Component Id="SystemSecurityPrincipalWindows" Guid="CE97EA99-628B-4DB5-A79F-D43004C70028">
268+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Security.Principal.Windows.dll"/>
269+
</Component>
270+
<Component Id="SystemServiceModelDuplex" Guid="80415050-636E-4B3B-8988-FD1B7C2C6602">
271+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ServiceModel.Duplex.dll"/>
272+
</Component>
273+
<Component Id="SystemServiceModelFederation" Guid="64399642-645C-4688-A7BB-420B38B71BBA">
274+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ServiceModel.Federation.dll"/>
275+
</Component>
276+
<Component Id="SystemServiceModelHttp" Guid="4BB435D8-322D-45F5-95C6-B30291A9C587">
277+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ServiceModel.Http.dll"/>
278+
</Component>
279+
<Component Id="SystemServiceModelNetTcp" Guid="D9C2F47F-49C8-4177-A6E4-D7A9B46C31C3">
280+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ServiceModel.NetTcp.dll"/>
281+
</Component>
282+
<Component Id="SystemServiceModelPrimitives" Guid="599114BE-E951-45EB-85D8-0591112A2330">
283+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ServiceModel.Primitives.dll"/>
284+
</Component>
285+
<Component Id="SystemServiceModelSecurity" Guid="1FC03E3F-47DA-4D16-929C-F0CA6E0BB7A9">
286+
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ServiceModel.Security.dll"/>
218287
</Component>
219288
<Component Id="SystemValueTuple" Guid="9F8DAB16-FBCA-4F08-A883-4A8689B744CC">
220289
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.ValueTuple.dll"/>
@@ -223,5 +292,45 @@
223292
<File Source="$(var.Daqifi.Desktop.TargetDir)\System.Windows.Interactivity.dll"/>
224293
</Component>
225294
</ComponentGroup>
295+
<ComponentGroup Id="X86Components" Directory="X86FOLDER">
296+
<Component Id="sqlceca40x86" Guid="8CA53811-0B5F-467B-BA22-91E882F63414">
297+
<File Id="sqlceca40x86File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceca40.dll"/>
298+
</Component>
299+
<Component Id="sqlcecompact40x86" Guid="681F8E06-FBCE-48B8-9FB1-E6C49CE483DA">
300+
<File Id="sqlcecompact40x86File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlcecompact40.dll"/>
301+
</Component>
302+
<Component Id="sqlceer40ENx86" Guid="FC7935C7-83F8-4409-A435-D72B9BE57BEB">
303+
<File Id="sqlceer40ENx86File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceer40EN.dll"/>
304+
</Component>
305+
<Component Id="sqlceme40x86" Guid="E6EC4E89-5DA9-48E1-A7E1-421EDA404672">
306+
<File Id="sqlceme40x86File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceme40.dll"/>
307+
</Component>
308+
<Component Id="sqlceqp40x86" Guid="68F42531-63E8-4D2A-8047-E77C553F6F47">
309+
<File Id="sqlceqp40x86File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlceqp40.dll"/>
310+
</Component>
311+
<Component Id="sqlcese40x86" Guid="3073A38C-C8AC-4B83-A917-B4270CBB63AE">
312+
<File Id="sqlcese40x86File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\x86\sqlcese40.dll"/>
313+
</Component>
314+
</ComponentGroup>
315+
<ComponentGroup Id="amd64Components" Directory="AMD64FOLDER">
316+
<Component Id="sqlceca40amd64" Guid="EF5BB741-336B-4C50-A204-7724F6B643B3">
317+
<File Id="sqlceca40amd64File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\amd64\sqlceca40.dll"/>
318+
</Component>
319+
<Component Id="sqlcecompact40amd64" Guid="90088064-8194-4D34-A6A0-1B37B262CFD5">
320+
<File Id="sqlcecompact40amd64File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\amd64\sqlcecompact40.dll"/>
321+
</Component>
322+
<Component Id="sqlceer40ENamd64" Guid="E6B0ADB4-27B7-4524-867E-3FC95BF8766E">
323+
<File Id="sqlceer40ENamd64File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\amd64\sqlceer40EN.dll"/>
324+
</Component>
325+
<Component Id="sqlceme40amd64" Guid="CD98F003-4B92-44B6-B367-A6BBFE1EF7AF">
326+
<File Id="sqlceme40amd64File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\amd64\sqlceme40.dll"/>
327+
</Component>
328+
<Component Id="sqlceqp40amd64" Guid="A1BEA2C6-2951-42BB-AF75-CD6CD188BD72">
329+
<File Id="sqlceqp40amd64File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\amd64\sqlceqp40.dll"/>
330+
</Component>
331+
<Component Id="sqlcese40amd64" Guid="53AE1036-DC9B-41C9-B86E-244F2E37329B">
332+
<File Id="sqlcese40amd64File" Source="$(var.Daqifi.Desktop.TargetDir)\Database\amd64\sqlcese40.dll"/>
333+
</Component>
334+
</ComponentGroup>
226335
</Fragment>
227336
</Wix>

‎Daqifi.Desktop.Test/Exporter/LoggingSessionExporterTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void ExportLoggingSession_ValidInput_ExportsCorrectOutput()
6060
exporter.ExportLoggingSession(loggingSession, exportFilePath);
6161

6262
var expectedOutput = "time,Channel 1,Channel 2,Channel 3\r\n";
63-
expectedOutput += "2/9/2018 1:03:30 AM,0.01,0.02,0.03\r\n";
64-
expectedOutput += "2/9/2018 1:03:31 AM,0.04,0.05,0.06\r\n";
63+
expectedOutput += "2018-02-09T01:03:30.0000000,0.01,0.02,0.03\r\n";
64+
expectedOutput += "2018-02-09T01:03:31.0000000,0.04,0.05,0.06\r\n";
6565

6666
var actualOutput = File.ReadAllText(exportFilePath);
6767

@@ -86,8 +86,8 @@ public void ExportLoggingSession_NonUniformData_ExportsCorrectOutput()
8686
exporter.ExportLoggingSession(loggingSession, exportFilePath);
8787

8888
var expectedOutput = "time,Channel 1,Channel 2,Channel 3\r\n";
89-
expectedOutput += "2/9/2018 1:03:30 AM,0.01,0.02,0.03\r\n";
90-
expectedOutput += "2/9/2018 1:03:31 AM,0.04,,0.06\r\n";
89+
expectedOutput += "2018-02-09T01:03:30.0000000,0.01,0.02,0.03\r\n";
90+
expectedOutput += "2018-02-09T01:03:31.0000000,0.04,,0.06\r\n";
9191

9292
var actualOutput = File.ReadAllText(exportFilePath);
9393

‎Daqifi.Desktop/Daqifi.Desktop.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,16 @@
177177
</ItemGroup>
178178
<ItemGroup>
179179
<Compile Remove="Loggers\CsvLogger.cs" />
180+
<Compile Remove="Migrations\201712291614345_InitialMigration.cs" />
181+
<Compile Remove="Migrations\Configuration.cs" />
180182
<Compile Remove="ViewModels\PlottingViewModel.cs" />
181183
<Compile Remove="ViewModels\PlotViewModel.cs" />
182184
<Compile Remove="ViewModels\ViewModelLocator.cs" />
183185
<Compile Remove="WiFiDAQOutMessage.cs" />
184186
</ItemGroup>
187+
<ItemGroup>
188+
<EmbeddedResource Include="Migrations\201712291614345_InitialMigration.cs" />
189+
<EmbeddedResource Include="Migrations\Configuration.cs" />
190+
</ItemGroup>
185191
<PropertyGroup />
186192
</Project>

0 commit comments

Comments
 (0)