Target OpenRiaServices instead of WCF Ria Services and update project…

… file (#1)

* Target open ria services instead of WCF Ria services

* update web part of "test" project

* Fix path to solution

* add client "test" project

* enable packing and tests

* disable packing for now

* fix server project for tests

* Fix tests

* update nuget version of test sdk

* Update azure-pipelines.yml for Azure Pipelines

add code coverage

* disable documentation generation

* use same namespace ass in current nguet releae

* properly handle generated_code folder for client project

* Delete fix_author.sh

Directory.Build.props

@@ -0,0 +1,45 @@
+<Project>
+
+  <!-- This PropertyGroup defines the location and version of Silverlight and SDK for .Net projects (Metadata projects) -->
+  <PropertyGroup>
+    <IsTestProject Condition="'$(IsTestProject)' == '' And ($(MSBuildProjectFile.Contains('.Test')) Or $(MSBuildProjectDirectory.Contains('Tests\')))">true</IsTestProject>
+    <IsFrameworkProject Condition="'$(IsTestProject)' != 'true'  and !$(MSBuildProjectFile.Contains('.Test')) ">true</IsFrameworkProject>
+
+    <DeterministicSourcePaths Condition="'$(BUILD_BUILDID)' != '' and '$(IsFrameworkProject)' == 'true'">true</DeterministicSourcePaths>
+
+    <!-- Use csharp 7.3 for all projects -->
+    <LangVersion Condition="'$(MSBuildProjectExtension)' == '.csproj'">7.3</LangVersion>
+
+    <SonarQubeTestProject Condition="'$(IsTestProject)' == 'true'">True</SonarQubeTestProject>
+    <IsPackable Condition="'$(IsTestProject)' == 'true'">false</IsPackable>
+
+    <!-- Project is missing documentation so not enabled -->
+    <!--<GenerateDocumentationFile  Condition="'$(IsFrameworkProject)' == 'true' and '$(Configuration)' != 'Debug'">true</GenerateDocumentationFile>-->
+    <CopyLocalLockFileAssemblies Condition="'$(IsFrameworkProject)' == 'true'">false</CopyLocalLockFileAssemblies>
+
+    <!-- Setup signing-->
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)OpenRiaServices.FluentMetadata.snk</AssemblyOriginatorKeyFile>
+
+    <!-- Common Assembly and Package Info-->
+    <Version>3.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>
+    <PackageProjectUrl>https://github.com/OpenRIAServices/OpenRiaServices.FluentMetadata/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/OpenRIAServices/OpenRiaServices.FluentMetadata.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReleaseNotes>This version supports Open Ria Services 4.6.0+.</PackageReleaseNotes>
+    <PackageTags>OpenRiaServices;Fluent;FluentMetadata</PackageTags>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+  </PropertyGroup>
+
+  <!-- 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"/>
+  </ItemGroup>
+
+</Project>

FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadata.Tests.Web.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,9 +13,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentMetadata.Tests.Web</RootNamespace>
     <AssemblyName>FluentMetadata.Tests.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
-    <SilverlightApplicationList>{3DFBD959-C1DD-445E-98BA-3C7256FC1789}|..\FluentMetadata.Tests\FluentMetadata.Tests.csproj|ClientBin|False</SilverlightApplicationList>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort>44365</IISExpressSSLPort>
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -24,6 +31,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,22 +40,17 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel.DomainServices.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.ServiceModel.DomainServices.Server, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
@@ -56,10 +59,6 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ClientBin\FluentMetadata.Tests.xap" />
-    <Content Include="FluentMetadata.TestsTestPage.aspx" />
-    <Content Include="FluentMetadata.TestsTestPage.html" />
-    <Content Include="Silverlight.js" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -75,15 +74,24 @@
     <Compile Include="Model\Foo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\..\FluentMetadata\FluentMetadata.csproj">
-      <Project>{085F2A42-8CCC-41B7-BCCB-92728E43A352}</Project>
-      <Name>FluentMetadata</Name>
+    <PackageReference Include="OpenRiaServices.Server">
+      <Version>4.6.0-preview0001</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\FluentMetadata\OpenRiaServices.DomainServices.Server.FluentMetadata.csproj">
+      <Project>{085f2a42-8ccc-41b7-bccb-92728e43a352}</Project>
+      <Name>OpenRiaServices.DomainServices.Server.FluentMetadata</Name>
     </ProjectReference>
   </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadataConfiguration.cs

@@ -1,4 +1,4 @@
-using System.Web.DomainServices.FluentMetadata;
+using OpenRiaServices.FluentMetadata;
 using FluentMetadata.Tests.Web.Model;
 
 namespace FluentMetadata.Tests.Web

FluentMetadata.Tests/FluentMetadata.Tests.Web/FluentMetadataTestDomainService.cs

@@ -2,9 +2,9 @@
 namespace FluentMetadata.Tests.Web
 {
     using System.Collections.Generic;
-    using System.ServiceModel.DomainServices.Hosting;
-    using System.ServiceModel.DomainServices.Server;
-    using System.Web.DomainServices.FluentMetadata;
+    using OpenRiaServices.DomainServices.Hosting;
+    using OpenRiaServices.DomainServices.Server;
+    using OpenRiaServices.FluentMetadata;
     using FluentMetadata.Tests.Web.Model;