diff options
| author | Elie Rodrigue <elie.rodrigue@nubik.ca> | 2017-05-15 03:41:59 +0300 |
|---|---|---|
| committer | Elie Rodrigue <elie.rodrigue@nubik.ca> | 2017-05-15 03:41:59 +0300 |
| commit | 7086386576228a2d5516c39c41fae79ae2ba11be (patch) | |
| tree | 4ad1016b596bca0d26856b30b7cfe115255eb35a | |
| parent | 2a699233996e799fd644504e953ae4e4d46f8236 (diff) | |
Fixed newtonjsoft json reference
Leave it there for a while, i'll work on removing it.
I'm planning more integration with JSON
| -rw-r--r-- | hakchi_gui.csproj | 15 | ||||
| -rw-r--r-- | tools/Newtonsoft.Json.dll | bin | 0 -> 457209 bytes |
2 files changed, 7 insertions, 8 deletions
diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj index 4b538043..4524d344 100644 --- a/hakchi_gui.csproj +++ b/hakchi_gui.csproj @@ -15,6 +15,7 @@ <TreatWarningsAsErrors>False</TreatWarningsAsErrors> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IsWebBootstrapper>true</IsWebBootstrapper> + <TargetFrameworkProfile /> <PublishUrl>ftp://clusterrr.com/www/www/soft/hakchi2/</PublishUrl> <Install>true</Install> <InstallFrom>Web</InstallFrom> @@ -37,7 +38,6 @@ <CreateDesktopShortcut>true</CreateDesktopShortcut> <PublishWizardCompleted>true</PublishWizardCompleted> <BootstrapperEnabled>true</BootstrapperEnabled> - <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -103,9 +103,8 @@ <NoWin32Manifest>true</NoWin32Manifest> </PropertyGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net35\Newtonsoft.Json.dll</HintPath> - <Private>True</Private> + <Reference Include="Newtonsoft.Json"> + <HintPath>tools\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -1747,22 +1746,22 @@ <ItemGroup> <PublishFile Include="data\GameGenieDB.xml"> <Visible>False</Visible> - <PublishState>Include</PublishState> - <IncludeHash>True</IncludeHash> <Group> </Group> <TargetPath> </TargetPath> + <PublishState>Include</PublishState> + <IncludeHash>True</IncludeHash> <FileType>File</FileType> </PublishFile> <PublishFile Include="data\nescarts.xml"> <Visible>False</Visible> - <PublishState>Include</PublishState> - <IncludeHash>True</IncludeHash> <Group> </Group> <TargetPath> </TargetPath> + <PublishState>Include</PublishState> + <IncludeHash>True</IncludeHash> <FileType>File</FileType> </PublishFile> </ItemGroup> diff --git a/tools/Newtonsoft.Json.dll b/tools/Newtonsoft.Json.dll Binary files differnew file mode 100644 index 00000000..d1737e23 --- /dev/null +++ b/tools/Newtonsoft.Json.dll |