Skip to content

Commit 9e7521b

Browse files
TkaelTkael
committed
Target x64.
1 parent 8f6c60f commit 9e7521b

41 files changed

Lines changed: 2625 additions & 2604 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BuildInstaller/BuildInstaller.csproj‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<TargetFramework>net48</TargetFramework>
44
<OutputType>Library</OutputType>
5+
<Platforms>x64</Platforms>
56
</PropertyGroup>
67
<PropertyGroup>
78
<RunPostBuildEvent>Always</RunPostBuildEvent>
@@ -44,16 +45,15 @@
4445

4546
<!--Check for unused dependencies in Directory.Packages.props-->
4647
<Target Name="CheckUnusedPackages" AfterTargets="Build">
47-
<Message Importance="High" Text=">>> Running solution-wide unused package check" />
48+
<Message Importance="High" Text="&gt;&gt;&gt; Running solution-wide unused package check" />
4849

4950
<PropertyGroup>
5051
<PackagesProps>$(MSBuildThisFileDirectory)..\Directory.Packages.props</PackagesProps>
5152
</PropertyGroup>
5253

5354
<!-- Load declared packages -->
54-
<XmlPeek XmlInputPath="$(PackagesProps)"
55-
Query="//PackageVersion/@Include">
56-
<Output TaskParameter="Result" ItemName="DeclaredPackagesRaw"/>
55+
<XmlPeek XmlInputPath="$(PackagesProps)" Query="//PackageVersion/@Include">
56+
<Output TaskParameter="Result" ItemName="DeclaredPackagesRaw" />
5757
</XmlPeek>
5858

5959
<ItemGroup>
@@ -66,11 +66,8 @@
6666
</ItemGroup>
6767

6868
<!-- Ask each project to report its PackageReferences -->
69-
<MSBuild Projects="@(ProjectFiles)"
70-
Targets="CollectPackageReferences"
71-
BuildInParallel="true"
72-
Properties="DesignTimeBuild=true">
73-
<Output TaskParameter="TargetOutputs" ItemName="UsedPackagesRaw"/>
69+
<MSBuild Projects="@(ProjectFiles)" Targets="CollectPackageReferences" BuildInParallel="true" Properties="DesignTimeBuild=true">
70+
<Output TaskParameter="TargetOutputs" ItemName="UsedPackagesRaw" />
7471
</MSBuild>
7572

7673
<ItemGroup>
@@ -79,21 +76,17 @@
7976

8077
<!-- Compare sets -->
8178
<ItemGroup>
82-
<UnusedPackages Include="@(DeclaredPackages)"
83-
Exclude="@(UsedPackages)" />
79+
<UnusedPackages Include="@(DeclaredPackages)" Exclude="@(UsedPackages)" />
8480
</ItemGroup>
8581

8682
<!-- Emit a single consolidated warning -->
87-
<Warning Text="Unused packages in Directory.Packages.props: @(UnusedPackages, ', ')"
88-
Condition=" '@(UnusedPackages)' != '' " />
83+
<Warning Text="Unused packages in Directory.Packages.props: @(UnusedPackages, ', ')" Condition=" '@(UnusedPackages)' != '' " />
8984
</Target>
9085

9186
<!-- Helper target: runs inside each project -->
9287
<Target Name="CollectPackageReferences" Returns="@(FilteredPackageRefs)">
9388
<ItemGroup>
94-
<FilteredPackageRefs Include="@(PackageReference->'%(Identity)')"
95-
Condition=" '%(PackageReference.PrivateAssets)' != 'all'
96-
and '%(PackageReference.IncludeAssets)' != 'analyzers' " />
89+
<FilteredPackageRefs Include="@(PackageReference->'%(Identity)')" Condition=" '%(PackageReference.PrivateAssets)' != 'all'&#xD;&#xA; and '%(PackageReference.IncludeAssets)' != 'analyzers' " />
9790
</ItemGroup>
9891
</Target>
9992

