Skip to content

Commit fa75a5d

Browse files
web-flowweb-flow
committed
2 parents aaa3650 + 9b42f36 commit fa75a5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+503
-423
lines changed

‎Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
3838

3939
<!-- Azure SDK for .NET dependencies -->
40-
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.49.0-preview.0" />
40+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.50.0-preview.0" />
4141

4242
<!-- SQL Server dependencies -->
43-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
43+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.0-preview1.25120.4" />
4444
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
4545

4646
<!-- external dependencies -->

‎azure-pipelines.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -177,37 +177,11 @@ extends:
177177
- _runCounter: $[counter(variables['Build.Reason'], 0)]
178178
# Rely on task Arcade injects, not auto-injected build step.
179179
- skipComponentGovernanceDetection: true
180-
- ${{ if notin(variables['Build.Reason'], 'PullRequest', 'Schedule') }}:
181-
- _CosmosConnectionUrl: 'true'
182180
steps:
183-
- bash: |
184-
echo "##vso[task.setvariable variable=_CosmosConnectionUrl]https://ef-nightly-test.documents.azure.com:443/"
185-
displayName: Prepare to run Cosmos tests on ef-nightly-test
186-
condition: and(eq(variables['_CosmosConnectionUrl'], 'true'), or(endsWith(variables['_runCounter'], '0'), endsWith(variables['_runCounter'], '2'), endsWith(variables['_runCounter'], '4'), endsWith(variables['_runCounter'], '6'), endsWith(variables['_runCounter'], '8')))
187-
- bash: |
188-
echo "##vso[task.setvariable variable=_CosmosConnectionUrl]https://ef-pr-test.documents.azure.com:443/"
189-
displayName: Prepare to run Cosmos tests on ef-pr-test
190-
condition: and(eq(variables['_CosmosConnectionUrl'], 'true'), or(endsWith(variables['_runCounter'], '1'), endsWith(variables['_runCounter'], '3'), endsWith(variables['_runCounter'], '5'), endsWith(variables['_runCounter'], '7'), endsWith(variables['_runCounter'], '9')))
191181
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
192182
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
193183
- script: eng/common/build.sh --restore --build --test --pack --ci --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
194184
displayName: Build
195-
- task: AzureCLI@2
196-
displayName: Run Cosmos tests
197-
condition: notin(variables['Build.Reason'], 'PullRequest', 'Schedule')
198-
inputs:
199-
azureSubscription: EFCosmosTesting
200-
addSpnToEnvironment: true
201-
scriptType: bash
202-
scriptLocation: 'inlineScript'
203-
inlineScript: |
204-
./test.sh --ci --configuration $(_BuildConfig) --projects $(Build.SourcesDirectory)/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj
205-
env:
206-
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
207-
Test__Cosmos__UseTokenCredential: true
208-
Test__Cosmos__SubscriptionId: d709b837-4a74-4aec-addc-b6e4b9b23e7e
209-
Test__Cosmos__ResourceGroup: efcosmosci
210-
name: Build
211185
templateContext:
212186
sdl:
213187
binskim:

