diff --git a/NuGet.config b/NuGet.config index 37c68dd4182d..4a605b7980fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,15 @@ + + + @@ -20,10 +23,12 @@ + + @@ -42,11 +47,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4544429e7d5b..effd20c913bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + f6ad34c0ba03ad79257a09903033493414af4ffa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + f6ad34c0ba03ad79257a09903033493414af4ffa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + f6ad34c0ba03ad79257a09903033493414af4ffa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + f6ad34c0ba03ad79257a09903033493414af4ffa https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3069afa2664d12f5290b7002c5a9eb110e4ea844 + 44b9411eeca123dd8b2c9d47afe46f9e537f1714 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42a83a56d421ac71312453e53dbacc3d2ae6d432 + 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b - + https://github.com/dotnet/fsharp - 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/fsharp - 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 @@ -146,13 +146,13 @@ 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff diff --git a/eng/Versions.props b/eng/Versions.props index b8b5df9e5f3c..2d7af08183a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.11-servicing.24521.3 + 8.0.12-servicing.24603.6 - 8.0.11-servicing.24521.7 + 8.0.12-servicing.24603.5 @@ -64,42 +64,42 @@ - 8.0.11 - 8.0.11 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 + 8.0.12 + 8.0.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 0.2.0 - 8.0.404 - 8.0.404-servicing.24521.39 - 8.0.404-servicing.24521.39 + 8.0.405 + 8.0.405-servicing.24604.17 + 8.0.405-servicing.24604.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24510.3 + 4.11.0-3.24554.2 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 - 8.0.11-servicing.24517.7 - 8.0.11-servicing.24517.7 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24603.5 + 8.0.12-servicing.24603.5 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 2.1.0 8.0.1 6.0.1 @@ -107,10 +107,10 @@ - 8.0.11-servicing.24521.5 - 8.0.11-servicing.24521.5 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24604.2 + 8.0.12-servicing.24604.2 + 8.0.12 + 8.0.12 @@ -183,7 +183,7 @@ 14.0.8478 17.0.8478 - 8.0.11 + 8.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))