Skip to content

Commit 938f350

Browse files
RonHeckRonHeck
authored
Merge branch 'dotnet:main' into Issue-6530_Automation_Peer_For_ContextMenu_Support_Groups
2 parents 09f03b1 + 1a196a8 commit 938f350

File tree

934 files changed

+6884
-10847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

934 files changed

+6884
-10847
lines changed

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<RepositoryName>wpf</RepositoryName>
44
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<TargetFrameworkVersion>8.0</TargetFrameworkVersion>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFrameworkVersion>9.0</TargetFrameworkVersion>
77
</PropertyGroup>
88
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
99
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">

‎Microsoft.Dotnet.Wpf.sln

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OSVersionHelper", "src\Micr
239239
EndProject
240240
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresentationNative", "src\Microsoft.DotNet.Wpf\redist\PresentationNative\PresentationNative.vcxproj", "{AF9084C3-BF37-4A56-A851-89F3BAE731B3}"
241241
EndProject
242+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3F4DFE8-A29C-4BA1-964D-954AB6732744}"
243+
EndProject
244+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf", "Microsoft.DotNet.Wpf", "{C9ECC1A1-917F-43D3-B340-2035B4938507}"
245+
EndProject
246+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{34B64A4A-7C83-4F92-8C47-80E9FA10D660}"
247+
EndProject
248+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{A48B585E-6AB0-4F8D-8484-77F37CB44437}"
249+
EndProject
250+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xaml.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Xaml.Tests\System.Xaml.Tests.csproj", "{B2F2A89C-55C9-41B1-A645-0948609BD8BE}"
251+
EndProject
242252
Global
243253
GlobalSection(SolutionConfigurationPlatforms) = preSolution
244254
Debug|Any CPU = Debug|Any CPU
@@ -1910,6 +1920,28 @@ Global
19101920
{AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.ActiveCfg = Release|Win32
19111921
{AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.Build.0 = Release|Win32
19121922
{AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.Deploy.0 = Release|Win32
1923+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.ActiveCfg = Debug|Win32
1924+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.Build.0 = Debug|Win32
1925+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.Deploy.0 = Debug|Win32
1926+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|ARM64.ActiveCfg = Debug|ARM64
1927+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|ARM64.Build.0 = Debug|ARM64
1928+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.ActiveCfg = Debug|x64
1929+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Build.0 = Debug|x64
1930+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Deploy.0 = Debug|x64
1931+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|Win32
1932+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|Win32
1933+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Deploy.0 = Debug|Win32
1934+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.ActiveCfg = Release|Win32
1935+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Build.0 = Release|Win32
1936+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Deploy.0 = Release|Win32
1937+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|ARM64.ActiveCfg = Release|ARM64
1938+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|ARM64.Build.0 = Release|ARM64
1939+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.ActiveCfg = Release|x64
1940+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Build.0 = Release|x64
1941+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Deploy.0 = Release|x64
1942+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|Win32
1943+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|Win32
1944+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|Win32
19131945
EndGlobalSection
19141946
GlobalSection(SolutionProperties) = preSolution
19151947
HideSolutionNode = FALSE
@@ -2026,6 +2058,10 @@ Global
20262058
{7EE0E965-7DA4-4A94-9441-801E8D2CC1CD} = {4557C5C6-10B1-475C-8279-5511955D1C29}
20272059
{3801B5AE-6871-4A72-B400-1F6ABCBF9045} = {7EE0E965-7DA4-4A94-9441-801E8D2CC1CD}
20282060
{AF9084C3-BF37-4A56-A851-89F3BAE731B3} = {DDED00A7-24FD-4AEF-B264-2150F0E59B4D}
2061+
{C9ECC1A1-917F-43D3-B340-2035B4938507} = {F3F4DFE8-A29C-4BA1-964D-954AB6732744}
2062+
{34B64A4A-7C83-4F92-8C47-80E9FA10D660} = {C9ECC1A1-917F-43D3-B340-2035B4938507}
2063+
{A48B585E-6AB0-4F8D-8484-77F37CB44437} = {34B64A4A-7C83-4F92-8C47-80E9FA10D660}
2064+
{B2F2A89C-55C9-41B1-A645-0948609BD8BE} = {A48B585E-6AB0-4F8D-8484-77F37CB44437}
20292065
EndGlobalSection
20302066
GlobalSection(ExtensibilityGlobals) = postSolution
20312067
SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567}

‎eng/Version.Details.xml

Lines changed: 84 additions & 84 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,35 @@
2121
</PropertyGroup>
2222
<!-- Packages that come from https://github.com/dotnet/winforms -->
2323
<PropertyGroup>
24-
<MicrosoftPrivateWinformsVersion>9.0.0-alpha.1.23454.1</MicrosoftPrivateWinformsVersion>
24+
<MicrosoftPrivateWinformsVersion>9.0.0-alpha.1.23522.1</MicrosoftPrivateWinformsVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/runtime -->
2727
<PropertyGroup>
28-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.0-alpha.1.23430.1</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-alpha.1.23430.1</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCorePlatformsVersion>9.0.0-alpha.1.23430.1</MicrosoftNETCorePlatformsVersion>
32-
<SystemCodeDomPackageVersion>9.0.0-alpha.1.23430.1</SystemCodeDomPackageVersion>
33-
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-alpha.1.23430.1</SystemConfigurationConfigurationManagerPackageVersion>
34-
<SystemDiagnosticsEventLogPackageVersion>9.0.0-alpha.1.23430.1</SystemDiagnosticsEventLogPackageVersion>
35-
<SystemDrawingCommonVersion>9.0.0-alpha.1.23454.1</SystemDrawingCommonVersion>
36-
<SystemDirectoryServicesVersion>9.0.0-alpha.1.23430.1</SystemDirectoryServicesVersion>
37-
<SystemIOPackagingVersion>9.0.0-alpha.1.23430.1</SystemIOPackagingVersion>
38-
<SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23430.1</SystemReflectionMetadataLoadContextVersion>
28+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23521.5</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.0-alpha.1.23521.5</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-alpha.1.23521.5</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCorePlatformsVersion>9.0.0-alpha.1.23521.5</MicrosoftNETCorePlatformsVersion>
32+
<SystemCodeDomPackageVersion>9.0.0-alpha.1.23521.5</SystemCodeDomPackageVersion>
33+
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-alpha.1.23521.5</SystemConfigurationConfigurationManagerPackageVersion>
34+
<SystemDiagnosticsEventLogPackageVersion>9.0.0-alpha.1.23521.5</SystemDiagnosticsEventLogPackageVersion>
35+
<SystemDrawingCommonVersion>9.0.0-alpha.1.23522.1</SystemDrawingCommonVersion>
36+
<SystemDirectoryServicesVersion>9.0.0-alpha.1.23521.5</SystemDirectoryServicesVersion>
37+
<SystemIOPackagingVersion>9.0.0-alpha.1.23521.5</SystemIOPackagingVersion>
38+
<SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23521.5</SystemReflectionMetadataLoadContextVersion>
3939
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
40-
<SystemResourcesExtensionsVersion>9.0.0-alpha.1.23430.1</SystemResourcesExtensionsVersion>
41-
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-alpha.1.23430.1</SystemSecurityCryptographyXmlPackageVersion>
42-
<SystemSecurityPermissionsPackageVersion>9.0.0-alpha.1.23430.1</SystemSecurityPermissionsPackageVersion>
43-
<SystemWindowsExtensionsPackageVersion>9.0.0-alpha.1.23430.1</SystemWindowsExtensionsPackageVersion>
40+
<SystemResourcesExtensionsVersion>9.0.0-alpha.1.23521.5</SystemResourcesExtensionsVersion>
41+
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-alpha.1.23521.5</SystemSecurityCryptographyXmlPackageVersion>
42+
<SystemSecurityPermissionsPackageVersion>9.0.0-alpha.1.23521.5</SystemSecurityPermissionsPackageVersion>
43+
<SystemWindowsExtensionsPackageVersion>9.0.0-alpha.1.23521.5</SystemWindowsExtensionsPackageVersion>
4444
</PropertyGroup>
4545
<!-- Docs / Intellisense -->
4646
<PropertyGroup>
4747
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20221010.1</MicrosoftPrivateIntellisenseVersion>
4848
</PropertyGroup>
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
51-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.23451.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.23451.1</MicrosoftDotNetCodeAnalysisPackageVersion>
51+
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.23518.2</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23518.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>
@@ -86,6 +86,16 @@
8686
<PropertyGroup>
8787
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
8888
</PropertyGroup>
89+
<!-- Test related -->
90+
<PropertyGroup>
91+
<MoqPackageVersion>4.10.0</MoqPackageVersion>
92+
</PropertyGroup>
93+
<!-- Code Coverage -->
94+
<PropertyGroup>
95+
<CoverletMSBuildPackageVersion>3.1.2</CoverletMSBuildPackageVersion>
96+
<CodecovVersion>1.9.0</CodecovVersion>
97+
<ReportGeneratorVersion>4.0.9</ReportGeneratorVersion>
98+
</PropertyGroup>
8999
<!--Package names-->
90100
<PropertyGroup>
91101
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>

‎eng/WpfArcadeSdk/tools/SdkReferences.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@
202202
Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
203203
<NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
204204
</Reference>
205-
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\net7.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
205+
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
206206
Condition="!Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')
207-
And $(TargetFramework) == 'net8.0'
208-
And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net7.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
207+
And $(TargetFramework) == 'net9.0'
208+
And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
209209
<NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
210210
</Reference>
211211
</ItemGroup>

‎eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
105105
-binarylog|-bl)
106106
binary_log=true
107107
;;
108-
-excludeCIBinarylog|-nobl)
108+
-excludecibinarylog|-nobl)
109109
exclude_ci_binary_log=true
110110
;;
111111
-pipelineslog|-pl)

