diff --git a/sdk/armcore/connection.go b/sdk/armcore/connection.go
index b673d1fc1761..67f8d44fc6b5 100644
--- a/sdk/armcore/connection.go
+++ b/sdk/armcore/connection.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/connection_test.go b/sdk/armcore/connection_test.go
index 67c6db25b758..f2127763e5fd 100644
--- a/sdk/armcore/connection_test.go
+++ b/sdk/armcore/connection_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/doc.go b/sdk/armcore/doc.go
index 5c2601d6455c..89b4fedca545 100644
--- a/sdk/armcore/doc.go
+++ b/sdk/armcore/doc.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/go.mod b/sdk/armcore/go.mod
index 2bd49163fd56..fbf6f63b63a2 100644
--- a/sdk/armcore/go.mod
+++ b/sdk/armcore/go.mod
@@ -1,3 +1,4 @@
+// Deprecated: The contents of this module have moved to github.com/Azure/azure-sdk-for-go/sdk/azcore/arm
 module github.com/Azure/azure-sdk-for-go/sdk/armcore
 
 go 1.14
diff --git a/sdk/armcore/internal/pollers/async/async.go b/sdk/armcore/internal/pollers/async/async.go
index 6080e7fc4f94..4736c648673b 100644
--- a/sdk/armcore/internal/pollers/async/async.go
+++ b/sdk/armcore/internal/pollers/async/async.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/async/async_test.go b/sdk/armcore/internal/pollers/async/async_test.go
index b798ea16d6b5..0f861927a425 100644
--- a/sdk/armcore/internal/pollers/async/async_test.go
+++ b/sdk/armcore/internal/pollers/async/async_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/body/body.go b/sdk/armcore/internal/pollers/body/body.go
index 55f83739e8b9..6402c07ba149 100644
--- a/sdk/armcore/internal/pollers/body/body.go
+++ b/sdk/armcore/internal/pollers/body/body.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/body/body_test.go b/sdk/armcore/internal/pollers/body/body_test.go
index 9cbd5821b028..50f4211a80dd 100644
--- a/sdk/armcore/internal/pollers/body/body_test.go
+++ b/sdk/armcore/internal/pollers/body/body_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/loc/loc.go b/sdk/armcore/internal/pollers/loc/loc.go
index 567dd0ad0c8e..3946322cbd38 100644
--- a/sdk/armcore/internal/pollers/loc/loc.go
+++ b/sdk/armcore/internal/pollers/loc/loc.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/loc/loc_test.go b/sdk/armcore/internal/pollers/loc/loc_test.go
index c9969b8a43e4..1cacefded4d4 100644
--- a/sdk/armcore/internal/pollers/loc/loc_test.go
+++ b/sdk/armcore/internal/pollers/loc/loc_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/pollers.go b/sdk/armcore/internal/pollers/pollers.go
index a030e081ae1f..955d7fc32251 100644
--- a/sdk/armcore/internal/pollers/pollers.go
+++ b/sdk/armcore/internal/pollers/pollers.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/internal/pollers/pollers_test.go b/sdk/armcore/internal/pollers/pollers_test.go
index 123a252f1f78..34644f3d5df9 100644
--- a/sdk/armcore/internal/pollers/pollers_test.go
+++ b/sdk/armcore/internal/pollers/pollers_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/policy_register_rp.go b/sdk/armcore/policy_register_rp.go
index d5aacca1420f..f7fdaa2c32a4 100644
--- a/sdk/armcore/policy_register_rp.go
+++ b/sdk/armcore/policy_register_rp.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/policy_register_rp_test.go b/sdk/armcore/policy_register_rp_test.go
index 7ab4646a3812..15650747c22e 100644
--- a/sdk/armcore/policy_register_rp_test.go
+++ b/sdk/armcore/policy_register_rp_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/poller.go b/sdk/armcore/poller.go
index 75e00060cc9d..7f0bf643656b 100644
--- a/sdk/armcore/poller.go
+++ b/sdk/armcore/poller.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/poller_test.go b/sdk/armcore/poller_test.go
index b4f8fe8a62d0..46e0bb0cbb8a 100644
--- a/sdk/armcore/poller_test.go
+++ b/sdk/armcore/poller_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/armcore/version.go b/sdk/armcore/version.go
index acdd3fcf5579..2a7c6793775d 100644
--- a/sdk/armcore/version.go
+++ b/sdk/armcore/version.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10,5 +11,5 @@ const (
 	UserAgent = "armcore/" + Version
 
 	// Version is the semantic version (see http://semver.org) of this module.
-	Version = "v0.8.0"
+	Version = "v0.8.1"
 )