Skip to content

Commit 14226ad

Browse files
committed
User Story 33636: Add Linux build support
- Added NuGet tool install to CI project build.
1 parent c10eb4b commit 14226ad

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
<Target Name="BuildAKVNetFx" DependsOnTargets="BuildAKVNetFxProject;BuildAKVNetFxPackage" />
453453
<Target Name="RestoreAKVNetFx">
454454
<PropertyGroup>
455-
<BuildProperties>$(ProjectProperties);TargetsNetFx=true</BuildProperties>
455+
<BuildProperties>$(CI);$(ProjectProperties);TargetsNetFx=true</BuildProperties>
456456
</PropertyGroup>
457457
<MSBuild
458458
Projects="@(AKVProvider)"
@@ -483,7 +483,7 @@
483483
<Target Name="BuildAKVNetCore" DependsOnTargets="BuildAKVNetCoreProject;BuildAKVNetCorePackage" />
484484
<Target Name="RestoreAKVNetCore">
485485
<PropertyGroup>
486-
<BuildProperties>$(ProjectProperties)</BuildProperties>
486+
<BuildProperties>$(CI);$(ProjectProperties)</BuildProperties>
487487
</PropertyGroup>
488488
<MSBuild
489489
Projects="@(AKVProvider)"

eng/pipelines/common/templates/steps/ci-project-build-step.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ parameters:
1818

1919
- name: operatingSystem
2020
type: string
21-
default: deferedToRuntime
21+
default: deferredToRuntime
2222
values:
2323
- Windows
2424
- Linux
2525
- MacOS
26-
- deferedToRuntime
26+
- deferredToRuntime
2727

2828
- name: build
2929
type: string
@@ -45,7 +45,12 @@ steps:
4545
packageType: 'runtime'
4646
version: '8.0'
4747

48-
- ${{ if or(eq(parameters.operatingSystem, 'Windows'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
48+
- task: NuGetToolInstaller@1
49+
displayName: 'Install Latest Nuget'
50+
inputs:
51+
checkLatest: true
52+
53+
- ${{ if or(eq(parameters.operatingSystem, 'Windows'), eq(parameters.operatingSystem, 'deferredToRuntime')) }}:
4954
- ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
5055
- task: MSBuild@1
5156
displayName: 'Restore nugets [Win]'
@@ -101,7 +106,7 @@ steps:
101106
configuration: '${{ parameters.configuration }}'
102107
msbuildArguments: '-t:BuildAKVNetCoreAllOS -p:BuildNumber=${{ parameters.buildNumber }}'
103108

104-
- ${{ if or(eq(parameters.operatingSystem, 'Linux'), eq(parameters.operatingSystem, 'MacOS'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
109+
- ${{ if or(eq(parameters.operatingSystem, 'Linux'), eq(parameters.operatingSystem, 'MacOS'), eq(parameters.operatingSystem, 'deferredToRuntime')) }}:
105110
- task: DotNetCoreCLI@2
106111
displayName: 'Build Driver [non-Win]'
107112
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@
899899
<Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />
900900
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContext.cs" />
901901
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContextFactory.cs" />
902-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_DeferedProcessing.cs" />
902+
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_DeferredProcessing.cs" />
903903
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventStream.cs" />
904904
<Compile Include="Microsoft\Data\SqlClient\Server\SmiExecuteType.cs" />
905905
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Data.SqlClient.Server
1212
// Main example:
1313
// SqlCommand.ExecuteNonQuerySmi calls EventStream.ProcessEvent with it's command event sink (CES)
1414
// ProcessEvent calls OnParametersAvailable on the CES
15-
// OnParametersAvailable sets up a deferedprocessing event sink (DPES) with the CES as its parent
15+
// OnParametersAvailable sets up a deferred processing event sink (DPES) with the CES as its parent
1616
// OnParametersAvailable calls ValueUtils to extract param values passing the DPES
1717
// ValueUtils calls Smi passing DPES
1818
// Smi may call MessagePosted, which will send a message up the sink parent chain and save it.
@@ -21,11 +21,11 @@ namespace Microsoft.Data.SqlClient.Server
2121
// SqlCommand.ExecuteNonQuerySmi calls CES.ProcessMessagesAndThrow, which handles the messages
2222
// sent from the Smi value extraction code.
2323
//
24-
// IMPORTANT: Code that uses the DeferedProccess event sink is responsible for ensuring that
24+
// IMPORTANT: Code that uses the DeferredProccessing event sink is responsible for ensuring that
2525
// these messages ARE processed at some point.
26-
internal class SmiEventSink_DeferedProcessing : SmiEventSink_Default
26+
internal class SmiEventSink_DeferredProcessing : SmiEventSink_Default
2727
{
28-
internal SmiEventSink_DeferedProcessing(SmiEventSink parent) : base(parent)
28+
internal SmiEventSink_DeferredProcessing(SmiEventSink parent) : base(parent)
2929
{
3030
}
3131

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ internal override void ParameterAvailable(SmiParameterMetaData metaData, SmiType
405405

406406
private SmiContext _smiRequestContext; // context that _smiRequest came from
407407
private CommandEventSink _smiEventSink;
408-
private SmiEventSink_DeferedProcessing _outParamEventSink;
408+
private SmiEventSink_DeferredProcessing _outParamEventSink;
409409

410410
private CommandEventSink EventSink
411411
{
@@ -421,13 +421,13 @@ private CommandEventSink EventSink
421421
}
422422
}
423423

424-
private SmiEventSink_DeferedProcessing OutParamEventSink
424+
private SmiEventSink_DeferredProcessing OutParamEventSink
425425
{
426426
get
427427
{
428428
if (_outParamEventSink == null)
429429
{
430-
_outParamEventSink = new SmiEventSink_DeferedProcessing(EventSink);
430+
_outParamEventSink = new SmiEventSink_DeferredProcessing(EventSink);
431431
}
432432
else
433433
{

0 commit comments

Comments
 (0)