Skip to content

Commit

Permalink
Merge pull request #523 from Daniel-Svensson/net8
Browse files Browse the repository at this point in the history
* Drop support for .NET 6 and netstandard 2, target .NET8 as minimum
* Update nuget dependencies to aling with .NET 9 release
* Stop shipping WCF based domainclient as part of OpenRiaServices.Client.Core
   * WCF e2e test now uses BinaryHttpDomainClient (Stop running tests with WCF based Domain Client)
  • Loading branch information
Daniel-Svensson authored Nov 14, 2024
2 parents bbb542d + 5c4561d commit f8a2c7f
Show file tree
Hide file tree
Showing 163 changed files with 994 additions and 2,511 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata minClientVersion="2.8">
<id>OpenRiaServices.Client.CodeGen</id>
<version>5.4.4</version>
<version>5.6.0</version>
<title>Open RIA Services Client Code Generator</title>
<authors>OpenRIAServices</authors>
<license type="expression">Apache-2.0</license>
Expand All @@ -17,9 +17,12 @@
<language>en-US</language>
<tags>WCF RIA Services RIAServices OpenRiaServices CodeGen</tags>
<dependencies>
<group>
<dependency id="OpenRiaServices.Client.Core" version="$version$"/>
</group>
<group targetFramework="net472">
<dependency id="OpenRiaServices.Client.Core" version="$version$"/>
</group>
<group targetFramework="net8.0">
<dependency id="OpenRiaServices.Client.Core" version="$version$"/>
</group>
</dependencies>
</metadata>
<files>
Expand All @@ -28,6 +31,6 @@
<file src="..\..\src\bin\Release\net472\Mono.Cecil.dll" target="tasks\net472\Mono.Cecil.dll"/>
<file src="..\..\src\bin\Release\net472\Mono.Cecil.Pdb.dll" target="tasks\net472\Mono.Cecil.Pdb.dll"/>
<!-- TODO: Make a publish of project and take assemblies from there instead -->
<file src="..\..\src\OpenRiaServices.Tools.CodeGenTask\bin\Release\net6.0\**\*.*" target="tasks\net6.0\"/>
<file src="..\..\src\OpenRiaServices.Tools.CodeGenTask\bin\Release\net8.0\**\*.*" target="tasks\net8.0\"/>
</files>
</package>
55 changes: 32 additions & 23 deletions NuGet/OpenRiaServices.Client.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,23 @@
<tags>WCF RIA Services RIAServices Silverlight OpenRiaServices</tags>
<dependencies>
<group targetFramework="net472" />
<group targetFramework="netstandard2.0">
<dependency id="System.ComponentModel.Annotations" version="5.0.0" />
<dependency id="System.ServiceModel.Http" version="4.10.2" />
<dependency id="System.ServiceModel.Primitives" version="4.10.2" />
</group>
<group targetFramework="net6.0-windows7.0">
<dependency id="System.ServiceModel.Http" version="6.2.0" />
<dependency id="System.ServiceModel.Primitives" version="6.2.0" />
</group>
<group targetFramework="net8.0" />
<group targetFramework="net8.0-windows7.0" />
</dependencies>
<frameworkReferences>
<group targetFramework="net6.0-windows7.0">
<group targetFramework="net8.0-windows7.0">
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
</group>
</frameworkReferences>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework="net472" />
<frameworkAssembly assemblyName="System.Net.Http" targetFramework="net472" />
<frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework="net472" />
<frameworkAssembly assemblyName="System.ServiceModel" targetFramework="net472" />
<frameworkAssembly assemblyName="System.ServiceModel.Web" targetFramework="net472" />
</frameworkAssemblies>
</metadata>
<files>
<!-- netstandard binaries -->
<!--
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.dll" target="lib\netstandard2.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.pdb" target="lib\netstandard2.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.xml" target="lib\netstandard2.0\OpenRiaServices.Client.xml" />
Expand All @@ -52,28 +44,45 @@
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.xml" />

