diff --git a/NuGet.config b/NuGet.config index c8bd4d7c7..341157ce4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,22 @@ + + + + + @@ -37,11 +42,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b2aaae08..c069fcbf6 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 - baf3c0df45e13d065884f7e84260f645295f219e + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + 41a4bd690229661e3ec74276ce3f93863b22435b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 46fb08cfa8160d0885b74c7f28a7b187ab86efed + ebbf01f54996755566db36e2e962ba6364da2ecc https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 08a90ca2c88b17f1b5d081318354a41db0882cff https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 08a90ca2c88b17f1b5d081318354a41db0882cff diff --git a/eng/Versions.props b/eng/Versions.props index 356cc7b6e..cdf8b59df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.3-servicing.24116.3 + 8.0.4-servicing.24169.11 - 8.0.3-servicing.24116.6 + 8.0.4-servicing.24169.10 @@ -66,22 +66,22 @@ - 8.0.3 - 8.0.3 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 + 8.0.4 + 8.0.4 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 0.2.0 - 8.0.103 - 8.0.103-servicing.24116.86 - 8.0.103-servicing.24116.86 + 8.0.104 + 8.0.104-servicing.24170.24 + 8.0.104-servicing.24170.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,24 +92,24 @@ - 8.0.3-servicing.24114.23 + 8.0.4-servicing.24169.9 - 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.23 - 8.0.3 - 8.0.3 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24169.9 + 8.0.4-servicing.24169.9 + 8.0.4 + 8.0.4 + 8.0.4 + 8.0.4 2.1.0 - 8.0.3-servicing.24116.9 - 8.0.3-servicing.24116.9 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24169.24 + 8.0.4-servicing.24169.24 + 8.0.4 + 8.0.4 @@ -213,7 +213,7 @@ 14.0.8478 17.0.8478 - 8.0.3 + 8.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))