Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions azure-pipelines-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ stages:

pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals build.ubuntu.2004.amd64.open
demands: ImageOverride -equals windows.vs2022preview.amd64.open

variables:
- _buildScript: $(Build.SourcesDirectory)/build.sh --ci
- _buildScript: $(Build.SourcesDirectory)/build.cmd -ci -NativeToolsOnMachine

preSteps:
- checkout: self
Expand All @@ -257,4 +257,4 @@ stages:
repoTestResultsPath: $(Build.Arcade.TestResultsPath)
skipTests: true
skipQualityGates: true
isWindows: false
isWindows: true
2 changes: 0 additions & 2 deletions azure-pipelines-unofficial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ extends:
repoTestResultsPath: $(Build.Arcade.TestResultsPath)
skipQualityGates: ${{ eq(variables['SkipQualityGates'], 'true') }}
isWindows: true
warnAsError: 0

# ----------------------------------------------------------------
# This job build and run tests on Ubuntu
Expand Down Expand Up @@ -163,7 +162,6 @@ extends:
repoTestResultsPath: $(Build.Arcade.TestResultsPath)
skipQualityGates: ${{ eq(variables['SkipQualityGates'], 'true') }}
isWindows: false
warnAsError: 0

# ----------------------------------------------------------------
# This stage performs quality gates enforcements
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ variables:
- ${{ if and(ne(variables['runAsPublic'], 'true'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
- name: enableSourceIndex
value: true
- name: sourceIndexBuildCommand
value: $(Build.SourcesDirectory)/build.cmd -ci -NativeToolsOnMachine
- ${{ else }}:
- name: enableSourceIndex
value: false
Expand Down Expand Up @@ -206,7 +208,6 @@ extends:
repoTestResultsPath: $(Build.Arcade.TestResultsPath)
skipQualityGates: ${{ eq(variables['SkipQualityGates'], 'true') }}
isWindows: true
warnAsError: 0

# ----------------------------------------------------------------
# This job build and run tests on Ubuntu
Expand Down Expand Up @@ -237,7 +238,6 @@ extends:
repoTestResultsPath: $(Build.Arcade.TestResultsPath)
skipQualityGates: ${{ eq(variables['SkipQualityGates'], 'true') }}
isWindows: false
warnAsError: 0

# ----------------------------------------------------------------
# This stage performs quality gates enforcements
Expand Down
9 changes: 6 additions & 3 deletions eng/pipelines/templates/BuildAndTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ steps:

- script: ${{ parameters.buildScript }}
-restore
-warnAsError ${{ parameters.warnAsError }}
/bl:${{ parameters.repoLogPath }}/restore.binlog
displayName: Restore

Expand All @@ -40,6 +41,7 @@ steps:

- script: ${{ parameters.buildScript }}
-restore
-warnAsError ${{ parameters.warnAsError }}
/bl:${{ parameters.repoLogPath }}/restore2.binlog
displayName: Restore solution

Expand All @@ -61,7 +63,7 @@ steps:
- script: ${{ parameters.buildScript }}
-pack
-configuration ${{ parameters.buildConfig }}
-warnAsError 1
-warnAsError ${{ parameters.warnAsError }}
/bl:${{ parameters.repoLogPath }}/pack.binlog
/p:Restore=false /p:Build=false
$(_OfficialBuildIdArgs)
Expand All @@ -71,7 +73,7 @@ steps:
- script: ${{ parameters.buildScript }}
-integrationTest
-configuration ${{ parameters.buildConfig }}
-warnAsError 1
-warnAsError ${{ parameters.warnAsError }}
/bl:${{ parameters.repoLogPath }}/integration_tests.binlog
$(_OfficialBuildIdArgs)
displayName: Run integration tests
Expand Down Expand Up @@ -158,6 +160,7 @@ steps:
# Publishing will happen in a subsequent step
- script: ${{ parameters.buildScript }}
-projects $(Build.SourcesDirectory)/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj
-warnAsError ${{ parameters.warnAsError }}
-pack
-configuration ${{ parameters.buildConfig }}
/bl:${{ parameters.repoLogPath }}/transport.binlog
Expand All @@ -173,7 +176,7 @@ steps:
-sign $(_SignArgs)
-publish $(_PublishArgs)
-configuration ${{ parameters.buildConfig }}
-warnAsError 1
-warnAsError ${{ parameters.warnAsError }}
/bl:${{ parameters.repoLogPath }}/publish.binlog
/p:Build=false
$(_OfficialBuildIdArgs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
<PackageReference Include="Microsoft.SemanticKernel.Connectors.SqliteVec" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<!-- Workaround https://github.com/microsoft/semantic-kernel/issues/13316 -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="$(MicrosoftBclAsyncInterfacesVersion)" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Microsoft.Extensions.AI.Abstractions.Tests\TestChatClient.cs" />
<!-- We don't run Sqlite tests on Full Framework due to some native dependency issues -->
Expand Down
Loading