Skip to content

Commit

Permalink
Add support for .NET 8; update version to 7.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
steveschmitt committed Nov 16, 2023
1 parent 66531b7 commit 535e08a
Show file tree
Hide file tree
Showing 12 changed files with 157 additions and 35 deletions.
@@ -1,33 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Breeze.snk</AssemblyOriginatorKeyFile>
<OutputType>Library</OutputType>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<Version>7.1.0</Version>
<Version>7.2.0</Version>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Description>Core ASP.NET Core functionality for any Breeze Server using ASP.NET Core.
Please review the Breeze documentation at http://breeze.github.io/doc-main/

Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
</Description>
<Copyright>Copyright © IdeaBlade 2012-2023</Copyright>
<PackageProjectUrl>http://breeze.github.io</PackageProjectUrl>
<Authors>Jay Traband</Authors>
<Company>IdeaBlade</Company>
<PackageReleaseNotes>
Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.

Please review the Breeze release notes at http://breeze.github.io/doc-net/release-notes.html
</PackageReleaseNotes>
<Product>Breeze Server - ASP.NET Core Provider</Product>
<PackageTags>AspNetCore DotNetCore Net7 Net6 Net5 JavaScript Breeze BreezeJs</PackageTags>
<PackageTags>AspNetCore DotNetCore Net8 Net7 Net6 Net5 JavaScript Breeze BreezeJs</PackageTags>
<NeutralLanguage>en-US</NeutralLanguage>
<AssemblyVersion>7.1.0</AssemblyVersion>
<FileVersion>7.1.0</FileVersion>
<AssemblyVersion>7.2.0</AssemblyVersion>
<FileVersion>7.2.0</FileVersion>
<PackageIcon>Breeze-aspnet.png</PackageIcon>
<RepositoryUrl>https://github.com/Breeze/breeze.server.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions DotNet/Breeze.Core/Breeze.Core.csproj
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Breeze.snk</AssemblyOriginatorKeyFile>
<IsPackable>true</IsPackable>
<Version>7.1.0</Version>
<Version>7.2.0</Version>
<Description>Core functionality for any Breeze Server using .NET.
Please review the Breeze documentation at http://breeze.github.io/doc-main/

Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
</Description>
<Copyright>Copyright © IdeaBlade 2012-2023</Copyright>
<PackageProjectUrl>http://breeze.github.io</PackageProjectUrl>
<Authors>Jay Traband</Authors>
<Company>IdeaBlade</Company>
<PackageReleaseNotes>
Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.

Please review the Breeze release notes at http://breeze.github.io/doc-net/release-notes.html
</PackageReleaseNotes>
<Product>Breeze Server - Core dll</Product>
<PackageTags>AspNetCore DotNetCore Net7 Net6 Net5 JavaScript Breeze BreezeJs</PackageTags>
<PackageTags>AspNetCore DotNetCore Net8 Net7 Net6 Net5 JavaScript Breeze BreezeJs</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DelaySign>false</DelaySign>
<AssemblyVersion>7.1.0</AssemblyVersion>
<FileVersion>7.1.0</FileVersion>
<AssemblyVersion>7.2.0</AssemblyVersion>
<FileVersion>7.2.0</FileVersion>
<PackageIcon>BreezeLogo.png</PackageIcon>
<RepositoryUrl>https://github.com/Breeze/breeze.server.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Breeze.snk</AssemblyOriginatorKeyFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<Version>7.1.0</Version>
<Version>7.2.0</Version>
<Description>Persistence for EF Core functionality for any Breeze Server using .NET.
Please review the Breeze documentation at http://breeze.github.io/doc-main/

Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
</Description>
<Copyright>Copyright © IdeaBlade 2012-2023</Copyright>
<PackageProjectUrl>http://breeze.github.io</PackageProjectUrl>
<Authors>Jay Traband</Authors>
<Company>IdeaBlade</Company>
<PackageReleaseNotes>
Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.

