diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index dddb7e729..ff035940f 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -158,8 +158,6 @@ jobs: fi docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed - # Disable smoke tests until more repos are building. - condition: false displayName: Run Tests # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index 0f4d3744c..20680dc30 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -25,7 +25,7 @@ $(BuildCommandArgs) /p:Rid=$(TargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index eec9fcd16..85bd5f8e6 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -59,11 +59,11 @@ - + - + diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..3032849b8 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,58 +1,153 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml +Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml -Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml +Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.xml +Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.xml +Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.SourceGeneration.xml +Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.CSharp.xml +Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.Core.xml +Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Registry.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.AppContext.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Buffers.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.DataAnnotations.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Configuration.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Core.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Concurrent.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Immutable.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.NonGeneric.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Specialized.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Annotations.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.EventBasedAsync.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.TypeConverter.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Console.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.Common.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.DataSetExtensions.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Contracts.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Debug.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.DiagnosticSource.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.FileVersionInfo.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Process.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.StackTrace.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TextWriterTraceListener.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tools.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TraceSource.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tracing.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.Primitives.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Dynamic.Runtime.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Asn1.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Tar.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Calendars.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Extensions.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.Brotli.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.FileSystem.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.ZipFile.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.AccessControl.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.DriveInfo.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Watcher.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.IsolatedStorage.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.MemoryMappedFiles.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.AccessControl.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.UnmanagedMemoryStream.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Expressions.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Parallel.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Queryable.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Memory.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.Json.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.HttpListener.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Mail.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NameResolution.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NetworkInformation.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Ping.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Requests.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Security.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.ServicePoint.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Sockets.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebClient.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebHeaderCollection.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebProxy.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.Client.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.Vectors.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.ObjectModel.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.DispatchProxy.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.ILGeneration.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.Lightweight.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Extensions.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Metadata.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.TypeExtensions.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Reader.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.ResourceManager.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Writer.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.VisualC.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Extensions.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Handles.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.RuntimeInformation.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Intrinsics.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Loader.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Numerics.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Formatters.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Json.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Xml.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.AccessControl.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Claims.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Algorithms.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Cng.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Csp.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Encoding.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.OpenSsl.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Primitives.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.X509Certificates.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.Windows.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.SecureString.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceModel.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceProcess.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.CodePages.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.Extensions.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encodings.Web.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Json.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.RegularExpressions.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Channels.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Overlapped.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Dataflow.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Extensions.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Parallel.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Thread.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.ThreadPool.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Timer.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.Local.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.ValueTuple.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Windows.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.HttpUtility.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Linq.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Serialization.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.ReaderWriter.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XDocument.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.xml Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlDocument.xml -Microsoft.NETCore.App.Ref/ref/netx.y/WindowsBase.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlSerializer.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.XDocument.xml +Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.xml NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config index 59db1a3f1..b3648690f 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config @@ -3,7 +3,7 @@ - - + + diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch new file mode 100644 index 000000000..5291396ad --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch @@ -0,0 +1,74 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 23 May 2022 19:09:18 +0000 +Subject: [PATCH] Add Microsoft.FSharp.Compiler to source-build + +Backport issue: Tracking issue: https://github.com/dotnet/fsharp/issues/13174 +--- + eng/SourceBuild.props | 17 +---------------- + .../Microsoft.FSharp.Compiler.csproj | 16 ++++++++++++++++ + 2 files changed, 17 insertions(+), 16 deletions(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index 903ee00d3..b8402e043 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -5,28 +5,13 @@ + true + + +- +- +- +- +- +- +- +- + + + +- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln" ++ $(InnerBuildArgs) '/p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln;$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"' + + + +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj +index eaeac80f3..417beac4e 100644 +--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj +@@ -9,8 +9,24 @@ + .NET Core compatible version of the F# compiler fsc.exe. + /blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion) + true ++ false + + ++ ++ ++ TargetFramework=net6.0 ++ ++ ++ TargetFramework=net6.0 ++ ++ ++ TargetFramework=netstandard2.0 ++ ++ ++ TargetFramework=netstandard2.0 ++ ++ ++ + + + diff --git a/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch b/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch new file mode 100644 index 000000000..057dcbc7b --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0003-Support-no-repack.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 17 May 2022 23:23:42 +0000 +Subject: [PATCH] Update to handle Microsoft.FSharp.Compiler to handle no NuGet repack support in source-build + +Tracking issue: https://github.com/dotnet/source-build/issues/2873 +--- + .../Microsoft.FSharp.Compiler.nuspec | 7 ++----- + 1 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +index ee67b15c5..b3f926f2f 100644 +--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +@@ -54,11 +54,8 @@ + + +- +- +- +- ++ +