diff --git a/NuGet.config b/NuGet.config index ff5001727a6a..b44d8be56dea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -13,18 +14,21 @@ + - + + - + + @@ -51,14 +55,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f23f95bd2b9..dbdec573ec37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,58 +14,58 @@ fe0130d773314a195b81fb2eecfb14db9b847563 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://github.com/dotnet/emsdk - 222749b48ecb0fe78f236ca9c61f6ff3b09cdc99 + 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 - - https://github.com/dotnet/msbuild - 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 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 - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 362ab6669d55a75d51166f01b596c967c734ef4c 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 - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7b95ca673ef08b7325429a3b675184b815482564 + 3ff72f664fd6e585b4b61fe5d79f33255aca5d6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 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 - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 237196c900a3..c995eb8949f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,22 +51,22 @@ - 8.0.20 - 8.0.20-servicing.25419.14 - 8.0.20 + 8.0.21 + 8.0.21-servicing.25475.13 + 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.20 - 8.0.20-servicing.25419.14 + 8.0.21 + 8.0.21-servicing.25475.13 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.20 + 8.0.21 8.0.0 8.0.0 - 8.0.20 + 8.0.21 8.0.0 8.0.0 8.0.0 @@ -126,7 +126,7 @@ - 17.11.45 + 17.11.48 $(MicrosoftBuildPackageVersion) - 8.0.20 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20 + 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 @@ -187,7 +187,7 @@ - 8.0.20-servicing.25420.2 + 8.0.21-servicing.25475.4 @@ -231,7 +231,7 @@ - 8.0.20 + 8.0.21 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index eab01ef1445f..461a9ef073af 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -117,10 +117,27 @@ + + + + + + + + + + + + +