Please review the Breeze release notes at http://breeze.github.io/doc-net/release-notes.html
</PackageReleaseNotes>
<Product>Breeze Server - Persistence for EF Core Provider</Product>
<PackageTags>AspNetCore DotNetCore Net7 Net6 Net5 EFCore EntityFramework JavaScript Breeze BreezeJs</PackageTags>
<PackageTags>AspNetCore DotNetCore Net8 Net7 Net6 Net5 EFCore EntityFramework JavaScript Breeze BreezeJs</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<DelaySign>false</DelaySign>
<AssemblyVersion>7.1.0</AssemblyVersion>
<FileVersion>7.1.0</FileVersion>
<AssemblyVersion>7.2.0</AssemblyVersion>
<FileVersion>7.2.0</FileVersion>
<PackageIcon>BreezeLogo.png</PackageIcon>
<RepositoryUrl>https://github.com/Breeze/breeze.server.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand All @@ -45,6 +45,7 @@ Please review the Breeze release notes at http://breeze.github.io/doc-net/releas
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.*" Condition="'$(TargetFramework)' == 'net5.0'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.*" Condition="'$(TargetFramework)' == 'net7.0'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.*" Condition="'$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions DotNet/Breeze.Persistence/Breeze.Persistence.csproj
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Breeze.snk</AssemblyOriginatorKeyFile>
<IsPackable>true</IsPackable>
<Version>7.1.0</Version>
<Version>7.2.0</Version>
<Description>Basic Persistence functionality for any Breeze Server using .NET.
Please review the Breeze documentation at http://breeze.github.io/doc-main/

Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
</Description>
<Copyright>Copyright © IdeaBlade 2012-2023</Copyright>
<PackageProjectUrl>http://breeze.github.io</PackageProjectUrl>
<Authors>Jay Traband</Authors>
<Company>IdeaBlade</Company>
<PackageReleaseNotes>
Note: Version 7.1+ of this package is for .NET 5, 6, and 7; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.
Note: Version 7.1+ of this package is for .NET 5, 6, 7, and 8; whereas Version 3.x is for .NET Core 3 and Version 1.x is for .NET Core 2.

Please review the Breeze release notes at http://breeze.github.io/doc-net/release-notes.html
</PackageReleaseNotes>
<Product>Breeze Server - Persistence for .NET</Product>
<PackageTags>AspNetCore DotNetCore Net7 Net6 Net5 JavaScript Breeze BreezeJs</PackageTags>
<PackageTags>AspNetCore DotNetCore Net8 Net7 Net6 Net5 JavaScript Breeze BreezeJs</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DelaySign>false</DelaySign>
<AssemblyVersion>7.1.0</AssemblyVersion>
<FileVersion>7.1.0</FileVersion>
<AssemblyVersion>7.2.0</AssemblyVersion>
<FileVersion>7.2.0</FileVersion>
<PackageIcon>BreezeLogo.png</PackageIcon>
<RepositoryUrl>https://github.com/Breeze/breeze.server.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down
2 changes: 1 addition & 1 deletion DotNet/tools/deploy.js
Expand Up @@ -6,7 +6,7 @@ var del = require('del');
const bu = require('.\\build-utils');

const localNugetCacheDir = process.env.LOCALAPPDATA + '\\NuGet\\Test';
const version = '7.1.0';
const version = '7.2.0';
const debugOrRelease = 'Release';

