Skip to content

Commit 8dbd500

Browse files
JanKrivanekJanKrivanek
committed
In progress post-merge changes
1 parent db60967 commit 8dbd500

5 files changed

Lines changed: 19 additions & 21 deletions

File tree

‎src/Build/BuildCheck/Infrastructure/BuildCheckBuildEventHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal BuildCheckBuildEventHandler(
3232
{ typeof(ProjectEvaluationFinishedEventArgs), (BuildEventArgs e) => HandleProjectEvaluationFinishedEvent((ProjectEvaluationFinishedEventArgs)e) },
3333
{ typeof(ProjectEvaluationStartedEventArgs), (BuildEventArgs e) => HandleProjectEvaluationStartedEvent((ProjectEvaluationStartedEventArgs)e) },
3434
{ typeof(ProjectStartedEventArgs), (BuildEventArgs e) => _buildCheckManager.StartProjectRequest(BuildCheckDataSource.EventArgs, e.BuildEventContext!) },
35-
{ typeof(ProjectFinishedEventArgs), (BuildEventArgs e) => _buildCheckManager.EndProjectRequest(BuildCheckDataSource.EventArgs, e.BuildEventContext!) },
35+
{ typeof(ProjectFinishedEventArgs), (BuildEventArgs e) => _buildCheckManager.EndProjectRequest(BuildCheckDataSource.EventArgs, e.BuildEventContext!, (e as ProjectFinishedEventArgs)!.ProjectFile!) },
3636
{ typeof(BuildCheckTracingEventArgs), (BuildEventArgs e) => HandleBuildCheckTracingEvent((BuildCheckTracingEventArgs)e) },
3737
{ typeof(BuildCheckAcquisitionEventArgs), (BuildEventArgs e) => HandleBuildCheckAcquisitionEvent((BuildCheckAcquisitionEventArgs)e) },
3838
{ typeof(TaskStartedEventArgs), (BuildEventArgs e) => HandleTaskStartedEvent((TaskStartedEventArgs)e) },

‎src/Build/BuildCheck/Infrastructure/BuildCheckCentralContext.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,27 +120,27 @@ internal void RunTaskInvocationActions(
120120

121121
internal void RunPropertyReadActions(
122122
PropertyReadData propertyReadDataData,
123-
LoggingContext loggingContext,
124-
Action<BuildAnalyzerWrapper, LoggingContext, BuildAnalyzerConfigurationInternal[], BuildCheckResult>
123+
IAnalysisContext analysisContext,
124+
Action<BuildAnalyzerWrapper, IAnalysisContext, BuildAnalyzerConfigurationInternal[], BuildCheckResult>
125125
resultHandler)
126126
=> RunRegisteredActions(_globalCallbacks.PropertyReadActions, propertyReadDataData,
127-
loggingContext, resultHandler);
127+
analysisContext, resultHandler);
128128

129129
internal void RunPropertyWriteActions(
130130
PropertyWriteData propertyWriteData,
131-
LoggingContext loggingContext,
132-
Action<BuildAnalyzerWrapper, LoggingContext, BuildAnalyzerConfigurationInternal[], BuildCheckResult>
131+
IAnalysisContext analysisContext,
132+
Action<BuildAnalyzerWrapper, IAnalysisContext, BuildAnalyzerConfigurationInternal[], BuildCheckResult>
133133
resultHandler)
134134
=> RunRegisteredActions(_globalCallbacks.PropertyWriteActions, propertyWriteData,
135-
loggingContext, resultHandler);
135+
analysisContext, resultHandler);
136136

137137
internal void RunProjectProcessingDoneActions(
138138
ProjectProcessingDoneData projectProcessingDoneData,
139-
LoggingContext loggingContext,
140-
Action<BuildAnalyzerWrapper, LoggingContext, BuildAnalyzerConfigurationInternal[], BuildCheckResult>
139+
IAnalysisContext analysisContext,
140+
Action<BuildAnalyzerWrapper, IAnalysisContext, BuildAnalyzerConfigurationInternal[], BuildCheckResult>
141141
resultHandler)
142142
=> RunRegisteredActions(_globalCallbacks.ProjectProcessingDoneActions, projectProcessingDoneData,
143-
loggingContext, resultHandler);
143+
analysisContext, resultHandler);
144144

