Skip to content

Commit

Permalink
release 3.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pofider committed Oct 4, 2022
1 parent b55a5be commit b331b09
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: Visual Studio 2019
image: Visual Studio 2022
artifacts:
- path: '**\jsreport.AspNetCore*.nupkg'
name: nuget
Expand Down
Binary file added icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions jsreport.AspNetCore.Test/jsreport.AspNetCore.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Shouldly" Version="4.0.3" />
</ItemGroup>

<ItemGroup>
Expand All @@ -31,11 +31,11 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="jsreport.Types" Version="2.7.0" />
<PackageReference Include="jsreport.Shared" Version="2.1.0" />
<PackageReference Include="jsreport.Client" Version="3.0.1" />
<PackageReference Include="jsreport.Local" Version="2.2.2" />
<PackageReference Include="jsreport.Binary" Version="2.7.1" />
<PackageReference Include="jsreport.Types" Version="3.8.1" />
<PackageReference Include="jsreport.Shared" Version="3.8.0" />
<PackageReference Include="jsreport.Client" Version="3.8.0" />
<PackageReference Include="jsreport.Local" Version="3.8.0" />
<PackageReference Include="jsreport.Binary" Version="3.8.0" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
18 changes: 13 additions & 5 deletions jsreport.AspNetCore/jsreport.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@
<PackageProjectUrl>https://jsreport.net</PackageProjectUrl>
<PackageLicenseUrl>https://www.opensource.org/licenses/mit-license.php</PackageLicenseUrl>
<PackageIconUrl>https://jsreport.net/img/favicon.ico</PackageIconUrl>
<Copyright>Copyright 2013-2020 Jan Blaha</Copyright>
<Copyright>Copyright 2013-2022 Jan Blaha</Copyright>
<PackageTags>jsreport;report;pdf;asp.net;core;mvc</PackageTags>
<RepositoryUrl>https://github.com/jsreport/jsreport-dotnet</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageReleaseNotes>Release notes are at https://github.com/jsreport/jsreport-dotnet-aspnetcore/releases</PackageReleaseNotes>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>2.1.0</Version>
<AssemblyVersion>2.1.0.0</AssemblyVersion>
<Version>3.8.0</Version>
<AssemblyVersion>3.8.0.0</AssemblyVersion>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
Expand All @@ -29,6 +30,13 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<None Include="..\icon.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<Choose>
<When Condition=" '$(SolutionName)' == 'jsreport.development' ">
<ItemGroup>
Expand All @@ -38,8 +46,8 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="jsreport.Types" Version="2.4.1" />
<PackageReference Include="jsreport.Shared" Version="2.0.1" />
<PackageReference Include="jsreport.Types" Version="3.8.1" />
<PackageReference Include="jsreport.Shared" Version="3.8.0" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down

0 comments on commit b331b09

Please sign in to comment.