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.

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

[net7] include net6 templates #8203

Merged
merged 39 commits into from
Jul 7, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
dc98b32
Include net6 template packs in net7 workload
Redth Jun 21, 2022
d5c81d8
Previous template pack version
Redth Jun 21, 2022
af08b6a
Fix bad copy pasta
Redth Jun 21, 2022
f959933
Merge remote-tracking branch 'origin/net7.0' into net7-include-net6-t…
mattleibow Jun 22, 2022
e976635
More template tests
mattleibow Jun 22, 2022
11cfe15
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 22, 2022
9b5d151
Merge remote-tracking branch 'origin/net7.0' into net7-include-net6-t…
mattleibow Jun 23, 2022
39056fd
Make --framework and -f work!
mattleibow Jun 23, 2022
92d9a6c
Swap the values in the cli file as well
mattleibow Jun 23, 2022
eb7e578
--Framework for now
mattleibow Jun 23, 2022
beae459
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 23, 2022
847c714
?:
mattleibow Jun 23, 2022
fa16f28
This should be working now
mattleibow Jun 24, 2022
952739f
revert that
mattleibow Jun 24, 2022
9099af9
Skip certian platforms
mattleibow Jun 24, 2022
05b5806
Load the SDK that matches the current build
mattleibow Jun 24, 2022
9a5769a
oops
mattleibow Jun 24, 2022
3251e8d
Use this instead
mattleibow Jun 24, 2022
414f9eb
Include both versions
mattleibow Jun 24, 2022
ff60600
Support older SDKs
mattleibow Jun 24, 2022
ef6ee32
Each workload version has a single support
mattleibow Jun 24, 2022
24bab94
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 24, 2022
10617b7
Seems this is OK
mattleibow Jun 24, 2022
824e862
Get something that will work
mattleibow Jun 25, 2022
32e3e98
this should be working now
mattleibow Jun 27, 2022
52c7008
Merge remote-tracking branch 'origin/net7.0' into net7-include-net6-t…
mattleibow Jun 27, 2022
fec5c75
Use the next stable version
mattleibow Jun 27, 2022
565393e
better formatting
mattleibow Jun 27, 2022
642ef54
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 27, 2022
a5b616c
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 27, 2022
ab144cd
The last version that worked
mattleibow Jun 27, 2022
8c67680
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 27, 2022
4cf8400
Due to a bug
mattleibow Jun 28, 2022
58a6344
Merge branch 'net7.0' into net7-include-net6-templates
mattleibow Jun 28, 2022
37b67ef
not much works
mattleibow Jun 28, 2022
7801e7d
Merge remote-tracking branch 'origin/net7.0' into net7-include-net6-t…
mattleibow Jun 30, 2022
e313ece
Merge remote-tracking branch 'origin/net7.0' into net7-include-net6-t…
mattleibow Jul 6, 2022
4dfe8bd
Merge remote-tracking branch 'origin/net7.0' into net7-include-net6-t…
mattleibow Jul 6, 2022
8245fcb
Try .net6.0 again
mattleibow Jul 7, 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
6 changes: 6 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
<_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0</_MauiDotNetVersionMinor>
<_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
<_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>

<_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">6</_MauiPreviousDotNetVersionMajor>
<_MauiPreviousDotNetVersionMinor Condition="'$(_MauiPreviousDotNetVersionMinor)' == ''">0</_MauiPreviousDotNetVersionMinor>
<_MauiPreviousDotNetVersion Condition="'$(_MauiPreviousDotNetVersion)' == ''">$(_MauiPreviousDotNetVersionMajor).$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersion>
<_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiDotNetTfm>

<_MauiTargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</_MauiTargetPlatformIdentifier>
<_MauiNoTargetPlatform Condition="'$(_MauiTargetPlatformIdentifier)' == ''">True</_MauiNoTargetPlatform>
<_MauiTargetPlatformIsAndroid Condition="'$(_MauiTargetPlatformIdentifier)' == 'android'">True</_MauiTargetPlatformIsAndroid>
Expand Down
2 changes: 2 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>
<PropertyGroup>
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.400</MicrosoftMauiPreviousDotNetReleasedVersion>
mattleibow marked this conversation as resolved.
Show resolved Hide resolved
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.6.22277.6</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
Expand Down
12 changes: 12 additions & 0 deletions src/Workload/Microsoft.NET.Sdk.Maui/Microsoft.NET.Sdk.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,24 @@
OldValue="@MAUI_GRAPHICS_VERSION@"
NewValue="$(MicrosoftMauiGraphicsVersion)"
/>
<ReplaceText
Input="$(IntermediateOutputPath)WorkloadManifest.json"
Output="$(IntermediateOutputPath)WorkloadManifest.json"
OldValue="@MAUI_PREVIOUS_DOTNET_VERSION@"
NewValue="$(_MauiPreviousDotNetVersion)"
/>
<ReplaceText
Input="$(IntermediateOutputPath)WorkloadManifest.json"
Output="$(IntermediateOutputPath)WorkloadManifest.json"
OldValue="@MAUI_DOTNET_VERSION@"
NewValue="$(_MauiDotNetVersion)"
/>
<ReplaceText
Input="$(IntermediateOutputPath)WorkloadManifest.json"
Output="$(IntermediateOutputPath)WorkloadManifest.json"
OldValue="@MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION@"
NewValue="$(MicrosoftMauiPreviousDotNetReleasedVersion)"
/>
<ReplaceText
Input="%(_JsonVariableMatrix.OutputPath)"
Output="%(_JsonVariableMatrix.OutputPath)"
Expand Down
5 changes: 5 additions & 0 deletions src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Microsoft.Maui.Sdk",
"Microsoft.Maui.Graphics",
"Microsoft.Maui.Resizetizer.Sdk",
"Microsoft.Maui.Templates-@MAUI_PREVIOUS_DOTNET_VERSION@",
"Microsoft.Maui.Templates-@MAUI_DOTNET_VERSION@",
"Microsoft.Maui.Core.Ref.any",
"Microsoft.Maui.Core.Runtime.any",
Expand Down Expand Up @@ -293,6 +294,10 @@
"Microsoft.Maui.Templates-@MAUI_DOTNET_VERSION@": {
"kind": "template",
"version": "@VERSION@"
},
"Microsoft.Maui.Templates-@MAUI_PREVIOUS_DOTNET_VERSION@": {
"kind": "template",
"version": "@MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION@"
}
}
}