‎CargoMonitor/EddiCargoMonitor.csproj‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
4-
<OutputType>Library</OutputType>
5-
<UseWPF>true</UseWPF>
6-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7-
<!--Dynamic loading copies dependencies of dynamically loaded assemblies to the output directory-->
8-
<EnableDynamicLoading>true</EnableDynamicLoading>
9-
</PropertyGroup>
10-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
11-
<OutputPath>..\bin\Debug\</OutputPath>
12-
</PropertyGroup>
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
14-
<OutputPath>..\bin\Release\</OutputPath>
15-
</PropertyGroup>
16-
<ItemGroup>
17-
<ProjectReference Include="..\ConfigService\EddiConfigService.csproj" />
18-
<ProjectReference Include="..\DataDefinitions\EddiDataDefinitions.csproj" />
19-
<ProjectReference Include="..\EddiCore\EddiCore.csproj" />
20-
<ProjectReference Include="..\Events\EddiEvents.csproj" />
21-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
22-
</ItemGroup>
23-
<ItemGroup>
24-
<PackageReference Include="JetBrains.Annotations" />
25-
<PackageReference Include="Microsoft.CSharp" />
26-
<PackageReference Include="Newtonsoft.Json" />
27-
<PackageReference Include="System.Runtime" />
28-
<PackageReference Include="System.Runtime.Extensions" />
29-
</ItemGroup>
30-
<ItemGroup>
31-
<Compile Update="Properties\CargoMonitor.Designer.cs">
32-
<DesignTime>True</DesignTime>
33-
<AutoGen>True</AutoGen>
34-
<DependentUpon>CargoMonitor.resx</DependentUpon>
35-
</Compile>
36-
</ItemGroup>
37-
<ItemGroup>
38-
<EmbeddedResource Update="Properties\CargoMonitor.resx">
39-
<Generator>PublicResXFileCodeGenerator</Generator>
40-
<LastGenOutput>CargoMonitor.Designer.cs</LastGenOutput>
41-
</EmbeddedResource>
42-
</ItemGroup>
43-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net48</TargetFramework>
4+
<OutputType>Library</OutputType>
5+
<UseWPF>true</UseWPF>
6+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7+
<!--Dynamic loading copies dependencies of dynamically loaded assemblies to the output directory-->
8+
<EnableDynamicLoading>true</EnableDynamicLoading>
9+
<Platforms>x64</Platforms>
10+
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
12+
<OutputPath>..\bin\Debug\</OutputPath>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
15+
<OutputPath>..\bin\Release\</OutputPath>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<ProjectReference Include="..\ConfigService\EddiConfigService.csproj" />
19+
<ProjectReference Include="..\DataDefinitions\EddiDataDefinitions.csproj" />
20+
<ProjectReference Include="..\EddiCore\EddiCore.csproj" />
21+
<ProjectReference Include="..\Events\EddiEvents.csproj" />
22+
<ProjectReference Include="..\Utilities\Utilities.csproj" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<PackageReference Include="JetBrains.Annotations" />
26+
<PackageReference Include="Microsoft.CSharp" />
27+
<PackageReference Include="Newtonsoft.Json" />
28+
<PackageReference Include="System.Runtime" />
29+
<PackageReference Include="System.Runtime.Extensions" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<Compile Update="Properties\CargoMonitor.Designer.cs">
33+
<DesignTime>True</DesignTime>
34+
<AutoGen>True</AutoGen>
35+
<DependentUpon>CargoMonitor.resx</DependentUpon>
36+
</Compile>
37+
</ItemGroup>
38+
<ItemGroup>
39+
<EmbeddedResource Update="Properties\CargoMonitor.resx">
40+
<Generator>PublicResXFileCodeGenerator</Generator>
41+
<LastGenOutput>CargoMonitor.Designer.cs</LastGenOutput>
42+
</EmbeddedResource>
43+
</ItemGroup>
44+
</Project>

‎ChangeLog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Full details of the variables available for each noted event, and VoiceAttack in
88
* Added support for Dodec stations (thanks Nepomuk).
99
* Added support for the Type-11 Prospector.
1010
* Revised Spansh faction queries to match the latest Spansh API revision.
11+
* Retargeted EDDI to target the x64 platform (rather than AnyCPU) to improve performance and reliability. This should not affect most users but may affect some users with private builds.
1112
* Various minor bug fixes.
1213
* `Body` object updated to include `alreadyfootfalled` boolean and `footfalled` timestamp fields.
1314
* `System` object updated to include an `id64` object field containing boxel, mass code, and stellar region information.

