diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fe22c7bd9..f5e03ad65 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -85,17 +85,17 @@
https://github.com/dotnet/test-templates
0385265f4d0b6413d64aea0223172366a9b9858c
-
+
https://github.com/dotnet/test-templates
- 94c498e399eb1cbb7290ed1e42564589a259312a
+ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4
-
+
https://github.com/dotnet/test-templates
- 94c498e399eb1cbb7290ed1e42564589a259312a
+ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4
-
+
https://github.com/dotnet/test-templates
- 94c498e399eb1cbb7290ed1e42564589a259312a
+ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4
@@ -198,18 +198,18 @@
-
+
https://github.com/dotnet/arcade
- 2e0fab0209c66d181d93b0d03bc267db5bde75be
+ 099bbb071e187ba4e1603004597624e6acae6394
-
+
https://github.com/dotnet/arcade
- 2e0fab0209c66d181d93b0d03bc267db5bde75be
+ 099bbb071e187ba4e1603004597624e6acae6394
-
+
https://github.com/dotnet/arcade
- 2e0fab0209c66d181d93b0d03bc267db5bde75be
+ 099bbb071e187ba4e1603004597624e6acae6394
https://github.com/dotnet/source-build-reference-packages
diff --git a/eng/Versions.props b/eng/Versions.props
index 4859b07dd..3b940a31d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
- 7.0.0-beta.23122.4
+ 7.0.0-beta.23164.3
@@ -46,9 +46,9 @@
1.0.2-beta4.22406.1
- 1.1.0-rc.23115.1
- 1.1.0-rc.23115.1
- 1.1.0-rc.23115.1
+ 1.1.0-rc.23166.1
+ 1.1.0-rc.23166.1
+ 1.1.0-rc.23166.1
@@ -122,8 +122,8 @@
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
-->
- true
- true
+ true
+ true
$([MSBuild]::Subtract($(VersionFeature60), 1))
$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))
@@ -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/global.json b/global.json
index 9890ccd94..da60f35de 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "7.0.103",
+ "dotnet": "7.0.104",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4",
- "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
+ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3"
}
}
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))
{