diff --git a/Directory.Build.props b/Directory.Build.props index ae3882f1df94..871bcd30e998 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -51,6 +51,11 @@ enable + + + false + + diff --git a/NuGet.config b/NuGet.config index 4cdd71f1133e..89019124c4ba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -13,17 +14,20 @@ + + + @@ -50,14 +54,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8248544f501..0393eb87e6dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ 98f9e6489e60d738e2bc75dd9e2d409dd3b56821 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://github.com/dotnet/emsdk - 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 + 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d https://github.com/nuget/nuget.client @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -228,70 +228,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3ff72f664fd6e585b4b61fe5d79f33255aca5d6c + 925e025a1ad14f0b6f094e5b2d5cc9f62ada294c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d https://github.com/dotnet/xdt @@ -437,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 269acbf537f9..317bd775b15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,22 +51,22 @@ - 8.0.21 - 8.0.21-servicing.25475.13 - 8.0.21 + 8.0.22 + 8.0.22-servicing.25527.7 + 8.0.22 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.21 - 8.0.21-servicing.25475.13 + 8.0.22 + 8.0.22-servicing.25527.7 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.21 + 8.0.22 8.0.0 8.0.0 - 8.0.21 + 8.0.22 8.0.0 8.0.0 8.0.0 @@ -171,13 +171,13 @@ - 8.0.21 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21 + 8.0.22 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22 @@ -187,7 +187,7 @@ - 8.0.21-servicing.25475.4 + 8.0.22-servicing.25528.2 @@ -231,7 +231,7 @@ - 8.0.21 + 8.0.22 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bb048ad125a8..76e639598408 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -545,19 +545,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component