Skip to content

Commit 1d70cb8

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20210528.1 (#33160)
[main] Update dependencies from dotnet/arcade
1 parent be21fc1 commit 1d70cb8

File tree

8 files changed

+32
-12
lines changed

8 files changed

+32
-12
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,18 +288,18 @@
288288
<Uri>https://github.com/dotnet/runtime</Uri>
289289
<Sha>b5c91e4c29359f160edcf7caf16530e48d9a4fb0</Sha>
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21271.3">
291+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21278.1">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
293+
<Sha>b5ca0997b26992dcc4e55ec3d87d71000be295ce</Sha>
294294
<SourceBuild RepoName="arcade" ManagedOnly="true" />
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21271.3">
296+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21278.1">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
298+
<Sha>b5ca0997b26992dcc4e55ec3d87d71000be295ce</Sha>
299299
</Dependency>
300-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21271.3">
300+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21278.1">
301301
<Uri>https://github.com/dotnet/arcade</Uri>
302-
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
302+
<Sha>b5ca0997b26992dcc4e55ec3d87d71000be295ce</Sha>
303303
</Dependency>
304304
</ToolsetDependencies>
305305
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.6.21280.1</MicrosoftEntityFrameworkCoreVersion>
137137
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.6.21280.1</MicrosoftEntityFrameworkCoreDesignVersion>
138138
<!-- Packages from dotnet/arcade -->
139-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21278.1</MicrosoftDotNetBuildTasksInstallersVersion>
140140
</PropertyGroup>
141141
<!--
142142

eng/common/sdk-task.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ try {
5353
}
5454

5555
if ($task -eq "") {
56-
Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task <value>'" -ForegroundColor Red
56+
Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task <value>'"
5757
Print-Usage
5858
ExitWithExitCode 1
5959
}
@@ -78,7 +78,7 @@ try {
7878

7979
$taskProject = GetSdkTaskProject $task
8080
if (!(Test-Path $taskProject)) {
81-
Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red
81+
Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task"
8282
ExitWithExitCode 1
8383
}
8484

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ parameters:
1515
# nonPortable: false
1616
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
1717
# linux-x64), and compiling against distro-provided packages rather than portable ones.
18+
# skipPublishValidation: false
19+
# Disables publishing validation. By default, a check is performed to ensure no packages are
20+
# published by source-build.
1821
# container: ''
1922
# A container to use. Runs in docker.
2023
# pool: {}

eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ stages:
4040
pool:
4141
vmImage: 'windows-2019'
4242
steps:
43+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
44+
displayName: Warn about v2 Arcade Publishing Usage
45+
4346
# This is necessary whenever we want to publish/restore to an AzDO private feed
4447
- task: NuGetAuthenticate@0
4548
displayName: 'Authenticate to AzDO Feeds'
@@ -110,6 +113,9 @@ stages:
110113
pool:
111114
vmImage: 'windows-2019'
112115
steps:
116+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
117+
displayName: Warn about v2 Arcade Publishing Usage
118+
113119
- task: DownloadBuildArtifacts@0
114120
displayName: Download Build Assets
115121
continueOnError: true

eng/common/templates/post-build/channels/generic-public-channel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ stages:
4242
pool:
4343
vmImage: 'windows-2019'
4444
steps:
45+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
46+
displayName: Warn about v2 Arcade Publishing Usage
47+
4548
- task: DownloadBuildArtifacts@0
4649
displayName: Download Build Assets
4750
continueOnError: true
@@ -109,6 +112,9 @@ stages:
109112
pool:
110113
vmImage: 'windows-2019'
111114
steps:
115+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
116+
displayName: Warn about v2 Arcade Publishing Usage
117+
112118
- task: DownloadBuildArtifacts@0
113119
displayName: Download Build Assets
114120
continueOnError: true

eng/common/templates/steps/source-build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ steps:
3434
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3535
fi
3636
37+
publishArgs=
38+
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
39+
publishArgs='--publish'
40+
fi
41+
3742
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
3843
--configuration $buildConfig \
39-
--restore --build --pack --publish -bl \
44+
--restore --build --pack $publishArgs -bl \
4045
$officialBuildArgs \
4146
$targetRidArgs \
4247
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.22.10",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21278.1",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21278.1"
3535
}
3636
}

0 commit comments

Comments
 (0)