Add the nuspec files for nightly and release

domenkogler · Sep 3, 2020 · 81354fc · 81354fc
1 parent 5402664
commit 81354fc
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 26 deletions.
diff --git a/images/odata.png b/images/odata.png
diff --git a/src/Microsoft.AspNetCore.OData.Nightly.nuspec b/src/Microsoft.AspNetCore.OData.Nightly.nuspec
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>Microsoft.AspNetCore.OData</id>
+    <title>Microsoft ASP.NET Core 3.x and 5.x for OData v4.0</title>
+    <version>$VersionFullSemantic$-Nightly$NightlyBuildVersion$</version>
+    <authors>Microsoft</authors>
+    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
+    <description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC and to support OData query syntax for your web APIs.</description>
+    <summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC.</summary>
+    <language>en-US</language>
+    <projectUrl>http://github.com/OData/AspNetCoreOData</projectUrl>
+    <license type="expression">MIT</license>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <tags>Microsoft AspNetCore WebApi OData</tags>
+    <icon>images\odata.png</icon>
+    <repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
+    <dependencies>
+        <group targetFramework=".netcoreapp3.1">
+          <dependency id="Microsoft.OData.ModelBuilder" version="$ODataModelBuilderPackageDependency$" />
+		  <dependency id="Microsoft.OData.Core" version="$ODataLibPackageDependency$" />
+		  <dependency id="Microsoft.OData.Edm" version="$ODataLibPackageDependency$" />
+          <dependency id="Microsoft.Spatial" version="$ODataLibPackageDependency$" />
+          <dependency id="System.Text.Json" version="$SystemTextJsonPackageDependency$" />
+        </group>
+		<group targetFramework=".net5.0">
+          <dependency id="Microsoft.OData.ModelBuilder" version="$ODataModelBuilderPackageDependency$" />
+		  <dependency id="Microsoft.OData.Core" version="$ODataLibPackageDependency$" />
+		  <dependency id="Microsoft.OData.Edm" version="$ODataLibPackageDependency$" />
+          <dependency id="Microsoft.Spatial" version="$ODataLibPackageDependency$" />
+          <dependency id="System.Text.Json" version="$SystemTextJsonPackageDependency$" />
+        </group>
+      </dependencies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\netcoreapp3.1\Microsoft.OData.ModelBuilder.dll" target="lib\netcoreapp3.1" />
+    <file src="$ProductRoot$\netcoreapp3.1\Microsoft.OData.ModelBuilder.xml" target="lib\netcoreapp3.1" />
+    <file src="$ProductRoot$\netcoreapp3.1\Microsoft.OData.ModelBuilder.pdb" target="lib\netcoreapp3.1" />
+	<file src="$ProductRoot$\net5.0\Microsoft.OData.ModelBuilder.dll" target="lib\net5.0" />
+    <file src="$ProductRoot$\net5.0\Microsoft.OData.ModelBuilder.xml" target="lib\net5.0" />
+    <file src="$ProductRoot$\net5.0\Microsoft.OData.ModelBuilder.pdb" target="lib\net5.0" />
+    <file src="$SourcesRoot$\images\odata.png" target="images\" />
+  </files>
+</package>
diff --git a/src/Microsoft.AspNetCore.OData.Release.nuspec b/src/Microsoft.AspNetCore.OData.Release.nuspec
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>Microsoft.AspNetCore.OData</id>
+    <title>Microsoft ASP.NET Core 3.x and 5.x for OData v4.0</title>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
+    <description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC and to support OData query syntax for your web APIs.</description>
+    <summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC.</summary>
+    <language>en-US</language>
+    <projectUrl>http://github.com/OData/AspNetCoreOData</projectUrl>
+    <license type="expression">MIT</license>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <tags>Microsoft AspNetCore WebApi OData</tags>
+    <icon>images\odata.png</icon>
+    <repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
+    <dependencies>
+      <group targetFramework=".netcoreapp3.1">
+          <dependency id="Microsoft.OData.ModelBuilder" version="$ODataModelBuilderPackageDependency$" />
+		  <dependency id="Microsoft.OData.Core" version="$ODataLibPackageDependency$" />
+		  <dependency id="Microsoft.OData.Edm" version="$ODataLibPackageDependency$" />
+          <dependency id="Microsoft.Spatial" version="$ODataLibPackageDependency$" />
+          <dependency id="System.Text.Json" version="$SystemTextJsonPackageDependency$" />
+        </group>
+		<group targetFramework=".net5.0">
+          <dependency id="Microsoft.OData.ModelBuilder" version="$ODataModelBuilderPackageDependency$" />
+		  <dependency id="Microsoft.OData.Core" version="$ODataLibPackageDependency$" />
+		  <dependency id="Microsoft.OData.Edm" version="$ODataLibPackageDependency$" />
+          <dependency id="Microsoft.Spatial" version="$ODataLibPackageDependency$" />
+          <dependency id="System.Text.Json" version="$SystemTextJsonPackageDependency$" />
+        </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\netcoreapp3.1\Microsoft.OData.ModelBuilder.dll" target="lib\netcoreapp3.1" />
+    <file src="$ProductRoot$\netcoreapp3.1\Microsoft.OData.ModelBuilder.xml" target="lib\netcoreapp3.1" />
+    <file src="$ProductRoot$\netcoreapp3.1\Microsoft.OData.ModelBuilder.pdb" target="lib\netcoreapp3.1" />
+	<file src="$ProductRoot$\net5.0\Microsoft.OData.ModelBuilder.dll" target="lib\net5.0" />
+    <file src="$ProductRoot$\net5.0\Microsoft.OData.ModelBuilder.xml" target="lib\net5.0" />
+    <file src="$ProductRoot$\net5.0\Microsoft.OData.ModelBuilder.pdb" target="lib\net5.0" />
+    <file src="$SourcesRoot$\images\odata.png" target="images\" />
+  </files>
+</package>
diff --git a/src/Microsoft.AspNetCore.OData/Formatter/Serialization/ODataResourceSerializer.cs b/src/Microsoft.AspNetCore.OData/Formatter/Serialization/ODataResourceSerializer.cs
@@ -18,8 +18,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.OData;
+using Microsoft.OData.ModelBuilder;
 using Microsoft.OData.Edm;
 using Microsoft.OData.UriParser;
