From 115398ea8bff0a9718e3ee05f76f8fc7dedafb7f Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 30 Aug 2018 13:36:01 -0700
Subject: [PATCH 1/2] Tag builds in release/2.2 (#1361)

* Add a script for tagging TeamCity builds

* chmod +x
---
 scripts/Tag-TeamCityBuild.ps1 | 37 +++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100755 scripts/Tag-TeamCityBuild.ps1

diff --git a/scripts/Tag-TeamCityBuild.ps1 b/scripts/Tag-TeamCityBuild.ps1
new file mode 100755
index 0000000000..d624d4f50c
--- /dev/null
+++ b/scripts/Tag-TeamCityBuild.ps1
@@ -0,0 +1,37 @@
+#!/usr/bin/env pwsh
+
+<#
+.SYNOPSIS
+    Tags the given TeamCity build with the given tag.
+.PARAMETER BuildId
+    The BuildId of the build to be tagged.
+.PARAMETER Tag
+    The tag to put on this build.
+#>
+
+[cmdletbinding(SupportsShouldProcess = $true)]
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$BuildId,
+    [Parameter(Mandatory = $true)]
+    [string]$Tag,
+    [Parameter(Mandatory = $true)]
+    [string]$UserName,
+    [Parameter(Mandatory = $true)]
+    [string]$Password
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2
+
+$authInfo = "${UserName}:$Password"
+$authEncoded = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($authInfo))
+$basicAuthValue = "Basic $authEncoded"
+
+$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$headers.Add("Authorization", $basicAuthValue)
+$headers.Add("Content-Type", "text/plain")
+
+$uri = "http://aspnetci/app/rest/builds/$BuildId/tags/"
+
+Invoke-WebRequest -Uri $uri -Method 'POST' -Headers $headers -Body $Tag -ErrorAction SilentlyContinue

From 11f28139d437bb6d243714e6ef39bf2d1e9f642e Mon Sep 17 00:00:00 2001
From: Brice Lambson <bricelam@users.noreply.github.com>
Date: Thu, 30 Aug 2018 13:54:10 -0700
Subject: [PATCH 2/2] Add
 Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite

---
 build/artifacts.props       | 1 +
 modules/EntityFrameworkCore | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index 07999086f7..b5a2f5a585 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -198,6 +198,7 @@
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Category="ship" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite" Category="ship" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Category="ship"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.Extensions.ActivatorUtilities.Sources" Category="noship" />
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index 0ffef54f5b..da777ce517 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit 0ffef54f5b545e415a5ea921e127e29973994abc
+Subproject commit da777ce51757b695443ac2fb8135bae2aab8a43b