Skip to content

Commit 19e3410

Browse files
WumboSpasmWumboSpasm
committed
Add Costura.Fody so DLLs embed into executable
1 parent 16afe1a commit 19e3410

File tree

3 files changed

+198
-2
lines changed

3 files changed

+198
-2
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
.vs/
22
bin/
33
obj/
4-
packages/
4+
packages/
5+
FlashpointInstaller.csproj.user
6+
FodyWeavers.xsd
7+
FodyWeavers.xml

‎FlashpointInstaller.csproj‎

Lines changed: 146 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.props" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -28,6 +29,8 @@
2829
<UseApplicationTrust>false</UseApplicationTrust>
2930
<PublishWizardCompleted>true</PublishWizardCompleted>
3031
<BootstrapperEnabled>true</BootstrapperEnabled>
32+
<NuGetPackageImportStamp>
33+
</NuGetPackageImportStamp>
3134
</PropertyGroup>
3235
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3336
<PlatformTarget>x86</PlatformTarget>
@@ -85,9 +88,17 @@
8588
<Prefer32Bit>true</Prefer32Bit>
8689
</PropertyGroup>
8790
<ItemGroup>
91+
<Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
92+
<HintPath>packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
93+
</Reference>
8894
<Reference Include="Downloader, Version=2.4.1.0, Culture=neutral, PublicKeyToken=844973e732f6cdf4, processorArchitecture=MSIL">
8995
<HintPath>packages\Downloader.2.4.1\lib\net452\Downloader.dll</HintPath>
9096
</Reference>
97+
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98+
<HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
99+
<Private>True</Private>
100+
<Private>True</Private>
101+
</Reference>
91102
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
92103
<HintPath>packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
93104
</Reference>
@@ -101,32 +112,156 @@
101112
<HintPath>packages\SharpCompress.0.32.2\lib\net461\SharpCompress.dll</HintPath>
102113
</Reference>
103114
<Reference Include="System" />
115+
<Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
116+
<HintPath>packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
117+
<Private>True</Private>
118+
<Private>True</Private>
119+
</Reference>
104120
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
105121
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
106122
</Reference>
123+
<Reference Include="System.ComponentModel.Composition" />
124+
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125+
<HintPath>packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
126+
<Private>True</Private>
127+
<Private>True</Private>
128+
</Reference>
107129
<Reference Include="System.Core" />
130+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
131+
<HintPath>packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
132+
</Reference>
133+
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134+
<HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
135+
<Private>True</Private>
136+
<Private>True</Private>
137+
</Reference>
138+
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
139+
<HintPath>packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
140+
<Private>True</Private>
141+
<Private>True</Private>
142+
</Reference>
143+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
144+
<HintPath>packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
145+
<Private>True</Private>
146+
<Private>True</Private>
147+
</Reference>
148+
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
149+
<HintPath>packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
150+
<Private>True</Private>
151+
<Private>True</Private>
152+
</Reference>
153+
<Reference Include="System.IO.Compression.FileSystem" />
154+
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
155+
<HintPath>packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
156+
<Private>True</Private>
157+
<Private>True</Private>
158+
</Reference>
159+
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
160+
<HintPath>packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
161+
<Private>True</Private>
162+
<Private>True</Private>
163+
</Reference>
164+
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
165+
<HintPath>packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
166+
<Private>True</Private>
167+
<Private>True</Private>
168+
</Reference>
169+
<Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
170+
<HintPath>packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
171+
<Private>True</Private>
172+
<Private>True</Private>
173+
</Reference>
174+
<Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
175+
<HintPath>packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
176+
<Private>True</Private>
177+
<Private>True</Private>
178+
</Reference>
108179
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
109180
<HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
110181
</Reference>
182+
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
183+
<HintPath>packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
184+
<Private>True</Private>
185+
<Private>True</Private>
186+
</Reference>
187+
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
188+
<HintPath>packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
189+
<Private>True</Private>
190+
<Private>True</Private>
191+
</Reference>
111192
<Reference Include="System.Numerics" />
112193
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
113194
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
114195
</Reference>
196+
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
197+
<HintPath>packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
198+
<Private>True</Private>
199+
<Private>True</Private>
200+
</Reference>
201+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
202+
<HintPath>packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
203+
<Private>True</Private>
204+
<Private>True</Private>
205+
</Reference>
115206
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
116207
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
117208
</Reference>
209+
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
210+
<HintPath>packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
211+
<Private>True</Private>
212+
<Private>True</Private>
213+
</Reference>
214+
<Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
215+
<HintPath>packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
216+
<Private>True</Private>
217+
<Private>True</Private>
218+
</Reference>
219+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
220+
<HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
221+
<Private>True</Private>
222+
<Private>True</Private>
223+
</Reference>
224+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
225+
<HintPath>packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
226+
<Private>True</Private>
227+
<Private>True</Private>
228+
</Reference>
229+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
230+
<HintPath>packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
231+
<Private>True</Private>
232+
<Private>True</Private>
233+
</Reference>
234+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
235+
<HintPath>packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
236+
<Private>True</Private>
237+
<Private>True</Private>
238+
</Reference>
239+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
240+
<HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
241+
<Private>True</Private>
242+
<Private>True</Private>
243+
</Reference>
118244
<Reference Include="System.Text.Encoding.CodePages, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
119245
<HintPath>packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
120246
</Reference>
247+
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
248+
<HintPath>packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
249+
<Private>True</Private>
250+
<Private>True</Private>
251+
</Reference>
121252
<Reference Include="System.Xml.Linq" />
122253
<Reference Include="System.Data.DataSetExtensions" />
123254
<Reference Include="Microsoft.CSharp" />
124255
<Reference Include="System.Data" />
125256
<Reference Include="System.Deployment" />
126257
<Reference Include="System.Drawing" />
127-
<Reference Include="System.Net.Http" />
128258
<Reference Include="System.Windows.Forms" />
129259
<Reference Include="System.Xml" />
260+
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
261+
<HintPath>packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
262+
<Private>True</Private>
263+
<Private>True</Private>
264+
</Reference>
130265
</ItemGroup>
131266
<ItemGroup>
132267
<Compile Include="Finish.cs">
@@ -208,4 +343,14 @@
208343
<Content Include="FlashpointIcon.ico" />
209344
</ItemGroup>
210345
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
346+
<Import Project="packages\Fody.6.5.5\build\Fody.targets" Condition="Exists('packages\Fody.6.5.5\build\Fody.targets')" />
347+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
348+
<PropertyGroup>
349+
<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>
350+
</PropertyGroup>
351+
<Error Condition="!Exists('packages\Fody.6.5.5\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.5.5\build\Fody.targets'))" />
352+
<Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
353+
<Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
354+
</Target>
355+
<Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
211356
</Project>

