From 013a5c821ed0bb20c2f4057c613e7d7de57d627f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 13 Apr 2023 07:44:57 -0500 Subject: [PATCH 1/3] Update SB test baselines (#16087) --- .../assets/baselines/MissingXmlDoc.txt | 1 + .../assets/baselines/MsftToSbSdk.diff | 35 +++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) 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..bde73ece6 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,6 +1,7 @@ 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/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.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/ref/netx.y/mscorlib.xml diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index af55e4865..6dfed1f0b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,21 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +43,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -545,7 +563,18 @@ index ------------ -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.resources.dll ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll - ./sdk/x.y.z/zh-Hant/vstest.console.resources.dll ./shared/ - ./shared/Microsoft.AspNetCore.App/x.y.z/ - +@@ ------------ @@ + ./templates/ + ./templates/x.y.z/ + ./templates/x.y.z/microsoft.dotnet.common.itemtemplates.x.y.z.nupkg +-./templates/x.y.z/microsoft.dotnet.common.projecttemplates.x.y.z.0.116.nupkg ++./templates/x.y.z/microsoft.dotnet.common.projecttemplates.x.y.z.0.115.nupkg + ./templates/x.y.z/microsoft.dotnet.test.projecttemplates.x.y.z.0.2-betax.y.z.nupkg +-./templates/x.y.z/microsoft.dotnet.web.itemtemplates.x.y.z.0.16.nupkg +-./templates/x.y.z/microsoft.dotnet.web.projecttemplates.x.y.z.0.16.nupkg +-./templates/x.y.z/microsoft.dotnet.web.spa.projecttemplates.x.y.z.0.16.nupkg ++./templates/x.y.z/microsoft.dotnet.web.itemtemplates.x.y.z.0.15.nupkg ++./templates/x.y.z/microsoft.dotnet.web.projecttemplates.x.y.z.0.15.nupkg ++./templates/x.y.z/microsoft.dotnet.web.spa.projecttemplates.x.y.z.0.15.nupkg + ./ThirdPartyNotices.txt \ No newline at end of file From 668276750ad97e5ff2011287f6b528eafcb332a8 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 13 Apr 2023 09:21:52 -0500 Subject: [PATCH 2/3] Write and upload updated baselines for source-build content tests (#16088) Co-authored-by: Logan Bussell --- .../eng/common/templates/job/source-build-build-tarball.yml | 2 ++ .../Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 b7318d262..488425c79 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 @@ -182,6 +182,8 @@ jobs: find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; displayName: Prepare BuildLogs staging directory continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index 32a23d76f..0641cfd49 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests public static void CompareContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper, bool warnOnDiffs = false) { - string actualFilePath = Path.Combine(Environment.CurrentDirectory, $"{baselineFileName}"); + string actualFilePath = Path.Combine(DotNetHelper.LogsDirectory, $"Updated{baselineFileName}"); File.WriteAllText(actualFilePath, actualContents); CompareFiles(baselineFileName, actualFilePath, outputHelper, warnOnDiffs); From 224920d84e359fd9b9cb6305cac1dbc49dcb65fa Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 13 Apr 2023 14:15:31 -0500 Subject: [PATCH 3/3] Update MsftToSbSdk.diff (#16106) --- .../assets/baselines/MsftToSbSdk.diff | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 6dfed1f0b..4e98d267b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -26,7 +26,6 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll @@ -563,18 +562,4 @@ index ------------ -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.resources.dll ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll - ./shared/ -@@ ------------ @@ - ./templates/ - ./templates/x.y.z/ - ./templates/x.y.z/microsoft.dotnet.common.itemtemplates.x.y.z.nupkg --./templates/x.y.z/microsoft.dotnet.common.projecttemplates.x.y.z.0.116.nupkg -+./templates/x.y.z/microsoft.dotnet.common.projecttemplates.x.y.z.0.115.nupkg - ./templates/x.y.z/microsoft.dotnet.test.projecttemplates.x.y.z.0.2-betax.y.z.nupkg --./templates/x.y.z/microsoft.dotnet.web.itemtemplates.x.y.z.0.16.nupkg --./templates/x.y.z/microsoft.dotnet.web.projecttemplates.x.y.z.0.16.nupkg --./templates/x.y.z/microsoft.dotnet.web.spa.projecttemplates.x.y.z.0.16.nupkg -+./templates/x.y.z/microsoft.dotnet.web.itemtemplates.x.y.z.0.15.nupkg -+./templates/x.y.z/microsoft.dotnet.web.projecttemplates.x.y.z.0.15.nupkg -+./templates/x.y.z/microsoft.dotnet.web.spa.projecttemplates.x.y.z.0.15.nupkg - ./ThirdPartyNotices.txt \ No newline at end of file + ./shared/ \ No newline at end of file