diff --git a/sdk/azcore/arm/client_options.go b/sdk/azcore/arm/client_options.go
index 41b283e0563f..deca402c54e8 100644
--- a/sdk/azcore/arm/client_options.go
+++ b/sdk/azcore/arm/client_options.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/doc.go b/sdk/azcore/arm/doc.go
index 657e2c84aef1..1bdd16a3d034 100644
--- a/sdk/azcore/arm/doc.go
+++ b/sdk/azcore/arm/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/arm/example_resource_identifier_test.go b/sdk/azcore/arm/example_resource_identifier_test.go
index 7e629a2fff47..5b2158484bde 100644
--- a/sdk/azcore/arm/example_resource_identifier_test.go
+++ b/sdk/azcore/arm/example_resource_identifier_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/async/async.go b/sdk/azcore/arm/internal/pollers/async/async.go
index 8dd0e57ea760..b76ef60240df 100644
--- a/sdk/azcore/arm/internal/pollers/async/async.go
+++ b/sdk/azcore/arm/internal/pollers/async/async.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/async/async_test.go b/sdk/azcore/arm/internal/pollers/async/async_test.go
index a87f503a6a77..7b3550a43cf1 100644
--- a/sdk/azcore/arm/internal/pollers/async/async_test.go
+++ b/sdk/azcore/arm/internal/pollers/async/async_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/body/body.go b/sdk/azcore/arm/internal/pollers/body/body.go
index 427e0910639f..0abe8969b4d1 100644
--- a/sdk/azcore/arm/internal/pollers/body/body.go
+++ b/sdk/azcore/arm/internal/pollers/body/body.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/body/body_test.go b/sdk/azcore/arm/internal/pollers/body/body_test.go
index aa19670dbd4e..76bf8dd63947 100644
--- a/sdk/azcore/arm/internal/pollers/body/body_test.go
+++ b/sdk/azcore/arm/internal/pollers/body/body_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/loc/loc.go b/sdk/azcore/arm/internal/pollers/loc/loc.go
index bbd19603a754..548250ff3adb 100644
--- a/sdk/azcore/arm/internal/pollers/loc/loc.go
+++ b/sdk/azcore/arm/internal/pollers/loc/loc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/loc/loc_test.go b/sdk/azcore/arm/internal/pollers/loc/loc_test.go
index 06365a1d6ec6..260140aef656 100644
--- a/sdk/azcore/arm/internal/pollers/loc/loc_test.go
+++ b/sdk/azcore/arm/internal/pollers/loc/loc_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/pollers.go b/sdk/azcore/arm/internal/pollers/pollers.go
index 3b9f5581c017..f23159fd10b9 100644
--- a/sdk/azcore/arm/internal/pollers/pollers.go
+++ b/sdk/azcore/arm/internal/pollers/pollers.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/internal/pollers/pollers_test.go b/sdk/azcore/arm/internal/pollers/pollers_test.go
index 10808c908256..f9af2d899608 100644
--- a/sdk/azcore/arm/internal/pollers/pollers_test.go
+++ b/sdk/azcore/arm/internal/pollers/pollers_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/policy/policy.go b/sdk/azcore/arm/policy/policy.go
index f49dbc313282..637cbc18ff6e 100644
--- a/sdk/azcore/arm/policy/policy.go
+++ b/sdk/azcore/arm/policy/policy.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/resource_identifier.go b/sdk/azcore/arm/resource_identifier.go
index d49b98fb2005..6e2efed8b8db 100644
--- a/sdk/azcore/arm/resource_identifier.go
+++ b/sdk/azcore/arm/resource_identifier.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/resource_identifier_test.go b/sdk/azcore/arm/resource_identifier_test.go
index bb5ba1414ad1..0cca039b1501 100644
--- a/sdk/azcore/arm/resource_identifier_test.go
+++ b/sdk/azcore/arm/resource_identifier_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/resource_type.go b/sdk/azcore/arm/resource_type.go
index 92920ed33716..6e9dbec8db54 100644
--- a/sdk/azcore/arm/resource_type.go
+++ b/sdk/azcore/arm/resource_type.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/resource_type_test.go b/sdk/azcore/arm/resource_type_test.go
index cde444f846d6..a941a22c42a0 100644
--- a/sdk/azcore/arm/resource_type_test.go
+++ b/sdk/azcore/arm/resource_type_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/runtime/pipeline.go b/sdk/azcore/arm/runtime/pipeline.go
index c15d9af46722..48775a7f514d 100644
--- a/sdk/azcore/arm/runtime/pipeline.go
+++ b/sdk/azcore/arm/runtime/pipeline.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/runtime/pipeline_test.go b/sdk/azcore/arm/runtime/pipeline_test.go
index 878b4bab51b9..384adf3869d8 100644
--- a/sdk/azcore/arm/runtime/pipeline_test.go
+++ b/sdk/azcore/arm/runtime/pipeline_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/runtime/policy_register_rp.go b/sdk/azcore/arm/runtime/policy_register_rp.go
index d2002794de65..67a104b13385 100644
--- a/sdk/azcore/arm/runtime/policy_register_rp.go
+++ b/sdk/azcore/arm/runtime/policy_register_rp.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/runtime/policy_register_rp_test.go b/sdk/azcore/arm/runtime/policy_register_rp_test.go
index a9da9d26a4b7..63d63c1c414d 100644
--- a/sdk/azcore/arm/runtime/policy_register_rp_test.go
+++ b/sdk/azcore/arm/runtime/policy_register_rp_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/runtime/poller.go b/sdk/azcore/arm/runtime/poller.go
index f1afe3473f57..dc775fcd3c04 100644
--- a/sdk/azcore/arm/runtime/poller.go
+++ b/sdk/azcore/arm/runtime/poller.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/arm/runtime/poller_test.go b/sdk/azcore/arm/runtime/poller_test.go
index 3edff1c30a47..0c3f35d608fc 100644
--- a/sdk/azcore/arm/runtime/poller_test.go
+++ b/sdk/azcore/arm/runtime/poller_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/core.go b/sdk/azcore/core.go
index 68253efccc59..b8bf33df5b33 100644
--- a/sdk/azcore/core.go
+++ b/sdk/azcore/core.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/core_test.go b/sdk/azcore/core_test.go
index e70a72b077e3..2cbd1d893de2 100644
--- a/sdk/azcore/core_test.go
+++ b/sdk/azcore/core_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // 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 69211850e428..0b64905a7e82 100644
--- a/sdk/azcore/doc.go
+++ b/sdk/azcore/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/errors.go b/sdk/azcore/errors.go
index daf415f1bf03..dda41c3331c4 100644
--- a/sdk/azcore/errors.go
+++ b/sdk/azcore/errors.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/etag.go b/sdk/azcore/etag.go
index d862501cea9c..23ea7e7c8eac 100644
--- a/sdk/azcore/etag.go
+++ b/sdk/azcore/etag.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/etag_test.go b/sdk/azcore/etag_test.go
index b291536a17b0..1edff01d0a8b 100644
--- a/sdk/azcore/etag_test.go
+++ b/sdk/azcore/etag_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/example_test.go b/sdk/azcore/example_test.go
index 689468cbcf7c..434051bcefe9 100644
--- a/sdk/azcore/example_test.go
+++ b/sdk/azcore/example_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/go.mod b/sdk/azcore/go.mod
index 63bb381ef057..580b787b9412 100644
--- a/sdk/azcore/go.mod
+++ b/sdk/azcore/go.mod
@@ -6,4 +6,11 @@ require (
 	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
 )
 
