Skip to content

Commit 02e35c1

Browse files
mfahadahmedmikeproeng37
mfahadahmed
authored and
mikeproeng37
committed
feat (audience match types): Condition Evaluator, Project Config, and Audience combinations PRs consolidation. (#125)
1 parent dc860a9 commit 02e35c1

28 files changed

+2079
-294
lines changed

‎OptimizelySDK.Net35/OptimizelySDK.Net35.csproj

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,27 @@
4646
</Reference>
4747
</ItemGroup>
4848
<ItemGroup>
49+
<Compile Include="..\OptimizelySDK\AudienceConditions\AndCondition.cs">
50+
<Link>AudienceConditions\AndCondition.cs</Link>
51+
</Compile>
52+
<Compile Include="..\OptimizelySDK\AudienceConditions\AudienceIdCondition.cs">
53+
<Link>AudienceConditions\AudienceIdCondition.cs</Link>
54+
</Compile>
55+
<Compile Include="..\OptimizelySDK\AudienceConditions\BaseCondition.cs">
56+
<Link>AudienceConditions\BaseCondition.cs</Link>
57+
</Compile>
58+
<Compile Include="..\OptimizelySDK\AudienceConditions\EmptyCondition.cs">
59+
<Link>AudienceConditions\EmptyCondition.cs</Link>
60+
</Compile>
61+
<Compile Include="..\OptimizelySDK\AudienceConditions\ICondition.cs">
62+
<Link>AudienceConditions\ICondition.cs</Link>
63+
</Compile>
64+
<Compile Include="..\OptimizelySDK\AudienceConditions\NotCondition.cs">
65+
<Link>AudienceConditions\NotCondition.cs</Link>
66+
</Compile>
67+
<Compile Include="..\OptimizelySDK\AudienceConditions\OrCondition.cs">
68+
<Link>AudienceConditions\OrCondition.cs</Link>
69+
</Compile>
4970
<Compile Include="..\OptimizelySDK\Entity\Attribute.cs">
5071
<Link>Entity\Attribute.cs</Link>
5172
</Compile>
@@ -64,7 +85,7 @@
6485
<Compile Include="..\OptimizelySDK\Entity\Experiment.cs">
6586
<Link>Entity\Experiment.cs</Link>
6687
</Compile>
67-
<Compile Include="..\OptimizelySDK\Entity\FeatureDecision.cs">
88+
<Compile Include="..\OptimizelySDK\Entity\FeatureDecision.cs">
6889
<Link>Entity\FeatureDecision.cs</Link>
6990
</Compile>
7091
<Compile Include="..\OptimizelySDK\Entity\ForcedVariation.cs">
@@ -127,7 +148,7 @@
127148
<Compile Include="..\OptimizelySDK\Logger\NoOpLogger.cs">
128149
<Link>Logger\NoOpLogger.cs</Link>
129150
</Compile>
130-
<Compile Include="..\OptimizelySDK\Notifications\NotificationCenter.cs">
151+
<Compile Include="..\OptimizelySDK\Notifications\NotificationCenter.cs">
131152
<Link>Notifications\NotificationCenter.cs</Link>
132153
</Compile>
133154
<Compile Include="..\OptimizelySDK\Optimizely.cs">
@@ -136,9 +157,6 @@
136157
<Compile Include="..\OptimizelySDK\ProjectConfig.cs">
137158
<Link>ProjectConfig.cs</Link>
138159
</Compile>
139-
<Compile Include="..\OptimizelySDK\Utils\ConditionEvaluator.cs">
140-
<Link>Utils\ConditionEvaluator.cs</Link>
141-
</Compile>
142160
<Compile Include="..\OptimizelySDK\Utils\ConfigParser.cs">
143161
<Link>Utils\ConfigParser.cs</Link>
144162
</Compile>
@@ -151,8 +169,14 @@
151169
<Compile Include="..\OptimizelySDK\Utils\Validator.cs">
152170
<Link>Utils\Validator.cs</Link>
153171
</Compile>
154-
<Compile Include="..\OptimizelySDK\Utils\ControlAttributes.cs">
172+
<Compile Include="..\OptimizelySDK\Utils\ControlAttributes.cs">
155173
<Link>Utils\ControlAttributes.cs</Link>
174+
</Compile>
175+
<Compile Include="..\OptimizelySDK\Utils\ConditionParser.cs">
176+
<Link>Utils\ConditionParser.cs</Link>
177+
</Compile>
178+
<Compile Include="..\OptimizelySDK\Utils\AttributeMatchTypes.cs">
179+
<Link>Utils\AttributeMatchTypes.cs</Link>
156180
</Compile>
157181
<Compile Include="Properties\AssemblyInfo.cs" />
158182
<Compile Include="..\OptimizelySDK\Bucketing\Bucketer.cs">
@@ -173,19 +197,19 @@
173197
<Compile Include="..\OptimizelySDK\Utils\ExperimentUtils.cs">
174198
<Link>Bucketing\ExperimentUtils</Link>
175199
</Compile>
176-
<Compile Include="..\OptimizelySDK\Bucketing\UserprofileUtil.cs">
200+
<Compile Include="..\OptimizelySDK\Bucketing\UserProfileUtil.cs">
177201
<Link>Bucketing\UserProfileUtil</Link>
178202
</Compile>
179-
<Compile Include="..\OptimizelySDK\Entity\FeatureVariableUsage.cs">
203+
<Compile Include="..\OptimizelySDK\Entity\FeatureVariableUsage.cs">
180204
<Link>Entity\FeatureVariableUsage</Link>
181205
</Compile>
182-
<Compile Include="..\OptimizelySDK\Entity\FeatureFlag.cs">
206+
<Compile Include="..\OptimizelySDK\Entity\FeatureFlag.cs">
183207
<Link>Entity\FeatureFlag</Link>
184208
</Compile>
185-
<Compile Include="..\OptimizelySDK\Entity\FeatureVariable.cs">
209+
<Compile Include="..\OptimizelySDK\Entity\FeatureVariable.cs">
186210
<Link>Entity\FeatureVariable</Link>
187211
</Compile>
188-
<Compile Include="..\OptimizelySDK\Entity\Rollout.cs">
212+
<Compile Include="..\OptimizelySDK\Entity\Rollout.cs">
189213
<Link>Entity\Rollout</Link>
190214
</Compile>
191215
</ItemGroup>
@@ -203,4 +227,4 @@
203227
<Target Name="AfterBuild">
204228
</Target>
205229
-->
206-
</Project>
230+
</Project>

‎OptimizelySDK.Net40/OptimizelySDK.Net40.csproj

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,27 @@
4747
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>
50+
<Compile Include="..\OptimizelySDK\AudienceConditions\AndCondition.cs">
51+
<Link>AudienceConditions\AndCondition.cs</Link>
52+
</Compile>
53+
<Compile Include="..\OptimizelySDK\AudienceConditions\AudienceIdCondition.cs">
54+
<Link>AudienceConditions\AudienceIdCondition.cs</Link>
55+
</Compile>
56+
<Compile Include="..\OptimizelySDK\AudienceConditions\BaseCondition.cs">
57+
<Link>AudienceConditions\BaseCondition.cs</Link>
58+
</Compile>
59+
<Compile Include="..\OptimizelySDK\AudienceConditions\EmptyCondition.cs">
60+
<Link>AudienceConditions\EmptyCondition.cs</Link>
61+
</Compile>
62+
<Compile Include="..\OptimizelySDK\AudienceConditions\ICondition.cs">
63+
<Link>AudienceConditions\ICondition.cs</Link>
64+
</Compile>
65+
<Compile Include="..\OptimizelySDK\AudienceConditions\NotCondition.cs">
66+
<Link>AudienceConditions\NotCondition.cs</Link>
67+
</Compile>
68+
<Compile Include="..\OptimizelySDK\AudienceConditions\OrCondition.cs">
69+
<Link>AudienceConditions\OrCondition.cs</Link>
70+
</Compile>
5071
<Compile Include="..\OptimizelySDK\Entity\Attribute.cs">
5172
<Link>Entity\Attribute.cs</Link>
5273
</Compile>
@@ -65,7 +86,7 @@
6586
<Compile Include="..\OptimizelySDK\Entity\Experiment.cs">
6687
<Link>Entity\Experiment.cs</Link>
6788
</Compile>
68-
<Compile Include="..\OptimizelySDK\Entity\FeatureDecision.cs">
89+
<Compile Include="..\OptimizelySDK\Entity\FeatureDecision.cs">
6990
<Link>Entity\FeatureDecision.cs</Link>
7091
</Compile>
7192
<Compile Include="..\OptimizelySDK\Entity\ForcedVariation.cs">
@@ -128,7 +149,7 @@
128149
<Compile Include="..\OptimizelySDK\Logger\NoOpLogger.cs">
129150
<Link>Logger\NoOpLogger.cs</Link>
130151
</Compile>
131-
<Compile Include="..\OptimizelySDK\Notifications\NotificationCenter.cs">
152+
<Compile Include="..\OptimizelySDK\Notifications\NotificationCenter.cs">
132153
<Link>Notifications\NotificationCenter.cs</Link>
133154
</Compile>
134155
<Compile Include="..\OptimizelySDK\Optimizely.cs">
@@ -137,11 +158,11 @@
137158
<Compile Include="..\OptimizelySDK\ProjectConfig.cs">
138159
<Link>ProjectConfig.cs</Link>
139160
</Compile>
140-
<Compile Include="..\OptimizelySDK\Utils\ConditionEvaluator.cs">
141-
<Link>Utils\ConditionEvaluator.cs</Link>
142-
</Compile>
143161
<Compile Include="..\OptimizelySDK\Utils\ConfigParser.cs">
144162
<Link>Utils\ConfigParser.cs</Link>
163+
</Compile>
164+
<Compile Include="..\OptimizelySDK\Utils\ConditionParser.cs">
165+
<Link>Utils\ConditionParser.cs</Link>
145166
</Compile>
146167
<Compile Include="..\OptimizelySDK\Utils\EventTagUtils.cs">
147168
<Link>Utils\EventTagUtils.cs</Link>
@@ -152,8 +173,11 @@
152173
<Compile Include="..\OptimizelySDK\Utils\Validator.cs">
153174
<Link>Utils\Validator.cs</Link>
154175
</Compile>
155-
<Compile Include="..\OptimizelySDK\Utils\ControlAttributes.cs">
176+
<Compile Include="..\OptimizelySDK\Utils\ControlAttributes.cs">
156177
<Link>Utils\ControlAttributes.cs</Link>
178+
</Compile>
179+
<Compile Include="..\OptimizelySDK\Utils\AttributeMatchTypes.cs">
180+
<Link>Utils\AttributeMatchTypes.cs</Link>
157181
</Compile>
158182
<Compile Include="Properties\AssemblyInfo.cs" />
159183
<Compile Include="..\OptimizelySDK\Bucketing\Bucketer.cs">
@@ -174,19 +198,19 @@
174198
<Compile Include="..\OptimizelySDK\Utils\ExperimentUtils.cs">
175199
<Link>Bucketing\ExperimentUtils</Link>
176200
</Compile>
177-
<Compile Include="..\OptimizelySDK\Bucketing\UserprofileUtil.cs">
201+
<Compile Include="..\OptimizelySDK\Bucketing\UserProfileUtil.cs">
178202
<Link>Bucketing\UserProfileUtil</Link>
179203
</Compile>
180-
<Compile Include="..\OptimizelySDK\Entity\FeatureVariableUsage.cs">
204+
<Compile Include="..\OptimizelySDK\Entity\FeatureVariableUsage.cs">
181205
<Link>Entity\FeatureVariableUsage</Link>
182206
</Compile>
183-
<Compile Include="..\OptimizelySDK\Entity\FeatureFlag.cs">
207+
<Compile Include="..\OptimizelySDK\Entity\FeatureFlag.cs">
184208
<Link>Entity\FeatureFlag</Link>
185209
</Compile>
186-
<Compile Include="..\OptimizelySDK\Entity\FeatureVariable.cs">
210+
<Compile Include="..\OptimizelySDK\Entity\FeatureVariable.cs">
187211
<Link>Entity\FeatureVariable</Link>
188212
</Compile>
189-
<Compile Include="..\OptimizelySDK\Entity\Rollout.cs">
213+
<Compile Include="..\OptimizelySDK\Entity\Rollout.cs">
190214
<Link>Entity\Rollout</Link>
191215
</Compile>
192216
</ItemGroup>
@@ -197,4 +221,4 @@
197221
<None Include="packages.config" />
198222
</ItemGroup>
199223
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
200-
</Project>
224+
</Project>

‎OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<Compile Include="..\OptimizelySDK\Entity\Attribute.cs" />
12+
<Compile Include="..\OptimizelySDK\AudienceConditions\AndCondition.cs" />
13+
<Compile Include="..\OptimizelySDK\AudienceConditions\AudienceIdCondition.cs" />
14+
<Compile Include="..\OptimizelySDK\AudienceConditions\BaseCondition.cs" />
15+
<Compile Include="..\OptimizelySDK\AudienceConditions\EmptyCondition.cs" />
16+
<Compile Include="..\OptimizelySDK\AudienceConditions\ICondition.cs" />
17+
<Compile Include="..\OptimizelySDK\AudienceConditions\NotCondition.cs" />
18+
<Compile Include="..\OptimizelySDK\AudienceConditions\OrCondition.cs" />
19+
<Compile Include="..\OptimizelySDK\Entity\Attribute.cs" />
1320
<Compile Include="..\OptimizelySDK\Entity\Audience.cs" />
1421
<Compile Include="..\OptimizelySDK\Entity\Entity.cs" />
1522
<Compile Include="..\OptimizelySDK\Entity\Event.cs" />
@@ -44,21 +51,20 @@
4451
<Compile Include="..\OptimizelySDK\Notifications\NotificationCenter.cs" />
4552
<Compile Include="..\OptimizelySDK\Optimizely.cs" />
4653
<Compile Include="..\OptimizelySDK\ProjectConfig.cs" />
47-
<Compile Include="..\OptimizelySDK\Utils\ConditionEvaluator.cs" />
4854
<Compile Include="..\OptimizelySDK\Utils\EventTagUtils.cs" />
4955
<Compile Include="..\OptimizelySDK\Utils\Validator.cs" />
5056
<Compile Include="..\OptimizelySDK\Utils\ConfigParser.cs" />
5157
<Compile Include="..\OptimizelySDK\Utils\Schema.cs" />
5258
<Compile Include="..\OptimizelySDK\Utils\ControlAttributes.cs" />
53-
59+
<Compile Include="..\OptimizelySDK\Utils\ExperimentUtils.cs" />
60+
<Compile Include="..\OptimizelySDK\Utils\ConditionParser.cs" />
61+
<Compile Include="..\OptimizelySDK\Utils\AttributeMatchTypes.cs" />
5462
<Compile Include="..\OptimizelySDK\Bucketing\Bucketer.cs" />
5563
<Compile Include="..\OptimizelySDK\Bucketing\Decision.cs" />
5664
<Compile Include="..\OptimizelySDK\Bucketing\DecisionService.cs" />
5765
<Compile Include="..\OptimizelySDK\Bucketing\UserProfile.cs" />
5866
<Compile Include="..\OptimizelySDK\Bucketing\UserProfileService.cs" />
5967
<Compile Include="..\OptimizelySDK\Bucketing\UserProfileUtil.cs" />
60-
<Compile Include="..\OptimizelySDK\Utils\ExperimentUtils.cs" />
61-
6268
</ItemGroup>
6369
<ItemGroup>
6470
<EmbeddedResource Include="..\OptimizelySDK\Utils\schema.json">

0 commit comments

Comments
 (0)