Skip to content

Commit

Permalink
chore: centralize control over Uno targets
Browse files Browse the repository at this point in the history
  • Loading branch information
dansiegel committed Dec 5, 2023
1 parent d62f270 commit 0454421
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
5 changes: 5 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
</When>
</Choose>

<PropertyGroup Condition=" $(IsUnoProject) ">
<UnoTargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</UnoTargetFrameworks>
<UnoTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UnoTargetFrameworks);net7.0-windows10.0.19041</UnoTargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>$(IsPackable)</GeneratePackageOnBuild>
Expand Down
3 changes: 1 addition & 2 deletions src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>$(UnoTargetFrameworks)</TargetFrameworks>
<NoWarn>$(NoWarn);1591</NoWarn>
<AssemblyName>Prism.DryIoc.Uno</AssemblyName>
<PackageId>Prism.DryIoc.Uno.WinUI</PackageId>
Expand Down
5 changes: 2 additions & 3 deletions src/Uno/Prism.Uno.Markup/Prism.Uno.WinUI.Markup.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>$(UnoTargetFrameworks)</TargetFrameworks>
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>

Expand All @@ -16,4 +15,4 @@
<ItemGroup>
<ProjectReference Include="..\Prism.Uno\Prism.Uno.WinUI.csproj" />
</ItemGroup>
</Project>
</Project>
3 changes: 1 addition & 2 deletions src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>$(UnoTargetFrameworks)</TargetFrameworks>
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<AssemblyName>Prism.Uno</AssemblyName>
<RootNamespace>Prism</RootNamespace>
Expand Down

0 comments on commit 0454421

Please sign in to comment.