-->
<!-- Desktop binaries -->
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.dll" target="lib\net472\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.pdb" target="lib\net472\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.xml" target="lib\net472\OpenRiaServices.Client.xml" />
<!--
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.Web.dll" target="lib\net472\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.Web.pdb" target="lib\net472\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.Web.xml" target="lib\net472\OpenRiaServices.Client.Web.xml" />
-->
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net472\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net472\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net472\OpenRiaServices.Client.DomainClients.Http.xml" />

<!-- Net6 binaries -->
<file src="..\src\bin\Release\net6.0-windows\OpenRiaServices.Client.dll" target="lib\net6.0-windows7.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net6.0-windows\OpenRiaServices.Client.pdb" target="lib\net6.0-windows7.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net6.0-windows\OpenRiaServices.Client.xml" target="lib\net6.0-windows7.0\OpenRiaServices.Client.xml" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Client.Web.dll" target="lib\net6.0-windows7.0\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Client.Web.pdb" target="lib\net6.0-windows7.0\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Client.Web.xml" target="lib\net6.0-windows7.0\OpenRiaServices.Client.Web.xml" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net6.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net6.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net6.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.xml" />
<!-- net8 binaries -->
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.dll" target="lib\net8.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.pdb" target="lib\net8.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.xml" target="lib\net8.0\OpenRiaServices.Client.xml" />
<!--
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.dll" target="lib\net8.0\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.pdb" target="lib\net8.0\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.xml" target="lib\net8.0\OpenRiaServices.Client.Web.xml" />
-->
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net8.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net8.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net8.0\OpenRiaServices.Client.DomainClients.Http.xml" />

<!-- net8-windows7 binaries -->
<file src="..\src\bin\Release\net8.0-windows\OpenRiaServices.Client.dll" target="lib\net8.0-windows7.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net8.0-windows\OpenRiaServices.Client.pdb" target="lib\net8.0-windows7.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net8.0-windows\OpenRiaServices.Client.xml" target="lib\net8.0-windows7.0\OpenRiaServices.Client.xml" />
<!--
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.dll" target="lib\net8.0-windows7.0\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.pdb" target="lib\net8.0-windows7.0\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.xml" target="lib\net8.0-windows7.0\OpenRiaServices.Client.Web.xml" />
-->
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net8.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net8.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net8.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.xml" />

</files>
</package>
16 changes: 7 additions & 9 deletions NuGet/OpenRiaServices.EntityFramework.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,27 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>OpenRiaServices.EntityFramework</id>
<version>4.6.0-preview1</version>
<version>5.6.0</version>
<title>Open RIA Services support for Entity Framework 6+</title>
<authors>OpenRIAServices</authors>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/OpenRIAServices/OpenRiaServices</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>
OpenRiaServices.EntityFramework provides the DbDomainService and LinqToEntities classes which can be used to create Domain Service classes for use with a DbContext or ObjectContext from the EntityFramework package.

This package supports versions of EntityFramework starting with EF 6.0.1
</description>
<summary>Open RIA Services - Entity Framework 6 support with DbDomainService and LinqToEntitiesDomainService</summary>
<releaseNotes>For release notes see https://github.com/OpenRIAServices/OpenRiaServices/releases</releaseNotes>
<copyright>.NET Foundation</copyright>
<language>en-US</language>
<tags>WCF RIA Services RIAServices EntityFramework CodeFirst OpenRIAServices</tags>
<dependencies>
<group targetFramework="net6.0">
<dependency id="EntityFramework" version="6.4.4" />
<group targetFramework="net8.0">
<dependency id="EntityFramework" version="6.5.1" />
<dependency id="OpenRiaServices.Server" version="$version$"/>
</group>
<group targetFramework="net472">
<dependency id="EntityFramework" version="6.4.4" />
<dependency id="EntityFramework" version="6.5.1" />
<dependency id="OpenRiaServices.Server" version="$version$"/>
</group>
</dependencies>
Expand All @@ -34,8 +32,8 @@
<file src="..\src\bin\Release\net472\OpenRiaServices.EntityFramework.pdb" target="lib\net472\OpenRiaServices.EntityFramework.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.EntityFramework.xml" target="lib\net472\OpenRiaServices.EntityFramework.xml" />