‎eng/DotNetBuild.props

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎eng/Version.Details.xml

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,84 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="3b83017bbef1dd0918f7c2f894cfd07f56bcd689" BarId="266652" />
34
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.4.25211.19">
5-
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25251.105">
6+
<Uri>https://github.com/dotnet/dotnet</Uri>
7+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
78
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.4.25211.19">
9-
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.5.25251.105">
10+
<Uri>https://github.com/dotnet/dotnet</Uri>
11+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
1112
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.4.25211.19">
13-
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.5.25251.105">
14+
<Uri>https://github.com/dotnet/dotnet</Uri>
15+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
1516
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.4.25211.19">
17-
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.5.25251.105">
18+
<Uri>https://github.com/dotnet/dotnet</Uri>
19+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
1920
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.4.25211.19">
21-
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.5.25251.105">
22+
<Uri>https://github.com/dotnet/dotnet</Uri>
23+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
2324
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.4.25211.19">
25-
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.5.25251.105">
26+
<Uri>https://github.com/dotnet/dotnet</Uri>
27+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
2728
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.4.25211.19">
29-
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.5.25251.105">
30+
<Uri>https://github.com/dotnet/dotnet</Uri>
31+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
3132
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.4.25211.19">
33-
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.5.25251.105">
34+
<Uri>https://github.com/dotnet/dotnet</Uri>
35+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
3536
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.4.25211.19">
37-
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25251.105">
38+
<Uri>https://github.com/dotnet/dotnet</Uri>
39+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
3940
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25211.19">
41-
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25251.105">
42+
<Uri>https://github.com/dotnet/dotnet</Uri>
43+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
4344
</Dependency>
4445
<!--
4546
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
4647
All Runtime.$rid packages should have the same version.
4748
-->
48-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25211.19">
49-
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25251.105">
50+
<Uri>https://github.com/dotnet/dotnet</Uri>
51+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
5152
</Dependency>
52-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.4.25211.19">
53-
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
53+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25251.105">
54+
<Uri>https://github.com/dotnet/dotnet</Uri>
55+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
5556
</Dependency>
56-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.4.25211.19">
57-
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
57+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25251.105">
58+
<Uri>https://github.com/dotnet/dotnet</Uri>
59+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
5960
</Dependency>
60-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.4.25211.19">
61-
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
61+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.5.25251.105">
62+
<Uri>https://github.com/dotnet/dotnet</Uri>
63+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
6364
</Dependency>
64-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.4.25211.19">
65-
<Uri>https://github.com/dotnet/runtime</Uri>
66-
<Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
65+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.5.25251.105">
66+
<Uri>https://github.com/dotnet/dotnet</Uri>
67+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
6768
</Dependency>
6869
</ProductDependencies>
6970
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25212.1">
71-
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
71+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25251.105">
72+
<Uri>https://github.com/dotnet/dotnet</Uri>
73+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
7374
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25212.1">
75-
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
75+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25251.105">
76+
<Uri>https://github.com/dotnet/dotnet</Uri>
77+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
7778
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25212.1">
79-
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
79+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25251.105">
80+
<Uri>https://github.com/dotnet/dotnet</Uri>
81+
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
8182
</Dependency>
8283
</ToolsetDependencies>
8384
</Dependencies>

‎eng/Versions.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup Label="Version settings">
33
<VersionPrefix>10.0.0</VersionPrefix>
44
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
5-
<PreReleaseVersionIteration>4</PreReleaseVersionIteration>
5+
<PreReleaseVersionIteration>5</PreReleaseVersionIteration>
66
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
77
<IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
88
<!--
@@ -16,24 +16,24 @@
1616
<UsingToolXliff>False</UsingToolXliff>
1717
</PropertyGroup>
1818
<PropertyGroup Label="Dependencies from dotnet/runtime">
19-
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.4.25211.19</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25211.19</MicrosoftNETCoreAppRuntimewinx64Version>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.4.25211.19</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.4.25211.19</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.4.25211.19</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.4.25211.19</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.5.25251.105</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25251.105</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25251.105</MicrosoftNETCoreAppRuntimewinx64Version>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25251.105</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.5.25251.105</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.5.25251.105</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.5.25251.105</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25251.105</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.13.9</MicrosoftBuildFrameworkVersion>
@@ -42,7 +42,7 @@
4242
<MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
4343
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
4444
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.24352.1</MicrosoftCodeAnalysisCSharpTestingVersion>
45-
<AzureIdentityVersion>1.13.1</AzureIdentityVersion>
45+
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
4646
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
4747
<OpenTelemetryExporterInMemoryVersion>1.8.1</OpenTelemetryExporterInMemoryVersion>
4848
<SQLitePCLRawVersion>2.1.10</SQLitePCLRawVersion>

‎eng/common/SetupNugetSources.sh

100644100755
File mode changed.

‎eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ parameters:
2727
# Specifies the build script to invoke to perform the build in the repo. The default
2828
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2929
# difficult situations.
30+
# buildArguments: ''
31+
# Specifies additional build arguments to pass to the build script.
3032
# jobProperties: {}
3133
# A list of job properties to inject at the top level, for potential extensibility beyond
3234
# container and pool.

‎eng/common/core-templates/jobs/jobs.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
# Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
2828
publishAssetsImmediately: false
2929

30+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
31+
isAssetlessBuild: false
32+
3033
# Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
3134
artifactsPublishingAdditionalParameters: ''
3235
signingValidationAdditionalParameters: ''
@@ -93,7 +96,7 @@ jobs:
9396
${{ parameter.key }}: ${{ parameter.value }}
9497

9598
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
96-
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
99+
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
97100
- template: ../job/publish-build-assets.yml
98101
parameters:
99102
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -109,7 +112,8 @@ jobs:
109112
- Source_Build_Complete
110113

111114
runAsPublic: ${{ parameters.runAsPublic }}
112-
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
115+
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
116+
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
113117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
114118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
115119
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}

‎eng/common/core-templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

0 commit comments

Comments
 (0)