Skip to content

Commit 2c90c61

Browse files
brettfobaronfel
authored andcommitted
Merge pull request #7829 from dotnet/darc-master-0e2010c0-8299-42c7-a298-cd724a96316e
[master] Update dependencies from dotnet/arcade
2 parents 2f87d5f + ce18cc5 commit 2c90c61

12 files changed

+346
-55
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19555.7">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19557.20">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>82c69e4d687077689fae4826e755ff5bf296c9c3</Sha>
8+
<Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/cross/toolchain.cmake

+15-34
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ else()
3131
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!")
3232
endif()
3333

34+
if(DEFINED ENV{TOOLCHAIN})
35+
set(TOOLCHAIN $ENV{TOOLCHAIN})
36+
endif()
37+
3438
# Specify include paths
3539
if(TARGET_ARCH_NAME STREQUAL "armel")
3640
if(DEFINED TIZEN_TOOLCHAIN)
@@ -39,48 +43,25 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
3943
endif()
4044
endif()
4145

42-
# add_compile_param - adds only new options without duplicates.
43-
# arg0 - list with result options, arg1 - list with new options.
44-
# arg2 - optional argument, quick summary string for optional using CACHE FORCE mode.
45-
macro(add_compile_param)
46-
if(NOT ${ARGC} MATCHES "^(2|3)$")
47-
message(FATAL_ERROR "Wrong using add_compile_param! Two or three parameters must be given! See add_compile_param description.")
48-
endif()
49-
foreach(OPTION ${ARGV1})
50-
if(NOT ${ARGV0} MATCHES "${OPTION}($| )")
51-
set(${ARGV0} "${${ARGV0}} ${OPTION}")
52-
if(${ARGC} EQUAL "3") # CACHE FORCE mode
53-
set(${ARGV0} "${${ARGV0}}" CACHE STRING "${ARGV2}" FORCE)
54-
endif()
55-
endif()
56-
endforeach()
57-
endmacro()
46+
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
47+
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
48+
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
49+
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
5850

5951
# Specify link flags
60-
add_compile_param(CROSS_LINK_FLAGS "--sysroot=${CROSS_ROOTFS}")
61-
add_compile_param(CROSS_LINK_FLAGS "--gcc-toolchain=${CROSS_ROOTFS}/usr")
62-
add_compile_param(CROSS_LINK_FLAGS "--target=${TOOLCHAIN}")
63-
add_compile_param(CROSS_LINK_FLAGS "-fuse-ld=gold")
6452