145145
private void RunRegisteredActions<T>(
146146
List<(BuildAnalyzerWrapper, Action<BuildCheckDataContext<T>>)> registeredCallbacks,

‎src/Build/BuildCheck/Infrastructure/BuildEventsProcessor.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,22 +174,22 @@ internal void ProcessTaskParameterEventArgs(
174174
}
175175
}
176176

177-
public void ProcessPropertyRead(PropertyReadData propertyReadData, AnalyzerLoggingContext buildAnalysisContext)
177+
public void ProcessPropertyRead(PropertyReadData propertyReadData, IAnalysisContext analysisContext)
178178
{
179-
_buildCheckCentralContext.RunPropertyReadActions(propertyReadData, buildAnalysisContext,
179+
_buildCheckCentralContext.RunPropertyReadActions(propertyReadData, analysisContext,
180180
ReportResult);
181181
}
182182

183-
public void ProcessPropertyWrite(PropertyWriteData propertyWriteData, AnalyzerLoggingContext buildAnalysisContext)
183+
public void ProcessPropertyWrite(PropertyWriteData propertyWriteData, IAnalysisContext analysisContext)
184184
{
185-
_buildCheckCentralContext.RunPropertyWriteActions(propertyWriteData, buildAnalysisContext,
185+
_buildCheckCentralContext.RunPropertyWriteActions(propertyWriteData, analysisContext,
186186
ReportResult);
187187
}
188188

189-
public void ProcessProjectDone(AnalyzerLoggingContext buildAnalysisContext, string projectFullPath)
189+
public void ProcessProjectDone(IAnalysisContext analysisContext, string projectFullPath)
190190
{
191191
_buildCheckCentralContext.RunProjectProcessingDoneActions(new ProjectProcessingDoneData(projectFullPath),
192-
buildAnalysisContext, ReportResult);
192+
analysisContext, ReportResult);
193193
}
194194

195195
private static void ReportResult(

‎src/Build/BuildCheck/Infrastructure/IBuildCheckManager.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ void ProcessTaskParameterEventArgs(
6363
// but as well from the ConnectorLogger - as even if interleaved, it gives the info
6464
// to manager about what analyzers need to be materialized and configuration fetched.
6565
// No unloading of analyzers is yet considered - once loaded it stays for whole build.
66-
void StartProjectEvaluation(BuildCheckDataSource buildCheckDataSource, BuildEventContext buildEventContext, string projectFullPath);
67-
6866
void StartProjectEvaluation(BuildCheckDataSource buildCheckDataSource, IAnalysisContext analysisContext, string projectFullPath);
6967

7068
void EndProjectEvaluation(BuildCheckDataSource buildCheckDataSource, BuildEventContext buildEventContext);

‎src/Build/BuildCheck/Infrastructure/NullBuildCheckManager.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void StartProjectRequest(BuildCheckDataSource buildCheckDataSource, Build
6767
{
6868
}
6969

70-
public void EndProjectRequest(BuildCheckDataSource buildCheckDataSource, BuildEventContext buildEventContext,
70+
public void EndProjectRequest(BuildCheckDataSource buildCheckDataSource, IAnalysisContext analysisContext,
7171
string projectFullPath)
7272
{
7373
}
@@ -91,9 +91,9 @@ public void EndTaskInvocation(BuildCheckDataSource buildCheckDataSource, TaskFin
9191
public void ProcessTaskParameter(BuildCheckDataSource buildCheckDataSource, TaskParameterEventArgs eventArg)
9292
{ }
9393

94-
public void ProcessPropertyRead(PropertyReadInfo propertyReadInfo, BuildEventContext buildEventContext)
94+
public void ProcessPropertyRead(PropertyReadInfo propertyReadInfo, IAnalysisContext analysisContext)
9595
{ }
9696

97-
public void ProcessPropertyWrite(PropertyWriteInfo propertyWriteInfo, BuildEventContext buildEventContext)
97+
public void ProcessPropertyWrite(PropertyWriteInfo propertyWriteInfo, IAnalysisContext analysisContext)
9898
{ }
9999
}

0 commit comments

Comments
 (0)