From f764492630b94e343361254ef11550b7af69845a Mon Sep 17 00:00:00 2001
From: Chidozie Ononiwu <31145988+chidozieononiwu@users.noreply.github.com>
Date: Wed, 8 Jul 2020 18:54:05 -0700
Subject: [PATCH 1/2] clean up resources / fix changelog (#12432)

---
 .../templates/steps/daily-dev-build-variable.yml     | 12 ++++++++++++
 eng/pipelines/templates/steps/set-dev-build.yml      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 eng/common/pipelines/templates/steps/daily-dev-build-variable.yml

diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
new file mode 100644
index 000000000000..2e10f695c998
--- /dev/null
+++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
@@ -0,0 +1,12 @@
+# This script fragment is used across our repos to set a variable "SetDevVersion" which
+# is used when this pipeline is going to be generating and publishing daily dev builds.
+
+steps:
+- pwsh: |
+    $setDailyDevBuild = "false"
+    if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) {
+      $setDailyDevBuild = "true"
+    }
+    echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild"
+  displayName: "Setup Versioning Properties"
+  condition: eq(variables['SetDevVersion'], '')
diff --git a/eng/pipelines/templates/steps/set-dev-build.yml b/eng/pipelines/templates/steps/set-dev-build.yml
index eb032e2574dc..adc1092763e9 100644
--- a/eng/pipelines/templates/steps/set-dev-build.yml
+++ b/eng/pipelines/templates/steps/set-dev-build.yml
@@ -3,7 +3,7 @@ parameters:
   ServiceDirectory: ''
 
 steps:
-  - template: tools/daily-dev-build-variable/daily-dev-build-variable.yml@azure-sdk-tools
+  - template: /eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
 
   - task: PythonScript@0
     condition: eq(variables['SetDevVersion'],'true')

From 48b781287c701f3d58503a8f5457fe6b1a9d1440 Mon Sep 17 00:00:00 2001
From: Xiang Yan <xiangsjtu@gmail.com>
Date: Thu, 11 Jun 2020 10:07:10 -0700
Subject: [PATCH 2/2] typing fix (#11985)

* typing fix
---
 sdk/core/azure-core/azure/core/polling/_poller.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sdk/core/azure-core/azure/core/polling/_poller.py b/sdk/core/azure-core/azure/core/polling/_poller.py
index 4dff2ab220f6..47ef004d4d0f 100644
--- a/sdk/core/azure-core/azure/core/polling/_poller.py
+++ b/sdk/core/azure-core/azure/core/polling/_poller.py
@@ -31,11 +31,15 @@
 except ImportError:
     from urllib.parse import urlparse
 
-from typing import Any, Callable, Union, List, Optional, Tuple, TypeVar, Generic
+from typing import TYPE_CHECKING, TypeVar, Generic
 from azure.core.pipeline.transport._base import HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.common import with_current_context
 
+if TYPE_CHECKING:
+    from typing import Any, Callable, Union, List, Optional, Tuple
+
+
 PollingReturnType = TypeVar("PollingReturnType")