<file src="..\src\bin\Release\net6.0\OpenRiaServices.EntityFramework.dll" target="lib\net6.0\OpenRiaServices.EntityFramework.dll" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.EntityFramework.pdb" target="lib\net6.0\OpenRiaServices.EntityFramework.pdb" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.EntityFramework.xml" target="lib\net6.0\OpenRiaServices.EntityFramework.xml" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.EntityFramework.dll" target="lib\net8.0\OpenRiaServices.EntityFramework.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.EntityFramework.pdb" target="lib\net8.0\OpenRiaServices.EntityFramework.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.EntityFramework.xml" target="lib\net8.0\OpenRiaServices.EntityFramework.xml" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>OpenRiaServices.Hosting.Wcf</id>
<version>4.6.0-preview1</version>
<version>5.6.0</version>
<title>OpenRiaServices.Hosting.Wcf</title>
<authors>OpenRIAServices</authors>
<license type="expression">Apache-2.0</license>
Expand All @@ -20,10 +20,10 @@
<tags>WCF RIA Services RIAServices Server aspnet OpenRiaServices</tags>
<dependencies>
<group targetFramework="net472">
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2"/>
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.0"/>
<dependency id="OpenRiaServices.Server" version="$version$"/>
<dependency id="System.Collections.Immutable" version="8.0.0" />
<dependency id="System.Memory" version="4.5.5"/>
<dependency id="System.Collections.Immutable" version="9.0.0" />
<dependency id="System.Memory" version="4.6.0"/>
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>OpenRiaServices.Server.Authentication.AspNetMembership</id>
<version>5.0.0-preview1</version>
<version>5.6.0</version>
<title>OpenRiaServices.Server Asp.Net Membership Authentication</title>
<authors>OpenRIAServices</authors>
<license type="expression">Apache-2.0</license>
Expand Down
43 changes: 23 additions & 20 deletions NuGet/OpenRiaServices.Server/OpenRiaServices.Server.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>OpenRiaServices.Server</id>
<version>4.6.0-preview1</version>
<version>5.6.0</version>
<title>OpenRiaServices.Server</title>
<authors>OpenRIAServices</authors>
<license type="expression">Apache-2.0</license>
Expand All @@ -21,35 +21,38 @@
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework="net472" />
</frameworkAssemblies>
<dependencies>
<group targetFramework="net472">
<dependency id="System.Threading.Tasks.Extensions" version="4.5.4"/>
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.ComponentModel.Annotations" version="5.0.0"/>
<dependency id="System.Reflection.Emit.Lightweight" version="4.7.0"/>
<dependency id="System.CodeDom" version="8.0.0"/>
<dependency id="System.Threading.Tasks.Extensions" version="4.5.4"/>
</group>
<group targetFramework="net6.0">
<dependency id="System.CodeDom" version="8.0.0"/>
</group>
</dependencies>
<dependencies>
<group targetFramework="net472">
<dependency id="System.Threading.Tasks.Extensions" version="4.6.0"/>
</group>
<!--
<group targetFramework="netstandard2.0">
<dependency id="System.ComponentModel.Annotations" version="5.0.0"/>
<dependency id="System.Reflection.Emit.Lightweight" version="4.7.0"/>
<dependency id="System.CodeDom" version="9.0.0"/>
<dependency id="System.Threading.Tasks.Extensions" version="4.6.0"/>
</group>
-->
<group targetFramework="net8.0">
<dependency id="System.CodeDom" version="8.0.0"/>
</group>
</dependencies>
</metadata>
<files>
<file src="build\OpenRiaServices.Server.targets" target="build\OpenRiaServices.Server.targets" />
<file src="..\..\src\bin\Release\net472\OpenRiaServices.Tools.dll" target="build\OpenRiaServices.Tools.dll" />
<file src="..\..\src\bin\Release\net472\Mono.Cecil.dll" target="build\Mono.Cecil.dll"/>
<file src="..\..\src\bin\Release\net472\Mono.Cecil.dll" target="build\Mono.Cecil.dll"/>
<file src="..\..\src\bin\Release\net472\OpenRiaServices.Server.dll" target="lib\net472\OpenRiaServices.Server.dll" />
<file src="..\..\src\bin\Release\net472\OpenRiaServices.Server.pdb" target="lib\net472\OpenRiaServices.Server.pdb" />
<file src="..\..\src\bin\Release\net472\OpenRiaServices.Server.xml" target="lib\net472\OpenRiaServices.Server.xml" />

