diff --git a/NuGet.config b/NuGet.config index 3015a14c1..704eeb938 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,22 @@ - - - + + - + + + + @@ -42,14 +44,15 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3e33549a..fba6bea06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 + e346a9e945fd8fb247ca06c129c68458b0713cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d + b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e0a72cb669f111b49ae42a5666e6306889ccc6 + 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4a5f0c6839363dea534f21736a9d0726c14b41c + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 512eac4b458953da405f51ec0ae7766bcb7b32e5 + d41bd7da4139331ef02657deb7944df43b8a181c https://github.com/dotnet/fsharp @@ -149,9 +149,9 @@ 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db - + https://github.com/dotnet/msbuild - 8e9cb295288f13095e9b7739cc4cbb04e9d246d2 + 6918b863aa37ad0699f98482fbab9f7a52e65a92 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + 9b227c1606a01920839873f840f6b76f7b492a66 - + https://github.com/dotnet/emsdk - b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda + 9b227c1606a01920839873f840f6b76f7b492a66 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 18aae61db..6125c0bce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23274.5 + 7.0.9-servicing.23321.6 - 7.0.7-servicing.23274.5 + 7.0.9-servicing.23321.9 @@ -56,46 +56,46 @@ - 7.0.7 - 7.0.7 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 - 7.0.7-servicing.23274.8 + 7.0.9 + 7.0.9 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 + 7.0.9-servicing.23321.10 0.2.0 - 7.0.107 - 7.0.107-servicing.23275.8 - 7.0.107-servicing.23275.8 + 7.0.109 + 7.0.109-servicing.23322.18 + 7.0.109-servicing.23322.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.3 + 7.0.4 - 7.0.7-servicing.23274.4 - 7.0.7-servicing.23274.4 - 7.0.7 - 7.0.7 - 7.0.7 - 7.0.7 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 + 7.0.9 + 7.0.9 + 7.0.9 + 7.0.9 2.1.0 - 7.0.7-servicing.23275.3 - 7.0.7-servicing.23275.3 - 7.0.7 - 7.0.7 + 7.0.9-servicing.23321.11 + 7.0.9-servicing.23321.11 + 7.0.9 + 7.0.9 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.7 - 7.0.7 + 7.0.9 + 7.0.9 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 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..f8d6ce417 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 @@ -6,6 +6,7 @@ using System; using System.Diagnostics; using System.IO; using System.Net.Http; +using System.Security.AccessControl; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -66,6 +67,9 @@ public class OmniSharpTests : SmokeTests Directory.CreateDirectory(OmniSharpDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {omniSharpTarballFile} -C {OmniSharpDirectory}", OutputHelper); + + // Ensure the run script is executable (see https://github.com/OmniSharp/omnisharp-roslyn/issues/2547) + File.SetUnixFileMode($"{OmniSharpDirectory}/run", UnixFileMode.UserRead | UnixFileMode.UserExecute); } } }