Skip to content

Commit 0b9b782

Browse files
3F3F
committed
SobaScript 1.14 & PostProcessingMSBuild -> PostProcessing
1 parent 226e08a commit 0b9b782

5 files changed

Lines changed: 4 additions & 42 deletions

File tree

‎SobaScript‎

‎SobaScript.Mapper‎

‎SobaScript.Z.Core.sln‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SobaScript.MapperTest", "So
3838
EndProject
3939
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SobaScript", "SobaScript.Mapper\SobaScript\SobaScript\SobaScript.csproj", "{5C96DF4F-267A-46DD-BA95-9F487E8DC1FE}"
4040
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SobaScriptTest", "SobaScript.Mapper\SobaScript\SobaScriptTest\SobaScriptTest.csproj", "{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}"
42-
EndProject
4341
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{54A3EE80-7894-433B-80BA-E29B0331B5B3}"
4442
ProjectSection(SolutionItems) = preProject
4543
SobaScript.Mapper\SobaScript\3rd-party = SobaScript.Mapper\SobaScript\3rd-party
@@ -49,8 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{54A3EE80-7
4947
EndProject
5048
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "E-MSBuild", "SobaScript.Mapper\SobaScript\E-MSBuild\E-MSBuild\E-MSBuild.csproj", "{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}"
5149
EndProject
52-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "E-MSBuildTest", "SobaScript.Mapper\SobaScript\E-MSBuild\E-MSBuildTest\E-MSBuildTest.csproj", "{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}"
53-
EndProject
5450
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Varhead", "SobaScript.Mapper\SobaScript\E-MSBuild\Varhead\Varhead\Varhead.csproj", "{D2185E13-8D1F-4C9E-B655-FE735F0542ED}"
5551
EndProject
5652
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LSender", "SobaScript.Mapper\SobaScript\E-MSBuild\Varhead\LSender\LSender\LSender.csproj", "{F76493C4-06AC-4B7F-A9B7-743D10336A7B}"
@@ -249,22 +245,6 @@ Global
249245
{5C96DF4F-267A-46DD-BA95-9F487E8DC1FE}.REL_SDK10|Any CPU.Build.0 = REL_SDK10|Any CPU
250246
{5C96DF4F-267A-46DD-BA95-9F487E8DC1FE}.REL_SDK15|Any CPU.ActiveCfg = REL_SDK15|Any CPU
251247
{5C96DF4F-267A-46DD-BA95-9F487E8DC1FE}.REL_SDK15|Any CPU.Build.0 = REL_SDK15|Any CPU
252-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DBG_SDK10|Any CPU.ActiveCfg = DBG_SDK10|Any CPU
253-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DBG_SDK10|Any CPU.Build.0 = DBG_SDK10|Any CPU
254-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DBG_SDK15|Any CPU.ActiveCfg = DBG_SDK15|Any CPU
255-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DBG_SDK15|Any CPU.Build.0 = DBG_SDK15|Any CPU
256-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DCI_SDK10|Any CPU.ActiveCfg = DCI_SDK10|Any CPU
257-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DCI_SDK10|Any CPU.Build.0 = DCI_SDK10|Any CPU
258-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DCI_SDK15|Any CPU.ActiveCfg = DCI_SDK15|Any CPU
259-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.DCI_SDK15|Any CPU.Build.0 = DCI_SDK15|Any CPU
260-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.RCI_SDK10|Any CPU.ActiveCfg = RCI_SDK10|Any CPU
261-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.RCI_SDK10|Any CPU.Build.0 = RCI_SDK10|Any CPU
262-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.RCI_SDK15|Any CPU.ActiveCfg = RCI_SDK15|Any CPU
263-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.RCI_SDK15|Any CPU.Build.0 = RCI_SDK15|Any CPU
264-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.REL_SDK10|Any CPU.ActiveCfg = REL_SDK10|Any CPU
265-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.REL_SDK10|Any CPU.Build.0 = REL_SDK10|Any CPU
266-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.REL_SDK15|Any CPU.ActiveCfg = REL_SDK15|Any CPU
267-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460}.REL_SDK15|Any CPU.Build.0 = REL_SDK15|Any CPU
268248
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}.DBG_SDK10|Any CPU.ActiveCfg = DBG_SDK10|Any CPU
269249
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}.DBG_SDK10|Any CPU.Build.0 = DBG_SDK10|Any CPU
270250
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}.DBG_SDK15|Any CPU.ActiveCfg = DBG_SDK15|Any CPU
@@ -281,22 +261,6 @@ Global
281261
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}.REL_SDK10|Any CPU.Build.0 = REL_SDK10|Any CPU
282262
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}.REL_SDK15|Any CPU.ActiveCfg = REL_SDK15|Any CPU
283263
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F}.REL_SDK15|Any CPU.Build.0 = REL_SDK15|Any CPU
284-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DBG_SDK10|Any CPU.ActiveCfg = DBG_SDK10|Any CPU
285-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DBG_SDK10|Any CPU.Build.0 = DBG_SDK10|Any CPU
286-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DBG_SDK15|Any CPU.ActiveCfg = DBG_SDK15|Any CPU
287-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DBG_SDK15|Any CPU.Build.0 = DBG_SDK15|Any CPU
288-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DCI_SDK10|Any CPU.ActiveCfg = DCI_SDK10|Any CPU
289-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DCI_SDK10|Any CPU.Build.0 = DCI_SDK10|Any CPU
290-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DCI_SDK15|Any CPU.ActiveCfg = DCI_SDK15|Any CPU
291-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.DCI_SDK15|Any CPU.Build.0 = DCI_SDK15|Any CPU
292-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.RCI_SDK10|Any CPU.ActiveCfg = RCI_SDK10|Any CPU
293-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.RCI_SDK10|Any CPU.Build.0 = RCI_SDK10|Any CPU
294-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.RCI_SDK15|Any CPU.ActiveCfg = RCI_SDK15|Any CPU
295-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.RCI_SDK15|Any CPU.Build.0 = RCI_SDK15|Any CPU
296-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.REL_SDK10|Any CPU.ActiveCfg = REL_SDK10|Any CPU
297-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.REL_SDK10|Any CPU.Build.0 = REL_SDK10|Any CPU
298-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.REL_SDK15|Any CPU.ActiveCfg = REL_SDK15|Any CPU
299-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC}.REL_SDK15|Any CPU.Build.0 = REL_SDK15|Any CPU
300264
{D2185E13-8D1F-4C9E-B655-FE735F0542ED}.DBG_SDK10|Any CPU.ActiveCfg = DBG_SDK10|Any CPU
301265
{D2185E13-8D1F-4C9E-B655-FE735F0542ED}.DBG_SDK10|Any CPU.Build.0 = DBG_SDK10|Any CPU
302266
{D2185E13-8D1F-4C9E-B655-FE735F0542ED}.DBG_SDK15|Any CPU.ActiveCfg = DBG_SDK15|Any CPU
@@ -344,10 +308,8 @@ Global
344308
{069A8DEC-D613-4051-BDD4-DD3F9A2C2397} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
345309
{A5B92B3B-B72D-426C-8C3D-9A41DF986357} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
346310
{5C96DF4F-267A-46DD-BA95-9F487E8DC1FE} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
347-
{E03F8EC5-20CA-4D54-8CEA-291AFEF6B460} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
348311
{54A3EE80-7894-433B-80BA-E29B0331B5B3} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
349312
{0BB9F0C4-CC70-41A5-8D04-56952B686C8F} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
350-
{649C8B1B-305C-4F1D-BD00-A9B4EEAD47EC} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
351313
{D2185E13-8D1F-4C9E-B655-FE735F0542ED} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
352314
{F76493C4-06AC-4B7F-A9B7-743D10336A7B} = {88368C47-6D83-42C2-BF3E-79583EACF29C}
353315
EndGlobalSection

‎SobaScript.Z.Core/UserVariableComponent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ protected string Get(string name, string project = null)
205205
protected virtual void Evaluate(string name, string project = null)
206206
{
207207
uvars.Evaluate(name, project, soba, true);
208-
if(PostProcessingMSBuild) {
208+
if(PostProcessing) {
209209
uvars.Evaluate(name, project, emsbuild, false);
210210
}
211211
}

‎SobaScript.Z.CoreTest/ConditionComponentTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void DisclosureTest4()
269269
soba.Register(new UserVariableComponent(soba));
270270

271271
var target = new ConditionComponent(soba) {
272-
PostProcessingMSBuild = true
272+
PostProcessing = true
273273
};
274274

275275
Assert.Equal("yes", target.Eval("[( $(test) == \"data(str)\" ){yes}else{no}]"));

0 commit comments

Comments
 (0)