Skip to content

Commit e974752

Browse files
authored
Clean up WPF project (#1062)
1 parent 866dd38 commit e974752

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

Src/IronPython.SQLite/IronPython.SQLite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net46;netcoreapp2.1;netcoreapp3.1;netstandard2.0;net5.0</TargetFrameworks>
5-
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<SQLiteCommon>SQLITE_DEBUG;TRUE;WIN32;_MSC_VER;SQLITE_ASCII;SQLITE_MEM_POOL;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF</SQLiteCommon>
77
<SQLiteCommonOmit>SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL</SQLiteCommonOmit>
88
<NoWarn>$(NoWarn);0168;0169;0414;0618;0649;1587;219;1570</NoWarn>
Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
<Project>
2-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition=" '$(OS)' == 'Windows_NT' " />
3-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" >
42

53
<PropertyGroup>
6-
<TargetFrameworks>net46</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);netcoreapp3.1;net5.0-windows</TargetFrameworks>
8-
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
4+
<TargetFrameworks>net46;netcoreapp3.1;net5.0-windows</TargetFrameworks>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
96
<StoreInDLLs>true</StoreInDLLs>
10-
<UseWPF Condition=" '$(OS)' == 'Windows_NT' ">true</UseWPF>
7+
<UseWPF>true</UseWPF>
118
</PropertyGroup>
129

1310
<ItemGroup>
@@ -22,17 +19,16 @@
2219
</ItemGroup>
2320

2421
<ItemGroup>
25-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
26-
<PrivateAssets>all</PrivateAssets>
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
</PackageReference>
2922
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
3023
</ItemGroup>
3124

32-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition=" '$(OS)' == 'Windows_NT' " />
33-
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />
34-
3525
<Import Project="$(AfterTargetFiles)" />
3626
<Target Name="AfterBuildEnds" AfterTargets="AfterBuild" DependsOnTargets="$(AfterTargets)" />
3727

28+
<ItemGroup>
29+
<KnownFrameworkReference Update="Microsoft.WindowsDesktop.App" IsWindowsOnly="false" />
30+
<KnownFrameworkReference Update="Microsoft.WindowsDesktop.App.WPF" IsWindowsOnly="false" />
31+
<KnownFrameworkReference Update="Microsoft.WindowsDesktop.App.WindowsForms" IsWindowsOnly="false" />
32+
</ItemGroup>
33+
3834
</Project>

0 commit comments

Comments
 (0)