diff --git a/NuGet.config b/NuGet.config index ade36ec4d1cd..fa6c9be0533c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,19 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e647de40d8e8..ef14a6b3c0b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,161 +1,161 @@ - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/android - a040a1d2df2c48d6ad7ff60ccd0aa609d3d15612 + 406e2395e5a607611f66cab3a43ff7a0be7db452 https://github.com/dotnet/android 9a2d211ba972d3a0c4c108e043def432f3ec2620 - + https://github.com/dotnet/macios - 2500333926386c67337b652a591c014de87c3d2d + 5515a3bbcc8b848100f82164b07618790cdb5745 - + https://github.com/dotnet/macios - 2500333926386c67337b652a591c014de87c3d2d + 5515a3bbcc8b848100f82164b07618790cdb5745 - + https://github.com/dotnet/macios - 2500333926386c67337b652a591c014de87c3d2d + 5515a3bbcc8b848100f82164b07618790cdb5745 - + https://github.com/dotnet/macios - 2500333926386c67337b652a591c014de87c3d2d + 5515a3bbcc8b848100f82164b07618790cdb5745 - + https://github.com/dotnet/macios - b364fe57e890ba1d1ca43740c038d1dfb6786576 + f97742bfb9145a25a2372f93b4efd2ef9c95f84c - + https://github.com/dotnet/macios - b364fe57e890ba1d1ca43740c038d1dfb6786576 + f97742bfb9145a25a2372f93b4efd2ef9c95f84c - + https://github.com/dotnet/macios - b364fe57e890ba1d1ca43740c038d1dfb6786576 + f97742bfb9145a25a2372f93b4efd2ef9c95f84c - + https://github.com/dotnet/macios - b364fe57e890ba1d1ca43740c038d1dfb6786576 + f97742bfb9145a25a2372f93b4efd2ef9c95f84c https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 https://github.com/dotnet/xharness @@ -175,37 +175,37 @@ - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 - + https://github.com/dotnet/dotnet - 3531114c7feabc86ea3769ca2c5b804e5339a932 + 129762816df93ca3a56a666de5f619d0de412ec7 diff --git a/eng/Versions.props b/eng/Versions.props index 35ff1c075e68..786a2fb5585f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ 10.0.20 - 11.0.100-preview.2.26103.111 + 11.0.100-preview.2.26161.107 $(MicrosoftNETSdkPackageVersion) 10.0.100 - 11.0.0-preview.2.26103.111 + 11.0.0-preview.2.final $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) @@ -43,37 +43,37 @@ 1.0.0-prerelease.26113.1 $(MicrosoftNETCoreAppRefPackageVersion) - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final 10.0.1 10.0.1 11.0.0-preview.2.26103.111 1.0.0-preview.251204.1 - 36.1.99-ci.main.157 + 36.1.99-preview.2.157 36.1.30 $(MicrosoftNetSdkAndroidManifest100100PackageVersion) - 26.2.11375-net11-p2 - 26.2.11375-net11-p2 - 26.2.11375-net11-p2 - 26.2.11375-net11-p2 + 26.2.11425-net11-p2 + 26.2.11425-net11-p2 + 26.2.11425-net11-p2 + 26.2.11425-net11-p2 - 26.2.10196 - 26.2.10196 - 26.2.10196 - 26.2.10196 + 26.2.10217 + 26.2.10217 + 26.2.10217 + 26.2.10217 8.0.148 @@ -82,19 +82,19 @@ 1.3.2 1.0.3179.45 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 - 11.0.0-preview.2.26103.111 + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final + 11.0.0-preview.2.final 10.0.2 $(MicrosoftAspNetCorePackageVersion) @@ -144,13 +144,13 @@ 0.9.0 4.2.3 9.0.0 - 11.0.0-beta.26103.111 - 11.0.0-beta.26103.111 - 11.0.0-beta.26103.111 - 11.0.0-beta.26103.111 + 11.0.0-beta.26161.107 + 11.0.0-beta.26161.107 + 11.0.0-beta.26161.107 + 11.0.0-beta.26161.107 1.1.87-gba258badda - 11.0.0-beta.26103.111 - 11.0.0-beta.26103.111 + 11.0.0-beta.26161.107 + 11.0.0-beta.26161.107 17.6.0 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 4cb769473f70..1997c2ae00d7 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,19 +60,19 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Azure-Linux-3-Amd64-Public + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: Azure-Linux-3-Amd64 + image: build.azurelinux.3.amd64 os: linux ${{ else }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Azure-Linux-3-Amd64-Public + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Azure-Linux-3-Amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9b7eede4e50f..ef97671fe6cb 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -295,9 +295,7 @@ while :; do ;; noble) # Ubuntu 24.04 __CodeName=noble - if [[ -z "$__LLDB_Package" ]]; then - __LLDB_Package="liblldb-19-dev" - fi + __LLDB_Package="liblldb-19-dev" ;; stretch) # Debian 9 __CodeName=stretch diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 11f81cbd40d4..abb47beacfa0 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -24,16 +24,16 @@ case "$os" in apt update apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ - libssl-dev libkrb5-dev pigz cpio + libssl-dev libkrb5-dev pigz cpio ninja-build localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" - $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build elif [ "$ID" = "amzn" ]; then - dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build elif [ "$ID" = "alpine" ]; then - apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio + apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio ninja else echo "Unsupported distro. distro: $ID" exit 1 @@ -54,6 +54,7 @@ brew "openssl@3" brew "pkgconf" brew "python3" brew "pigz" +brew "ninja" EOF ;; diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f6bde2683794..d127bbe5a788 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -588,6 +588,11 @@ function LocateVisualStudio([object]$vsRequirements = $null){ return $null } + if ($null -eq $vsInfo -or $vsInfo.Count -eq 0) { + throw "No instance of Visual Studio meeting the requirements specified was found. Requirements: $($args -join ' ')" + return $null + } + # use first matching instance return $vsInfo[0] } diff --git a/eng/pipelines/ci-device-tests.yml b/eng/pipelines/ci-device-tests.yml index a3aeb934681f..f3b2c1da8689 100644 --- a/eng/pipelines/ci-device-tests.yml +++ b/eng/pipelines/ci-device-tests.yml @@ -5,6 +5,7 @@ trigger: - release/* - net*.0 - inflight/* + - darc-* tags: include: - '*' diff --git a/eng/pipelines/ci-uitests.yml b/eng/pipelines/ci-uitests.yml index b7c924cbb623..3588b03db746 100644 --- a/eng/pipelines/ci-uitests.yml +++ b/eng/pipelines/ci-uitests.yml @@ -5,6 +5,7 @@ trigger: - release/* - net*.0 - inflight/* + - darc-* tags: include: - '*' diff --git a/global.json b/global.json index e7b5f4e0021d..f3bce01c2fd0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "11.0.100-preview.2.26103.111" + "dotnet": "11.0.100-preview.2.26161.107" }, "sdk": { "paths": [ @@ -11,7 +11,7 @@ "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26103.111", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26103.111" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26161.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26161.107" } } diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs b/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs index 33fc077d7400..25753f022a70 100644 --- a/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs +++ b/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs @@ -49,7 +49,7 @@ public partial class EmbeddedFontLoader #pragma warning restore CA1422 #pragma warning restore CA1416 - var uiFont = UIFont.FromName(name, 10); + var uiFont = name is not null ? UIFont.FromName(name, 10) : null; if (uiFont != null) return name; diff --git a/src/Core/src/Fonts/FontManager.iOS.cs b/src/Core/src/Fonts/FontManager.iOS.cs index 0bfd45a3e9f2..04eda4fd5123 100644 --- a/src/Core/src/Fonts/FontManager.iOS.cs +++ b/src/Core/src/Fonts/FontManager.iOS.cs @@ -44,7 +44,7 @@ public FontManager(IFontRegistrar fontRegistrar, IServiceProvider? serviceProvid /// public UIFont DefaultFont => - _defaultFont ??= UIFont.SystemFontOfSize(UIFont.SystemFontSize); + _defaultFont ??= UIFont.SystemFontOfSize(UIFont.SystemFontSize)!; static double? defaultFontSize; @@ -151,7 +151,7 @@ UIFont CreateFont(Font font) } var cleansedFont = CleanseFontName(family); - result = UIFont.FromName(cleansedFont, size); + result = cleansedFont is not null ? UIFont.FromName(cleansedFont, size) : null; if (result != null) return ApplyScaling(font, result); @@ -167,12 +167,12 @@ UIFont CreateFont(Font font) if (hasAttributes) { - var defaultFont = UIFont.SystemFontOfSize(size); + var defaultFont = UIFont.SystemFontOfSize(size) ?? DefaultFont; var descriptor = defaultFont.FontDescriptor.CreateWithAttributes(GetFontAttributes(font)); - return ApplyScaling(font, UIFont.FromDescriptor(descriptor, size)); + return ApplyScaling(font, UIFont.FromDescriptor(descriptor, size) ?? DefaultFont); } - return ApplyScaling(font, UIFont.SystemFontOfSize(size)); + return ApplyScaling(font, UIFont.SystemFontOfSize(size) ?? DefaultFont); UIFont ApplyScaling(Font font, UIFont uiFont) { diff --git a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs index 6d903fcb3bed..fa144ce67ac2 100644 --- a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs +++ b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs @@ -253,7 +253,8 @@ void UpdatePickerSelectedIndex(UIPickerView? pickerView, int formsIndex) if (VirtualView == null || pickerView == null) return; - var source = (PickerSource)pickerView.Model; + if (pickerView.Model is not PickerSource source) + return; source.SelectedIndex = formsIndex; pickerView.Select(Math.Max(formsIndex, 0), 0, true); } @@ -329,8 +330,7 @@ void OnEnded(object? sender, EventArgs eventArgs) if (Handler is not PickerHandler handler || handler._pickerView is not UIPickerView pickerView) return; - PickerSource? model = (PickerSource)pickerView.Model; - if (model.SelectedIndex != -1 && model.SelectedIndex != pickerView.SelectedRowInComponent(0)) + if (pickerView.Model is PickerSource model && model.SelectedIndex != -1 && model.SelectedIndex != pickerView.SelectedRowInComponent(0)) { pickerView.Select(model.SelectedIndex, 0, false); } diff --git a/src/Core/src/Platform/iOS/MauiTextView.cs b/src/Core/src/Platform/iOS/MauiTextView.cs index abd5be6475b1..fd0a3102c787 100644 --- a/src/Core/src/Platform/iOS/MauiTextView.cs +++ b/src/Core/src/Platform/iOS/MauiTextView.cs @@ -191,7 +191,7 @@ void UpdatePlaceholderFont(UIFont? value) { _defaultPlaceholderSize ??= _placeholderLabel.Font.PointSize; _placeholderLabel.Font = value ?? _placeholderLabel.Font.WithSize( - value?.PointSize ?? _defaultPlaceholderSize.Value); + value?.PointSize ?? _defaultPlaceholderSize.Value) ?? _placeholderLabel.Font; } [UnconditionalSuppressMessage("Memory", "MEM0002", Justification = IUIViewLifeCycleEvents.UnconditionalSuppressMessage)]