<!--
<file src="..\..\src\bin\Release\netstandard2.0\OpenRiaServices.Server.dll" target="lib\netstandard2.0\OpenRiaServices.Server.dll" />
<file src="..\..\src\bin\Release\netstandard2.0\OpenRiaServices.Server.pdb" target="lib\netstandard2.0\OpenRiaServices.Server.pdb" />
<file src="..\..\src\bin\Release\netstandard2.0\OpenRiaServices.Server.xml" target="lib\netstandard2.0\OpenRiaServices.Server.xml" />

<file src="..\..\src\bin\Release\net6.0\OpenRiaServices.Server.dll" target="lib\net6.0\OpenRiaServices.Server.dll" />
<file src="..\..\src\bin\Release\net6.0\OpenRiaServices.Server.pdb" target="lib\net6.0\OpenRiaServices.Server.pdb" />
<file src="..\..\src\bin\Release\net6.0\OpenRiaServices.Server.xml" target="lib\net6.0\OpenRiaServices.Server.xml" />
-->
<file src="..\..\src\bin\Release\net8.0\OpenRiaServices.Server.dll" target="lib\net8.0\OpenRiaServices.Server.dll" />
<file src="..\..\src\bin\Release\net8.0\OpenRiaServices.Server.pdb" target="lib\net8.0\OpenRiaServices.Server.pdb" />
<file src="..\..\src\bin\Release\net8.0\OpenRiaServices.Server.xml" target="lib\net8.0\OpenRiaServices.Server.xml" />
</files>
</package>
14 changes: 7 additions & 7 deletions NuGet/OpenRiaServices.T4.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<language>en-US</language>
<tags>WCF RIA Services RIAServices T4 OpenRiaServices</tags>
<dependencies>
<group targetFramework="net6.0">
<group targetFramework="net8.0">
<dependency id="OpenRiaServices.Server" version="$version$" />
<dependency id="Mono.Cecil" version="0.11.6" />
</group>
Expand All @@ -33,11 +33,11 @@
<file src="..\src\bin\Release\net472\OpenRiaServices.Tools.pdb" target="lib\net472\OpenRiaServices.Tools.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Tools.xml" target="lib\net472\OpenRiaServices.Tools.xml" />

<file src="..\src\bin\Release\net6.0\OpenRiaServices.Tools.TextTemplate.dll" target="lib\net6.0\OpenRiaServices.Tools.TextTemplate.dll" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Tools.TextTemplate.pdb" target="lib\net6.0\OpenRiaServices.Tools.TextTemplate.pdb" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Tools.TextTemplate.xml" target="lib\net6.0\OpenRiaServices.Tools.TextTemplate.xml" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Tools.dll" target="lib\net6.0\OpenRiaServices.Tools.dll" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Tools.pdb" target="lib\net6.0\OpenRiaServices.Tools.pdb" />
<file src="..\src\bin\Release\net6.0\OpenRiaServices.Tools.xml" target="lib\net6.0\OpenRiaServices.Tools.xml" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Tools.TextTemplate.dll" target="lib\net8.0\OpenRiaServices.Tools.TextTemplate.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Tools.TextTemplate.pdb" target="lib\net8.0\OpenRiaServices.Tools.TextTemplate.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Tools.TextTemplate.xml" target="lib\net8.0\OpenRiaServices.Tools.TextTemplate.xml" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Tools.dll" target="lib\net8.0\OpenRiaServices.Tools.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Tools.pdb" target="lib\net8.0\OpenRiaServices.Tools.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Tools.xml" target="lib\net8.0\OpenRiaServices.Tools.xml" />
</files>
</package>
Loading

0 comments on commit f8a2c7f

Please sign in to comment.