github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conditional include logic

Browse source
This commit is contained in:
Pepe Rivera 2019-05-02 17:12:12 -07:00
commit 43f18e50d3
5 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -290,6 +290,7 @@ __pycache__/
# Calculator specific # Calculator specific
Generated Files/ Generated Files/
src/GraphControl/GraphingImplOverrides.props src/GraphControl/GraphingImplOverrides.props
src/CalcViewModel/DataLoaders/DataLoaderConstants.h
!/build/config/TRexDefs/** !/build/config/TRexDefs/**
!src/Calculator/TemporaryKey.pfx !src/Calculator/TemporaryKey.pfx
!src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx !src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx

12
src/CalcViewModel/CalcViewModel.vcxproj
View file

@ -344,7 +344,6 @@
<ClInclude Include="Common\TraceLogger.h" /> <ClInclude Include="Common\TraceLogger.h" />
<ClInclude Include="Common\Utils.h" /> <ClInclude Include="Common\Utils.h" />
<ClInclude Include="Common\ValidatingConverters.h" /> <ClInclude Include="Common\ValidatingConverters.h" />
<ClInclude Include="DataLoaders\DataLoaderConstants.h" />
<ClInclude Include="DataLoaders\CurrencyDataLoader.h" /> <ClInclude Include="DataLoaders\CurrencyDataLoader.h" />
<ClInclude Include="DataLoaders\CurrencyHttpClient.h" /> <ClInclude Include="DataLoaders\CurrencyHttpClient.h" />
<ClInclude Include="DataLoaders\ICurrencyHttpClient.h" /> <ClInclude Include="DataLoaders\ICurrencyHttpClient.h" />
@ -409,6 +408,17 @@
<Project>{311e866d-8b93-4609-a691-265941fee101}</Project> <Project>{311e866d-8b93-4609-a691-265941fee101}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemDefinitionGroup Condition="!Exists('DataLoaders\DataLoaderConstants.h')">
<ClCompile>
<AdditionalOptions>/DUSE_MOCK_DATA %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup Condition="!Exists('DataLoaders\DataLoaderConstants.h')">
<ClInclude Include="DataLoaders\DataLoaderMockConstants.h" />
</ItemGroup>
<ItemGroup Condition="Exists('DataLoaders\DataLoaderConstants.h')">
<ClInclude Include="DataLoaders\DataLoaderConstants.h" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="DataLoaders\DefaultFromToCurrency.json" /> <None Include="DataLoaders\DefaultFromToCurrency.json" />
<None Include="packages.config" /> <None Include="packages.config" />

3
src/CalcViewModel/CalcViewModel.vcxproj.filters
View file

@ -213,6 +213,9 @@
<ClInclude Include="Common\TraceActivity.h"> <ClInclude Include="Common\TraceActivity.h">
<Filter>Common</Filter> <Filter>Common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DataLoaders\DataLoaderMockConstants.h">
<Filter>DataLoaders</Filter>
</ClInclude>
<ClInclude Include="DataLoaders\DataLoaderConstants.h"> <ClInclude Include="DataLoaders\DataLoaderConstants.h">
<Filter>DataLoaders</Filter> <Filter>DataLoaders</Filter>
</ClInclude> </ClInclude>

5
src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp
View file

@ -3,7 +3,12 @@
#include "pch.h" #include "pch.h"
#include "CurrencyHttpClient.h" #include "CurrencyHttpClient.h"
#ifdef USE_MOCK_DATA
#include "DataLoaderMockConstants.h"
#else
#include "DataLoaderConstants.h" #include "DataLoaderConstants.h"
#endif
using namespace CalculatorApp::DataLoaders; using namespace CalculatorApp::DataLoaders;
using namespace Platform; using namespace Platform;

0
src/CalcViewModel/DataLoaders/DataLoaderConstants.h → src/CalcViewModel/DataLoaders/DataLoaderMockConstants.h
View file