‎CommanderMonitor/EddiCommanderMonitor.csproj‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
4-
<OutputType>Library</OutputType>
5-
<UseWPF>true</UseWPF>
6-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7-
<!--Dynamic loading copies dependencies of dynamically loaded assemblies to the output directory-->
8-
<EnableDynamicLoading>true</EnableDynamicLoading>
9-
</PropertyGroup>
10-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
11-
<OutputPath>..\bin\Debug\</OutputPath>
12-
</PropertyGroup>
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
14-
<OutputPath>..\bin\Release\</OutputPath>
15-
</PropertyGroup>
16-
<ItemGroup>
17-
<Reference Include="PresentationCore" />
18-
<Reference Include="PresentationFramework" />
19-
<Reference Include="System" />
20-
<Reference Include="System.Core" />
21-
<Reference Include="System.Xaml" />
22-
<Reference Include="System.Xml.Linq" />
23-
<Reference Include="System.Data.DataSetExtensions" />
24-
<Reference Include="Microsoft.CSharp" />
25-
<Reference Include="System.Data" />
26-
<Reference Include="System.Net.Http" />
27-
<Reference Include="System.Xml" />
28-
<Reference Include="WindowsBase" />
29-
</ItemGroup>
30-
<ItemGroup>
31-
<ProjectReference Include="..\ConfigService\EddiConfigService.csproj" />
32-
<ProjectReference Include="..\DataDefinitions\EddiDataDefinitions.csproj" />
33-
<ProjectReference Include="..\DataProviderService\EddiDataProviderService.csproj" />
34-
<ProjectReference Include="..\EddiCore\EddiCore.csproj" />
35-
<ProjectReference Include="..\Events\EddiEvents.csproj" />
36-
<ProjectReference Include="..\SpeechService\EddiSpeechService.csproj" />
37-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
38-
</ItemGroup>
39-
<ItemGroup>
40-
<PackageReference Include="JetBrains.Annotations" />
41-
</ItemGroup>
42-
<ItemGroup>
43-
<Compile Update="Properties\Resources.Designer.cs">
44-
<DesignTime>True</DesignTime>
45-
<AutoGen>True</AutoGen>
46-
<DependentUpon>Resources.resx</DependentUpon>
47-
</Compile>
48-
</ItemGroup>
49-
<ItemGroup>
50-
<EmbeddedResource Update="Properties\Resources.resx">
51-
<Generator>PublicResXFileCodeGenerator</Generator>
52-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
53-
</EmbeddedResource>
54-
</ItemGroup>
55-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net48</TargetFramework>
4+
<OutputType>Library</OutputType>
5+
<UseWPF>true</UseWPF>
6+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7+
<!--Dynamic loading copies dependencies of dynamically loaded assemblies to the output directory-->
8+
<EnableDynamicLoading>true</EnableDynamicLoading>
9+
<Platforms>x64</Platforms>
10+
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
12+
<OutputPath>..\bin\Debug\</OutputPath>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
15+
<OutputPath>..\bin\Release\</OutputPath>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<Reference Include="PresentationCore" />
19+
<Reference Include="PresentationFramework" />
20+
<Reference Include="System" />
21+
<Reference Include="System.Core" />
22+
<Reference Include="System.Xaml" />
23+
<Reference Include="System.Xml.Linq" />
24+
<Reference Include="System.Data.DataSetExtensions" />
25+
<Reference Include="Microsoft.CSharp" />
26+
<Reference Include="System.Data" />
27+
<Reference Include="System.Net.Http" />
28+
<Reference Include="System.Xml" />
29+
<Reference Include="WindowsBase" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<ProjectReference Include="..\ConfigService\EddiConfigService.csproj" />
33+
<ProjectReference Include="..\DataDefinitions\EddiDataDefinitions.csproj" />
34+
<ProjectReference Include="..\DataProviderService\EddiDataProviderService.csproj" />
35+
<ProjectReference Include="..\EddiCore\EddiCore.csproj" />
36+
<ProjectReference Include="..\Events\EddiEvents.csproj" />
37+
<ProjectReference Include="..\SpeechService\EddiSpeechService.csproj" />
38+
<ProjectReference Include="..\Utilities\Utilities.csproj" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<PackageReference Include="JetBrains.Annotations" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Compile Update="Properties\Resources.Designer.cs">
45+
<DesignTime>True</DesignTime>
46+
<AutoGen>True</AutoGen>
47+
<DependentUpon>Resources.resx</DependentUpon>
48+
</Compile>
49+
</ItemGroup>
50+
<ItemGroup>
51+
<EmbeddedResource Update="Properties\Resources.resx">
52+
<Generator>PublicResXFileCodeGenerator</Generator>
53+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
54+
</EmbeddedResource>
55+
</ItemGroup>
56+
</Project>

