diff --git a/eng/Versions.props b/eng/Versions.props index cb68e967c..ed5e80d6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.103 - 7.0.103 + 7.0.104 + 7.0.104 diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props index ced02e960..82542a831 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -2,7 +2,7 @@ - 7.0.0-rtm.22518.5 + 7.0.4-servicing.23107.6 $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 4ebdc2be0..56136778d 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103" + "dotnet": "7.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index ff1071e2e..80ff2e29e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -14,13 +14,13 @@ internal class DotNetHelper { private static readonly object s_lockObj = new(); - private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime(); public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet"); public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages"); public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}"); private ITestOutputHelper OutputHelper { get; } + private bool IsMonoRuntime { get; } public DotNetHelper(ITestOutputHelper outputHelper) { @@ -38,6 +38,7 @@ internal class DotNetHelper Directory.CreateDirectory(Config.DotNetDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper); } + IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory); if (!Directory.Exists(ProjectsDirectory)) { @@ -234,10 +235,8 @@ internal class DotNetHelper return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}"; } - private static bool DetermineIsMonoRuntime() + private static bool DetermineIsMonoRuntime(string dotnetRoot) { - string dotnetRoot = Config.DotNetDirectory; - string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App"); if (!Directory.Exists(sharedFrameworkRoot)) {