From 82f949d5a38c578f833b4fd3c60c1b08fa8b0826 Mon Sep 17 00:00:00 2001
From: Sam Xu <saxu@microsoft.com>
Date: Wed, 22 Apr 2020 15:01:40 -0700
Subject: [PATCH] update the build CI and project

---
 azure-pipelines-1.yml                         | 140 ++++++++++++++++++
 ...rosoft.OData.Client.Nightly.Release.nuspec |  82 ++++++++++
 .../Microsoft.OData.Client.Release.nuspec     |  87 +++++++++++
 .../Microsoft.OData.Client.csproj             |   1 +
 .../Microsoft.OData.Core.Net35.Release.nuspec |  32 ++++
 ...icrosoft.OData.Core.Nightly.Release.nuspec |  35 +++++
 .../Microsoft.OData.Core.Release.nuspec       |  36 +++++
 .../Microsoft.OData.Edm.Net35.Release.nuspec  |  26 ++++
 ...Microsoft.OData.Edm.Nightly.Release.nuspec |  29 ++++
 .../Microsoft.OData.Edm.Release.nuspec        |  30 ++++
 .../Microsoft.Spatial.Nightly.Release.nuspec  |  26 ++++
 .../Microsoft.Spatial.Release.nuspec          |  30 ++++
 12 files changed, 554 insertions(+)
 create mode 100644 src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Nightly.Release.nuspec
 create mode 100644 src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Release.nuspec
 create mode 100644 src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Net35.Release.nuspec
 create mode 100644 src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Nightly.Release.nuspec
 create mode 100644 src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Release.nuspec
 create mode 100644 src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Net35.Release.nuspec
 create mode 100644 src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Nightly.Release.nuspec
 create mode 100644 src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Release.nuspec
 create mode 100644 src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Nightly.Release.nuspec
 create mode 100644 src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Release.nuspec

diff --git a/azure-pipelines-1.yml b/azure-pipelines-1.yml
index 408712c727..a21ab576e6 100644
--- a/azure-pipelines-1.yml
+++ b/azure-pipelines-1.yml
@@ -76,7 +76,140 @@ steps:
 
 
 
+# //----------------------------------------
 
