diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 0007b6c6e..39f48573d 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100" + "dotnet": "6.0.200-preview.21603.2" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 05c0b2fe9..2a0b789e6 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -48,8 +48,7 @@ configuration="Release" excludeNonWebTests=false excludeWebTests=false excludeWebNoHttpsTests=false -# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed. -excludeWebHttpsTests=true +excludeWebHttpsTests=false excludeLocalTests=false excludeOnlineTests=false devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index b82c812ab..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -7,13 +7,29 @@ Removes prebuilts. Background Issue: https://github.com/dotnet/source-build/issues/2542 --- + eng/dependabot/Packages.props | 3 --- src/Build/Microsoft.Build.csproj | 4 +++- src/Directory.BeforeCommon.targets | 2 +- + src/Framework/Microsoft.Build.Framework.csproj | 2 +- src/Samples/Directory.Build.props | 1 + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 5 files changed, 9 insertions(+), 4 deletions(-) + 7 files changed, 10 insertions(+), 8 deletions(-) +diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props +index a1f21de26..ff74d6e7f 100644 +--- a/eng/dependabot/Packages.props ++++ b/eng/dependabot/Packages.props +@@ -22,9 +22,6 @@ + + + +- +- +- + + + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj @@ -43,6 +59,19 @@ index 913c97b12..320bffa56 100644 $(DefineConstants);FEATURE_MSCOREE +diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj +index df7556447..c7edff611 100644 +--- a/src/Framework/Microsoft.Build.Framework.csproj ++++ b/src/Framework/Microsoft.Build.Framework.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + + + diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props index 6b9d6cd9f..317ef14a6 100644 --- a/src/Samples/Directory.Build.props diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch new file mode 100644 index 000000000..a0133a35f --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rainer Sigwald +Date: Fri, 3 Dec 2021 14:24:03 -0600 +Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118) + +This package is only super relevant at PR-build time so it should +be fine to drop it from source-build scenarios. Fixes #7115. + +Patch created from https://github.com/dotnet/msbuild/pull/7118 +--- + src/Directory.Build.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets +index 2a840bfd7..bff6cc905 100644 +--- a/src/Directory.Build.targets ++++ b/src/Directory.Build.targets +@@ -85,7 +85,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch deleted file mode 100644 index 8e3884438..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 19 Oct 2021 11:39:32 -0500 -Subject: [PATCH] Apply arcade-powered source-build patches (#55823) - -Don't include desktop artifacts that don't exist in source-build. -Source-build doesn't have these artifacts available, even when we eventually will -build desktop TFMs, because Roslyn is one of the first builds in source-build. -Instead Roslyn is picking up reference packages that don't have the `lib` directory -which is causing a build failure. This disables the attempt to grab these desktop -artifacts so source-build just skips them instead. - -Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823 ---- - .../DesktopCompilerArtifacts.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -index c8b87ab6958..107ff051b51 100644 ---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -@@ -20,7 +20,7 @@ - VS training data to the assemblies they produce. - --> - -- -+ - - - --- -2.31.1 -