‎eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
487487
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
488488
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
489489
-U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
490-
search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
490+
search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
491491
fi
492492

493493
# install all packages in one go

‎eng/common/cross/riscv64/tizen/tizen.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-littleriscv)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )

‎eng/common/cross/tizen-build-rootfs.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ case "$ARCH" in
2222
TIZEN_ARCH="x86_64"
2323
LINK_ARCH="x86"
2424
;;
25+
riscv64)
26+
TIZEN_ARCH="riscv64"
27+
LINK_ARCH="riscv"
28+
;;
2529
*)
2630
echo "Unsupported architecture for tizen: $ARCH"
2731
exit 1
@@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR
5862
echo ">>Start configuring Tizen rootfs"
5963
ln -sfn asm-${LINK_ARCH} ./usr/include/asm
6064
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
65+
if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
66+
echo "Fixing broken symlinks in $PWD"
67+
rm ./usr/lib64/libresolv.so
68+
ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
69+
rm ./usr/lib64/libpthread.so
70+
ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
71+
rm ./usr/lib64/libdl.so
72+
ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
73+
rm ./usr/lib64/libutil.so
74+
ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
75+
rm ./usr/lib64/libm.so
76+
ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
77+
rm ./usr/lib64/librt.so
78+
ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
79+
rm ./lib/ld-linux-riscv64-lp64d.so.1
80+
ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
81+
fi
6182
echo "<<Finish configuring Tizen rootfs"

