Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[workload] Remove Microsoft.Maui.Extensions pack #5918

Merged
merged 5 commits into from
May 31, 2022
Merged

[workload] Remove Microsoft.Maui.Extensions pack #5918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b89855
[workload] Merge Dependencies and Extensions packs
pjcollins Apr 8, 2022
1dfc8a0
Merge branch 'main' into merge-deps-exts
rmarinho Apr 15, 2022
0102bc8
Merge remote-tracking branch 'upstream/main' into merge-deps-exts
pjcollins Apr 29, 2022
52f7c2d
Apply feedback
pjcollins Apr 29, 2022
da7364b
Use Versions.props package versions
pjcollins Apr 29, 2022
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
1 change: 0 additions & 1 deletion Microsoft.Maui-mac.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Maui.Packages-mac.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Maui.Packages.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
7 changes: 0 additions & 7 deletions Microsoft.Maui.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion omnisharp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
22 changes: 0 additions & 22 deletions src/Workload/Microsoft.Maui.Extensions/Microsoft.Maui.Extensions.csproj
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@
OldValue="@MicrosoftWindowsSDKBuildToolsPackageVersion@"
NewValue="$(MicrosoftWindowsSDKBuildToolsPackageVersion)"
/>
<ReplaceText
Input="$(IntermediateOutputPath)BundledVersions.targets"
Output="$(IntermediateOutputPath)BundledVersions.targets"
OldValue="@MicrosoftExtensionsPackageVersion@"
NewValue="$(MicrosoftExtensionsPackageVersion)"
/>
<ReplaceText
Input="$(IntermediateOutputPath)BundledVersions.targets"
Output="$(IntermediateOutputPath)BundledVersions.targets"
OldValue="@MicrosoftExtensionsServicingPackageVersion@"
NewValue="$(MicrosoftExtensionsServicingPackageVersion)"
/>
<ItemGroup>
<None
Include="$(IntermediateOutputPath)BundledVersions.targets"
Expand Down
5 changes: 4 additions & 1 deletion src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@

<!-- These implicit <PackageReference/> pull dependencies from NuGet transitively -->
<ItemGroup Condition=" '$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true' ">
<PackageReference Include="Microsoft.Maui.Extensions" Version="$(MauiVersion)" IsImplicitlyDefined="true" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true" />
</ItemGroup>
<ItemGroup Condition=" '$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true' or '$(UseMauiEssentials)' == 'true' ">
<PackageReference Include="Microsoft.Maui.Dependencies" Version="$(MauiVersion)" IsImplicitlyDefined="true" />
Expand Down
5 changes: 0 additions & 5 deletions src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"packs": [
"Microsoft.Maui.Dependencies",
"Microsoft.Maui.Sdk",
"Microsoft.Maui.Extensions",
"Microsoft.Maui.Graphics",
"Microsoft.Maui.Resizetizer.Sdk",
"Microsoft.Maui.Templates",
Expand Down Expand Up @@ -275,10 +274,6 @@
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.Maui.Extensions": {
"kind": "library",
"version": "@VERSION@"
},
"Microsoft.Maui.Graphics": {
"kind": "library",
"version": "@MAUI_GRAPHICS_VERSION@"
Expand Down
1 change: 0 additions & 1 deletion src/Workload/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down