[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15817)

v-wuzhai · web-flow · commit ecacef4686a0 · 2023-03-16T18:58:12.000-07:00
diff --git 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.
     -->
-    <PrivateSourceBuiltSDKVersion>7.0.103</PrivateSourceBuiltSDKVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>7.0.103</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltSDKVersion>7.0.104</PrivateSourceBuiltSDKVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>7.0.104</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
      <!-- 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 -->
-     <NonshippingRuntimeVersionFor700>7.0.0-rtm.22518.5</NonshippingRuntimeVersionFor700>
+     <NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
 
      <MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
      <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
diff --git 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
@@ -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 @@ public DotNetHelper(ITestOutputHelper outputHelper)
                 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 @@ private static string GetBinLogOption(string projectName, string command, string
         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))
         {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"tools": {`
`3`		`- "dotnet": "7.0.103"`
	`3`	`+ "dotnet": "7.0.104"`
`4`	`4`	`},`
`5`	`5`	`"msbuild-sdks": {`
`6`	`6`	`"Microsoft.Build.CentralPackageVersions": "2.0.1",`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@ internal class DotNetHelper`
`14`	`14`	`{`
`15`	`15`	`private static readonly object s_lockObj = new();`
`16`	`16`
`17`		`- private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime();`
`18`	`17`	`public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet");`
`19`	`18`	`public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs");`
`20`	`19`	`public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages");`
`21`	`20`	`public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}");`
`22`	`21`
`23`	`22`	`private ITestOutputHelper OutputHelper { get; }`
	`23`	`+ private bool IsMonoRuntime { get; }`
`24`	`24`
`25`	`25`	`public DotNetHelper(ITestOutputHelper outputHelper)`
`26`	`26`	`{`
`@@ -38,6 +38,7 @@ public DotNetHelper(ITestOutputHelper outputHelper)`
`38`	`38`	`Directory.CreateDirectory(Config.DotNetDirectory);`
`39`	`39`	`ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper);`
`40`	`40`	`}`
	`41`	`+ IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);`
`41`	`42`
`42`	`43`	`if (!Directory.Exists(ProjectsDirectory))`
`43`	`44`	`{`
`@@ -234,10 +235,8 @@ private static string GetBinLogOption(string projectName, string command, string`
`234`	`235`	`return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}";`
`235`	`236`	`}`
`236`	`237`
`237`		`- private static bool DetermineIsMonoRuntime()`
	`238`	`+ private static bool DetermineIsMonoRuntime(string dotnetRoot)`
`238`	`239`	`{`
`239`		`- string dotnetRoot = Config.DotNetDirectory;`
`240`		`-`
`241`	`240`	`string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App");`
`242`	`241`	`if (!Directory.Exists(sharedFrameworkRoot))`
`243`	`242`	`{`