diff --git a/Directory.Packages.props b/Directory.Packages.props
index 928b44f65d5e..ecc47ba3f164 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,11 +5,11 @@
$(NoWarn);NU1507
-
+
-
+
@@ -94,7 +94,7 @@
-
+
diff --git a/eng/Signing.props b/eng/Signing.props
index 484697efecbc..872602d12f5c 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -84,6 +84,9 @@
+
+
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 90d64968c27b..7322c808e708 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,137 +6,137 @@ This file should be imported by eng/Versions.props
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-preview.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 17.15.0-preview-25460-104
- 17.15.0-preview-25460-104
- 7.0.0-preview.1.46104
- 10.0.0-beta.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 10.0.0-preview.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 2.0.0-preview.1.25460.104
- 2.2.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 14.0.100-rc2.25460.104
- 10.0.0-rc.2.25460.104
- 5.0.0-2.25460.104
- 5.0.0-2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-preview.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 18.0.0-preview-25467-107
+ 18.0.0-preview-25467-107
+ 7.0.0-preview.2.46807
+ 10.0.0-beta.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 10.0.0-preview.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 2.0.0-preview.1.25467.107
+ 2.2.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 14.0.100-rc2.25467.107
+ 10.0.0-rc.2.25467.107
+ 5.0.0-2.25467.107
+ 5.0.0-2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
10.0.0-preview.7.25377.103
- 10.0.0-preview.25460.104
- 10.0.0-rc.2.25460.104
- 18.0.0-preview-25460-104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.0-beta.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 10.0.100-rc.2.25460.104
- 18.0.0-preview-25460-104
- 18.0.0-preview-25460-104
- 3.2.0-preview.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 7.0.0-preview.1.46104
- 10.0.0-rc.2.25460.104
- 2.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
- 10.0.0-rc.2.25460.104
+ 10.0.0-preview.25467.107
+ 10.0.0-rc.2.25467.107
+ 18.0.0-preview-25467-107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.0-beta.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 10.0.100-rc.2.25467.107
+ 18.0.0-preview-25467-107
+ 18.0.0-preview-25467-107
+ 3.2.0-preview.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 7.0.0-preview.2.46807
+ 10.0.0-rc.2.25467.107
+ 2.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
+ 10.0.0-rc.2.25467.107
2.1.0
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e146d19ecfda..2aad78631d64 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,62 +1,62 @@
-
+
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
@@ -68,170 +68,170 @@
https://github.com/dotnet/dotnet
6a953e76162f3f079405f80e28664fa51b136740
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
https://github.com/microsoft/testfx
@@ -561,9 +561,9 @@
https://github.com/microsoft/testfx
0f88daa1f377afaac08ffff1c29ecca6cb79e9a4
-
+
https://github.com/dotnet/dotnet
- eac14590f69f6876d418cef9e8fdd3f44f6ef0b2
+ e533cfad385ba4f0ec96e35ad3d485dc13581906
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index 792b60b49d42..9445c3143258 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}
-$dotnetVersions = @('5','6','7','8','9')
+$dotnetVersions = @('5','6','7','8','9','10')
foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index facb415ca6ff..ddf4efc81a4a 100755
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi
-DotNetVersions=('5' '6' '7' '8' '9')
+DotNetVersions=('5' '6' '7' '8' '9' '10')
for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
index aba50e341034..348cd16376f1 100644
--- a/eng/common/core-templates/job/publish-build-assets.yml
+++ b/eng/common/core-templates/job/publish-build-assets.yml
@@ -40,8 +40,6 @@ parameters:
repositoryAlias: self
- officialBuildId: ''
-
jobs:
- job: Asset_Registry_Publish
@@ -64,11 +62,6 @@ jobs:
value: false
# unconditional - needed for logs publishing (redactor tool version)
- template: /eng/common/core-templates/post-build/common-variables.yml
- - name: OfficialBuildId
- ${{ if ne(parameters.officialBuildId, '') }}:
- value: ${{ parameters.officialBuildId }}
- ${{ else }}:
- value: $(Build.BuildNumber)
pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index 947f0971eb5c..d805d5faeb94 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -34,9 +34,6 @@ parameters:
# container and pool.
platform: {}
- # Optional list of directories to ignore for component governance scans.
- componentGovernanceIgnoreDirectories: []
-
is1ESPipeline: ''
# If set to true and running on a non-public project,
@@ -97,4 +94,3 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
platform: ${{ parameters.platform }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml
index 01ada7476651..b637cb6e9480 100644
--- a/eng/common/core-templates/jobs/jobs.yml
+++ b/eng/common/core-templates/jobs/jobs.yml
@@ -44,7 +44,6 @@ parameters:
artifacts: {}
is1ESPipeline: ''
repositoryAlias: self
- officialBuildId: ''
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -117,4 +116,3 @@ jobs:
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
repositoryAlias: ${{ parameters.repositoryAlias }}
- officialBuildId: ${{ parameters.officialBuildId }}
diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml
index eb4b923a7777..d92860cba208 100644
--- a/eng/common/core-templates/jobs/source-build.yml
+++ b/eng/common/core-templates/jobs/source-build.yml
@@ -15,9 +15,6 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []
- # Optional list of directories to ignore for component governance scans.
- componentGovernanceIgnoreDirectories: []
-
is1ESPipeline: ''
# If set to true and running on a non-public project,
@@ -34,7 +31,6 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -43,5 +39,4 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 77321eee11f7..acf16ed34963 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -11,10 +11,6 @@ parameters:
# for details. The entire object is described in the 'job' template for simplicity, even though
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
platform: {}
-
- # Optional list of directories to ignore for component governance scans.
- componentGovernanceIgnoreDirectories: []
-
is1ESPipeline: false
steps:
diff --git a/global.json b/global.json
index 1b17260e86c1..cf8f1c013299 100644
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
},
"tools": {
- "dotnet": "10.0.100-rc.1.25420.111",
+ "dotnet": "10.0.100-rc.1.25451.107",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25460.104",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25467.107",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25467.107",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
index c8835d1acb42..84852c4df9a9 100644
--- a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
+++ b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs
index e7762086e680..d53f7052b754 100644
--- a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs
+++ b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs
@@ -202,7 +202,6 @@ private IEnumerable GetCscArguments(
"/deterministic+",
"/langversion:14.0",
"/features:FileBasedProgram",
- $"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig",
$"/analyzerconfig:{objDir}/{fileNameWithoutExtension}.GeneratedMSBuildEditorConfig.editorconfig",
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_10_default.globalconfig",
$"/analyzer:{SdkPath}/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll",
diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs b/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
index 3c6e0bb43c6d..32a38bdd9af9 100644
--- a/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
@@ -174,10 +174,7 @@ private static Command ConstructCommand()
private class ShowWorkloadsInfoAction : SynchronousCommandLineAction
{
- public ShowWorkloadsInfoAction()
- {
- Terminating = true;
- }
+ public override bool Terminating => true;
public override int Invoke(ParseResult parseResult)
{
@@ -189,10 +186,7 @@ public override int Invoke(ParseResult parseResult)
private class ShowWorkloadsVersionOption : SynchronousCommandLineAction
{
- public ShowWorkloadsVersionOption()
- {
- Terminating = true;
- }
+ public override bool Terminating => true;
public override int Invoke(ParseResult parseResult)
{
diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs
index 4bddb07f976e..23dd3d6ebef3 100644
--- a/src/Cli/dotnet/Parser.cs
+++ b/src/Cli/dotnet/Parser.cs
@@ -427,10 +427,8 @@ public override void Write(HelpContext context)
private class PrintCliSchemaAction : SynchronousCommandLineAction
{
- internal PrintCliSchemaAction()
- {
- Terminating = true;
- }
+ public override bool Terminating => true;
+
public override int Invoke(ParseResult parseResult)
{
CliSchema.PrintCliSchema(parseResult.CommandResult, parseResult.InvocationConfiguration.Output, Program.TelemetryClient);
diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
index cd82a15330f4..ea6537b41516 100644
--- a/src/Cli/dotnet/Program.cs
+++ b/src/Cli/dotnet/Program.cs
@@ -237,8 +237,8 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime)
// Get the global.json state to report in telemetry along with this command invocation.
// We don't care about the actual SDK resolution, just the global.json information,
// so just pass empty string as executable directory for resolution.
- NativeWrapper.SdkResolutionResult result = NativeWrapper.NETCoreSdkResolverNativeWrapper.ResolveSdk(string.Empty, Environment.CurrentDirectory);
- globalJsonState = result.GlobalJsonState;
+ // NativeWrapper.SdkResolutionResult result = NativeWrapper.NETCoreSdkResolverNativeWrapper.ResolveSdk(string.Empty, Environment.CurrentDirectory);
+ // globalJsonState = result.GlobalJsonState;
}
TelemetryEventEntry.SendFiltered(Tuple.Create(parseResult, performanceData, globalJsonState));
diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props
index 479a7c0a421e..c8bc9ffafc2a 100644
--- a/src/Layout/Directory.Build.props
+++ b/src/Layout/Directory.Build.props
@@ -78,4 +78,10 @@
$(MSBuildThisFileDirectory)pkg\
+
+ <_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\csc.dll" />
+ <_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\vbc.dll" />
+ <_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\VBCSCompiler.dll" />
+
+
diff --git a/src/Layout/redist/targets/Crossgen.targets b/src/Layout/redist/targets/Crossgen.targets
index 909c5de0bf3c..3e07f481af11 100644
--- a/src/Layout/redist/targets/Crossgen.targets
+++ b/src/Layout/redist/targets/Crossgen.targets
@@ -197,6 +197,7 @@
+
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index 65d4aff197c6..0b5bcb6fa182 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
@@ -59,6 +59,12 @@
+
+
@@ -495,6 +501,7 @@
+
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
index acb871529a97..7b5b7bc0da15 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
@@ -817,20 +817,36 @@ private ToolPackSupport AddToolPack(
{
var packNamePattern = knownPack.GetMetadata(packName + "PackNamePattern");
var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(';');
- // When publishing for the non-portable RID that matches NETCoreSdkRuntimeIdentifier, prefer NETCoreSdkRuntimeIdentifier for the host.
+ var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(';');
+
+ // When publishing for a non-portable RID, prefer NETCoreSdkRuntimeIdentifier for the host.
// Otherwise prefer the NETCoreSdkPortableRuntimeIdentifier.
- // This makes non-portable SDKs behave the same as portable SDKs except for the specific case of targetting the non-portable RID.
- // It also enables the non-portable ILCompiler to be packaged separately from the SDK and
- // only required when publishing for the non-portable SDK RID.
- string portableSdkRid = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier) ? NETCoreSdkPortableRuntimeIdentifier : NETCoreSdkRuntimeIdentifier;
- bool targetsNonPortableSdkRid = EffectiveRuntimeIdentifier == NETCoreSdkRuntimeIdentifier && NETCoreSdkRuntimeIdentifier != portableSdkRid;
- string? hostRuntimeIdentifier = targetsNonPortableSdkRid ? NETCoreSdkRuntimeIdentifier : portableSdkRid;
- Log.LogMessage(MessageImportance.Low, $"Determining best RID for '{knownPack.ItemSpec}@{packVersion}' for '{hostRuntimeIdentifier}' from among '{knownPack.GetMetadata(packName + "RuntimeIdentifiers")}'");
- // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture
+ // This makes non-portable SDKs behave the same as portable SDKs except for the specific case of targetting a non-portable RID.
+ // This ensures that targeting portable RIDs doesn't require any non-portable assets that aren't packaged in the SDK.
+ // Due to size concerns, the non-portable ILCompiler and Crossgen2 aren't included by default in non-portable SDK distributions.
var runtimeGraph = new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath);
- hostRuntimeIdentifier = NuGetUtils.GetBestMatchingRid(runtimeGraph, hostRuntimeIdentifier, packSupportedRuntimeIdentifiers, out bool wasInGraph);
+
+ // Prefer portable when the "supported RID" for the tool pack is the same RID as the "supported portable RID".
+ // This makes non-portable SDKs behave the same as portable SDKs except for the specific cases added to "supported", such as targeting the non-portable RID.
+ // This also ensures that targeting common RIDs doesn't require any non-portable assets that aren't packaged in the SDK by default.
+ // Due to size concerns, the non-portable ILCompiler and Crossgen2 aren't included by default in non-portable SDK distributions.
+ var runtimeIdentifier = RuntimeIdentifier ?? "any";
+ string? supportedTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedRuntimeIdentifiers, out _);
+ string? supportedPortableTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _);
+
+ bool usePortable = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier)
+ && supportedTargetRid is not null && supportedPortableTargetRid is not null
+ && supportedTargetRid == supportedPortableTargetRid;
+
+ // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture
+ Log.LogMessage(MessageImportance.Low, $"Determining best RID for '{knownPack.ItemSpec}@{packVersion}' from among '{knownPack.GetMetadata(packName + "RuntimeIdentifiers")}'");
+ string? hostRuntimeIdentifier = usePortable
+ ? NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkPortableRuntimeIdentifier!, packSupportedPortableRuntimeIdentifiers, out _)
+ : NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkRuntimeIdentifier!, packSupportedRuntimeIdentifiers, out _);
+
if (hostRuntimeIdentifier == null)
{
+ Log.LogMessage(MessageImportance.Low, $"No matching RID was found'");
return ToolPackSupport.UnsupportedForHostRuntimeIdentifier;
}
Log.LogMessage(MessageImportance.Low, $"Best RID for '{knownPack.ItemSpec}@{packVersion}' is '{hostRuntimeIdentifier}'");
diff --git a/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs b/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs
index ba14cd54eebc..2f473b12d72f 100644
--- a/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs
+++ b/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs
@@ -6,6 +6,7 @@
using Basic.CompilerLog.Util;
using Microsoft.Build.Logging.StructuredLogger;
using Microsoft.CodeAnalysis;
+using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.NET.Build.Tests;
@@ -18,16 +19,16 @@ public sealed class RoslynBuildTaskTests(ITestOutputHelper log) : SdkTest(log)
_ => throw new ArgumentOutOfRangeException(paramName: nameof(language)),
};
- private static string CoreCompilerFileName(Language language) => CompilerFileNameWithoutExtension(language) + ".dll";
+ private static string DotNetExecCompilerFileName(Language language) => CompilerFileNameWithoutExtension(language) + ".dll";
- private static string FxCompilerFileName(Language language) => CompilerFileNameWithoutExtension(language) + ".exe";
+ private static string AppHostCompilerFileName(Language language) => CompilerFileNameWithoutExtension(language) + FileNameSuffixes.CurrentPlatform.Exe;
[FullMSBuildOnlyTheory, CombinatorialData]
public void FullMSBuild_SdkStyle(bool useSharedCompilation, Language language)
{
var testAsset = CreateProject(useSharedCompilation, language);
var buildCommand = BuildAndRunUsingMSBuild(testAsset);
- VerifyCompiler(buildCommand, CoreCompilerFileName(language), useSharedCompilation);
+ VerifyCompiler(buildCommand, AppHostCompilerFileName(language), useSharedCompilation);
}
[FullMSBuildOnlyTheory, CombinatorialData]
@@ -38,7 +39,7 @@ public void FullMSBuild_SdkStyle_OptOut(bool useSharedCompilation, Language lang
doc.Root!.Element("PropertyGroup")!.Add(new XElement("RoslynCompilerType", "Framework"));
});
var buildCommand = BuildAndRunUsingMSBuild(testAsset);
- VerifyCompiler(buildCommand, FxCompilerFileName(language), useSharedCompilation);
+ VerifyCompiler(buildCommand, AppHostCompilerFileName(language), useSharedCompilation);
}
[FullMSBuildOnlyTheory, CombinatorialData]
@@ -50,7 +51,7 @@ public void FullMSBuild_NonSdkStyle(bool useSharedCompilation, Language language
project.TargetFrameworkVersion = "v4.7.2";
});
var buildCommand = BuildAndRunUsingMSBuild(testAsset);
- VerifyCompiler(buildCommand, FxCompilerFileName(language), useSharedCompilation);
+ VerifyCompiler(buildCommand, AppHostCompilerFileName(language), useSharedCompilation);
}
[FullMSBuildOnlyTheory, CombinatorialData]
@@ -58,7 +59,7 @@ public void FullMSBuild_SdkStyle_ToolsetPackage(bool useSharedCompilation, Langu
{
var testAsset = CreateProject(useSharedCompilation, language, AddCompilersToolsetPackage);
var buildCommand = BuildAndRunUsingMSBuild(testAsset);
- VerifyCompiler(buildCommand, FxCompilerFileName(language), useSharedCompilation, toolsetPackage: true);
+ VerifyCompiler(buildCommand, AppHostCompilerFileName(language), useSharedCompilation, toolsetPackage: true);
}
[Theory, CombinatorialData]
@@ -66,7 +67,7 @@ public void DotNet(bool useSharedCompilation, Language language)
{
var testAsset = CreateProject(useSharedCompilation, language);
var buildCommand = BuildAndRunUsingDotNet(testAsset);
- VerifyCompiler(buildCommand, CoreCompilerFileName(language), useSharedCompilation);
+ VerifyCompiler(buildCommand, AppHostCompilerFileName(language), useSharedCompilation);
}
// https://github.com/dotnet/sdk/issues/49665
@@ -75,7 +76,7 @@ public void DotNet_ToolsetPackage(bool useSharedCompilation, Language language)
{
var testAsset = CreateProject(useSharedCompilation, language, AddCompilersToolsetPackage);
var buildCommand = BuildAndRunUsingDotNet(testAsset);
- VerifyCompiler(buildCommand, CoreCompilerFileName(language), useSharedCompilation, toolsetPackage: true);
+ VerifyCompiler(buildCommand, DotNetExecCompilerFileName(language), useSharedCompilation, toolsetPackage: true);
}
private TestAsset CreateProject(bool useSharedCompilation, Language language, Action? configure = null, [CallerMemberName] string callingMethod = "")
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh b/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh
index 0e1338dd8889..c6b13b332377 100644
--- a/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh
+++ b/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh
@@ -1137,7 +1137,7 @@ _testhost_package_update() {
prev="${COMP_WORDS[COMP_CWORD-1]}"
COMPREPLY=()
- opts="--project --interactive --verbosity --help"
+ opts="--project --vulnerable --interactive --verbosity --help"
if [[ $COMP_CWORD == "$1" ]]; then
COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -1145,6 +1145,10 @@ _testhost_package_update() {
fi
case $prev in
+ --vulnerable)
+ COMPREPLY=( $(compgen -W "False True" -- "$cur") )
+ return
+ ;;
--interactive)
COMPREPLY=( $(compgen -W "False True" -- "$cur") )
return
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1 b/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1
index e112a825b4ae..b6a42c2d8590 100644
--- a/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1
+++ b/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1
@@ -671,6 +671,7 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
'testhost;package;update' {
$staticCompletions = @(
[CompletionResult]::new('--project', '--project', [CompletionResultType]::ParameterName, "Path to a project or solution file, or a directory.")
+ [CompletionResult]::new('--vulnerable', '--vulnerable', [CompletionResultType]::ParameterName, "Upgrade packages with known vulnerabilities.")
[CompletionResult]::new('--interactive', '--interactive', [CompletionResultType]::ParameterName, "Allows the command to stop and wait for user input or action (for example to complete authentication).")
[CompletionResult]::new('--verbosity', '--verbosity', [CompletionResultType]::ParameterName, "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].")
[CompletionResult]::new('--verbosity', '-v', [CompletionResultType]::ParameterName, "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].")
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh b/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh
index 03a8a7c0f296..f46e5d073ca7 100644
--- a/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh
+++ b/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh
@@ -669,6 +669,7 @@ _testhost() {
(update)
_arguments "${_arguments_options[@]}" : \
'--project=[Path to a project or solution file, or a directory.]: : ' \
+ '--vulnerable=[Upgrade packages with known vulnerabilities.]: :((False\:"False" True\:"True" ))' \
'--interactive=[Allows the command to stop and wait for user input or action (for example to complete authentication).]: :((False\:"False" True\:"True" ))' \
'--verbosity=[Set the verbosity level of the command. Allowed values are q\[uiet\], m\[inimal\], n\[ormal\], d\[etailed\], and diag\[nostic\].]: :((d\:"d" detailed\:"detailed" diag\:"diag" diagnostic\:"diagnostic" m\:"m" minimal\:"minimal" n\:"n" normal\:"normal" q\:"q" quiet\:"quiet" ))' \
'-v=[Set the verbosity level of the command. Allowed values are q\[uiet\], m\[inimal\], n\[ormal\], d\[etailed\], and diag\[nostic\].]: :((d\:"d" detailed\:"detailed" diag\:"diag" diagnostic\:"diagnostic" m\:"m" minimal\:"minimal" n\:"n" normal\:"normal" q\:"q" quiet\:"quiet" ))' \