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

Build the net6 templates in net7 #9758

Merged
merged 2 commits into from
Oct 19, 2022
Merged

Build the net6 templates in net7 #9758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a781f
Squashed commit of the following
mattleibow Oct 19, 2022
6e20110
Merge branch 'net7.0' into dev/net6-in-net7
mattleibow Oct 19, 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
15 changes: 0 additions & 15 deletions eng/cake/dotnet.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,21 +190,6 @@ Task("dotnet-templates")
"</TargetFrameworks> -->",
"</TargetFrameworks>");

// TODO: remove this once issues are fixed
if (TestTFM.StartsWith("net6"))
{
// Mac Catalyst/iOS does not yet support net6 from the net7 SDK.
ReplaceTextInFiles($"{projectName}/*.csproj",
";net6.0-ios;net6.0-maccatalyst",
"");

// Android does not yet support net6 from the net7 SDK in Release builds
if (configuration == "Release")
ReplaceTextInFiles($"{projectName}/*.csproj",
"net6.0-android",
"");
Comment on lines -201 to -205
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will probably have to put this if back in, this problem is caused by new linker behavior in .NET 7, but this isn't backported to 6:

dotnet/runtime#72143 (comment)

}

// Build
RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild);

Expand Down
1 change: 0 additions & 1 deletion src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<RootNamespace>Microsoft.Maui.MauiBlazorWebView.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.MauiBlazorWebView.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Core/tests/DeviceTests/Core.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Core.DeviceTests</AssemblyName>
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<SingleProject>true</SingleProject>
<RootNamespace>Microsoft.Maui.Essentials.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.Essentials.DeviceTests</AssemblyName>
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>

<PropertyGroup>
Expand Down