-go 1.16
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+)
+
+go 1.18
diff --git a/sdk/azcore/go.sum b/sdk/azcore/go.sum
index f2d37fc64a4e..e2a63a7c8f85 100644
--- a/sdk/azcore/go.sum
+++ b/sdk/azcore/go.sum
@@ -18,9 +18,6 @@ golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
diff --git a/sdk/azcore/internal/pipeline/pipeline.go b/sdk/azcore/internal/pipeline/pipeline.go
index e2c9f115a1d7..f44b53db5e42 100644
--- a/sdk/azcore/internal/pipeline/pipeline.go
+++ b/sdk/azcore/internal/pipeline/pipeline.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pipeline/pipeline_test.go b/sdk/azcore/internal/pipeline/pipeline_test.go
index 81bc22e698af..ad836d3160f4 100644
--- a/sdk/azcore/internal/pipeline/pipeline_test.go
+++ b/sdk/azcore/internal/pipeline/pipeline_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pipeline/request.go b/sdk/azcore/internal/pipeline/request.go
index 17c97592e526..3c00320d6687 100644
--- a/sdk/azcore/internal/pipeline/request.go
+++ b/sdk/azcore/internal/pipeline/request.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pipeline/request_test.go b/sdk/azcore/internal/pipeline/request_test.go
index 7d6ff8d6730e..a72c445e629d 100644
--- a/sdk/azcore/internal/pipeline/request_test.go
+++ b/sdk/azcore/internal/pipeline/request_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/loc/loc.go b/sdk/azcore/internal/pollers/loc/loc.go
index 35f318a1c712..a7efa52f5d2a 100644
--- a/sdk/azcore/internal/pollers/loc/loc.go
+++ b/sdk/azcore/internal/pollers/loc/loc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/loc/loc_test.go b/sdk/azcore/internal/pollers/loc/loc_test.go
index 6fa70aef14d2..50a324a4b5a5 100644
--- a/sdk/azcore/internal/pollers/loc/loc_test.go
+++ b/sdk/azcore/internal/pollers/loc/loc_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/op/op.go b/sdk/azcore/internal/pollers/op/op.go
index 9795e2946567..f32dd45add43 100644
--- a/sdk/azcore/internal/pollers/op/op.go
+++ b/sdk/azcore/internal/pollers/op/op.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/op/op_test.go b/sdk/azcore/internal/pollers/op/op_test.go
index 55c3f2253ea4..198441cf19f2 100644
--- a/sdk/azcore/internal/pollers/op/op_test.go
+++ b/sdk/azcore/internal/pollers/op/op_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/poller.go b/sdk/azcore/internal/pollers/poller.go
index a6bccbfb5e0b..18b8467b4cb4 100644
--- a/sdk/azcore/internal/pollers/poller.go
+++ b/sdk/azcore/internal/pollers/poller.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/poller_test.go b/sdk/azcore/internal/pollers/poller_test.go
index c7d260e49af0..8e2ea6da9098 100644
--- a/sdk/azcore/internal/pollers/poller_test.go
+++ b/sdk/azcore/internal/pollers/poller_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/util.go b/sdk/azcore/internal/pollers/util.go
index dca70b5a596b..81b7d95603ad 100644
--- a/sdk/azcore/internal/pollers/util.go
+++ b/sdk/azcore/internal/pollers/util.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/pollers/util_test.go b/sdk/azcore/internal/pollers/util_test.go
index 04932bfcdf73..11bad46862b6 100644
--- a/sdk/azcore/internal/pollers/util_test.go
+++ b/sdk/azcore/internal/pollers/util_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/constants.go b/sdk/azcore/internal/shared/constants.go
index 99fb05c5563e..5aba64f5f197 100644
--- a/sdk/azcore/internal/shared/constants.go
+++ b/sdk/azcore/internal/shared/constants.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/expiring_resource.go b/sdk/azcore/internal/shared/expiring_resource.go
index 1c285e97df08..5ff6b3d1d676 100644
--- a/sdk/azcore/internal/shared/expiring_resource.go
+++ b/sdk/azcore/internal/shared/expiring_resource.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/expiring_resource_test.go b/sdk/azcore/internal/shared/expiring_resource_test.go
index d4762bdd5d49..02e0783c7281 100644
--- a/sdk/azcore/internal/shared/expiring_resource_test.go
+++ b/sdk/azcore/internal/shared/expiring_resource_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/response_error.go b/sdk/azcore/internal/shared/response_error.go
index e2297706d714..ca33b7993566 100644
--- a/sdk/azcore/internal/shared/response_error.go
+++ b/sdk/azcore/internal/shared/response_error.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/response_error_test.go b/sdk/azcore/internal/shared/response_error_test.go
index 8c4ea41d0dcb..15de60d88ebb 100644
--- a/sdk/azcore/internal/shared/response_error_test.go
+++ b/sdk/azcore/internal/shared/response_error_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/shared.go b/sdk/azcore/internal/shared/shared.go
index 60bc985be4ef..6615ed5629ef 100644
--- a/sdk/azcore/internal/shared/shared.go
+++ b/sdk/azcore/internal/shared/shared.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/internal/shared/shared_test.go b/sdk/azcore/internal/shared/shared_test.go
index e8422eac29c2..8b1ebebaf7c7 100644
--- a/sdk/azcore/internal/shared/shared_test.go
+++ b/sdk/azcore/internal/shared/shared_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/log/doc.go b/sdk/azcore/log/doc.go
index 9fc18afee8a3..2f3901bff3c4 100644
--- a/sdk/azcore/log/doc.go
+++ b/sdk/azcore/log/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/log/log.go b/sdk/azcore/log/log.go
index 56e71fb1ef2d..47979b39a977 100644
--- a/sdk/azcore/log/log.go
+++ b/sdk/azcore/log/log.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/log/log_test.go b/sdk/azcore/log/log_test.go
index 2f070590497e..0e281cd76045 100644
--- a/sdk/azcore/log/log_test.go
+++ b/sdk/azcore/log/log_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy/doc.go b/sdk/azcore/policy/doc.go
index 572c7f119b86..fad2579ed6c5 100644
--- a/sdk/azcore/policy/doc.go
+++ b/sdk/azcore/policy/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/policy/policy.go b/sdk/azcore/policy/policy.go
index b5a3c60d1c20..c855647f6b69 100644
--- a/sdk/azcore/policy/policy.go
+++ b/sdk/azcore/policy/policy.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/doc.go b/sdk/azcore/runtime/doc.go
index d3f5408def39..c9cfa438cb34 100644
--- a/sdk/azcore/runtime/doc.go
+++ b/sdk/azcore/runtime/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/runtime/errors.go b/sdk/azcore/runtime/errors.go
index 0b19b5c74dcf..02d1b8d7373d 100644
--- a/sdk/azcore/runtime/errors.go
+++ b/sdk/azcore/runtime/errors.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/pipeline.go b/sdk/azcore/runtime/pipeline.go
index 0da992c276e0..a69da8c85eac 100644
--- a/sdk/azcore/runtime/pipeline.go
+++ b/sdk/azcore/runtime/pipeline.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/pipeline_test.go b/sdk/azcore/runtime/pipeline_test.go
index 5027a0d57ed5..f118a9ef0b22 100644
--- a/sdk/azcore/runtime/pipeline_test.go
+++ b/sdk/azcore/runtime/pipeline_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_body_download.go b/sdk/azcore/runtime/policy_body_download.go
index aa974e5f9d8f..e83f9562b425 100644
--- a/sdk/azcore/runtime/policy_body_download.go
+++ b/sdk/azcore/runtime/policy_body_download.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_body_download_test.go b/sdk/azcore/runtime/policy_body_download_test.go
index f72fd08e0e8c..92deff3fe3e7 100644
--- a/sdk/azcore/runtime/policy_body_download_test.go
+++ b/sdk/azcore/runtime/policy_body_download_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_http_header.go b/sdk/azcore/runtime/policy_http_header.go
index 69d42fbf9d6b..770e0a2b6a64 100644
--- a/sdk/azcore/runtime/policy_http_header.go
+++ b/sdk/azcore/runtime/policy_http_header.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_http_header_test.go b/sdk/azcore/runtime/policy_http_header_test.go
index a1b69b578cd1..6787e9389e16 100644
--- a/sdk/azcore/runtime/policy_http_header_test.go
+++ b/sdk/azcore/runtime/policy_http_header_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_logging.go b/sdk/azcore/runtime/policy_logging.go
index ce2f993dd505..2faad35bb5bf 100644
--- a/sdk/azcore/runtime/policy_logging.go
+++ b/sdk/azcore/runtime/policy_logging.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_logging_test.go b/sdk/azcore/runtime/policy_logging_test.go
index 357defeb33f0..63b7230b6758 100644
--- a/sdk/azcore/runtime/policy_logging_test.go
+++ b/sdk/azcore/runtime/policy_logging_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_request_id.go b/sdk/azcore/runtime/policy_request_id.go
index b30170b2bace..6b6f12463515 100644
--- a/sdk/azcore/runtime/policy_request_id.go
+++ b/sdk/azcore/runtime/policy_request_id.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_request_id_test.go b/sdk/azcore/runtime/policy_request_id_test.go
index c027c5a43093..cd0772287f94 100644
--- a/sdk/azcore/runtime/policy_request_id_test.go
+++ b/sdk/azcore/runtime/policy_request_id_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_retry.go b/sdk/azcore/runtime/policy_retry.go
index a35e18d52e95..5f525eaaa976 100644
--- a/sdk/azcore/runtime/policy_retry.go
+++ b/sdk/azcore/runtime/policy_retry.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_retry_test.go b/sdk/azcore/runtime/policy_retry_test.go
index 08b19c5c3050..7bd7e87ae625 100644
--- a/sdk/azcore/runtime/policy_retry_test.go
+++ b/sdk/azcore/runtime/policy_retry_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_telemetry.go b/sdk/azcore/runtime/policy_telemetry.go
index 5e628e7a3257..48634170e570 100644
--- a/sdk/azcore/runtime/policy_telemetry.go
+++ b/sdk/azcore/runtime/policy_telemetry.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/policy_telemetry_test.go b/sdk/azcore/runtime/policy_telemetry_test.go
index 4777848a1772..bdb56765786d 100644
--- a/sdk/azcore/runtime/policy_telemetry_test.go
+++ b/sdk/azcore/runtime/policy_telemetry_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/poller.go b/sdk/azcore/runtime/poller.go
index fbb364cdf9e8..b1f50e41ab9f 100644
--- a/sdk/azcore/runtime/poller.go
+++ b/sdk/azcore/runtime/poller.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/poller_test.go b/sdk/azcore/runtime/poller_test.go
index 3e5c9f8b9ab9..a6b5127ac153 100644
--- a/sdk/azcore/runtime/poller_test.go
+++ b/sdk/azcore/runtime/poller_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/request.go b/sdk/azcore/runtime/request.go
index 785b08a24a46..78d06ce0d3d9 100644
--- a/sdk/azcore/runtime/request.go
+++ b/sdk/azcore/runtime/request.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/request_test.go b/sdk/azcore/runtime/request_test.go
index 42a1e7ea7e0b..5ee2e451d3f4 100644
--- a/sdk/azcore/runtime/request_test.go
+++ b/sdk/azcore/runtime/request_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/response.go b/sdk/azcore/runtime/response.go
index 8df3ca8131f2..086f7af57105 100644
--- a/sdk/azcore/runtime/response.go
+++ b/sdk/azcore/runtime/response.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/response_test.go b/sdk/azcore/runtime/response_test.go
index 0697aed14111..433cf724fcbf 100644
--- a/sdk/azcore/runtime/response_test.go
+++ b/sdk/azcore/runtime/response_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/runtime/transport_default_http_client.go b/sdk/azcore/runtime/transport_default_http_client.go
index f7f3ca9c14ed..869bed511842 100644
--- a/sdk/azcore/runtime/transport_default_http_client.go
+++ b/sdk/azcore/runtime/transport_default_http_client.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/streaming/doc.go b/sdk/azcore/streaming/doc.go
index b613f085bb62..cadaef3d5842 100644
--- a/sdk/azcore/streaming/doc.go
+++ b/sdk/azcore/streaming/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/streaming/progress.go b/sdk/azcore/streaming/progress.go
index ca0b05c80812..50f9a0a8d877 100644
--- a/sdk/azcore/streaming/progress.go
+++ b/sdk/azcore/streaming/progress.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/streaming/progress_test.go b/sdk/azcore/streaming/progress_test.go
index 63d0d4cd9564..9e6ffd7a6c94 100644
--- a/sdk/azcore/streaming/progress_test.go
+++ b/sdk/azcore/streaming/progress_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/to/doc.go b/sdk/azcore/to/doc.go
index 64733444fb5a..faa98c9dc514 100644
--- a/sdk/azcore/to/doc.go
+++ b/sdk/azcore/to/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/to/to.go b/sdk/azcore/to/to.go
index 01bb033ef03c..57a8d10ecc3f 100644
--- a/sdk/azcore/to/to.go
+++ b/sdk/azcore/to/to.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/to/to_test.go b/sdk/azcore/to/to_test.go
index ef9374b0ceda..177e9a48a3e4 100644
--- a/sdk/azcore/to/to_test.go
+++ b/sdk/azcore/to/to_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.