mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/7.0.1xx' into release/7.0.2xx

Browse source
This commit is contained in:
Jason Zhai 2023-03-15 19:52:12 -07:00
commit fe9bb2191e
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Versions.props
View file

@ -215,8 +215,8 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file. necessary, and this property is removed from the file.
--> -->
<PrivateSourceBuiltSDKVersion>7.0.103</PrivateSourceBuiltSDKVersion> <PrivateSourceBuiltSDKVersion>7.0.104</PrivateSourceBuiltSDKVersion>
<PrivateSourceBuiltArtifactsPackageVersion>7.0.103</PrivateSourceBuiltArtifactsPackageVersion> <PrivateSourceBuiltArtifactsPackageVersion>7.0.104</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- Workload manifest package versions --> <!-- Workload manifest package versions -->
<PropertyGroup> <PropertyGroup>

2
src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<!-- 7.0.0 produced improperly versioned runtime assets because the OfficialBuildId <!-- 7.0.0 produced improperly versioned runtime assets because the OfficialBuildId
was not set correctly. This is the actual shipping version that it should have been --> was not set correctly. This is the actual shipping version that it should have been -->
<NonshippingRuntimeVersionFor700>7.0.0-rtm.22518.5</NonshippingRuntimeVersionFor700> <NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
<MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion> <MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
<MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion> <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>

2
src/SourceBuild/tarball/content/global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "7.0.103" "dotnet": "7.0.104"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.CentralPackageVersions": "2.0.1",

7
src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
View file

@ -14,13 +14,13 @@ internal class DotNetHelper
{ {
private static readonly object s_lockObj = new(); 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 DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet");
public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs");
public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages"); public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages");
public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}"); public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}");
private ITestOutputHelper OutputHelper { get; } private ITestOutputHelper OutputHelper { get; }
private bool IsMonoRuntime { get; }
public DotNetHelper(ITestOutputHelper outputHelper) public DotNetHelper(ITestOutputHelper outputHelper)
{ {
@ -38,6 +38,7 @@ internal class DotNetHelper
Directory.CreateDirectory(Config.DotNetDirectory); Directory.CreateDirectory(Config.DotNetDirectory);
ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper);
} }
IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
if (!Directory.Exists(ProjectsDirectory)) if (!Directory.Exists(ProjectsDirectory))
{ {
@ -234,10 +235,8 @@ internal class DotNetHelper
return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}"; 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"); string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App");
if (!Directory.Exists(sharedFrameworkRoot)) if (!Directory.Exists(sharedFrameworkRoot))
{ {