diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 62253ff9842a02..a123b9e2f7694c 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -8,75 +8,75 @@ This file should be imported by eng/Versions.props
11.0.0-alpha.1.26063.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
- 19.1.0-alpha.1.26104.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
+ 19.1.0-alpha.1.26109.1
- 5.5.0-2.26110.116
- 5.5.0-2.26110.116
- 5.5.0-2.26110.116
- 11.0.100-preview.2.26110.116
- 11.0.100-preview.2.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 0.11.5-preview.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 11.0.0-beta.26110.116
- 2.9.3-beta.26110.116
- 2.9.3-beta.26110.116
- 11.0.0-beta.26110.116
- 5.5.0-2.26110.116
- 11.0.0-preview.2.26110.116
- 11.0.100-preview.2.26110.116
- 11.0.0-preview.2.26110.116
- 11.0.0-preview.2.26110.116
- 7.5.0-rc.11116
- 7.5.0-rc.11116
- 7.5.0-rc.11116
- 7.5.0-rc.11116
- 11.0.0-preview.2.26110.116
- 3.0.0-preview.2.26110.116
- 11.0.0-preview.2.26110.116
- 11.0.0-preview.2.26110.116
- 11.0.0-preview.2.26110.116
+ 5.5.0-2.26122.107
+ 5.5.0-2.26122.107
+ 5.5.0-2.26122.107
+ 11.0.100-preview.2.26122.107
+ 11.0.100-preview.2.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 0.11.5-preview.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 11.0.0-beta.26122.107
+ 2.9.3-beta.26122.107
+ 2.9.3-beta.26122.107
+ 11.0.0-beta.26122.107
+ 5.5.0-2.26122.107
+ 11.0.0-preview.2.26122.107
+ 11.0.100-preview.2.26122.107
+ 11.0.0-preview.2.26122.107
+ 11.0.0-preview.2.26122.107
+ 7.5.0-rc.12307
+ 7.5.0-rc.12307
+ 7.5.0-rc.12307
+ 7.5.0-rc.12307
+ 11.0.0-preview.2.26122.107
+ 3.0.0-preview.2.26122.107
+ 11.0.0-preview.2.26122.107
+ 11.0.0-preview.2.26122.107
+ 11.0.0-preview.2.26122.107
11.0.0-beta.26071.1
11.0.0-beta.26071.1
@@ -108,14 +108,14 @@ This file should be imported by eng/Versions.props
11.0.0-alpha.0.25625.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
- 11.0.0-alpha.1.26104.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
+ 11.0.0-alpha.1.26109.1
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e519668c1e0647..53c2c92aed5e9b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,127 +1,127 @@
-
+
https://github.com/dotnet/icu
b12b32d4177efa391c10895fc2ef3b7a21fb1d4d
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
https://github.com/dotnet/runtime-assets
@@ -175,117 +175,117 @@
https://github.com/dotnet/runtime-assets
2497df9ce6db7a2b4082cb45b203983f977c6d5b
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/llvm-project
- d236ab665a39b0dadec765bf1fdbbff11c648be6
+ 9b07aadeedd210008626c0d05f54fdfb8a7951f3
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
https://github.com/dotnet/xharness
@@ -299,9 +299,9 @@
https://github.com/dotnet/xharness
31e0b8e08f57890f7b7004b93361d69cd4b21079
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -327,29 +327,29 @@
https://github.com/dotnet/runtime-assets
2497df9ce6db7a2b4082cb45b203983f977c6d5b
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -361,53 +361,53 @@
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/dotnet
- 72217c0d2d275adb380979be6f366a38292cf053
+ e1a0fb23745648b7c69c990564b6db2d28abd473
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
-
+
https://github.com/dotnet/node
- a3c48e4c5cdc3096257f984739ec30f5fd2eb77f
+ d41da27dc43bd92e69e1fd37a8916ff0dc4cef68
https://github.com/dotnet/runtime-assets
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index f6bde268379400..d127bbe5a78855 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -588,6 +588,11 @@ function LocateVisualStudio([object]$vsRequirements = $null){
return $null
}
+ if ($null -eq $vsInfo -or $vsInfo.Count -eq 0) {
+ throw "No instance of Visual Studio meeting the requirements specified was found. Requirements: $($args -join ' ')"
+ return $null
+ }
+
# use first matching instance
return $vsInfo[0]
}
diff --git a/global.json b/global.json
index 3983566eba52d3..fc14b70d8d31c0 100644
--- a/global.json
+++ b/global.json
@@ -1,18 +1,18 @@
{
"sdk": {
- "version": "11.0.100-preview.1.26078.121",
+ "version": "11.0.100-preview.1.26104.118",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "11.0.100-preview.1.26078.121"
+ "dotnet": "11.0.100-preview.1.26104.118"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26110.116",
- "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26110.116",
- "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26110.116",
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26122.107",
+ "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26122.107",
+ "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26122.107",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
- "Microsoft.NET.Sdk.IL": "11.0.0-preview.2.26110.116"
+ "Microsoft.NET.Sdk.IL": "11.0.0-preview.2.26122.107"
}
}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
index 7bebc39f8a007d..7b684bbe7fc7f6 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
@@ -8,10 +8,13 @@
true
+ $(NoWarn);NETSDK1206
- $(NoWarn);NETSDK1206;SYSLIB1002;SYSLIB1013;SYSLIB1018;8795
+ $(NoWarn);SYSLIB1002;SYSLIB1013;SYSLIB1018
+
+ $(NoWarn);8795
$(WarningsNotAsErrors);8795
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.WithDiagnostics.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.WithDiagnostics.cs
index 69c7ae61842540..3b3da8bfd0a339 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.WithDiagnostics.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.WithDiagnostics.cs
@@ -8,9 +8,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
internal static partial class ExceptionTestExtensions
{
-#pragma warning disable SYSLIB1013
[LoggerMessage(EventId = 2, Level = LogLevel.Debug, Message = "M2 {arg1}: {ex}")]
internal static partial void M2(ILogger logger, string arg1, Exception ex);
-#pragma warning restore SYSLIB1013
}
}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.WithDiagnostics.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.WithDiagnostics.cs
index de51db107399b3..27a876710debfa 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.WithDiagnostics.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.WithDiagnostics.cs
@@ -7,14 +7,10 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
internal static partial class LevelTestExtensions
{
-#pragma warning disable SYSLIB1002
[LoggerMessage(EventId = 12, Message = "M12 {level}")]
internal static partial void M12(ILogger logger, LogLevel level);
-#pragma warning restore SYSLIB1002
-#pragma warning disable SYSLIB1018
[LoggerMessage(EventId = 13, Message = "M13 {logger}")]
internal static partial void M13(ILogger logger, LogLevel level);
-#pragma warning restore SYSLIB1018
}
}