Adapted for OpenRIA 5.0 rc1 (#11)

* Drop DomainServices from namespaces and filenames * Upgrade openria to 5.0 rc0001 * Get build pipeline working again * Remove net472 target * Update Annotations to 5.0 * Update Version
OpenRIAServices · Nov 18, 2020 · bac84d9 · bac84d9
1 parent 430a94a
commit bac84d9
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 33 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -24,8 +24,7 @@
     <!-- Common Assembly and Package Info-->
     <!-- Include symbol files (*.pdb) in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <Version>3.0.0</Version>
-    <Authors>Merijn de Jonge, OpenRiaServices, Nikhil Kothari</Authors>
+    <Version>5.0.0</Version>    <Authors>Merijn de Jonge, OpenRiaServices, Nikhil Kothari</Authors>
     <Company>Merijn de Jonge</Company>
     <Product>OpenRiaServices.FluentMetadata</Product>
     <Copyright>Copyright © OpenRiaServices 2019</Copyright>
@@ -41,7 +40,7 @@
   <!-- Enable source link, we really only want this for framework assemblies and CI builds
   -->
   <ItemGroup Condition="'$(IsFrameworkProject)' == 'true'">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadata.Tests.Web.csproj b/FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadata.Tests.Web.csproj
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentMetadata.Tests.Web</RootNamespace>
     <AssemblyName>FluentMetadata.Tests.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort>44365</IISExpressSSLPort>
@@ -75,14 +75,17 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="OpenRiaServices.Hosting.Wcf">
+      <Version>5.0.0-rc0001</Version>
+    </PackageReference>
     <PackageReference Include="OpenRiaServices.Server">
-      <Version>4.6.0</Version>
+      <Version>5.0.0-rc0001</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\FluentMetadata\OpenRiaServices.DomainServices.Server.FluentMetadata.csproj">
+    <ProjectReference Include="..\..\FluentMetadata\OpenRiaServices.Server.FluentMetadata.csproj">
       <Project>{085f2a42-8ccc-41b7-bccb-92728e43a352}</Project>
-      <Name>OpenRiaServices.DomainServices.Server.FluentMetadata</Name>
+      <Name>OpenRiaServices.Server.FluentMetadata</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadataTestDomainService.cs b/FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadataTestDomainService.cs
@@ -2,8 +2,7 @@
 namespace FluentMetadata.Tests.Web
 {
     using System.Collections.Generic;
-    using OpenRiaServices.DomainServices.Hosting;
-    using OpenRiaServices.DomainServices.Server;
+    using OpenRiaServices.Server;
     using OpenRiaServices.FluentMetadata;
     using FluentMetadata.Tests.Web.Model;
 

diff --git a/FluentMetadata.Tests/FluentMetadata.Tests.Web/Web.config b/FluentMetadata.Tests/FluentMetadata.Tests.Web/Web.config
@@ -6,16 +6,16 @@
 <configuration>
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true">
-      <add name="DomainServiceModule" preCondition="managedHandler" type="OpenRiaServices.DomainServices.Hosting.DomainServiceHttpModule, OpenRiaServices.DomainServices.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2e0b7ccb1ae5b4c8"/>
+      <add name="DomainServiceModule" preCondition="managedHandler" type="OpenRiaServices.Hosting.Wcf.DomainServiceHttpModule, OpenRiaServices.Hosting.Wcf, Version=5.0.0.0, Culture=neutral, PublicKeyToken=2e0b7ccb1ae5b4c8"/>
     </modules>
     <validation validateIntegratedModeConfiguration="false"/>
   </system.webServer>
   <system.web>
     <httpModules>
-      <add name="DomainServiceModule" type="OpenRiaServices.DomainServices.Hosting.DomainServiceHttpModule, OpenRiaServices.DomainServices.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2e0b7ccb1ae5b4c8"/>
+      <add name="DomainServiceModule" type="OpenRiaServices.Hosting.Wcf.DomainServiceHttpModule, OpenRiaServices.Hosting.Wcf, Version=5.0.0.0, Culture=neutral, PublicKeyToken=2e0b7ccb1ae5b4c8"/>
     </httpModules>
-    <httpRuntime targetFramework="4.6.1" />
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <httpRuntime targetFramework="4.7.2" />
+    <compilation debug="true" targetFramework="4.7.2"/>
   </system.web>
   <system.serviceModel>
     <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>

diff --git a/FluentMetadata.Tests/FluentMetadata.Tests/FluentMetadata.Tests.csproj b/FluentMetadata.Tests/FluentMetadata.Tests/FluentMetadata.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <LinkedOpenRiaServerProject>..\FluentMetadata.Tests.Web\FluentMetadata.Tests.Web.csproj</LinkedOpenRiaServerProject>
   </PropertyGroup>
   <ItemGroup>
@@ -11,8 +11,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
-    <PackageReference Include="OpenRiaServices.Client.Core" Version="4.6.0" />
-    <PackageReference Include="OpenRiaServices.Client.CodeGen" Version="4.6.0">
+    <PackageReference Include="OpenRiaServices.Client.Core" Version="5.0.0-rc0001" />
+    <PackageReference Include="OpenRiaServices.Client.CodeGen" Version="5.0.0-rc0001">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/FluentMetadata.sln b/FluentMetadata.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28902.138
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaServices.DomainServices.Server.FluentMetadata", "FluentMetadata\OpenRiaServices.DomainServices.Server.FluentMetadata.csproj", "{085F2A42-8CCC-41B7-BCCB-92728E43A352}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaServices.Server.FluentMetadata", "FluentMetadata\OpenRiaServices.Server.FluentMetadata.csproj", "{085F2A42-8CCC-41B7-BCCB-92728E43A352}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{42A9EEDA-1219-4F3E-8585-0C8BF7B7FDD3}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/FluentMetadata/DomainServiceDescriptionProvider/FluentMetadataAttribute.cs b/FluentMetadata/DomainServiceDescriptionProvider/FluentMetadataAttribute.cs
@@ -3,14 +3,14 @@
 
 using System.Collections.Generic;
 using System.Reflection;
-using OpenRiaServices.DomainServices.Server;
+using OpenRiaServices.Server;
 using System.Linq;
 using System;
 
 namespace OpenRiaServices.FluentMetadata
 {
     /// <summary>
-    /// Attribute applied to a OpenRiaServices.DomainServices.Server.DomainService
+    /// Attribute applied to a OpenRiaServices.Server.DomainService
     /// type to specify that Metadata for entities is specified using the FluentMetadata interface.
     /// </summary>
     public sealed class FluentMetadataAttribute : DomainServiceDescriptionProviderAttribute

diff --git a/FluentMetadata/DomainServiceDescriptionProvider/FluentTypeDescriptionProvider.cs b/FluentMetadata/DomainServiceDescriptionProvider/FluentTypeDescriptionProvider.cs
@@ -2,7 +2,7 @@ namespace OpenRiaServices.FluentMetadata
 {
     using System;
     using System.ComponentModel;
-    using OpenRiaServices.DomainServices.Server;
+    using OpenRiaServices.Server;
 
     internal sealed class FluentTypeDescriptionProvider : DomainServiceDescriptionProvider
     {

diff --git a/FluentMetadata/FluentConfiguration/AssociationMetadata.cs b/FluentMetadata/FluentConfiguration/AssociationMetadata.cs
@@ -1,4 +1,4 @@
-using OpenRiaServices.DomainServices;
+using OpenRiaServices;
 
 namespace OpenRiaServices.FluentMetadata
 {

diff --git a/FluentMetadata/FluentConfiguration/MemberProjectionMetadata.cs b/FluentMetadata/FluentConfiguration/MemberProjectionMetadata.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using OpenRiaServices.DomainServices;
-using OpenRiaServices.DomainServices.Server;
+using OpenRiaServices;
+using OpenRiaServices.Server;
 
 namespace OpenRiaServices.FluentMetadata
 {

diff --git a/FluentMetadata/Metadata/MetadataContainer.cs b/FluentMetadata/Metadata/MetadataContainer.cs
@@ -5,7 +5,7 @@
     using System.ComponentModel;
     using System.ComponentModel.DataAnnotations;
     using System.Linq;
-    using OpenRiaServices.DomainServices.Server;
+    using OpenRiaServices.Server;
 
     public class MetadataContainer
     {

diff --git a/...mainServices.Server.FluentMetadata.csproj → ...nRiaServices.Server.FluentMetadata.csproj b/...mainServices.Server.FluentMetadata.csproj → ...nRiaServices.Server.FluentMetadata.csproj
@@ -1,24 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <Description>library that provides a fluent configuration interface for configuring domain services.</Description>
     <PackageId>OpenRiaServices.FluentMetadata</PackageId>
     <GeneratePackageOnBuild Condition="'$(BUILD_BUILDID)' != ''">true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenRiaServices.Server" Version="4.6.0" />
+    <PackageReference Include="OpenRiaServices.Server" Version="5.0.0-rc0001" />
   </ItemGroup>
 
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,6 +19,7 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+
 - task: NuGetToolInstaller@1
   inputs:
     versionSpec: '5.8.0'
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ variables: @@
       buildConfiguration: 'Release'
     steps:
     - task: NuGetToolInstaller@1
       inputs:
         versionSpec: '5.8.0'
@@ Expand Down @@