From 263fb022a9940ed5c435d42caeccd123dd8dc028 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 6 Jul 2023 10:10:24 -0700 Subject: [PATCH] [automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16892) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Nikola Milosavljevic Co-authored-by: Matt Thalman Co-authored-by: Jason Zhai --- eng/Versions.props | 2 +- global.json | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/PoisonUsage.txt | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 272935017..fb22a6054 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 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.105 + 7.0.108 diff --git a/global.json b/global.json index c39b8898d..5bf585afe 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.107", + "dotnet": "7.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 5782f6cac..95586bbec 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.107" + "dotnet": "7.0.108" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 9428e5b29..e29c81347 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -20,15 +20,6 @@ AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute