Skip to content

Commit bd4069d

Browse files
author
Mirroring
committed
Merge commit '43457665e467efbd8ffb244bea0ceeffc178c6c1'
2 parents 99549ff + 4345766 commit bd4069d

File tree

10 files changed

+49
-54
lines changed

10 files changed

+49
-54
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!-- Begin: Package sources from dotnet-winforms -->
11-
<add key="darc-int-dotnet-winforms-44b9411" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-44b9411e/nuget/v3/index.json" />
1210
<!-- End: Package sources from dotnet-winforms -->
1311
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1412
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,10 +20,8 @@
2220
<disabledPackageSources>
2321
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2422
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
2623
<!-- End: Package sources from dotnet-runtime -->
2724
<!-- Begin: Package sources from dotnet-winforms -->
28-
<add key="darc-int-dotnet-winforms-44b9411" value="true" />
2925
<!-- End: Package sources from dotnet-winforms -->
3026
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3127
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>
159-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
161+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24516.1">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25060.1">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
165+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
169+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24516.1">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25060.1">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
173+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24516.1">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25060.1">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
177+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
178178
</Dependency>
179179
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
180180
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.24516.1</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24516.1</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25060.1</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25060.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

‎eng/common/cross/toolchain.cmake‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
4040
set(TOOLCHAIN "arm-linux-gnueabihf")
4141
endif()
4242
if(TIZEN)
43-
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
43+
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
4444
endif()
4545
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4646
set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4949
elseif(LINUX)
5050
set(TOOLCHAIN "aarch64-linux-gnu")
5151
if(TIZEN)
52-
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
52+
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
5353
endif()
5454
elseif(FREEBSD)
5555
set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
5858
set(CMAKE_SYSTEM_PROCESSOR armv7l)
5959
set(TOOLCHAIN "arm-linux-gnueabi")
6060
if(TIZEN)
61-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
61+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
6262
endif()
6363
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6464
set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -95,7 +95,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
9595
elseif(LINUX)
9696
set(TOOLCHAIN "x86_64-linux-gnu")
9797
if(TIZEN)
98-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
98+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
9999
endif()
100100
elseif(FREEBSD)
101101
set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +112,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
112112
set(TOOLCHAIN "i686-linux-gnu")
113113
endif()
114114
if(TIZEN)
115-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
115+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
116116
endif()
117117
else()
118118
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -124,26 +124,25 @@ endif()
124124

125125
# Specify include paths
126126
if(TIZEN)
127-
if(TARGET_ARCH_NAME STREQUAL "arm")
128-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
129-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
130-
endif()
131-
if(TARGET_ARCH_NAME STREQUAL "armel")
132-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
133-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
134-
endif()
135-
if(TARGET_ARCH_NAME STREQUAL "arm64")
136-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
137-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
138-
endif()
139-
if(TARGET_ARCH_NAME STREQUAL "x86")
140-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
141-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
142-
endif()
143-
if(TARGET_ARCH_NAME STREQUAL "x64")
144-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
127+
function(find_toolchain_dir prefix)
128+
# Dynamically find the version subdirectory
129+
file(GLOB DIRECTORIES "${prefix}/*")
130+
list(GET DIRECTORIES 0 FIRST_MATCH)
131+
get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
132+
133+
set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
134+
endfunction()
135+
136+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
137+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
138+
else()
139+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
146140
endif()
141+
142+
message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
143+
144+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
145+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
147146
endif()
148147

149148
if(ANDROID)
@@ -265,21 +264,21 @@ endif()
265264

266265
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
267266
if(TIZEN)
268-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
267+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
269268
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
270269
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
270+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
272271
endif()
273272
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
274273
if(TIZEN)
275-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
274+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
276275
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
277276
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
278-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
277+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
279278

280279
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
281280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
282-
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
281+
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
283282
endif()
284283
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285284
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
@@ -288,10 +287,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
288287
endif()
289288
add_toolchain_linker_flag(-m32)
290289
if(TIZEN)
291-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
290+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
292291
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
293292
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
294-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
293+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
295294
endif()
296295
elseif(ILLUMOS)
297296
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
arguments: >
8787
-task PublishBuildAssets -restore -msbuildEngine dotnet
8888
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
89-
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
89+
/p:MaestroApiEndpoint=https://maestro.dot.net
9090
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
9191
/p:OfficialBuildId=$(Build.BuildNumber)
9292
condition: ${{ parameters.condition }}

‎eng/common/templates-official/post-build/common-variables.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77

88
# Default Maestro++ API Endpoint and API Version
99
- name: MaestroApiEndPoint
10-
value: "https://maestro-prod.westus2.cloudapp.azure.com"
10+
value: "https://maestro.dot.net"
1111
- name: MaestroApiAccessToken
1212
value: $(MaestroAccessToken)
1313
- name: MaestroApiVersion

‎eng/common/templates/job/job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128

129129
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130130
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@3
131+
- task: MicroBuildSigningPlugin@4
132132
displayName: Install MicroBuild plugin
133133
inputs:
134134
signType: $(_SignType)

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot,
321321
$variations += @($installParameters)
322322

323323
$dotnetBuilds = $installParameters.Clone()
324-
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
324+
$dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
325325
$variations += @($dotnetBuilds)
326326

327327
if ($runtimeSourceFeed) {

‎eng/common/tools.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function InstallDotNet {
234234
local public_location=("${installParameters[@]}")
235235
variations+=(public_location)
236236

237-
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
237+
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
238238
variations+=(dotnetbuilds)
239239

240240
if [[ -n "${6:-}" ]]; then

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
1717
},
1818
"sdk": {
1919
"version": "8.0.110"

0 commit comments

Comments
 (0)