‎packages.config‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,60 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Costura.Fody" version="5.7.0" targetFramework="net472" developmentDependency="true" />
34
<package id="Downloader" version="2.4.1" targetFramework="net472" />
5+
<package id="Fody" version="6.5.5" targetFramework="net472" developmentDependency="true" />
6+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net472" />
7+
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
48
<package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net472" />
59
<package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net472" />
10+
<package id="NETStandard.Library" version="1.6.1" targetFramework="net472" />
611
<package id="SharpCompress" version="0.32.2" targetFramework="net472" />
12+
<package id="System.AppContext" version="4.3.0" targetFramework="net472" />
713
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
14+
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
15+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
16+
<package id="System.Console" version="4.3.0" targetFramework="net472" />
17+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
18+
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net472" />
19+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
20+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
21+
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
22+
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net472" />
23+
<package id="System.IO" version="4.3.0" targetFramework="net472" />
24+
<package id="System.IO.Compression" version="4.3.0" targetFramework="net472" />
25+
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net472" />
26+
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net472" />
27+
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net472" />
28+
<package id="System.Linq" version="4.3.0" targetFramework="net472" />
29+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
830
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
31+
<package id="System.Net.Http" version="4.3.0" targetFramework="net472" />
32+
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net472" />
33+
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net472" />
934
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
35+
<package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
36+
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
37+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
38+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
39+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
40+
<package id="System.Runtime" version="4.3.0" targetFramework="net472" />
1041
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
42+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net472" />
43+
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
44+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
45+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
46+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net472" />
47+
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net472" />
48+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
49+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
50+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net472" />
51+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
1152
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net472" />
53+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net472" />
54+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net472" />
55+
<package id="System.Threading" version="4.3.0" targetFramework="net472" />
56+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
57+
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
58+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net472" />
59+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
1260
</packages>

0 commit comments

Comments
 (0)