Skip to content

Commit acf36dd

Browse files
authored
Merge pull request #9486 from dotnet/merge/release/8.0.1xx-to-release/8.0.3xx
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'
2 parents c999ad6 + cd55056 commit acf36dd

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

azure-pipelines.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,20 @@ extends:
109109
- checkout: self
110110
clean: true
111111
# Use utility script to run script command dependent on agent OS.
112-
- script: eng/common/cibuild.cmd
113-
-configuration $(_BuildConfig)
114-
-prepareMachine
115-
-integrationTest
116-
$(_InternalBuildArgs)
117-
displayName: Windows Build / Publish
112+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
113+
- script: eng/common/cibuild.cmd
114+
-configuration $(_BuildConfig)
115+
-prepareMachine
116+
-integrationTest
117+
$(_InternalBuildArgs)
118+
displayName: Windows Build / Publish
119+
- ${{ else }}:
120+
- script: eng/common/cibuild.cmd
121+
-configuration $(_BuildConfig)
122+
-prepareMachine
123+
/p:Test=false
124+
$(_InternalBuildArgs)
125+
displayName: Windows Build / Publish
118126

119127
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
120128
- ${{ each config in parameters.buildConfigurations }}:

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<Sha>3dc05150cf234f76f6936dcb2853d31a0da1f60e</Sha>
77
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25520.5">
9+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25522.3">
1010
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
11-
<Sha>4f39ba9e117ece1679a2bd4f2e8c188f914078e1</Sha>
11+
<Sha>449148366d9105de8a6470ebc4ba198926e9a30a</Sha>
1212
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1313
</Dependency>
1414
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23407.1">

0 commit comments

Comments
 (0)