Skip to content

Commit

Permalink
better build setup with nuget, dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@Icehunter
Icehunter committed Aug 21, 2017
1 parent dfb2107 commit b9fbc2a
Show file tree
Hide file tree
Showing 28 changed files with 748 additions and 65 deletions.
1 change: 1 addition & 0 deletions .nuget/NuGet.Config
View file
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
Expand Down
Binary file modified .nuget/NuGet.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion .nuget/NuGet.targets
View file
Expand Up @@ -51,7 +51,7 @@
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>

<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>

<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>

Expand Down
Binary file added .vs/FFXIVAPP/v15/sqlite3/storage.ide
View file
Binary file not shown.
37 changes: 7 additions & 30 deletions FFXIVAPP.Client/FFXIVAPP.Client.csproj
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="..\..\ffxivapp-props\Common.props" />
<Import Project="..\..\ffxivapp-props\FFXIVAPP.Common.props" />
<Import Project="..\..\ffxivapp-props\FFXIVAPP.IPluginInterface.props" />
<Import Project="..\..\ffxivapp-props\FFXIVAPP.ResourceFiles.props" />
Expand Down Expand Up @@ -39,32 +39,6 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\build\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\distribution\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>FFXIVAPP.ico</ApplicationIcon>
</PropertyGroup>
Expand All @@ -73,15 +47,15 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FFXIVAPP.Common, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FFXIVAPP.Common.4.0.3\lib\NET461\FFXIVAPP.Common.dll</HintPath>
<HintPath>..\packages\FFXIVAPP.Common.4.0.4\lib\NET461\FFXIVAPP.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFXIVAPP.IPluginInterface, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FFXIVAPP.IPluginInterface.4.0.3\lib\NET461\FFXIVAPP.IPluginInterface.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFXIVAPP.ResourceFiles, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FFXIVAPP.ResourceFiles.1.0.2\lib\NET461\FFXIVAPP.ResourceFiles.dll</HintPath>
<HintPath>..\packages\FFXIVAPP.ResourceFiles.1.0.3\lib\NET461\FFXIVAPP.ResourceFiles.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Machina, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -107,7 +81,7 @@
<HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Sharlayan, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sharlayan.4.0.0\lib\net461\Sharlayan.dll</HintPath>
<HintPath>..\packages\Sharlayan.4.0.1\lib\net461\Sharlayan.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down Expand Up @@ -337,6 +311,9 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>%25SYSTEMROOT%25\System32\WindowsPowerShell\v1.0\powershell.exe –NonInteractive –ExecutionPolicy Unrestricted –command "&amp; { &amp;'$(SolutionDir)RestorePackages.ps1' '$(SolutionDir).nuget/nuget.exe' }"</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Initializer.cs
View file
Expand Up @@ -678,7 +678,7 @@ public static void StartMemoryWorkers()
MemoryHandler.Instance.ExceptionEvent += MemoryHandler_ExceptionEvent;
MemoryHandler.Instance.SignaturesFoundEvent += MemoryHandler_SignaturesFoundEvent;

MemoryHandler.Instance.SetProcess(Constants.ProcessModel, Settings.Default.GameLanguage, "latest", !Settings.Default.CacheMemoryJSONData);
MemoryHandler.Instance.SetProcess(Constants.ProcessModel, Settings.Default.GameLanguage, "latest", Settings.Default.UseLocalMemoryJSONDataCache);

