diff --git a/NuGet.config b/NuGet.config index 14a0481f6..287683d61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + - + - - - + - - - + @@ -47,20 +42,17 @@ + - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 993e9cbf0..68c4766c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - c60eee85ec0109bdda894806b167bb4d55f75183 + + https://github.com/nuget/nuget.client + 822425710cec4e49c9344ada58c21c7d3223973b @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 14d64a811e8d4140438f9a8288abb139cb56d5de + 9f2e9f6ec690ad8f4aea16b33f4a4bcc11b3d2cb https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 40e7bda69..0f6df721d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23074.3 - 6.0.113 + 6.0.114 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.113-servicing.22601.32 - 6.0.113-servicing.22601.32 + 6.0.114-servicing.23074.26 + 6.0.114-servicing.23074.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.113 + 6.0.114 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index f9fe2c166..734362867 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -7,5 +7,13 @@ + + + +