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] Trim dot from pack names and alias #9830

Merged
merged 4 commits into from
Sep 1, 2022
Merged

[workload] Trim dot from pack names and alias #9830

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e03a668
[workload] Trim dot from pack names and alias
pjcollins Aug 31, 2022
7704f95
Merge branch 'release/7.0.1xx-rc1' into trimnetpacksuffix
mattleibow Sep 1, 2022
bbd2f0e
Update the "previous" maui version (#9826)
mattleibow Sep 1, 2022
acb9288
Merge branch 'release/7.0.1xx-rc1' into trimnetpacksuffix
mattleibow Sep 1, 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
2 changes: 1 addition & 1 deletion eng/automation/vs-workload.template.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<ComponentResources Include="maui-ios" Version="@VS_COMPONENT_VERSION@" Category=".NET" Title=".NET MAUI SDK for iOS" Description=".NET SDK Workload for building MAUI applications that target iOS." />
<ComponentResources Include="maui-windows" Version="@VS_COMPONENT_VERSION@" Category=".NET" Title=".NET MAUI SDK for Windows" Description=".NET SDK Workload for building MAUI applications that target Windows." />
<WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Maui.Manifest*.nupkg" Version="@VS_COMPONENT_VERSION@" />
<MultiTargetPackNames Include="Microsoft.Maui.Sdk" />
<MultiTargetPackNames Include="Microsoft.Maui.Sdk;Microsoft.Maui.Templates" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Templates/src/Microsoft.Maui.Templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PropertyGroup>
<TargetFramework>$(_MauiDotNetTfm)</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>Microsoft.Maui.Templates-$(_MauiDotNetVersion)</PackageId>
<PackageId>Microsoft.Maui.Templates.net$(_MauiDotNetVersionMajor)</PackageId>
<Title>.NET MAUI Templates</Title>
<Authors>Microsoft</Authors>
<Description>Templates for .NET MAUI.</Description>
Expand Down
4 changes: 2 additions & 2 deletions src/Workload/Microsoft.NET.Sdk.Maui/Microsoft.NET.Sdk.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
<_VersionsToReplace Include="MicrosoftMauiGraphicsWin2DWinUIDesktopPackageVersion" PropertyName="MicrosoftMauiGraphicsVersion" />
<_VersionsToReplace Include="MAUI_GRAPHICS_VERSION" PropertyName="MicrosoftMauiGraphicsVersion" />
<_VersionsToReplace Include="VERSION" PropertyName="PackageReferenceVersion" />
<_VersionsToReplace Include="MAUI_DOTNET_TFM" PropertyName="_MauiDotNetTfm" />
<_VersionsToReplace Include="MAUI_DOTNET_VERSION_MAJOR" PropertyName="_MauiDotNetVersionMajor" />
<_VersionsToReplace Include="MAUI_DOTNET_VERSION" PropertyName="_MauiDotNetVersion" />
<_VersionsToReplace Include="MAUI_PREVIOUS_DOTNET_TFM" PropertyName="_MauiPreviousDotNetTfm" />
<_VersionsToReplace Include="MAUI_PREVIOUS_DOTNET_VERSION_MAJOR" PropertyName="_MauiPreviousDotNetVersionMajor" />
<_VersionsToReplace Include="MAUI_PREVIOUS_DOTNET_VERSION" PropertyName="_MauiPreviousDotNetVersion" />
<_VersionsToReplace Include="MAUI_PREVIOUS_DOTNET_VERSION_NO_DOT" PropertyName="_MauiPreviousDotNetVersionNoDot" />
<_VersionsToReplace Include="MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION" PropertyName="MicrosoftMauiPreviousDotNetReleasedVersion" />
Expand Down
16 changes: 8 additions & 8 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 @@ -27,12 +27,12 @@
"abstract": true,
"description": ".NET MAUI SDK Core Packages",
"packs": [
"Microsoft.Maui.Sdk.@MAUI_DOTNET_TFM@",
"Microsoft.Maui.Sdk.@MAUI_PREVIOUS_DOTNET_TFM@",
"Microsoft.Maui.Sdk.net@MAUI_DOTNET_VERSION_MAJOR@",
"Microsoft.Maui.Sdk.net@MAUI_PREVIOUS_DOTNET_VERSION_MAJOR@",
"Microsoft.Maui.Graphics",
"Microsoft.Maui.Resizetizer.Sdk",
"Microsoft.Maui.Templates-@MAUI_PREVIOUS_DOTNET_VERSION@",
"Microsoft.Maui.Templates-@MAUI_DOTNET_VERSION@",
"Microsoft.Maui.Templates.net@MAUI_DOTNET_VERSION_MAJOR@",
"Microsoft.Maui.Templates.net@MAUI_PREVIOUS_DOTNET_VERSION_MAJOR@",
"Microsoft.Maui.Core.Ref.any",
"Microsoft.Maui.Core.Runtime.any",
"Microsoft.Maui.Controls.Ref.any",
Expand Down Expand Up @@ -279,14 +279,14 @@
"kind": "library",
"version": "@MAUI_GRAPHICS_VERSION@"
},
"Microsoft.Maui.Sdk.@MAUI_DOTNET_TFM@": {
"Microsoft.Maui.Sdk.net@MAUI_DOTNET_VERSION_MAJOR@": {
"kind": "sdk",
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.Maui.Sdk"
}
},
"Microsoft.Maui.Sdk.@MAUI_PREVIOUS_DOTNET_TFM@": {
"Microsoft.Maui.Sdk.net@MAUI_PREVIOUS_DOTNET_VERSION_MAJOR@": {
"kind": "sdk",
"version": "@MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION@",
"alias-to": {
Expand All @@ -297,11 +297,11 @@
"kind": "sdk",
"version": "@VERSION@"
},
"Microsoft.Maui.Templates-@MAUI_DOTNET_VERSION@": {
"Microsoft.Maui.Templates.net@MAUI_DOTNET_VERSION_MAJOR@": {
"kind": "template",
"version": "@VERSION@"
},
"Microsoft.Maui.Templates-@MAUI_PREVIOUS_DOTNET_VERSION@": {
"Microsoft.Maui.Templates.net@MAUI_PREVIOUS_DOTNET_VERSION_MAJOR@": {
"kind": "template",
"version": "@MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION@"
}
Expand Down
4 changes: 2 additions & 2 deletions src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

<Import
Condition=" ('$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true' or '$(UseMauiEssentials)' == 'true' or '$(UseMauiAssets)' == 'true') and ($([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@MAUI_DOTNET_VERSION@'))) "
Project="Sdk.targets" Sdk="Microsoft.Maui.Sdk.@MAUI_DOTNET_TFM@"
Project="Sdk.targets" Sdk="Microsoft.Maui.Sdk.net@MAUI_DOTNET_VERSION_MAJOR@"
/>
<Import
Condition=" ('$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true' or '$(UseMauiEssentials)' == 'true' or '$(UseMauiAssets)' == 'true') and ($([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@MAUI_PREVIOUS_DOTNET_VERSION@'))) "
Project="Sdk.targets" Sdk="Microsoft.Maui.Sdk.@MAUI_PREVIOUS_DOTNET_TFM@"
Project="Sdk.targets" Sdk="Microsoft.Maui.Sdk.net@MAUI_PREVIOUS_DOTNET_VERSION_MAJOR@"
/>

<Import
Expand Down