diff --git a/NuGet.config b/NuGet.config index f233ad36b..f47da0a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,21 @@ - - - + + + + + @@ -40,16 +42,17 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d77af516..9cfaae8dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 39e0501ee91dcf2b9b885d647795184815fb0408 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a23430d931218c8b2ffe6a51d120cd12fccece49 + 080b813fcf9f2417d6f0d50a6853d1b71034482b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a23430d931218c8b2ffe6a51d120cd12fccece49 + 080b813fcf9f2417d6f0d50a6853d1b71034482b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a23430d931218c8b2ffe6a51d120cd12fccece49 + 080b813fcf9f2417d6f0d50a6853d1b71034482b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 597ab8665d3b6fa5d1bad36724a3303aac430a5e + 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 597ab8665d3b6fa5d1bad36724a3303aac430a5e + 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a29a62bc7aa91d9e7509261a138af3c27c0506ea + 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - a91ee4835f3c2bb33a4295ba3aae43479b50564d + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 97dbe85a8..7a91aaab5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.18-servicing.23272.1 + 6.0.20-servicing.23321.4 - 6.0.18-servicing.23272.2 + 6.0.20-servicing.23321.8 - 6.0.118 + 6.0.120 @@ -44,44 +44,44 @@ - 6.0.18 - 6.0.18 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 0.2.0 - 6.0.118-servicing.23272.29 - 6.0.118-servicing.23272.29 + 6.0.120-servicing.23322.14 + 6.0.120-servicing.23322.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.10 + 6.0.11 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.18 - 6.0.18 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.20 + 6.0.20 2.1.0 - 6.0.18-servicing.23272.2 - 6.0.18-servicing.23272.2 - 6.0.18 - 6.0.18 + 6.0.20-servicing.23321.10 + 6.0.20-servicing.23321.10 + 6.0.20 + 6.0.20 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.118 + 6.0.120 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.18 + 6.0.20 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 56f14043b..747c739db 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -66,6 +66,7 @@ public class OmniSharpTests : SmokeTests Directory.CreateDirectory(OmniSharpDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {omniSharpTarballFile} -C {OmniSharpDirectory}", OutputHelper); + ExecuteHelper.ExecuteProcessValidateExitCode("chmod", $"+x {OmniSharpDirectory}/run", OutputHelper); } } }