6553
if(TARGET_ARCH_NAME STREQUAL "armel")
6654
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
67-
add_compile_param(CROSS_LINK_FLAGS "-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
68-
add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib")
69-
add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib")
70-
add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
55+
add_link_options("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
56+
add_link_options("-L${CROSS_ROOTFS}/lib")
57+
add_link_options("-L${CROSS_ROOTFS}/usr/lib")
58+
add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
7159
endif()
7260
elseif(TARGET_ARCH_NAME STREQUAL "x86")
73-
add_compile_param(CROSS_LINK_FLAGS "-m32")
61+
add_link_options(-m32)
7462
endif()
7563

76-
add_compile_param(CMAKE_EXE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS")
77-
add_compile_param(CMAKE_SHARED_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS")
78-
add_compile_param(CMAKE_MODULE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS")
79-
8064
# Specify compile options
81-
add_compile_options("--sysroot=${CROSS_ROOTFS}")
82-
add_compile_options("--target=${TOOLCHAIN}")
83-
add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr")
8465

8566
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
8667
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
@@ -103,7 +84,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
10384
add_compile_options(-Wno-error=unused-command-line-argument)
10485
endif()
10586

106-
# Set LLDB include and library paths
87+
# Set LLDB include and library paths for builds that need lldb.
10788
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
10889
if(TARGET_ARCH_NAME STREQUAL "x86")
10990
set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}")
@@ -131,7 +112,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
131112
endif()
132113
endif()
133114

134-
set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}")
115+
135116
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
136117
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
137118
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
parameters:
2+
artifactsPublishingAdditionalParameters: ''
3+
dependsOn:
4+
- Validate
5+
publishInstallersAndChecksums: false
6+
symbolPublishingAdditionalParameters: ''
7+
8+
stages:
9+
- stage: General_Testing_Publish
10+
dependsOn: ${{ parameters.dependsOn }}
11+
variables:
12+
- template: ../common-variables.yml
13+
displayName: General Testing Publishing
14+
jobs:
15+
- template: ../setup-maestro-vars.yml
16+
17+
- job:
18+
displayName: Symbol Publishing
19+
dependsOn: setupMaestroVars
20+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.GeneralTesting_Channel_Id))
21+
variables:
22+
- group: DotNet-Symbol-Server-Pats
23+
pool:
24+
vmImage: 'windows-2019'
25+
steps:
26+
- task: DownloadBuildArtifacts@0
27+
displayName: Download Blob Artifacts
28+
inputs:
29+
artifactName: 'BlobArtifacts'
30+
continueOnError: true
31+
32+
- task: DownloadBuildArtifacts@0
33+
displayName: Download PDB Artifacts
34+
inputs:
35+
artifactName: 'PDBArtifacts'
36+
continueOnError: true
37+
38+
# This is necessary whenever we want to publish/restore to an AzDO private feed
39+
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
40+
# otherwise it'll complain about accessing a private feed.
41+
- task: NuGetAuthenticate@0
42+
displayName: 'Authenticate to AzDO Feeds'
43+
44+
- task: PowerShell@2
45+
displayName: Enable cross-org publishing
46+
inputs:
47+
filePath: eng\common\enable-cross-org-publishing.ps1
48+
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
49+
50+
- task: PowerShell@2
51+
displayName: Publish
52+
inputs:
53+
filePath: eng\common\sdk-task.ps1
54+
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
55+
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
56+
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
57+
/p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
58+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
59+
/p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
60+
/p:Configuration=Release
61+
${{ parameters.symbolPublishingAdditionalParameters }}
62+
63+
- job: publish_assets
64+
displayName: Publish Assets
65+
dependsOn: setupMaestroVars
66+
variables:
67+
- name: BARBuildId
68+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
69+
- name: IsStableBuild
70+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
71+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.GeneralTesting_Channel_Id))
72+
pool:
73+
vmImage: 'windows-2019'
74+
steps:
75+
- task: DownloadBuildArtifacts@0
76+
displayName: Download Package Artifacts
77+
inputs:
78+
buildType: current
79+
artifactName: PackageArtifacts
80+
continueOnError: true
81+
82+
- task: DownloadBuildArtifacts@0
83+
displayName: Download Blob Artifacts
84+
inputs:
85+
buildType: current
86+
artifactName: BlobArtifacts
87+
continueOnError: true
88+
89+
- task: DownloadBuildArtifacts@0
90+
displayName: Download Asset Manifests
91+
inputs:
92+
buildType: current
93+
artifactName: AssetManifests
94+
95+
- task: NuGetToolInstaller@1
96+
displayName: 'Install NuGet.exe'
97+
98+
# This is necessary whenever we want to publish/restore to an AzDO private feed
99+
- task: NuGetAuthenticate@0
100+
displayName: 'Authenticate to AzDO Feeds'
101+
102+
- task: PowerShell@2
103+
displayName: Enable cross-org publishing
104+
inputs:
105+
filePath: eng\common\enable-cross-org-publishing.ps1
106+
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
107+
108+
- task: PowerShell@2
109+
displayName: Publish Assets
110+
inputs:
111+
filePath: eng\common\sdk-task.ps1
112+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
113+
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
114+
/p:IsStableBuild=$(IsStableBuild)
115+
/p:IsInternalBuild=$(IsInternalBuild)
116+
/p:RepositoryName=$(Build.Repository.Name)
117+
/p:CommitSha=$(Build.SourceVersion)
118+
/p:NugetPath=$(NuGetExeToolPath)
119+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
120+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
121+
/p:BARBuildId=$(BARBuildId)
122+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
123+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
124+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
125+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
126+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
127+
/p:Configuration=Release
128+
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
129+
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
130+
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
131+
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
132+
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
133+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
134+
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
135+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
136+
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
137+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
138+
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
139+
${{ parameters.artifactsPublishingAdditionalParameters }}
140+
141+
- template: ../../steps/promote-build.yml
142+
parameters:
143+
ChannelId: ${{ variables.GeneralTesting_Channel_Id }}

eng/common/templates/post-build/channels/netcore-3-tools-validation.yml renamed to eng/common/templates/post-build/channels/netcore-3-eng-validation.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ stages:
8383
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
8484
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
8585
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
86-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
86+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
8787
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
88-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
88+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
8989
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
90-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
90+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
9191
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
9292
${{ parameters.artifactsPublishingAdditionalParameters }}
9393

eng/common/templates/post-build/channels/netcore-3-tools.yml renamed to eng/common/templates/post-build/channels/netcore-3-eng.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ stages:
130130
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
131131
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
132132
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
133-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
133+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
134134
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
135-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
135+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
136136
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
137-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
137+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
138138
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
139139
${{ parameters.artifactsPublishingAdditionalParameters }}
140140

0 commit comments

Comments
 (0)