Skip to content

Commit aba23f9

Browse files
DamirLisakDamirLisak
committed
Warnings removed
1 parent f4248f9 commit aba23f9

9 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<!-- iPlus settings and overrides -->
33
<PropertyGroup>
44
<IsAvaloniaUIProject>true</IsAvaloniaUIProject>
5+
<IsAvaloniaUIProject Condition="'$(MSBuildProjectName)' == 'Dock.Model'">false</IsAvaloniaUIProject>
6+
<IsAvaloniaUIProject Condition="'$(MSBuildProjectName)' == 'Dock.Controls.Recycling.Model'">false</IsAvaloniaUIProject>
7+
<IsAvaloniaUIProject Condition="$([System.String]::Copy('$(MSBuildProjectName)').StartsWith('Dock.Model.')) and '$(MSBuildProjectName)' != 'Dock.Model.Avalonia'">false</IsAvaloniaUIProject>
8+
<IsAvaloniaUIProject Condition="$([System.String]::Copy('$(MSBuildProjectName)').StartsWith('Dock.Serializer.'))">false</IsAvaloniaUIProject>
59
</PropertyGroup>
610
<Import Project="../iPlus/build/Avalonia.Build.props" />
711
<!--<Import Condition="'$(UseAvaloniaFork)' == 'True'" Project="../iPlus/build/AvaloniaBaseBuildServicesInclude.props" />-->

‎build/System.Text.Json.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
3+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETFramework'">
44
<PackageReference Include="System.Text.Json" />
55
</ItemGroup>
66
</Project>

‎samples/DockCodeOnlyMvvmSample/DockCodeOnlyMvvmSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<!--<TargetFramework>net10.0</TargetFramework>-->
55
<TargetFramework>$(AvaloniaBuildFramework)</TargetFramework>
66
<OutputType>WinExe</OutputType>
77
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>

‎src/Dock.Avalonia.Themes.Simple/Dock.Avalonia.Themes.Simple.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!--<TargetFrameworks>nnet8.0;net10.0</TargetFrameworks>-->
4+
<!--<TargetFrameworks>net8.0;net10.0</TargetFrameworks>-->
55
<TargetFrameworks>$(AvaloniaBuildFramework)</TargetFrameworks>
66
<OutputType>Library</OutputType>
77
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>

‎src/Dock.Controls.ProportionalStackPanel/Dock.Controls.ProportionalStackPanel.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!--<TargetFrameworks>nnet8.0;net10.0</TargetFrameworks>-->
4+
<!--<TargetFrameworks>net8.0;net10.0</TargetFrameworks>-->
55
<TargetFrameworks>$(AvaloniaBuildFramework)</TargetFrameworks>
66
<OutputType>Library</OutputType>
77
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>

‎src/Dock.Controls.Recycling/Dock.Controls.Recycling.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!--<TargetFrameworks>nnet8.0;net10.0</TargetFrameworks>-->
4+
<!--<TargetFrameworks>net8.0;net10.0</TargetFrameworks>-->
55
<TargetFrameworks>$(AvaloniaBuildFramework)</TargetFrameworks>
66
<OutputType>Library</OutputType>
77
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>

‎src/Dock.Model.Mvvm/Dock.Model.Mvvm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!--<TargetFrameworksvnet6.0;net8.0;net10.0</TargetFrameworks>-->
4+
<!--<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>-->
55
<TargetFrameworks>$(AvaloniaBuildFramework)</TargetFrameworks>
66
<OutputType>Library</OutputType>
77
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>

‎src/Dock.Serializer.SystemTextJson.Generators/Dock.Serializer.SystemTextJson.Generators.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<IsAvaloniaUIProject>false</IsAvaloniaUIProject>
56
<OutputType>Library</OutputType>
67
<Nullable>enable</Nullable>
78
<IsPackable>false</IsPackable>

‎src/Dock.Serializer.SystemTextJson/Dock.Serializer.SystemTextJson.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<!--<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>-->
55
<TargetFrameworks>$(AvaloniaBuildFramework)</TargetFrameworks>
6+
<IsAvaloniaUIProject>false</IsAvaloniaUIProject>
67
<OutputType>Library</OutputType>
78
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
89
<Nullable>enable</Nullable>

0 commit comments

Comments
 (0)