diff --git a/NuGet.config b/NuGet.config index e6c5a0ccc913..61e794b48bc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,20 +24,42 @@ + + + + + + - + + + + + + + + + + + + + + + + + @@ -64,10 +86,25 @@ + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d3530be1ffe..7691edc95a74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 0c96b36ccec4428bbfdeafae392bda49c1667361 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 @@ -59,32 +59,32 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + 78f6f07d38e8755e573039a8aa04e131d3e59b76 - + https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + 78f6f07d38e8755e573039a8aa04e131d3e59b76 - + https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + 78f6f07d38e8755e573039a8aa04e131d3e59b76 https://github.com/dotnet/msbuild - ced361277f33b9eb9312d927869a77b6d9108876 + 13c590f8d138d6a30b899a5172cc6ec494db930b - + https://github.com/dotnet/msbuild - ced361277f33b9eb9312d927869a77b6d9108876 + 13c590f8d138d6a30b899a5172cc6ec494db930b - + https://github.com/dotnet/msbuild - ced361277f33b9eb9312d927869a77b6d9108876 + 13c590f8d138d6a30b899a5172cc6ec494db930b @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 https://github.com/nuget/nuget.client @@ -230,99 +230,99 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef0ddf89991072267608f432ca2163ac54fdecab + b141ff423da53a66cda0be31dad3059317be52f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef0ddf89991072267608f432ca2163ac54fdecab + b141ff423da53a66cda0be31dad3059317be52f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef0ddf89991072267608f432ca2163ac54fdecab + b141ff423da53a66cda0be31dad3059317be52f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef0ddf89991072267608f432ca2163ac54fdecab + b141ff423da53a66cda0be31dad3059317be52f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 33f5371cc258de0a72569adf1e9fbcbf04256a17 + 6df813d45ebffd2739980b7f372767ac5fd68e2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 @@ -343,21 +343,21 @@ 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 https://github.com/dotnet/test-templates @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ca42d9e58480ab4ebb845027c44c6b4f10e0539d + 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 33f5371cc258de0a72569adf1e9fbcbf04256a17 + 6df813d45ebffd2739980b7f372767ac5fd68e2a https://github.com/dotnet/xdt @@ -503,89 +503,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d5dc8a13cc618b9cbdc1e5744b4806c594d49553 + ed74665e773dd1ebea3289c5662d71c590305932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 @@ -619,9 +619,9 @@ ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index abeabc81de31..646ec895a1a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.4-servicing.25163.12 + 9.0.5-servicing.25216.1 @@ -86,54 +86,54 @@ - 9.0.4 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 8.0.0-rc.1.23414.4 - 9.0.4-servicing.25163.5 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5-servicing.25215.9 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 2.1.0 - 9.0.4 + 9.0.5 8.0.0 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 8.0.0 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 8.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 - 9.0.4-servicing.25164.6 - 9.0.4-servicing.25164.6 - 9.0.4 - 9.0.4 + 9.0.5-servicing.25216.2 + 9.0.5-servicing.25216.2 + 9.0.5 + 9.0.5 @@ -181,8 +181,8 @@ Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> 17.12.35 - 17.12.35-preview-25214-08 - 17.11.4 + 17.12.35-preview-25210-18 + 17.11.31 17.12 @@ -215,19 +215,19 @@ - 9.0.4 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4 - 9.0.4 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 - 9.0.4-servicing.25164.3 + 9.0.5 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5 + 9.0.5 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 + 9.0.5-servicing.25229.4 @@ -237,8 +237,8 @@ - 9.0.4-rtm.25164.2 - 9.0.4-rtm.25164.2 + 9.0.5-rtm.25216.2 + 9.0.5-rtm.25216.2 @@ -317,8 +317,8 @@ 15.0.9617 18.0.9617 - 9.0.4-servicing.25157.2 - 9.0.4 + 9.0.5-servicing.25212.1 + 9.0.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`))