diff --git a/NuGet.config b/NuGet.config index 1b9167e7c..fe0022aab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,24 @@ + + + + + + @@ -37,11 +43,16 @@ + + + + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 0b2b78fe8..bf27fdb5f 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -17,5 +17,7 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1db217339..212f8dd22 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 - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 3ecaf32089ff44b59b6cfc518baf20be49886604 https://github.com/dotnet/test-templates @@ -124,35 +124,35 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6c37c986b6c8fc0669b38a03a03445a75b8227a6 + fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 + 43bb8cc831c2658e1117415019264bfe6f644f94 - + https://github.com/dotnet/fsharp - 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 + 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/dotnet/fsharp - 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 + 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/microsoft/vstest - 56d28849af08dc3143d019694aa92f186b89d2ac + 83d73f783bf54c336d1eab04a53d554f8a6c0b19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://github.com/dotnet/roslyn - 3af0081a6e811b78d37c62e479914f7f4cfb0d1a + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a64772f521c578bc9925578b1384d3a08a02d31d - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a64772f521c578bc9925578b1384d3a08a02d31d diff --git a/eng/Versions.props b/eng/Versions.props index 76290f52a..8028cd046 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.5-servicing.24217.4 + 8.0.7-servicing.24313.8 - 8.0.5-servicing.24217.2 + 8.0.7-servicing.24313.7 @@ -65,50 +65,50 @@ - 8.0.5 - 8.0.5 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 + 8.0.7 + 8.0.7 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 0.2.0 - 8.0.300 - 8.0.300-rtm.24224.16 - 8.0.300-rtm.24224.16 + 8.0.303 + 8.0.303-servicing.24317.6 + 8.0.303-servicing.24317.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24216.12 + 4.10.0-3.24314.14 - 8.0.5-servicing.24216.15 + 8.0.7-servicing.24313.11 - 8.0.5-servicing.24216.15 - 8.0.5-servicing.24216.15 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 + 8.0.7-servicing.24313.11 + 8.0.7-servicing.24313.11 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 2.1.0 - 8.0.5-servicing.24217.5 - 8.0.5-servicing.24217.5 - 8.0.5 - 8.0.5 + 8.0.7-servicing.24314.3 + 8.0.7-servicing.24314.3 + 8.0.7 + 8.0.7 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24203-04 + 17.10.0-release-24272-11 8.0.0-alpha.1.22557.12 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.5 + 8.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))