Skip to content

Commit 8a2fec7

Browse files
authored
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#20665)
2 parents 7679ce1 + 09f3921 commit 8a2fec7

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resources:
4444
ref: refs/tags/release
4545

4646
extends:
47-
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
47+
${{ if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'dotnet-installer-official-ci')) }}:
4848
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
4949
${{ else }}:
5050
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines

eng/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ jobs:
116116
helixRepo: dotnet/installer
117117
workspace:
118118
clean: all
119+
${{ if ne(variables['Build.DefinitionName'], 'dotnet-installer-official-ci') }}:
120+
microbuildUseESRP: false
119121

120122
variables:
121123
# Test variables
@@ -167,7 +169,8 @@ jobs:
167169
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
168170
- group: DotNet-HelixApi-Access
169171
- _PushToVSFeed: true
170-
- _SignType: real
172+
- ${{ if eq(variables['Build.DefinitionName'], 'dotnet-installer-official-ci') }}:
173+
- _SignType: real
171174
- _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
172175
/p:DotNetSignType=$(_SignType)
173176
/p:TeamName=$(_TeamName)

src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
These URLs can't be composed from their base URL and version as we read them from the
3131
prep.sh and pipeline scripts, outside of MSBuild.
3232
-->
33-
<PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.120-servicing.25421.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
34-
<PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.120-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
33+
<PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.121-servicing.25476.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
34+
<PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.121-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
3535
</PropertyGroup>
3636
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.120"
3+
"dotnet": "8.0.121"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",
77
"Microsoft.Build.Traversal": "2.0.2",
88
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
9-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25415.2",
9+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25465.1",
1010
"Yarn.MSBuild": "1.15.2"
1111
}
1212
}

0 commit comments

Comments
 (0)