GitHub-Mirror
/
Tapeti
mirror of
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/3.1.4' into develop

This commit is contained in:
Mark van Renswoude 2023-04-26 14:25:47 +02:00
parent 9c40c2928c 67fe5f21eb
commit 6def317cab
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tapeti.Flow/Tapeti.Flow.csproj
View File

@ -12,6 +12,7 @@
<PackageIcon>Tapeti.Flow.png</PackageIcon> <PackageIcon>Tapeti.Flow.png</PackageIcon>
<Version>2.0.0</Version> <Version>2.0.0</Version>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<DefineConstants>JETBRAINS_ANNOTATIONS</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -22,6 +23,10 @@
<ProjectReference Include="..\Tapeti\Tapeti.csproj" /> <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2022.*" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\resources\icons\Tapeti.Flow.png"> <None Include="..\resources\icons\Tapeti.Flow.png">
<Pack>True</Pack> <Pack>True</Pack>

1
Tapeti/Tapeti.csproj
View File

@ -12,6 +12,7 @@
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl> <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
<PackageIcon>Tapeti.png</PackageIcon> <PackageIcon>Tapeti.png</PackageIcon>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<DefineConstants>JETBRAINS_ANNOTATIONS</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">