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

Fixed Wasdk breaking on net7+ #125

Merged
merged 5 commits into from
Aug 28, 2023
Merged

Fixed Wasdk breaking on net7+ #125

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
f20aecb
[WIP] Added net7 as Wasdk Tfm
Arlodotexe Aug 25, 2023
08dddc7
Revert to Uno tfms to netstandard until Wasdk supports net7
Arlodotexe Aug 25, 2023
142ce9d
Revert "Revert to Uno tfms to netstandard until Wasdk supports net7"
Arlodotexe Aug 28, 2023
efd95db
Fixed an issue where IsWinAppSdk was evaluating to true for net7.0 (n…
Arlodotexe Aug 28, 2023
2a452f8
Merge branch 'main' into feature/wasdk/net7-support
Arlodotexe Aug 28, 2023
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 MultiTarget/AvailableTargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.19041.0</WinAppSdkTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;</WinAppSdkTargetFramework>

<WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
<LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>
Expand Down
3 changes: 2 additions & 1 deletion MultiTarget/EnabledTargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.19041.0</WinAppSdkTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;</WinAppSdkTargetFramework>

<WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
<LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>
Expand All @@ -17,3 +17,4 @@
<DotnetCommonTargetFramework>net7.0</DotnetCommonTargetFramework>
</PropertyGroup>
</Project>

3 changes: 2 additions & 1 deletion MultiTarget/MultiTargetIdentifiers.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
<IsGtk Condition="'$(IsGtk)' == '' AND ('$(IsGtkHead)' == 'true' or '$(IsGtkLib)' == 'true')">true</IsGtk>

<IsUwp Condition="'$(IsUwp)' == '' AND '$(TargetFramework)' == '$(UwpTargetFramework)' AND '$(UwpTargetFramework)' != '' AND '$(MultiTargetsUwp)' == 'true'">true</IsUwp>
<IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND '$(TargetFramework)' == '$(WinAppSdkTargetFramework)' AND '$(WinAppSdkTargetFramework)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>
<IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND $(WinAppSdkTargetFramework.Contains('$(TargetFramework);')) AND '$(WinAppSdkTargetFramework)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>

<IsDroid Condition="'$(IsDroid)' == '' AND '$(TargetFramework)' == '$(AndroidLibTargetFramework)' AND '$(AndroidLibTargetFramework)' != '' AND '$(MultiTargetsDroid)' == 'true'">true</IsDroid>
<IsMacOS Condition="'$(IsMacOS)' == '' AND '$(TargetFramework)' == '$(MacOSLibTargetFramework)' AND '$(MacOSLibTargetFramework)' != '' AND '$(MultiTargetsMacOS)' == 'true'">true</IsMacOS>
<IsiOS Condition="'$(IsiOS)' == '' AND '$(TargetFramework)' == '$(iOSLibTargetFramework)' AND '$(iOSLibTargetFramework)' != '' AND '$(MultiTargetsiOS)' == 'true'">true</IsiOS>
Expand Down
2 changes: 1 addition & 1 deletion ProjectHeads/App.Head.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</ItemGroup>

<!-- Source generators -->
<ItemGroup Condition="'$(TargetFramework)' != '$(WinAppSdkTargetFramework)'">
<ItemGroup Condition="'$(IsWinAppSdk)' != 'true'">
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ProjectHeads/Head.WinAppSdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\PackageReferences\WinAppSdk.props" />
<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\WinUI.Extra.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>$(WinAppSdkTargetFramework)</TargetFramework>
<TargetFramework>$(WinAppSdkTargetFramework.Split(';')[0])</TargetFramework>
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
Expand All @@ -15,6 +12,9 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\PackageReferences\WinAppSdk.props" />
<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\WinUI.Extra.props" />

<ItemGroup>
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ProjectHeads/Tests.Head.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<!-- Source generators -->
<ItemGroup Condition="'$(TargetFramework)' != '$(WinAppSdkTargetFramework)'">
<ItemGroup Condition="'$(IsWinAppSdk)' != 'true'">
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
</ItemGroup>
Expand Down