diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 301b565d6ab8..f0c4d17b2af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,41 +1,5 @@ - - https://github.com/dotnet/installer - e6dd91c290b808f971a1ac69c2fb29395bbf1051 - - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 - - - https://github.com/xamarin/xamarin-android - 8f1d9a47205ead80132661f68b0cee9ed0e0220b - - - https://github.com/xamarin/xamarin-macios - 9ffa71bdb3432581640b5830c775c9bfd0c16902 - - - https://github.com/xamarin/xamarin-macios - 9ffa71bdb3432581640b5830c775c9bfd0c16902 - - - https://github.com/xamarin/xamarin-macios - 9ffa71bdb3432581640b5830c775c9bfd0c16902 - - - https://github.com/xamarin/xamarin-macios - 9ffa71bdb3432581640b5830c775c9bfd0c16902 - - - https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 - - - https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 - https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 210ac9b92494..64ffe02739d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.547 - 7.0.100-rtm.22519.39 + 7.0.102 - 7.0.0-rtm.22511.4 + 7.0.2 7.0.0 7.0.0 7.0.0 - 33.0.4 + 33.0.26 16.2.1026 13.1.1026 @@ -20,8 +20,7 @@ 7.0.100 - 7.0.0-rtm.22504.3 - $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) + 7.0.2 1.2.230118.102 10.0.22621.755 diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index be53b01fac6e..630842987ba3 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -102,9 +102,14 @@ Task("dotnet-build") { RunMSBuildWithDotNet("./Microsoft.Maui.BuildTasks.slnf"); if (IsRunningOnWindows()) + { RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount: 1); + } else - RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount: 1); + { + // NOTE: intentionally omit maxCpuCount, to avoid an issue with the 7.0.100 .NET SDK + RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf"); + } }); Task("dotnet-samples") diff --git a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj index c29f24aa0b4b..b004c3c281ba 100644 --- a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj +++ b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj @@ -7,6 +7,8 @@ Microsoft.Maui.MauiBlazorWebView.DeviceTests Microsoft.Maui.MauiBlazorWebView.DeviceTests $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj b/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj index 703d0b08be71..2dbb53f863ea 100644 --- a/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj +++ b/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj @@ -11,6 +11,8 @@ 1 false true + + maccatalyst-x64 diff --git a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj index 66419a33a81f..ada765a27dd2 100644 --- a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj +++ b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj @@ -5,6 +5,8 @@ Exe true false + + maccatalyst-x64 diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 7a6944e5632c..8b202bce4519 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -8,6 +8,8 @@ Maui.Controls.Sample false $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj index cd867390d54e..ae03466f1b4b 100644 --- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj +++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj @@ -7,6 +7,8 @@ Microsoft.Maui.DeviceTests Microsoft.Maui.Controls.DeviceTests $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj index 9a738a7bcb2f..38b4ce0f3b8a 100644 --- a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj +++ b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj @@ -7,6 +7,8 @@ Microsoft.Maui.DeviceTests Microsoft.Maui.Core.DeviceTests $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj index 73af4f3e7f83..3d60fb740ea1 100644 --- a/src/DotNet/DotNet.csproj +++ b/src/DotNet/DotNet.csproj @@ -4,14 +4,12 @@ false true https://dotnetbuilds.blob.core.windows.net/internal - https://dotnetbuilds.blob.core.windows.net/public https://dot.net/v1/dotnet-install.ps1 dotnet-install.ps1 $(DotNetOutputPath)$(DotNetInstallScriptName) & '$(DotNetInstallScriptPath)' -Version $(MicrosoftDotnetSdkInternalPackageVersion) -InstallDir '$(DotNetDirectory)' -Verbose - $(DotNetInstallCommand) -AzureFeed $(DotNetFeedUrl) $(DotNetInstallCommand) -AzureFeed $(InternalAzureFeed) -FeedCredential $env:DOTNET_TOKEN powershell -ExecutionPolicy ByPass -NoProfile -Command "$(DotNetInstallCommand)" @@ -21,7 +19,6 @@ $(DotNetOutputPath)$(DotNetInstallScriptName) bash '$(DotNetInstallScriptPath)' --version $(MicrosoftDotnetSdkInternalPackageVersion) --install-dir '$(DotNetDirectory)' --verbose $(DotNetInstallCommand) --azure-feed $(InternalAzureFeed) --feed-credential $DOTNET_TOKEN - $(DotNetInstallCommand) --azure-feed $(DotNetFeedUrl) @@ -75,7 +72,7 @@ - + @@ -168,7 +165,7 @@ Inputs="$(_Inputs)" Outputs="$(DotNetPacksDirectory).stamp"> diff --git a/src/Essentials/samples/Samples/Essentials.Sample.csproj b/src/Essentials/samples/Samples/Essentials.Sample.csproj index a8b4f2d98c87..ed5ca90f2524 100644 --- a/src/Essentials/samples/Samples/Essentials.Sample.csproj +++ b/src/Essentials/samples/Samples/Essentials.Sample.csproj @@ -8,6 +8,8 @@ true false $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj b/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj index b9ece6c582ea..a43927241f0b 100644 --- a/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj +++ b/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj @@ -6,6 +6,8 @@ true Microsoft.Maui.Essentials.DeviceTests Microsoft.Maui.Essentials.DeviceTests + + maccatalyst-x64 diff --git a/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj b/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj index 3038be2718ee..52b3534462b4 100644 --- a/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj +++ b/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj @@ -6,6 +6,8 @@ true Microsoft.Maui.Graphics.DeviceTests Microsoft.Maui.Graphics.DeviceTests + + maccatalyst-x64 diff --git a/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj b/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj index 15e2be0f48db..30745bd73bcd 100644 --- a/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj +++ b/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj @@ -6,6 +6,8 @@ true Microsoft.Maui.TestUtils.DeviceTests.Sample Microsoft.Maui.TestUtils.DeviceTests.Sample + + maccatalyst-x64