diff --git a/NuGet.config b/NuGet.config index f512fb23c..5e7f2297d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + - + - + - + + @@ -41,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddc377e95..58a198760 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 - c0170915ed6c164a594cd9d558d44aaf98fc6961 + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6192aadb9e2257206a8328c41df7dc179fcc3197 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + e61cfa7d404cf0d4cb24b5d6e69bb44978a9b45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + 32051d79682192306ba625d5ff0df24735953053 https://github.com/dotnet/fsharp @@ -141,16 +141,16 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + 3259862fadd5e784564e7d920a2d61a75f415a79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://github.com/dotnet/roslyn 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - - https://github.com/dotnet/source-build-externals - e844aa02a05b90d8cbe499676ec6ee0f19ec4980 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 0f0f1f0f33830f27ed0ff357145d2464b96b1a3e diff --git a/eng/Versions.props b/eng/Versions.props index 578cf9580..f3a84a074 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23516.4 + 8.0.0-beta.23564.4 @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23578.7 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23578.5 @@ -72,13 +72,13 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 0.2.0 @@ -86,36 +86,36 @@ 8.0.101 - 8.0.101-servicing.23567.10 - 8.0.101-servicing.23567.10 + 8.0.101-servicing.23579.8 + 8.0.101-servicing.23579.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23566.2 + 4.8.0-7.23572.1 - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23578.5 - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23578.5 + 8.0.1-servicing.23578.5 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23579.1 + 8.0.1-servicing.23579.1 + 8.0.1 + 8.0.1 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23553-01 + 17.8.0-release-23578-02 8.0.0-alpha.1.22557.12 @@ -258,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 165f87523..cdd195114 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -113,6 +113,9 @@ + + +