diff --git a/NuGet.config b/NuGet.config index e818620abfd0..0750e60f8360 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -13,18 +14,21 @@ + - + + + @@ -51,8 +55,10 @@ + + @@ -60,8 +66,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c1fd186b453..dfa274d97198 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,58 +14,58 @@ 48975a32b817268bc046f006657d876400d463e0 - + 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 - e71ee2d1051ea6c9c254d4be138fbb36be653fd8 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + aa888d3214e5adb503c48c3bad2bfc6c5aff638a - - https://github.com/dotnet/msbuild - e71ee2d1051ea6c9c254d4be138fbb36be653fd8 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + aa888d3214e5adb503c48c3bad2bfc6c5aff638a - - https://github.com/dotnet/msbuild - e71ee2d1051ea6c9c254d4be138fbb36be653fd8 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + aa888d3214e5adb503c48c3bad2bfc6c5aff638a @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + 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 c4d80397805bec06b354d20aeb1773e243c6add0 - + 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 51ecca98bb8c800e4f4a17eacf94c2eb41c79a5a - + 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 f97ef3754140..292855c75814 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ 13.0.3 4.8.6 1.2.0-beta.435 - 7.0.0 + 8.0.0 4.0.0 - 7.0.0 + 8.0.1 8.0.0-beta.25515.1 7.0.0-preview.22423.2 8.0.0 @@ -50,22 +50,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 @@ -125,16 +125,14 @@ - 17.10.45 + 17.10.46 $(MicrosoftBuildPackageVersion) - - 17.8.29 + $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.10.45-servicing-25458-05 + 17.10.46-servicing-25466-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) @@ -170,13 +168,13 @@ - 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 @@ -186,7 +184,7 @@ - 8.0.20-servicing.25420.2 + 8.0.21-servicing.25475.4 @@ -230,7 +228,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 @@ + + + + + + + + + + + + + LoggerVerbosity.Diagnostic; set { } } - public string Parameters { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public string? Parameters { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } private List _messages = new(); public IReadOnlyList Messages {get { return _messages; } }