diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2da2bba78..8814405bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a7157f09b..1ae5d5a42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23114.3 + 7.0.0-beta.23164.3 @@ -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 5039463a8..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.23114.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" + "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",