Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
78cc04b
Update dependencies from https://github.com/dotnet/sdk build 20250319.17
dotnet-maestro[bot] Mar 20, 2025
969677a
Update dependencies from https://github.com/dotnet/sdk build 20250320.12
dotnet-maestro[bot] Mar 21, 2025
115df3e
Update dependencies from https://github.com/dotnet/sdk build 20250321.12
dotnet-maestro[bot] Mar 22, 2025
3bbe897
Update dependencies from https://github.com/dotnet/sdk build 20250322.1
dotnet-maestro[bot] Mar 23, 2025
e115420
Update dependencies from https://github.com/dotnet/sdk build 20250323.7
dotnet-maestro[bot] Mar 24, 2025
ebd9dcb
Update dependencies from https://github.com/dotnet/sdk build 20250324.13
dotnet-maestro[bot] Mar 25, 2025
2cd595f
Update dependencies from https://github.com/dotnet/sdk build 20250325.17
dotnet-maestro[bot] Mar 26, 2025
9f7379d
Update dependencies from https://github.com/dotnet/sdk build 20250326.16
dotnet-maestro[bot] Mar 27, 2025
5f44d64
[ci] Update android and iOS
rmarinho Mar 27, 2025
c8696e2
[ci] Add runtime updates
rmarinho Mar 27, 2025
99c5adf
Update dependencies from https://github.com/dotnet/sdk build 20250327.22
dotnet-maestro[bot] Mar 28, 2025
e7ec3cf
Update dependencies from https://github.com/dotnet/sdk build 20250328.13
dotnet-maestro[bot] Mar 29, 2025
e95caef
Update dependencies from https://github.com/dotnet/sdk build 20250329.3
dotnet-maestro[bot] Mar 30, 2025
fb4ee87
Update dependencies from https://github.com/dotnet/sdk build 20250330.3
dotnet-maestro[bot] Mar 31, 2025
03cdf5f
Update dependencies from https://github.com/dotnet/sdk build 20250331.20
dotnet-maestro[bot] Apr 1, 2025
bf16e1e
Update dependencies from https://github.com/dotnet/sdk build 20250401.23
dotnet-maestro[bot] Apr 2, 2025
0404e02
Update dependencies from https://github.com/dotnet/sdk build 20250402.40
dotnet-maestro[bot] Apr 3, 2025
d6570b0
[ci] Update android and sdk
rmarinho Apr 3, 2025
414bd96
[ci] Update SystemNumericsVectorsVersion
rmarinho Apr 3, 2025
1379272
Try 4.6.1
rmarinho Apr 3, 2025
cbc7fe7
[ci] Add missing version
rmarinho Apr 3, 2025
33054be
Merge branch 'net10.0' into darc-net10.0-d26c605c-7a05-4253-99e5-825a…
rmarinho Apr 3, 2025
ccd729c
[ci] Missing global
rmarinho Apr 3, 2025
c292b7a
Update dependencies from https://github.com/dotnet/sdk build 20250403.20
dotnet-maestro[bot] Apr 4, 2025
bebb338
Update dependencies from https://github.com/dotnet/sdk build 20250404.13
dotnet-maestro[bot] Apr 5, 2025
06a19ca
Update dependencies from https://github.com/dotnet/sdk build 20250405.3
dotnet-maestro[bot] Apr 6, 2025
783547b
Update dependencies from https://github.com/dotnet/sdk build 20250406.7
dotnet-maestro[bot] Apr 7, 2025
939d43e
[android] More global fixes
rmarinho Apr 7, 2025
963d54e
[android] Update more android namespaces
rmarinho Apr 7, 2025
8089d81
[android] More namespaces fixes
rmarinho Apr 7, 2025
ee0c3ff
[android] Update more namespaces
rmarinho Apr 7, 2025
fff2905
Update dependencies from https://github.com/dotnet/sdk build 20250407.27
dotnet-maestro[bot] Apr 8, 2025
5a78b8b
[android] More updates to namespaces, ignore xaml warnings
rmarinho Apr 8, 2025
922ec9c
more updates to namespaces
rmarinho Apr 8, 2025
8ec7769
[ci] Update arcade and xharness
rmarinho Apr 8, 2025
aff9afe
[ci] Update sdk and android
rmarinho Apr 8, 2025
955e055
Update dependencies from https://github.com/dotnet/sdk build 20250408.22
dotnet-maestro[bot] Apr 9, 2025
4244a4f
Update System.Runtime.Compiler.ServicesUnsafe
rmarinho Apr 9, 2025
e8d00eb
Merge branch 'net10.0' into darc-net10.0-d26c605c-7a05-4253-99e5-825a…
rmarinho Apr 9, 2025
a31feab
[tests] Revert the nowarn for xaml tests
rmarinho Apr 9, 2025
d90d729
Update dependencies from https://github.com/dotnet/sdk build 20250409.42
dotnet-maestro[bot] Apr 10, 2025
e08a058
[ci] Update android and sdk
rmarinho Apr 10, 2025
d35ac76
[ci] Bump aspnet and runtime
rmarinho Apr 10, 2025
e9d6e0a
Update dependencies from https://github.com/dotnet/sdk build 20250410.19
dotnet-maestro[bot] Apr 11, 2025
6112462
Fix package versions for emscripten
akoeplinger Apr 11, 2025
7ec5903
Fix more namespaces
rmarinho Apr 11, 2025
96d1865
Merge branch 'darc-net10.0-d26c605c-7a05-4253-99e5-825a3d9bcac8' of h…
rmarinho Apr 11, 2025
97dc1d7
More namespace changes
rmarinho Apr 11, 2025
ff84f28
Update MainView.cs
rmarinho Apr 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"rollForward": false
},
"microsoft.dotnet.xharness.cli": {
"version": "10.0.0-prerelease.25176.1",
"version": "10.0.0-prerelease.25207.6",
"commands": [
"xharness"
],
Expand Down
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-android -->
<add key="darc-pub-dotnet-android-e7876a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-e7876a4f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="local" value="LOCAL_PLACEHOLDER" />
Expand Down
181 changes: 91 additions & 90 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

93 changes: 47 additions & 46 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,59 +28,60 @@
<PropertyGroup>
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.14</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftNETSdkPackageVersion>10.0.100-preview.3.25175.10</MicrosoftNETSdkPackageVersion>
<!-- dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>10.0.100-preview.4.25210.19</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.3.25171.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25209.13</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
<!-- Microsoft/Extensions -->
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsHostingAbstractionsVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-preview.3.7</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-ci.main.32</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdknet100_182PackageVersion>18.2.10675-net10-p3</MicrosoftMacCatalystSdknet100_182PackageVersion>
<MicrosoftmacOSSdknet100_152PackageVersion>15.2.10675-net10-p3</MicrosoftmacOSSdknet100_152PackageVersion>
<MicrosoftiOSSdknet100_182PackageVersion>18.2.10675-net10-p3</MicrosoftiOSSdknet100_182PackageVersion>
<MicrosofttvOSSdknet100_182PackageVersion>18.2.10675-net10-p3</MicrosofttvOSSdknet100_182PackageVersion>
<MicrosoftMacCatalystSdknet100_182PackageVersion>18.2.10691-net10-p4</MicrosoftMacCatalystSdknet100_182PackageVersion>
<MicrosoftmacOSSdknet100_152PackageVersion>15.2.10691-net10-p4</MicrosoftmacOSSdknet100_152PackageVersion>
<MicrosoftiOSSdknet100_182PackageVersion>18.2.10691-net10-p4</MicrosoftiOSSdknet100_182PackageVersion>
<MicrosofttvOSSdknet100_182PackageVersion>18.2.10691-net10-p4</MicrosofttvOSSdknet100_182PackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-preview.3.25168.2</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.6.250228001</MicrosoftWindowsAppSDKPackageVersion>
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
<MicrosoftGraphicsWin2DPackageVersion>1.2.0</MicrosoftGraphicsWin2DPackageVersion>
<MicrosoftWindowsWebView2PackageVersion>1.0.2903.40</MicrosoftWindowsWebView2PackageVersion>
<!-- Everything else -->
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.3.25172.1</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>10.0.0-preview.3.25172.1</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>10.0.0-preview.4.25209.3</MicrosoftJSInteropPackageVersion>
<!-- Everything else (previous edition) -->
<MicrosoftAspNetCorePackageVersion>8.0.10</MicrosoftAspNetCorePackageVersion>
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
Expand All @@ -101,12 +102,12 @@
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
<MicrosoftIoRecyclableMemoryStreamVersion>3.0.1</MicrosoftIoRecyclableMemoryStreamVersion>
<SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
<SystemNumericsVectorsVersion>4.6.1</SystemNumericsVectorsVersion>
<SystemMemoryPackageVersion>4.5.5</SystemMemoryPackageVersion>
<SystemBuffersPackageVersion>4.5.1</SystemBuffersPackageVersion>
<SystemIOUnmanagedMemoryStreamPackageVersion>4.3.0</SystemIOUnmanagedMemoryStreamPackageVersion>
<SystemObjectModelPackageVersion>4.3.0</SystemObjectModelPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
<MicrosoftBuildFrameworkPackageVersion>17.9.5</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>17.9.5</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
Expand All @@ -127,22 +128,22 @@
<_HarfBuzzSharpVersion>8.3.0.1</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e57e2a11dac4ccc72bea52939dede49816842005.1728</_SkiaSharpNativeAssetsVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.120</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25176.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25176.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25176.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25207.6</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25207.6</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25207.6</MicrosoftDotNetXHarnessCLIVersion>
<TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
<SvgSkiaPackageVersion>2.0.0.4</SvgSkiaPackageVersion>
<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25178.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25178.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25178.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25178.2</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25207.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetHelixSdkPackageVersion>
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25178.2</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25178.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
Expand Down
13 changes: 0 additions & 13 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ jobs:
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation
value: 'true'
# Retry signature validation up to three times, waiting 2 seconds between attempts.
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
Expand Down Expand Up @@ -147,16 +144,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
- task: RichCodeNavIndexer@0
displayName: RichCodeNav Upload
inputs:
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
continueOnError: true

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25178.2"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25207.4"
},
"sdk": {
"allowPrerelease": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
using Microsoft.Maui;
using Microsoft.Maui.Dispatching;
using Microsoft.Maui.Handlers;
using static Android.Views.ViewGroup;
using AWebView = Android.Webkit.WebView;
using static global::Android.Views.ViewGroup;
using AWebView = global::Android.Webkit.WebView;
using Path = System.IO.Path;

namespace Microsoft.AspNetCore.Components.WebView.Maui
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorWebView/tests/MauiDeviceTests/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.Maui.MauiBlazorWebView.DeviceTests
public static class MauiProgram
{
#if ANDROID
public static Android.Content.Context CurrentContext => MauiProgramDefaults.DefaultContext;
public static global::Android.Content.Context CurrentContext => MauiProgramDefaults.DefaultContext;
#elif WINDOWS
public static Microsoft.UI.Xaml.Window CurrentWindow => MauiProgramDefaults.DefaultWindow;
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/Foldable/src/Android/FoldableService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Microsoft.Maui.Controls;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Platform;
using AView = Android.Views.View;
using AView = global::Android.Views.View;

namespace Microsoft.Maui.Foldable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<MauiEnablePlatformUsings>true</MauiEnablePlatformUsings>
<NoWarn>$(NoWarn);XC0022</NoWarn>

<!-- Display name -->
<ApplicationTitle>.NET MAUI Embedding</ApplicationTitle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ApplicationVersion>1</ApplicationVersion>
<IsPackable>false</IsPackable>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<NoWarn>$(NoWarn);XC0022</NoWarn>
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);XC0022</NoWarn>
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RootNamespace>Maui.Controls.Sample</RootNamespace>
<AssemblyName>Maui.Controls.Sample</AssemblyName>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);CA1416;CS0618;XC0618</NoWarn>
<NoWarn>$(NoWarn);CA1416;CS0618;XC0618;XC0022</NoWarn>
<Nullable>enable</Nullable>
<!-- Disable multi-RID builds to workaround a parallel build issue -->
<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
Expand Down
Loading