diff --git a/NuGet.config b/NuGet.config index 32bdebd91702..8b93b13e1d08 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c5306ea04074..e794b362e235 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,12 +8,12 @@ This file should be imported by eng/Versions.props 2.1.0 - 10.0.10-servicing.26307.103 - 10.0.10-servicing.26307.103 - 10.0.10-servicing.26307.103 - 10.0.10-servicing.26307.103 + 10.0.10-servicing.26310.111 + 10.0.10-servicing.26310.111 + 10.0.10-servicing.26310.111 + 10.0.10-servicing.26310.111 10.0.10 - 10.0.10-servicing.26307.103 + 10.0.10-servicing.26310.111 10.0.10 10.0.10 10.0.10 @@ -21,46 +21,46 @@ This file should be imported by eng/Versions.props 10.0.10 10.0.10 10.0.10 - 10.0.10-servicing.26307.103 + 10.0.10-servicing.26310.111 10.0.10 10.0.10 10.0.10 10.0.10 - 10.0.10-servicing.26307.103 + 10.0.10-servicing.26310.111 10.0.10 - 10.0.10-servicing.26307.103 - 10.0.10-servicing.26307.103 - 10.0.0-preview.26307.103 + 10.0.10-servicing.26310.111 + 10.0.10-servicing.26310.111 + 10.0.0-preview.26310.111 10.0.10 10.0.10 18.0.11 - 18.0.11-servicing-26307-103 - 7.0.3-rc.30803 + 18.0.11-servicing-26310-111 + 7.0.3-rc.31111 10.0.110 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 10.0.0-preview.26307.103 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 2.0.0-rtm.1.26307.103 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 10.0.0-preview.26310.111 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 2.0.0-rtm.1.26310.111 2.2.10 - 10.0.0-beta.26307.103 - 10.0.0-beta.26307.103 - 10.0.0-beta.26307.103 - 10.0.0-beta.26307.103 - 10.0.0-beta.26307.103 - 10.0.0-beta.26307.103 + 10.0.0-beta.26310.111 + 10.0.0-beta.26310.111 + 10.0.0-beta.26310.111 + 10.0.0-beta.26310.111 + 10.0.0-beta.26310.111 + 10.0.0-beta.26310.111 10.0.10 10.0.10 - 10.0.10-servicing.26307.103 - 10.0.10-servicing.26307.103 - 10.0.0-beta.26307.103 - 10.0.0-beta.26307.103 + 10.0.10-servicing.26310.111 + 10.0.10-servicing.26310.111 + 10.0.0-beta.26310.111 + 10.0.0-beta.26310.111 10.0.10 10.0.10 10.0.10 @@ -70,20 +70,20 @@ This file should be imported by eng/Versions.props 10.0.10 10.0.10 10.0.10 - 14.0.110-servicing.26307.103 + 14.0.110-servicing.26310.111 10.0.10 10.0.10 - 5.0.0-2.26307.103 - 5.0.0-2.26307.103 - 10.0.10-servicing.26307.103 + 5.0.0-2.26310.111 + 5.0.0-2.26310.111 + 10.0.10-servicing.26310.111 10.0.10 10.0.10 10.0.0-preview.7.25377.103 - 10.0.0-preview.26307.103 - 10.0.10-servicing.26307.103 - 18.0.2-release-26307-103 + 10.0.0-preview.26310.111 + 10.0.10-servicing.26310.111 + 18.0.2-release-26310-111 10.0.10 - 10.0.10-servicing.26307.103 + 10.0.10-servicing.26310.111 10.0.110 10.0.110 10.0.110 @@ -92,34 +92,34 @@ This file should be imported by eng/Versions.props 10.0.110 10.0.110 10.0.110 - 10.0.110-servicing.26307.103 + 10.0.110-servicing.26310.111 10.0.110 - 10.0.110-servicing.26307.103 + 10.0.110-servicing.26310.111 10.0.110 10.0.110 - 10.0.110-servicing.26307.103 - 18.0.2-release-26307-103 - 18.0.2-release-26307-103 + 10.0.110-servicing.26310.111 + 18.0.2-release-26310-111 + 18.0.2-release-26310-111 3.2.10 10.0.10 - 10.0.10-servicing.26307.103 + 10.0.10-servicing.26310.111 10.0.10 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 - 7.0.3-rc.30803 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 + 7.0.3-rc.31111 10.0.10 2.0.10 10.0.10 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b77956dd7d79..d712fbd70998 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 - + https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 https://github.com/microsoft/testfx @@ -575,7 +575,7 @@ https://github.com/dotnet/dotnet - fe7283f2bc56523c765bc050be87a97543db180a + e8558e6339cd4fccd998b5cdecb76eeb6ec75363 diff --git a/global.json b/global.json index 6cf6cecd724c..8ec65569aa3f 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26307.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26307.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26310.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26310.111", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs index ce2f747bf645..b7a828f87255 100644 --- a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs +++ b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs @@ -11,7 +11,7 @@ public GivenThatWeWantToUseFrameworkRoslyn(ITestOutputHelper log) : base(log) { } - [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/pull/49654/")] + [FullMSBuildOnlyFact] public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_requested() { const string testProjectName = "NetCoreApp"; @@ -46,45 +46,6 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_requeste .HaveStdOutContaining(Path.Combine(toolsetPackageDir, toolsetPackageVersion, "csc.exe") + " /noconfig"); } - [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/pull/49654/")] - public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_is_torn() - { - const string testProjectName = "NetCoreApp"; - var project = new TestProject - { - Name = testProjectName, - TargetFrameworks = "net6.0", - }; - - // simulate mismatched MSBuild versions - project.AdditionalProperties.Add("_IsDisjointMSBuildVersion", "true"); - - // avoid opt in to RoslynCompilerType=Core - string[] args = ["-p:DOTNET_HOST_PATH=", "-p:DOTNET_EXPERIMENTAL_HOST_PATH="]; - - var testAsset = _testAssetsManager - .CreateTestProject(project); - - NuGetConfigWriter.Write(testAsset.Path, TestContext.Current.TestPackages); - - var customPackagesDir = Path.Combine(testAsset.Path, "nuget-packages"); - - testAsset.GetRestoreCommand(Log, relativePath: testProjectName) - .WithEnvironmentVariable("NUGET_PACKAGES", customPackagesDir) - .Execute(args).Should().Pass(); - - var toolsetPackageDir = Path.Combine(customPackagesDir, "microsoft.net.sdk.compilers.toolset"); - - Assert.True(Directory.Exists(toolsetPackageDir)); - - var toolsetPackageVersion = Directory.EnumerateDirectories(toolsetPackageDir).Should().ContainSingle().Subject; - - new BuildCommand(testAsset) - .WithEnvironmentVariable("NUGET_PACKAGES", customPackagesDir) - .Execute(args).Should().Pass().And - .HaveStdOutContaining(Path.Combine(toolsetPackageDir, toolsetPackageVersion, "csc.exe") + " /noconfig"); - } - [FullMSBuildOnlyFact] public void It_throws_a_warning_when_adding_the_PackageReference_directly() { @@ -144,11 +105,7 @@ public void It_throws_a_warning_when_NuGetPackageRoot_is_empty() TargetFrameworks = "net6.0", }; - // simulate mismatched MSBuild versions - project.AdditionalProperties.Add("_IsDisjointMSBuildVersion", "true"); - - // avoid opt in to RoslynCompilerType=Core - string[] args = ["-p:DOTNET_HOST_PATH=", "-p:DOTNET_EXPERIMENTAL_HOST_PATH="]; + project.AdditionalProperties.Add("BuildWithNetFrameworkHostedCompiler", "true"); var testAsset = _testAssetsManager .CreateTestProject(project); @@ -159,7 +116,7 @@ public void It_throws_a_warning_when_NuGetPackageRoot_is_empty() var command = (MSBuildCommand)new MSBuildCommand(testAsset, "Restore;Build") .WithEnvironmentVariable("NUGET_PACKAGES", customPackagesDir); - command.ExecuteWithoutRestore(args) + command.ExecuteWithoutRestore() .Should().Pass().And.HaveStdOutContaining("NETSDK1221"); // The package is downloaded, but the targets cannot find the path to it @@ -183,9 +140,7 @@ public void It_does_not_throw_a_warning_when_NuGetPackageRoot_is_empty_in_wpftmp WorkingDirectory = Path.Combine(testAsset.Path, "FxWpf") }; - // simulate mismatched MSBuild versions via _IsDisjointMSBuildVersion - // avoid opt in to RoslynCompilerType=Core by unsetting DOTNET_HOST_PATH and DOTNET_EXPERIMENTAL_HOST_PATH - buildCommand.Execute("-p:_IsDisjointMSBuildVersion=true", "-p:DOTNET_HOST_PATH=", "-p:DOTNET_EXPERIMENTAL_HOST_PATH=") + buildCommand.Execute("-p:BuildWithNetFrameworkHostedCompiler=true") .Should().Pass().And.NotHaveStdOutContaining("NETSDK1221"); Assert.True(File.Exists(Path.Combine(testAsset.Path, "obj", "net472", "MainWindow.g.cs")));