var baseNames = [
Expand Down
11 changes: 11 additions & 0 deletions Tests/Model_Inheritance.EFCore/Model_Inheritance.EFCore8.csproj
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*" />
</ItemGroup>

</Project>
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*" />
</ItemGroup>

</Project>
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions Tests/Test.AspNetCore.EFCore/Startup.cs
Expand Up @@ -78,9 +78,9 @@ public class Startup {
var nwcf = Configuration.GetConnectionString("NorthwindIB_CF");
var ptph = Configuration.GetConnectionString("ProduceTPH");
#if EFCORE
services.AddDbContext<InheritanceContext>(options => options.UseSqlServer(inhe));
services.AddDbContext<NorthwindIBContext_CF>(options => options.UseSqlServer(nwcf));
services.AddDbContext<ProduceTPHContext>(options => options.UseSqlServer(ptph));
services.AddDbContext<InheritanceContext>(options => options.UseSqlServer(inhe, o => o.UseCompatibilityLevel(120)));
services.AddDbContext<NorthwindIBContext_CF>(options => options.UseSqlServer(nwcf, o => o.UseCompatibilityLevel(120)));
services.AddDbContext<ProduceTPHContext>(options => options.UseSqlServer(ptph, o => o.UseCompatibilityLevel(120)));
#endif

#if NHIBERNATE
Expand Down
38 changes: 38 additions & 0 deletions Tests/Test.AspNetCore.EFCore/Test.AspNetCore8.EFCore8.csproj
@@ -0,0 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;EFCORE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE;EFCORE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Breeze.AspNetCore.NetCore" Version="7.1.1" />
<PackageReference Include="Breeze.Persistence.EFCore" Version="7.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Model_Inheritance.EFCore\Model_Inheritance.EFCore8.csproj" />
<ProjectReference Include="..\Model_NorthwindIB_CF.EFCore\Model_NorthwindIB_CF.EFCore8.csproj" />
<ProjectReference Include="..\Model_ProduceTPH_CF.EFCore\Model_ProduceTPH_CF.EFCore8.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="breezeTests\breeze\breeze.debug.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
48 changes: 48 additions & 0 deletions Tests/Test.AspNetCore.EFCore/Test.AspNetCore8.EFCore8.sln
@@ -0,0 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E8AE90D-3456-4606-861C-392FD1BCDB8D}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.AspNetCore8.EFCore8", "Test.AspNetCore8.EFCore8.csproj", "{EFE64E35-D079-4039-AA74-0F5FF85E4EEF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model.NorthwindIB_CF.EFCore8", "..\Model_NorthwindIB_CF.EFCore\Model_NorthwindIB_CF.EFCore8.csproj", "{F54AC8A6-E24A-489A-855A-3FCFF6243D64}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model_ProduceTPH_CF.EFCore8", "..\Model_ProduceTPH_CF.EFCore\Model_ProduceTPH_CF.EFCore8.csproj", "{6F767212-B256-4453-AF68-5BCC2B2E16DD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model_Inheritance.EFCore8", "..\Model_Inheritance.EFCore\Model_Inheritance.EFCore8.csproj", "{25291B8C-8D8E-4D00-854B-4259205D7E2D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EFE64E35-D079-4039-AA74-0F5FF85E4EEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFE64E35-D079-4039-AA74-0F5FF85E4EEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFE64E35-D079-4039-AA74-0F5FF85E4EEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFE64E35-D079-4039-AA74-0F5FF85E4EEF}.Release|Any CPU.Build.0 = Release|Any CPU
{F54AC8A6-E24A-489A-855A-3FCFF6243D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F54AC8A6-E24A-489A-855A-3FCFF6243D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F54AC8A6-E24A-489A-855A-3FCFF6243D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F54AC8A6-E24A-489A-855A-3FCFF6243D64}.Release|Any CPU.Build.0 = Release|Any CPU
{6F767212-B256-4453-AF68-5BCC2B2E16DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F767212-B256-4453-AF68-5BCC2B2E16DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F767212-B256-4453-AF68-5BCC2B2E16DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F767212-B256-4453-AF68-5BCC2B2E16DD}.Release|Any CPU.Build.0 = Release|Any CPU
{25291B8C-8D8E-4D00-854B-4259205D7E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25291B8C-8D8E-4D00-854B-4259205D7E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25291B8C-8D8E-4D00-854B-4259205D7E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25291B8C-8D8E-4D00-854B-4259205D7E2D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5E2E1E29-904E-45ED-8EE2-FEDEE75DE081}
EndGlobalSection
EndGlobal

0 comments on commit 535e08a

Please sign in to comment.