+- task: EsrpCodeSigning@1
+
+  displayName: 'ESRP CodeSign - OData'
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSigning - OData'
+    #FolderPath: '$(Build.SourcesDirectory)\src\Microsoft.Spatial\bin\Debug\netstandard2.0'
+    FolderPath: '$(Build.SourcesDirectory)\src'
+
+    Pattern: 'Microsoft.Spatial.dll,Microsoft.OData.Edm.dll,Microsoft.OData.Core.dll,Microsoft.OData.Client.dll'
+
+    signConfigType: inlineSignParams
+
+    inlineOperation: |
+     [
+       {
+         "keyCode": "MSSharedLibSnKey",
+         "operationSetCode": "StrongNameSign",
+         "parameters": null,
+         "toolName": "sn.exe",
+         "toolVersion": "V4.6.1586.0"
+       },
+       {
+         "keyCode": "MSSharedLibSnKey",
+         "operationSetCode": "StrongNameVerify",
+         "parameters": null,
+         "toolName": "sn.exe",
+         "toolVersion": "V4.6.1586.0"
+       },
+       {
+         "keyCode": "CP-230012",
+         "operationSetCode": "SigntoolSign",
+         "parameters": [
+         {
+           "parameterName": "OpusName",
+           "parameterValue": "TestSign"
+         },
+         {
+           "parameterName": "OpusInfo",
+           "parameterValue": "http://test"
+         },
+         {
+           "parameterName": "PageHash",
+           "parameterValue": "/NPH"
+         },
+         {
+           "parameterName": "TimeStamp",
+           "parameterValue": "/t \"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS\""
+         }
+         ],
+         "toolName": "signtool.exe",
+         "toolVersion": "6.2.9304.0"
+       },
+       {
+         "keyCode": "CP-230012",
+         "operationSetCode": "SigntoolSign",
+         "parameters": [
+         {
+           "parameterName": "OpusName",
+           "parameterValue": "TestSign"
+         },
+         {
+           "parameterName": "OpusInfo",
+           "parameterValue": "http://test"
+         },
+         {
+           "parameterName": "Append",
+           "parameterValue": "/AS"
+         },
+         {
+           "parameterName": "PageHash",
+           "parameterValue": "/NPH"
+         },
+         {
+           "parameterName": "FileDigest",
+           "parameterValue": "/fd sha256"
+         },
+         {
+           "parameterName": "TimeStamp",
+           "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+         }
+         ],
+         "toolName": "signtool.exe",
+         "toolVersion": "6.2.9304.0"
+       },
+       {
+         "keyCode": "CP-230012",
+         "operationSetCode": "SigntoolVerify",
+         "parameters": [
+         {
+           "parameterName": "VerifyAll",
+           "parameterValue": "/all"
+         }
+         ],
+         "toolName": "signtool.exe",
+         "toolVersion": "6.2.9304.0"
+       }
+     ]
+
+    SessionTimeout: 20
+    VerboseLogin: true
+
+
+
+- task: CopyFiles@2
+  displayName: 'Copy Files - Product'
+  inputs:
+    SourceFolder: |
+      $(ProductBinPath1)
+      $(ProductBinPath2)
+    TargetFolder: '$(Build.ArtifactStagingDirectory)\Product'
+
+
+
+
+    
+- task: NuGetCommand@2
+  displayName: 'NuGet - pack Microsoft.Spatial.Nightly.Release'
+  inputs:
+    command: custom
+    feedsToUse: config
+    arguments: 'pack $(Build.SourcesDirectory)\src\Microsoft.Spatial\Build.NuGet\Microsoft.Spatial.Nightly.Release.nuspec -NonInteractive -OutputDirectory $(Build.ArtifactStagingDirectory)\Nuget -Properties Configuration=$(BuildConfiguration);ProductRoot=$(ProductBinPath);SourcesRoot=$(Build.SourcesDirectory);VersionFullSemantic=$(VersionFullSemantic);NightlyBuildVersion=$(VersionNugetNightlyBuild);VersionNuGetSemantic=$(VersionNuGetSemantic) -Verbosity Detailed -Symbols'
+
+
+
+
+# - task: NuGetCommand@2
+#   displayName: 'NuGet - pack Microsoft.OData.Spatial.Nightly.nuspec '
+#   inputs:
+#     command: custom
+#     arguments: 'pack $(Build.SourcesDirectory)\src\Microsoft.Spatial\Build.NuGet\Microsoft.Spatial.Nightly.Release.nuspec -NonInteractive -OutputDirectory $(Build.ArtifactStagingDirectory)\Nuget -Properties Configuration=$(BuildConfiguration);ProductRoot=$(ProductBinPath);SourcesRoot=$(Build.SourcesDirectory);VersionFullSemantic=$(VersionFullSemantic);NightlyBuildVersion=$(VersionNugetNightlyBuild);VersionNuGetSemantic=$(VersionNuGetSemantic);SystemComponentPackageDependency="$(SystemComponentPackageDependency)";ODataLibPackageDependency="$(ODataLibPackageDependency)" -Verbosity Detailed -Symbols'
+    
+# \\fdffdf
 
 
 
@@ -385,6 +518,13 @@ steps:
 
 
 
+- task: NuGetCommand@2
+  displayName: 'NuGet - pack Microsoft.OData.Spatial.Nightly.nuspec '
+  inputs:
+    command: custom
+    arguments: 'pack $(Build.SourcesDirectory)\src\Microsoft.Spatial\Build.NuGet\Microsoft.Spatial.Nightly.Release.nuspec -NonInteractive -OutputDirectory $(Build.ArtifactStagingDirectory)\Nuget -Properties Configuration=$(BuildConfiguration);ProductRoot=$(ProductBinPath);SourcesRoot=$(Build.SourcesDirectory);VersionFullSemantic=$(VersionFullSemantic);NightlyBuildVersion=$(VersionNugetNightlyBuild);VersionNuGetSemantic=$(VersionNuGetSemantic);SystemComponentPackageDependency="$(SystemComponentPackageDependency)";ODataLibPackageDependency="$(ODataLibPackageDependency)" -Verbosity Detailed -Symbols'
+    
+
 - task: CopyFiles@2
   displayName: 'Copy Files - Product'
   inputs:
diff --git a/src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Nightly.Release.nuspec b/src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Nightly.Release.nuspec
new file mode 100644
index 0000000000..47cd8fc888
--- /dev/null
+++ b/src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Nightly.Release.nuspec
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>OData Client for .NET</title>
+    <id>Microsoft.OData.Client</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionFullSemantic$-Nightly$NightlyBuildVersion$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>LINQ-enabled client API for issuing OData queries and consuming OData JSON payloads. Supports OData v4. </summary>
+    <description>LINQ-enabled client API for issuing OData queries and consuming OData JSON payloads. Supports OData v4. Targets .NET 4.5 and .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <dependencies>
+      <dependency id="Microsoft.OData.Core" version="[$VersionFullSemantic$-Nightly$NightlyBuildVersion$]" />
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Windows" targetFramework="sl4" />
+      <frameworkAssembly assemblyName="System.Xml.Linq" targetFramework="sl4" />
+    </frameworkAssemblies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\Desktop\Microsoft.OData.Client.dll" target="lib\net45" />
+    <file src="$ProductRoot$\Desktop\Microsoft.OData.Client.xml" target="lib\net45" />
+    <file src="$ProductRoot$\Desktop\Microsoft.OData.Client.pdb" target="lib\net45" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Client.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Client.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Client.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Client\**\*.cs" target="src\Microsoft.OData.Client" />
+    <!-- files imported from EdmLib -->
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
+    <!-- files imported from odatalib -->
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\ExceptionUtils.cs" target="src\Microsoft.OData.Core\ExceptionUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\EdmValueUtils.cs" target="src\Microsoft.OData.Core\Evaluation\EdmValueUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\KeySerializer.cs" target="src\Microsoft.OData.Core\Evaluation\KeySerializer.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\LiteralFormatter.cs" target="src\Microsoft.OData.Core\Evaluation\LiteralFormatter.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\ODataResourceMetadataBuilder.cs" target="src\Microsoft.OData.Core\Evaluation\ODataResourceMetadataBuilder.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\ODataUriBuilder.cs" target="src\Microsoft.OData.Core\Evaluation\ODataUriBuilder.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Json\JsonSharedUtils.cs" target="src\Microsoft.OData.Core\Json\JsonSharedUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\SimpleLazy.cs" target="src\Microsoft.OData.Core\SimpleLazy.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Metadata\EdmLibraryExtensions.cs" target="src\Microsoft.OData.Core\Metadata\EdmLibraryExtensions.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\InternalErrorCodesCommon.cs" target="src\Microsoft.OData.Core\InternalErrorCodesCommon.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\TaskUtils.cs" target="src\Microsoft.OData.Core\TaskUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryTokenKind.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryTokenKind.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\ReadOnlyEnumerableForUriParser.cs" target="src\Microsoft.OData.Core\UriParser\ReadOnlyEnumerableForUriParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\NamedValue.cs" target="src\Microsoft.OData.Core\UriParser\NamedValue.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\AllToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\AllToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\AnyToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\AnyToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\BinaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\BinaryOperatorToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\CustomQueryOptionToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\CustomQueryOptionToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\DottedIdentifierToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\DottedIdentifierToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\EndPathToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\EndPathToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandTermToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandTermToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionCallToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionCallToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterAliasToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterAliasToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\InnerPathToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\InnerPathToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Visitors\IPathSegmentTokenVisitor.cs" target="src\Microsoft.OData.Core\UriParser\Visitors\IPathSegmentTokenVisitor.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Visitors\ISyntacticTreeVisitor.cs" target="src\Microsoft.OData.Core\UriParser\Visitors\ISyntacticTreeVisitor.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\LambdaToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\LambdaToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\LiteralToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\LiteralToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\NonSystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\NonSystemToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\OrderByToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\OrderByToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\PathSegmentToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\PathSegmentToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\PathToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\PathToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\RangeVariableToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\RangeVariableToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectExpandTermToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectExpandTermToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectTermToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectTermToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\StarToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\StarToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Release.nuspec b/src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Release.nuspec
new file mode 100644
index 0000000000..51ad213308
--- /dev/null
+++ b/src/Microsoft.OData.Client/Build.NuGet/Microsoft.OData.Client.Release.nuspec
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>OData Client for .NET</title>
+    <id>Microsoft.OData.Client</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>LINQ-enabled client API for issuing OData queries and consuming OData JSON payloads. Supports OData v4. </summary>
+    <description>LINQ-enabled client API for issuing OData queries and consuming OData JSON payloads. Supports OData v4. Targets .NET 4.5 and .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <releaseNotes>http://odata.github.io/odata.net/v7/#ODL-$VersionFullSemantic$</releaseNotes>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <dependencies>
+      <dependency id="Microsoft.OData.Core" version="[$VersionNuGetSemantic$]" />
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Windows" targetFramework="sl4" />
+      <frameworkAssembly assemblyName="System.Xml.Linq" targetFramework="sl4" />
+    </frameworkAssemblies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\Desktop\Microsoft.OData.Client.dll" target="lib\net45" />
+    <file src="$ProductRoot$\Desktop\Microsoft.OData.Client.xml" target="lib\net45" />
+    <file src="$ProductRoot$\Desktop\Microsoft.OData.Client.pdb" target="lib\net45" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Client.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Client.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Client.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Client\**\*.cs" target="src\Microsoft.OData.Client" />
+    <!-- files imported from EdmLib -->
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
+    <!-- files imported from odatalib -->
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\ExceptionUtils.cs" target="src\Microsoft.OData.Core\ExceptionUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\EdmValueUtils.cs" target="src\Microsoft.OData.Core\Evaluation\EdmValueUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\KeySerializer.cs" target="src\Microsoft.OData.Core\Evaluation\KeySerializer.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\LiteralFormatter.cs" target="src\Microsoft.OData.Core\Evaluation\LiteralFormatter.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\ODataResourceMetadataBuilder.cs" target="src\Microsoft.OData.Core\Evaluation\ODataResourceMetadataBuilder.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Evaluation\ODataUriBuilder.cs" target="src\Microsoft.OData.Core\Evaluation\ODataUriBuilder.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Json\JsonSharedUtils.cs" target="src\Microsoft.OData.Core\Json\JsonSharedUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\SimpleLazy.cs" target="src\Microsoft.OData.Core\SimpleLazy.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\Metadata\EdmLibraryExtensions.cs" target="src\Microsoft.OData.Core\Metadata\EdmLibraryExtensions.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\InternalErrorCodesCommon.cs" target="src\Microsoft.OData.Core\InternalErrorCodesCommon.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\TaskUtils.cs" target="src\Microsoft.OData.Core\TaskUtils.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Aggregation\AggregateExpressionToken.cs" target="src\Microsoft.OData.Core\UriParser\Aggregation\AggregateExpressionToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Aggregation\AggregateToken.cs" target="src\Microsoft.OData.Core\UriParser\Aggregation\AggregateToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Aggregation\ApplyTransformationToken.cs" target="src\Microsoft.OData.Core\UriParser\Aggregation\ApplyTransformationToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Aggregation\GroupByToken.cs" target="src\Microsoft.OData.Core\UriParser\Aggregation\GroupByToken.cs" />    
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryTokenKind.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryTokenKind.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\ReadOnlyEnumerableForUriParser.cs" target="src\Microsoft.OData.Core\UriParser\ReadOnlyEnumerableForUriParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\NamedValue.cs" target="src\Microsoft.OData.Core\UriParser\NamedValue.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\AllToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\AllToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\AnyToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\AnyToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\BinaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\BinaryOperatorToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\CustomQueryOptionToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\CustomQueryOptionToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\DottedIdentifierToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\DottedIdentifierToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\EndPathToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\EndPathToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandTermToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandTermToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\ExpandToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionCallToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionCallToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterAliasToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterAliasToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\FunctionParameterToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\InnerPathToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\InnerPathToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Visitors\IPathSegmentTokenVisitor.cs" target="src\Microsoft.OData.Core\UriParser\Visitors\IPathSegmentTokenVisitor.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\Visitors\ISyntacticTreeVisitor.cs" target="src\Microsoft.OData.Core\UriParser\Visitors\ISyntacticTreeVisitor.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\LambdaToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\LambdaToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\LiteralToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\LiteralToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\NonSystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\NonSystemToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\OrderByToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\OrderByToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\PathSegmentToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\PathSegmentToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\PathToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\PathToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\QueryToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\RangeVariableToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\RangeVariableToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectExpandTermToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectExpandTermToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectTermToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectTermToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SelectToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\StarToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\StarToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj b/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
index 57f33b6408..feb0198ac6 100644
--- a/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
+++ b/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
@@ -154,6 +154,7 @@
   
   <ItemGroup>
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Net35.Release.nuspec b/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Net35.Release.nuspec
new file mode 100644
index 0000000000..0c48d7bbd4
--- /dev/null
+++ b/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Net35.Release.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>ODataLib</title>
+    <id>Microsoft.OData.Core.Net35</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Classes to serialize, deserialize and validate OData JSON payloads. Supports OData v4.</summary>
+    <description>Classes to serialize, deserialize and validate OData JSON payloads. Supports OData v4. Enables construction of OData producers and consumers. Targets .NET Portable Lib with support for .NET 3.5.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <dependencies>
+      <dependency id="Microsoft.Spatial.Net35" version="[$VersionNuGetSemantic$]" />
+      <dependency id="Microsoft.OData.Edm.Net35" version="[$VersionNuGetSemantic$]" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\Net35\Microsoft.OData.Core.NetFX35.V7.dll" target="lib\net35" />
+    <file src="$ProductRoot$\Net35\Microsoft.OData.Core.NetFX35.V7.pdb" target="lib\net35" />
+    <file src="$ProductRoot$\Net35\Microsoft.OData.Core.NetFX35.V7.xml" target="lib\net35" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\**\*.cs" target="src\Microsoft.OData.Core" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Nightly.Release.nuspec b/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Nightly.Release.nuspec
new file mode 100644
index 0000000000..0cd18b2862
--- /dev/null
+++ b/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Nightly.Release.nuspec
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>ODataLib</title>
+    <id>Microsoft.OData.Core</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionFullSemantic$-Nightly$NightlyBuildVersion$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Classes to serialize, deserialize and validate OData JSON payloads. Supports OData v4.</summary>
+    <description>Classes to serialize, deserialize and validate OData JSON payloads. Supports OData v4. Enables construction of OData services and clients. Targets .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <dependencies>
+      <dependency id="Microsoft.Spatial" version="[$VersionFullSemantic$-Nightly$NightlyBuildVersion$]" />
+      <dependency id="Microsoft.OData.Edm" version="[$VersionFullSemantic$-Nightly$NightlyBuildVersion$]" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Core.dll" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Core.pdb" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Core.xml" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Core.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Core.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Core.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\**\*.cs" target="src\Microsoft.OData.Core" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Release.nuspec b/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Release.nuspec
new file mode 100644
index 0000000000..b094ae1ed9
--- /dev/null
+++ b/src/Microsoft.OData.Core/Build.NuGet/Microsoft.OData.Core.Release.nuspec
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>ODataLib</title>
+    <id>Microsoft.OData.Core</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Classes to serialize, deserialize and validate OData JSON payloads. Supports OData v4.</summary>
+    <description>Classes to serialize, deserialize and validate OData JSON payloads. Supports OData v4. Enables construction of OData services and clients. Targets .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <releaseNotes>http://odata.github.io/odata.net/v7/#ODL-$VersionFullSemantic$</releaseNotes>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <dependencies>
+      <dependency id="Microsoft.Spatial" version="[$VersionNuGetSemantic$]" />
+      <dependency id="Microsoft.OData.Edm" version="[$VersionNuGetSemantic$]" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Core.dll" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Core.pdb" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Core.xml" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Core.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Core.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Core.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Core\**\*.cs" target="src\Microsoft.OData.Core" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Net35.Release.nuspec b/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Net35.Release.nuspec
new file mode 100644
index 0000000000..ca6b1ef144
--- /dev/null
+++ b/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Net35.Release.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>EdmLib</title>
+    <id>Microsoft.OData.Edm.Net35</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Classes to represent, construct, parse, serialize and validate entity data models. Supports OData v4.</summary>
+    <description>Classes to represent, construct, parse, serialize and validate entity data models. Supports OData v4. Targets .NET Lib with support for .NET 3.5.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\Net35\Microsoft.OData.Edm.NetFX35.V7.dll" target="lib\net35" />
+    <file src="$ProductRoot$\Net35\Microsoft.OData.Edm.NetFX35.V7.pdb" target="lib\net35" />
+    <file src="$ProductRoot$\Net35\Microsoft.OData.Edm.NetFX35.V7.xml" target="lib\net35" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Nightly.Release.nuspec b/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Nightly.Release.nuspec
new file mode 100644
index 0000000000..0d962ecd9f
--- /dev/null
+++ b/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Nightly.Release.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>EdmLib</title>
+    <id>Microsoft.OData.Edm</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionFullSemantic$-Nightly$NightlyBuildVersion$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Classes to represent, construct, parse, serialize and validate entity data models. Supports OData v4.</summary>
+    <description>Classes to represent, construct, parse, serialize and validate entity data models. Supports OData v4. Targets .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Edm.dll" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Edm.pdb" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Edm.xml" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Edm.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Edm.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Edm.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm\" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Release.nuspec b/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Release.nuspec
new file mode 100644
index 0000000000..b3818e6c93
--- /dev/null
+++ b/src/Microsoft.OData.Edm/Build.NuGet/Microsoft.OData.Edm.Release.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>EdmLib</title>
+    <id>Microsoft.OData.Edm</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Classes to represent, construct, parse, serialize and validate entity data models. Supports OData v4.</summary>
+    <description>Classes to represent, construct, parse, serialize and validate entity data models. Supports OData v4. Targets .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <releaseNotes>http://odata.github.io/odata.net/v7/#ODL-$VersionFullSemantic$</releaseNotes>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Edm.dll" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Edm.pdb" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.OData.Edm.xml" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Edm.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Edm.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.OData.Edm.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Nightly.Release.nuspec b/src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Nightly.Release.nuspec
new file mode 100644
index 0000000000..21261d3529
--- /dev/null
+++ b/src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Nightly.Release.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>Microsoft.Spatial</title>
+    <id>Microsoft.Spatial</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionFullSemantic$-Nightly$NightlyBuildVersion$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Contains classes and methods that facilitate geography and geometry spatial operations.</summary>
+    <description>Contains classes and methods that facilitate geography and geometry spatial operations. Targets .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\netstandard2.0\\Microsoft.Spatial.dll" target="lib\netstandard2.0" />
+    <file src="$ProductRoot$\netstandard2.0\Microsoft.Spatial.pdb" target="lib\netstandard2.0" />
+    <file src="$ProductRoot$\netstandard2.0\Microsoft.Spatial.xml" target="lib\netstandard2.0" />    
+    <file src="$SourcesRoot$\src\Microsoft.Spatial\**\*.cs" target="src\Microsoft.Spatial" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Release.nuspec b/src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Release.nuspec
new file mode 100644
index 0000000000..4f5a86c8c9
--- /dev/null
+++ b/src/Microsoft.Spatial/Build.NuGet/Microsoft.Spatial.Release.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <title>Microsoft.Spatial</title>
+    <id>Microsoft.Spatial</id>
+    <tags>wcf data services odata odatalib edmlib spatial ado.net ef entity framework open protocol wcfds wcfdataservices dataservices</tags>
+    <version>$VersionNuGetSemantic$</version>
+    <authors>Microsoft</authors>
+    <licenseUrl>http://go.microsoft.com/fwlink/?linkid=833178</licenseUrl>
+    <projectUrl>http://odata.github.io/</projectUrl>
+    <iconUrl>http://static.tumblr.com/hgchgxz/9ualgdf98/icon.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <summary>Contains classes and methods that facilitate geography and geometry spatial operations.</summary>
+    <description>Contains classes and methods that facilitate geography and geometry spatial operations. Targets .NET Platform Standard 1.1.
+OData .NET library is open source at http://github.com/OData/odata.net. Documentation for the library can be found at https://odata.github.io/odata.net.</description>
+    <releaseNotes>http://odata.github.io/odata.net/v7/#ODL-$VersionFullSemantic$</releaseNotes>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+  </metadata>
+  <files>
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.Spatial.dll" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.Spatial.pdb" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v4.5\Microsoft.Spatial.xml" target="lib\portable-net45+win8+wpa81" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.Spatial.dll" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.Spatial.pdb" target="lib\netstandard1.1" />
+    <file src="$ProductRoot$\.NETPortable\v5.0\Microsoft.Spatial.xml" target="lib\netstandard1.1" />
+    <file src="$SourcesRoot$\src\Microsoft.Spatial\**\*.cs" target="src\Microsoft.Spatial" />
+    <file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
+    <file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
+  </files>
+</package>
\ No newline at end of file