‎CompanionAppService/EddiCompanionAppService.csproj‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net48</TargetFramework>
4-
<OutputType>Library</OutputType>
5-
<UseWPF>true</UseWPF>
6-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7-
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
9-
<OutputPath>..\bin\Debug\</OutputPath>
10-
</PropertyGroup>
11-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
12-
<OutputPath>..\bin\Release\</OutputPath>
13-
</PropertyGroup>
14-
<ItemGroup>
15-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
16-
</ItemGroup>
17-
<ItemGroup>
18-
<PackageReference Include="JetBrains.Annotations" />
19-
<PackageReference Include="Microsoft.CSharp" />
20-
<PackageReference Include="Newtonsoft.Json" />
21-
<PackageReference Include="System.Runtime" />
22-
<PackageReference Include="System.Runtime.Extensions" />
23-
</ItemGroup>
24-
<ItemGroup>
25-
<Compile Update="Properties\CapiResources.Designer.cs">
26-
<DesignTime>True</DesignTime>
27-
<AutoGen>True</AutoGen>
28-
<DependentUpon>CapiResources.resx</DependentUpon>
29-
</Compile>
30-
</ItemGroup>
31-
<ItemGroup>
32-
<EmbeddedResource Update="Properties\CapiResources.resx">
33-
<Generator>PublicResXFileCodeGenerator</Generator>
34-
<LastGenOutput>CapiResources.Designer.cs</LastGenOutput>
35-
</EmbeddedResource>
36-
</ItemGroup>
37-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net48</TargetFramework>
4+
<OutputType>Library</OutputType>
5+
<UseWPF>true</UseWPF>
6+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7+
<Platforms>x64</Platforms>
8+
</PropertyGroup>
9+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
10+
<OutputPath>..\bin\Debug\</OutputPath>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
13+
<OutputPath>..\bin\Release\</OutputPath>
14+
</PropertyGroup>
15+
<ItemGroup>
16+
<ProjectReference Include="..\Utilities\Utilities.csproj" />
17+
</ItemGroup>
18+
<ItemGroup>
19+
<PackageReference Include="JetBrains.Annotations" />
20+
<PackageReference Include="Microsoft.CSharp" />
21+
<PackageReference Include="Newtonsoft.Json" />
22+
<PackageReference Include="System.Runtime" />
23+
<PackageReference Include="System.Runtime.Extensions" />
24+
</ItemGroup>
25+
<ItemGroup>
26+
<Compile Update="Properties\CapiResources.Designer.cs">
27+
<DesignTime>True</DesignTime>
28+
<AutoGen>True</AutoGen>
29+
<DependentUpon>CapiResources.resx</DependentUpon>
30+
</Compile>
31+
</ItemGroup>
32+
<ItemGroup>
33+
<EmbeddedResource Update="Properties\CapiResources.resx">
34+
<Generator>PublicResXFileCodeGenerator</Generator>
35+
<LastGenOutput>CapiResources.Designer.cs</LastGenOutput>
36+
</EmbeddedResource>
37+
</ItemGroup>
38+
</Project>

0 commit comments

Comments
 (0)