diff --git a/Microsoft.Maui-mac.slnf b/Microsoft.Maui-mac.slnf index 03a00bfc0d4d..4e684a5e9643 100644 --- a/Microsoft.Maui-mac.slnf +++ b/Microsoft.Maui-mac.slnf @@ -57,7 +57,6 @@ "src\\Workload\\Microsoft.Maui.Dependencies\\Microsoft.Maui.Dependencies.csproj", "src\\Workload\\Microsoft.Maui.Essentials.Ref\\Microsoft.Maui.Essentials.Ref.csproj", "src\\Workload\\Microsoft.Maui.Essentials.Runtime\\Microsoft.Maui.Essentials.Runtime.csproj", - "src\\Workload\\Microsoft.Maui.Extensions\\Microsoft.Maui.Extensions.csproj", "src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj", "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj" ] diff --git a/Microsoft.Maui.Packages-mac.slnf b/Microsoft.Maui.Packages-mac.slnf index 96593273106d..34849b233dac 100644 --- a/Microsoft.Maui.Packages-mac.slnf +++ b/Microsoft.Maui.Packages-mac.slnf @@ -23,7 +23,6 @@ "src\\Workload\\Microsoft.Maui.Dependencies\\Microsoft.Maui.Dependencies.csproj", "src\\Workload\\Microsoft.Maui.Essentials.Ref\\Microsoft.Maui.Essentials.Ref.csproj", "src\\Workload\\Microsoft.Maui.Essentials.Runtime\\Microsoft.Maui.Essentials.Runtime.csproj", - "src\\Workload\\Microsoft.Maui.Extensions\\Microsoft.Maui.Extensions.csproj", "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj" ] } diff --git a/Microsoft.Maui.Packages.slnf b/Microsoft.Maui.Packages.slnf index 89326db00df2..3fcc73150784 100644 --- a/Microsoft.Maui.Packages.slnf +++ b/Microsoft.Maui.Packages.slnf @@ -25,7 +25,6 @@ "src\\Workload\\Microsoft.Maui.Dependencies\\Microsoft.Maui.Dependencies.csproj", "src\\Workload\\Microsoft.Maui.Essentials.Ref\\Microsoft.Maui.Essentials.Ref.csproj", "src\\Workload\\Microsoft.Maui.Essentials.Runtime\\Microsoft.Maui.Essentials.Runtime.csproj", - "src\\Workload\\Microsoft.Maui.Extensions\\Microsoft.Maui.Extensions.csproj", "src\\Workload\\Microsoft.Maui.Resizetizer.Sdk\\Microsoft.Maui.Resizetizer.Sdk.csproj", "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj" ] diff --git a/Microsoft.Maui.sln b/Microsoft.Maui.sln index 7c95b5414f2a..d72c53c9d7ea 100644 --- a/Microsoft.Maui.sln +++ b/Microsoft.Maui.sln @@ -90,8 +90,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Resizetizer. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Maui", "src\Workload\Microsoft.NET.Sdk.Maui\Microsoft.NET.Sdk.Maui.csproj", "{081EE5E5-69D4-493C-9EB4-47423C4728AB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Extensions", "src\Workload\Microsoft.Maui.Extensions\Microsoft.Maui.Extensions.csproj", "{6EDE0C1B-B718-4331-99BA-423042CDBE24}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils.DeviceTests.Runners", "src\TestUtils\src\DeviceTests.Runners\TestUtils.DeviceTests.Runners.csproj", "{316C0861-069B-4572-879F-F01E568F33A2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils.DeviceTests.Runners.SourceGen", "src\TestUtils\src\DeviceTests.Runners.SourceGen\TestUtils.DeviceTests.Runners.SourceGen.csproj", "{E87D865B-4EA8-4A30-B6C1-572D2061D707}" @@ -326,10 +324,6 @@ Global {081EE5E5-69D4-493C-9EB4-47423C4728AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {081EE5E5-69D4-493C-9EB4-47423C4728AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {081EE5E5-69D4-493C-9EB4-47423C4728AB}.Release|Any CPU.Build.0 = Release|Any CPU - {6EDE0C1B-B718-4331-99BA-423042CDBE24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EDE0C1B-B718-4331-99BA-423042CDBE24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EDE0C1B-B718-4331-99BA-423042CDBE24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EDE0C1B-B718-4331-99BA-423042CDBE24}.Release|Any CPU.Build.0 = Release|Any CPU {316C0861-069B-4572-879F-F01E568F33A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {316C0861-069B-4572-879F-F01E568F33A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {316C0861-069B-4572-879F-F01E568F33A2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -542,7 +536,6 @@ Global {C69336DF-EE56-4236-8188-06B2A8AD8A36} = {EC63FD88-5E12-46D7-B440-68F70241D987} {02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC} = {EC63FD88-5E12-46D7-B440-68F70241D987} {081EE5E5-69D4-493C-9EB4-47423C4728AB} = {EC63FD88-5E12-46D7-B440-68F70241D987} - {6EDE0C1B-B718-4331-99BA-423042CDBE24} = {EC63FD88-5E12-46D7-B440-68F70241D987} {316C0861-069B-4572-879F-F01E568F33A2} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {E87D865B-4EA8-4A30-B6C1-572D2061D707} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {C60B92DA-96F2-41EF-8594-864164A82C6A} = {6998CAA1-11D4-46B2-B80F-0AC882F58124} diff --git a/omnisharp.json b/omnisharp.json index c11fac9281d9..e4b0a3cf074e 100644 --- a/omnisharp.json +++ b/omnisharp.json @@ -30,7 +30,6 @@ "src/Workload/Microsoft.Maui.Core.Runtime/Microsoft.Maui.Core.Runtime.csproj", "src/Workload/Microsoft.Maui.Essentials.Ref/Microsoft.Maui.Essentials.Ref.csproj", "src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj", - "src/Workload/Microsoft.Maui.Extensions/Microsoft.Maui.Extensions.csproj", "Microsoft.Maui.Packages.slnf", "Microsoft.Maui.Samples.slnf", diff --git a/src/Workload/Microsoft.Maui.Extensions/Microsoft.Maui.Extensions.csproj b/src/Workload/Microsoft.Maui.Extensions/Microsoft.Maui.Extensions.csproj deleted file mode 100644 index e903a1614672..000000000000 --- a/src/Workload/Microsoft.Maui.Extensions/Microsoft.Maui.Extensions.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - $(MSBuildProjectName) - Microsoft.Extensions dependencies for .NET MAUI - $(_MauiDotNetTfm);$(MauiPlatforms) - false - false - false - $(NoWarn);NU5128 - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj b/src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj index 7d3cfd3526dc..5439995da866 100644 --- a/src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj +++ b/src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj @@ -78,6 +78,18 @@ OldValue="@MicrosoftWindowsSDKBuildToolsPackageVersion@" NewValue="$(MicrosoftWindowsSDKBuildToolsPackageVersion)" /> + + pull dependencies from NuGet transitively --> - + + + + diff --git a/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json b/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json index 2179b82d7cd5..28153a7a0360 100644 --- a/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json +++ b/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json @@ -29,7 +29,6 @@ "packs": [ "Microsoft.Maui.Dependencies", "Microsoft.Maui.Sdk", - "Microsoft.Maui.Extensions", "Microsoft.Maui.Graphics", "Microsoft.Maui.Resizetizer.Sdk", "Microsoft.Maui.Templates", @@ -275,10 +274,6 @@ "kind": "framework", "version": "@VERSION@" }, - "Microsoft.Maui.Extensions": { - "kind": "library", - "version": "@VERSION@" - }, "Microsoft.Maui.Graphics": { "kind": "library", "version": "@MAUI_GRAPHICS_VERSION@" diff --git a/src/Workload/README.md b/src/Workload/README.md index 66b291829c12..03ccd066c076 100644 --- a/src/Workload/README.md +++ b/src/Workload/README.md @@ -26,7 +26,6 @@ The idea, is a project to be able to set `$(UseMaui)`: * `Microsoft.Maui.Dependencies` * `Microsoft.Maui.Essentials.Ref.[platform]` * `Microsoft.Maui.Essentials.Runtime.[platform]` -* `Microsoft.Maui.Extensions` * `Microsoft.Maui.Templates` BlazorWebView is an addition to MAUI, project can currently opt into