+using NavigationSourceLinkBuilderAnnotation = Microsoft.AspNetCore.OData.Edm.NavigationSourceLinkBuilderAnnotation;
 
 namespace Microsoft.AspNetCore.OData.Formatter.Serialization
 {
@@ -480,7 +482,7 @@ public virtual ODataResource CreateResource(SelectExpandNode selectExpandNode, R
                 if (!(resourceContext.NavigationSource is IEdmContainedEntitySet))
                 {
                     IEdmModel model = resourceContext.SerializerContext.Model;
-                    NavigationSourceLinkBuilderAnnotation linkBuilder = model.GetNavigationSourceLinkBuilder(resourceContext.NavigationSource);
+                    NavigationSourceLinkBuilderAnnotation linkBuilder = Edm.EdmModelExtensions.GetNavigationSourceLinkBuilder(model, resourceContext.NavigationSource);
                     EntitySelfLinks selfLinks = linkBuilder.BuildEntitySelfLinks(resourceContext, resourceContext.SerializerContext.MetadataLevel);
 
                     if (selfLinks.IdLink != null)
@@ -930,7 +932,7 @@ public virtual ODataNestedResourceInfo CreateNavigationLink(IEdmNavigationProper
             {
                 IEdmTypeReference propertyType = navigationProperty.Type;
                 IEdmModel model = writeContext.Model;
-                NavigationSourceLinkBuilderAnnotation linkBuilder = model.GetNavigationSourceLinkBuilder(navigationSource);
+                NavigationSourceLinkBuilderAnnotation linkBuilder = Edm.EdmModelExtensions.GetNavigationSourceLinkBuilder(model, navigationSource);
                 Uri navigationUrl = linkBuilder.BuildNavigationLink(resourceContext, navigationProperty, writeContext.MetadataLevel);
 
                 navigationLink = new ODataNestedResourceInfo

diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
@@ -6717,34 +6717,14 @@
         </member>
         <member name="P:Microsoft.AspNetCore.OData.Query.ExpandConfiguration.ExpandType">
             <summary>
-            Gets or sets the <see cref="T:Microsoft.AspNetCore.OData.Query.SelectExpandType"/>.
+            Gets or sets the <see cref="T:Microsoft.OData.ModelBuilder.SelectExpandType"/>.
             </summary>
         </member>
         <member name="P:Microsoft.AspNetCore.OData.Query.ExpandConfiguration.MaxDepth">
             <summary>
             Gets or sets the maximum depth.
             </summary>
         </member>
-        <member name="T:Microsoft.AspNetCore.OData.Query.SelectExpandType">
-            <summary>
-            Represents the type of expand and select.
-            </summary>
-        </member>
-        <member name="F:Microsoft.AspNetCore.OData.Query.SelectExpandType.Allowed">
-            <summary>
-            Allowed to be expanded and selected.
-            </summary>
-        </member>
-        <member name="F:Microsoft.AspNetCore.OData.Query.SelectExpandType.Automatic">
-            <summary>
-            Automatic expanded and selected.
-            </summary>
-        </member>
-        <member name="F:Microsoft.AspNetCore.OData.Query.SelectExpandType.Disabled">
-            <summary>
-            Disallowed to be expanded and selected.
-            </summary>
-        </member>
         <member name="T:Microsoft.AspNetCore.OData.Query.Container.AggregationPropertyContainer">
             <summary>
             Reperesent properties used in groupby and aggregate clauses to make them accessiable in further clauses/transformations
@@ -8037,7 +8017,7 @@
         </member>
         <member name="P:Microsoft.AspNetCore.OData.Query.ModelBoundQuerySettings.DefaultExpandType">
             <summary>
-            Gets or sets the default <see cref="T:Microsoft.AspNetCore.OData.Query.SelectExpandType"/> of navigation properties.
+            Gets or sets the default <see cref="T:Microsoft.OData.ModelBuilder.SelectExpandType"/> of navigation properties.
             </summary>
         </member>
         <member name="P:Microsoft.AspNetCore.OData.Query.ModelBoundQuerySettings.DefaultMaxDepth">
@@ -8085,7 +8065,7 @@
             Copy the $orderby configuration of properties.
             </summary>
         </member>
-        <member name="M:Microsoft.AspNetCore.OData.Query.ModelBoundQuerySettings.CopySelectConfigurations(System.Collections.Generic.Dictionary{System.String,Microsoft.AspNetCore.OData.Query.SelectExpandType})">
+        <member name="M:Microsoft.AspNetCore.OData.Query.ModelBoundQuerySettings.CopySelectConfigurations(System.Collections.Generic.Dictionary{System.String,Microsoft.OData.ModelBuilder.SelectExpandType})">
             <summary>
             Copy the $select configuration of properties.
             </summary>

diff --git a/src/Microsoft.AspNetCore.OData/Query/Query/SelectExpandQueryOption.cs b/src/Microsoft.AspNetCore.OData/Query/Query/SelectExpandQueryOption.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.OData.Query.Expressions;
 using Microsoft.AspNetCore.OData.Query.Validator;
 using Microsoft.OData.Edm;
+using Microsoft.OData.ModelBuilder;
 using Microsoft.OData.UriParser;
 
 namespace Microsoft.AspNetCore.OData.Query

diff --git a/src/Microsoft.AspNetCore.OData/Query/Validator/SelectExpandQueryValidator.cs b/src/Microsoft.AspNetCore.OData/Query/Validator/SelectExpandQueryValidator.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OData;
 using Microsoft.OData.Edm;
+using Microsoft.OData.ModelBuilder;
 using Microsoft.OData.UriParser;
 
 namespace Microsoft.AspNetCore.OData.Query.Validator

diff --git a/tool/build.props b/tool/build.props
@@ -28,7 +28,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>