diff --git a/NuGet.config b/NuGet.config
index 496a9ded7306..8f43edb20176 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,10 +6,16 @@
+
+
+
+
+
+
@@ -19,9 +25,9 @@
-
-
-
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5b4a28c7d38b..74327b79aa64 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
-
+
https://github.com/dotnet/installer
- e6dd91c290b808f971a1ac69c2fb29395bbf1051
+ e36f7f3feaa561782a66165b8db55f4c0bbdf963
-
+
https://github.com/dotnet/runtime
- d25158d0dffd699340cedcfd43324c87a809a214
+ 7db1c3333302d4d5ac97a5cfb28e88e5c2cde968
-
+
https://github.com/xamarin/xamarin-android
- 8f1d9a47205ead80132661f68b0cee9ed0e0220b
+ 1d146df317ff971f3c59464a23ad2c7538872fb6
https://github.com/xamarin/xamarin-macios
@@ -28,13 +28,13 @@
https://github.com/xamarin/xamarin-macios
d06856ad79b9fb77de944b3f59a1fc799964a496
-
+
https://github.com/dotnet/emsdk
- daca2015ce74956591df9c9dc7ee732af7863b42
+ 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb
-
+
https://github.com/dotnet/emsdk
- daca2015ce74956591df9c9dc7ee732af7863b42
+ 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb
https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal
diff --git a/eng/Versions.props b/eng/Versions.props
index df288000c5c8..c89c84334c0d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,15 +3,15 @@
6.0.552
- 7.0.100-rtm.22519.39
+ 7.0.103-servicing.23073.22
- 7.0.0-rtm.22511.4
+ 7.0.3
7.0.0
7.0.0
7.0.0
- 33.0.4
+ 33.0.32
16.2.1024
13.1.1024
@@ -20,7 +20,7 @@
7.0.100
- 7.0.0-rtm.22504.3
+ 7.0.3
$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)
1.2.221209.1
diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
index 70bc78802b78..8644fde1904b 100644
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@@ -88,9 +88,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 05a4b3e42ea0..6a18a3957423 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 05ad55b47484..8e240e7b0127 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..5b4826f3f474 100644
--- a/src/DotNet/DotNet.csproj
+++ b/src/DotNet/DotNet.csproj
@@ -75,7 +75,7 @@
-
+
@@ -168,7 +168,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 75811e62aa6d..fa9bf1646cca 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 04620193cd70..0baae6cdbf5c 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 940430bf939a..f2d99b603559 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