‎eng/common/cross/tizen-fetch.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,28 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159+
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160+
BASE="Tizen-Base-RISCV"
161+
UNIFIED="Tizen-Unified-RISCV"
162+
else
163+
BASE="Tizen-Base"
164+
UNIFIED="Tizen-Unified"
165+
fi
166+
159167
Inform "Initialize ${TIZEN_ARCH} base"
160-
fetch_tizen_pkgs_init standard Tizen-Base
168+
fetch_tizen_pkgs_init standard $BASE
161169
Inform "fetch common packages"
162170
fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
163171
Inform "fetch coreclr packages"
164-
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
172+
fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
173+
if [ "$TIZEN_ARCH" != "riscv64" ]; then
174+
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
175+
fi
165176
Inform "fetch corefx packages"
166177
fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
167178

168179
Inform "Initialize standard unified"
169-
fetch_tizen_pkgs_init standard Tizen-Unified
180+
fetch_tizen_pkgs_init standard $UNIFIED
170181
Inform "fetch corefx packages"
171182
fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
172183

‎eng/common/cross/toolchain.cmake

Lines changed: 13 additions & 6 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/13.1.0")
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/13.1.0")
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/13.1.0")
6262
endif()
6363
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6464
set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
8080
set(TOOLCHAIN "riscv64-alpine-linux-musl")
8181
else()
8282
set(TOOLCHAIN "riscv64-linux-gnu")
83+
if(TIZEN)
84+
set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
85+
endif()
8386
endif()
8487
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
8588
set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -95,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
9598
elseif(LINUX)
9699
set(TOOLCHAIN "x86_64-linux-gnu")
97100
if(TIZEN)
98-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
101+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0")
99102
endif()
100103
elseif(FREEBSD)
101104
set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
112115
set(TOOLCHAIN "i686-linux-gnu")
113116
endif()
114117
if(TIZEN)
115-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
118+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0")
116119
endif()
117120
else()
118121
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -144,6 +147,10 @@ if(TIZEN)
144147
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145148
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
146149
endif()
150+
if(TARGET_ARCH_NAME STREQUAL "riscv64")
151+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
152+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
153+
endif()
147154
endif()
148155

149156
if(ANDROID)
@@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
270277
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271278
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
272279
endif()
273-
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280+
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
274281
if(TIZEN)
275282
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
276283
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")

‎eng/common/post-build/check-channel-consistency.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ try {
77
. $PSScriptRoot\post-build-utils.ps1
88

99
if ($PromoteToChannels -eq "") {
10-
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
10+
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
1111
ExitWithExitCode 0
1212
}
1313

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
displayName: RichCodeNav Upload
155155
inputs:
156156
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
157-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
157+
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
158158
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
159159
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
160160
continueOnError: true

0 commit comments

Comments
 (0)