diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 285e3ace7074..a07f78593af6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,7 +28,7 @@ jobs:
       GOPATH: '$(system.defaultWorkingDirectory)/work'
       sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)'
       IGNORE_BREAKING_CHANGES: true
-      go.list.filter: 'grep -v vendor | grep -v azure-sdk-for-go/sdk'
+      go.list.filter: '| grep -v vendor'
 
     steps:
     - script: |
@@ -48,7 +48,7 @@ jobs:
         go get -u golang.org/x/lint/golint
       workingDirectory: '$(sdkPath)'
       displayName: 'Install Dependencies'
-    - script: go vet $(go list ./... $(go.list.filter))
+    - script: go vet -v $(go list ./... $(go.list.filter))
       workingDirectory: '$(sdkPath)'
       displayName: 'Vet'
     - script: go build -v $(go list ./... $(go.list.filter))
diff --git a/sdk/azcore/core.go b/sdk/azcore/core.go
index 8d4296bebe78..de01623ffe3b 100644
--- a/sdk/azcore/core.go
+++ b/sdk/azcore/core.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/credential.go b/sdk/azcore/credential.go
index 7a37d48e5f74..997872203925 100644
--- a/sdk/azcore/credential.go
+++ b/sdk/azcore/credential.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/doc.go b/sdk/azcore/doc.go
index ced9b8091c3d..6546445bc796 100644
--- a/sdk/azcore/doc.go
+++ b/sdk/azcore/doc.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
 // license that can be found in the LICENSE file.
diff --git a/sdk/azcore/error.go b/sdk/azcore/error.go
index 22a6f5fd54ff..93d6957e206f 100644
--- a/sdk/azcore/error.go
+++ b/sdk/azcore/error.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/headers.go b/sdk/azcore/headers.go
index 523d01f1ea07..0daa2908ee04 100644
--- a/sdk/azcore/headers.go
+++ b/sdk/azcore/headers.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/log.go b/sdk/azcore/log.go
index be33ac73dce8..211cdd99d622 100644
--- a/sdk/azcore/log.go
+++ b/sdk/azcore/log.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/log_test.go b/sdk/azcore/log_test.go
index e5fd547121c9..f9eadbe2c5f8 100644
--- a/sdk/azcore/log_test.go
+++ b/sdk/azcore/log_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_anonymous_credential.go b/sdk/azcore/policy_anonymous_credential.go
index 73b56be1b7b0..6d5977ccd9f6 100644
--- a/sdk/azcore/policy_anonymous_credential.go
+++ b/sdk/azcore/policy_anonymous_credential.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_anonymous_credential_test.go b/sdk/azcore/policy_anonymous_credential_test.go
index cce19e79e6ff..d860a843f704 100644
--- a/sdk/azcore/policy_anonymous_credential_test.go
+++ b/sdk/azcore/policy_anonymous_credential_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_body_download.go b/sdk/azcore/policy_body_download.go
index 5a9ce9b30316..8a8f46c06dcb 100644
--- a/sdk/azcore/policy_body_download.go
+++ b/sdk/azcore/policy_body_download.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_body_download_test.go b/sdk/azcore/policy_body_download_test.go
index b512c178be16..3b8b1e14643e 100644
--- a/sdk/azcore/policy_body_download_test.go
+++ b/sdk/azcore/policy_body_download_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_logging.go b/sdk/azcore/policy_logging.go
index cdd500c84499..5900e64f9c04 100644
--- a/sdk/azcore/policy_logging.go
+++ b/sdk/azcore/policy_logging.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_logging_test.go b/sdk/azcore/policy_logging_test.go
index 21ee1a492e09..046a6a448262 100644
--- a/sdk/azcore/policy_logging_test.go
+++ b/sdk/azcore/policy_logging_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_retry.go b/sdk/azcore/policy_retry.go
index 566e33677281..2a9531aef5ba 100644
--- a/sdk/azcore/policy_retry.go
+++ b/sdk/azcore/policy_retry.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_retry_test.go b/sdk/azcore/policy_retry_test.go
index 409e1df5a770..d096b12bd31b 100644
--- a/sdk/azcore/policy_retry_test.go
+++ b/sdk/azcore/policy_retry_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_telemetry.go b/sdk/azcore/policy_telemetry.go
index 934dd3a2ce64..10c83fb82f2f 100644
--- a/sdk/azcore/policy_telemetry.go
+++ b/sdk/azcore/policy_telemetry.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_telemetry_test.go b/sdk/azcore/policy_telemetry_test.go
index 48ce76d2e93c..2c5dfe3a7f71 100644
--- a/sdk/azcore/policy_telemetry_test.go
+++ b/sdk/azcore/policy_telemetry_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_unique_request_id.go b/sdk/azcore/policy_unique_request_id.go
index 0a14a28a3b47..c5f9a84f2867 100644
--- a/sdk/azcore/policy_unique_request_id.go
+++ b/sdk/azcore/policy_unique_request_id.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/policy_unique_request_id_test.go b/sdk/azcore/policy_unique_request_id_test.go
index 05293a4a7469..66c2141063c1 100644
--- a/sdk/azcore/policy_unique_request_id_test.go
+++ b/sdk/azcore/policy_unique_request_id_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/progress.go b/sdk/azcore/progress.go
index 119d2c593bbc..8364581b657e 100644
--- a/sdk/azcore/progress.go
+++ b/sdk/azcore/progress.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/progress_test.go b/sdk/azcore/progress_test.go
index 83985b5262c9..61c3830175f0 100644
--- a/sdk/azcore/progress_test.go
+++ b/sdk/azcore/progress_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/request.go b/sdk/azcore/request.go
index fc1c0c2f9201..509640c34636 100644
--- a/sdk/azcore/request.go
+++ b/sdk/azcore/request.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/request_test.go b/sdk/azcore/request_test.go
index 80e58928b4f8..a887ee5b633e 100644
--- a/sdk/azcore/request_test.go
+++ b/sdk/azcore/request_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/response.go b/sdk/azcore/response.go
index b58bc14e0f1c..5dfd184b8a86 100644
--- a/sdk/azcore/response.go
+++ b/sdk/azcore/response.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/response_test.go b/sdk/azcore/response_test.go
index 6317f50f0fc0..b44c05f678a1 100644
--- a/sdk/azcore/response_test.go
+++ b/sdk/azcore/response_test.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/transport_default_http_client.go b/sdk/azcore/transport_default_http_client.go
index ffe451359ee3..487ed9566d26 100644
--- a/sdk/azcore/transport_default_http_client.go
+++ b/sdk/azcore/transport_default_http_client.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/azcore/version.go b/sdk/azcore/version.go
index b3e9559a43e6..8d4493c648c8 100644
--- a/sdk/azcore/version.go
+++ b/sdk/azcore/version.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/internal/atomic/atomic.go b/sdk/internal/atomic/atomic.go
index ad57c0702103..781dbeca94af 100644
--- a/sdk/internal/atomic/atomic.go
+++ b/sdk/internal/atomic/atomic.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/internal/mock/mock.go b/sdk/internal/mock/mock.go
index c270ccf592f1..d409860389ca 100644
--- a/sdk/internal/mock/mock.go
+++ b/sdk/internal/mock/mock.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
diff --git a/sdk/internal/uuid/uuid.go b/sdk/internal/uuid/uuid.go
index 6fa7a62cd61d..4b288d81fecd 100644
--- a/sdk/internal/uuid/uuid.go
+++ b/sdk/internal/uuid/uuid.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.