_chatLogWorker = new ChatLogWorker();
_chatLogWorker.StartScanning();
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/Chinese.cs
View file
Expand Up @@ -133,7 +133,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "Targets &amp; Enmity");
Dictionary.Add("app_InvMSSLabel", "Inventory");
Dictionary.Add("app_NetworkUseWinPCapLabel", "Use WinPCap For Network Reading");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/English.cs
View file
Expand Up @@ -135,7 +135,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "Targets &amp; Enmity");
Dictionary.Add("app_InvMSSLabel", "Inventory");
Dictionary.Add("app_NetworkUseWinPCapLabel", "Use WinPCap For Network Reading");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/French.cs
View file
Expand Up @@ -133,7 +133,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "Targets &amp; Enmity");
Dictionary.Add("app_InvMSSLabel", "Inventory");
Dictionary.Add("app_NetworkUseWinPCapLabel", "Use WinPCap For Network Reading");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/German.cs
View file
Expand Up @@ -133,7 +133,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "Targets &amp; Enmity");
Dictionary.Add("app_InvMSSLabel", "Inventory");
Dictionary.Add("app_NetworkUseWinPCapLabel", "Use WinPCap For Network Reading");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/Japanese.cs
View file
Expand Up @@ -133,7 +133,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "Targets &amp; Enmity");
Dictionary.Add("app_InvMSSLabel", "Inventory");
Dictionary.Add("app_NetworkUseWinPCapLabel", "Use WinPCap For Network Reading");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/Korean.cs
View file
Expand Up @@ -135,7 +135,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "대상 &amp; 적개심");
Dictionary.Add("app_InvMSSLabel", "소지품");
Dictionary.Add("app_NetworkUseWinPCapLabel", "네트워크 읽을 때 WinPCap 사용하기");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Localization/Russian.cs
View file
Expand Up @@ -136,7 +136,7 @@ public static ResourceDictionary Context()
Dictionary.Add("app_TargEnmMSSLabel", "Цели и Враждебность");
Dictionary.Add("app_InvMSSLabel", "Инвентарь");
Dictionary.Add("app_NetworkUseWinPCapLabel", "Use WinPCap For Network Reading");
Dictionary.Add("app_CacheMemoryJSONDataHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_UseLocalMemoryJSONDataCacheHeader", "Cache Memory JSON Data Locally");
Dictionary.Add("app_RefreshMemoryWorkersButtonText", "Refresh Memory Workers");
return Dictionary;
}
Expand Down
8 changes: 4 additions & 4 deletions FFXIVAPP.Client/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion FFXIVAPP.Client/Properties/Settings.settings
View file
Expand Up @@ -263,7 +263,7 @@
<Setting Name="NetworkUseWinPCap" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="CacheMemoryJSONData" Type="System.Boolean" Scope="User">
<Setting Name="UseLocalMemoryJSONDataCache" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="HotBarRecastWorkerRefresh" Type="System.String" Scope="User">
Expand Down
4 changes: 2 additions & 2 deletions FFXIVAPP.Client/Views/SettingsView.xaml
View file
Expand Up @@ -138,9 +138,9 @@
ItemsSource="{Binding AvailableAudioDevicesList}"
SelectedValue="{Binding DefaultAudioDevice, Source={x:Static Properties:Settings.Default}}" />
</GroupBox>
<GroupBox Header="{Binding Locale[app_CacheMemoryJSONDataHeader], Source={StaticResource AppProperties}}">
<GroupBox Header="{Binding Locale[app_UseLocalMemoryJSONDataCacheHeader], Source={StaticResource AppProperties}}">
<StackPanel>
<MetroControls:ToggleSwitch IsChecked="{Binding CacheMemoryJSONData, Source={x:Static Properties:Settings.Default}}" />
<MetroControls:ToggleSwitch IsChecked="{Binding UseLocalMemoryJSONDataCache, Source={x:Static Properties:Settings.Default}}" />
</StackPanel>
</GroupBox>
<GroupBox Header="{Binding Locale[app_MemScanSpeedLabel], Source={StaticResource AppProperties}}">
Expand Down
20 changes: 13 additions & 7 deletions FFXIVAPP.Client/app.config
View file
Expand Up @@ -115,7 +115,7 @@
<setting name="NetworkUseWinPCap" serializeAs="String">
<value>False</value>
</setting>
<setting name="CacheMemoryJSONData" serializeAs="String">
<setting name="UseLocalMemoryJSONDataCache" serializeAs="String">
<value>False</value>
</setting>
<setting name="HotBarRecastWorkerRefresh" serializeAs="String">
Expand All @@ -127,7 +127,8 @@
<FFXIVAPP.Client.Properties.Settings>
<setting name="ThemeList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>Red|Light</string>
<string>Green|Light</string>
<string>Blue|Light</string>
Expand Down Expand Up @@ -177,7 +178,8 @@
</setting>
<setting name="ServerList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>Adamantoise</string>
<string>Aegis</string>
<string>Alexander</string>
Expand Down Expand Up @@ -246,7 +248,8 @@
</setting>
<setting name="GameLanguageList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>English</string>
<string>Japanese</string>
<string>French</string>
Expand All @@ -261,14 +264,16 @@
</setting>
<setting name="HomePluginList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>None</string>
</ArrayOfString>
</value>
</setting>
<setting name="UIScaleList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>0.8</string>
<string>0.9</string>
<string>1.0</string>
Expand All @@ -282,7 +287,8 @@
</setting>
<setting name="DefaultAudioDeviceList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>System Default</string>
</ArrayOfString>
</value>
Expand Down
8 changes: 4 additions & 4 deletions FFXIVAPP.Client/packages.config
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FFXIVAPP.Common" version="4.0.3" targetFramework="net461" />
<package id="FFXIVAPP.IPluginInterface" version="4.0.3" targetFramework="net461" />
<package id="FFXIVAPP.ResourceFiles" version="1.0.2" targetFramework="net461" />
<package id="FFXIVAPP.Common" version="4.0.4" targetFramework="net461" />
<package id="FFXIVAPP.IPluginInterface" version="4.0.4" targetFramework="net461" />
<package id="FFXIVAPP.ResourceFiles" version="1.0.3" targetFramework="net461" />
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
<package id="Machina" version="1.0.3" targetFramework="net461" />
<package id="MahApps.Metro" version="1.5.0" targetFramework="net461" />
Expand All @@ -12,5 +12,5 @@
<package id="NLog" version="4.4.11" targetFramework="net461" />
<package id="NLog.Config" version="4.4.11" targetFramework="net461" />
<package id="NLog.Schema" version="4.4.11" targetFramework="net461" />
<package id="Sharlayan" version="4.0.0" targetFramework="net461" />
<package id="Sharlayan" version="4.0.1" targetFramework="net461" />
</packages>

2 comments on commit b9fbc2a

@lakario
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you in the process of getting this application back to functional? Gitter has been dead for about a year, and yet here you are making updates. Color me enthused.

@Icehunter
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already working in 4.1 ;)

Please sign in to comment.